diff --git a/src/modb_database.c b/src/modb_database.c
index ec36e37..4f68302 100644
--- a/src/modb_database.c
+++ b/src/modb_database.c
@@ -35,7 +35,7 @@ int modbCreate(stored_conn *sconn, modb_ref *modb, column_data **col_data, size_
 }
 int modbExists(stored_conn *sconn, modb_ref *modb)
 {
-  return MODBTableExists(sconn, modb, META_TABLE, STR_LEN(META_TABLE));
+  return MODBTableExists(sconn, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE));
 }
 int modbHasExtendedMetadata(stored_conn *sconn, modb_ref *modb)
 {
@@ -46,7 +46,7 @@ int modbDestroy(stored_conn *sconn, modb_ref *modb)
   uint64_t err = 0
       | destroyMODBTable(sconn, modb, MDO_GROUPS_TABLE, STR_LEN(MDO_GROUPS_TABLE))
       | destroyMODBTable(sconn, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE))
-      | destroyMODBTable(sconn, modb, META_TABLE, STR_LEN(META_TABLE))
+      | destroyMODBTable(sconn, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE))
       | destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE))
       | destroyMODBTable(sconn, modb, USER_GROUPS_TABLE, STR_LEN(USER_GROUPS_TABLE))
       | destroyMODBTable(sconn, modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE))
diff --git a/src/modb_database_p.c b/src/modb_database_p.c
index edff6c4..a27ae4f 100644
--- a/src/modb_database_p.c
+++ b/src/modb_database_p.c
@@ -254,11 +254,11 @@ uint64_t createMetaTable(stored_conn *sconn, modb_ref *modb)
 {
   return createMODBTable(
         sconn, modb,
-        META_TABLE, STR_LEN(META_TABLE),
+        METADATA_TABLE, STR_LEN(METADATA_TABLE),
         "("
         "`mdo_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, "
         "`title` VARCHAR(255) NOT NULL, "
-        "`owner` INT UNSIGNED NOT NULL, "
+        "`owner_id` INT UNSIGNED NOT NULL, "
         "`created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
         "`updated` TIMESTAMP on update CURRENT_TIMESTAMP NULL DEFAULT NULL, "
         "`deleted` TIMESTAMP NULL DEFAULT NULL, "
diff --git a/src/modb_p.h b/src/modb_p.h
index 51e8d44..b04f263 100644
--- a/src/modb_p.h
+++ b/src/modb_p.h
@@ -9,7 +9,7 @@
 
 
 #define SYS_TABLE "_sys"
-#define META_TABLE "_meta"
+#define METADATA_TABLE "_meta"
 #define OBJECTS_TABLE "_objects"
 #define MDO_GROUPS_TABLE "_mdo_groups"