diff --git a/src/modb_groups.c b/src/modb_groups.c
index 4292a07..6713b5d 100644
--- a/src/modb_groups.c
+++ b/src/modb_groups.c
@@ -243,7 +243,7 @@ int modbGroupList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with
   struct group_t *group;
 
   if (with_deleted == 0) {
-    wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
+    wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
   }
   res = doGroupsQuery(sconn, modb, wb, groups, n_groups);
   if (wb != 0) {
diff --git a/src/modb_metadata.c b/src/modb_metadata.c
index 3586e81..7e89852 100644
--- a/src/modb_metadata.c
+++ b/src/modb_metadata.c
@@ -245,7 +245,7 @@ int modbMetadataListByOwnerId(stored_conn *sconn, modb_ref *modb, unsigned int o
 
   wb = where(0, "owner_id", EQ, TYPE_ID, owner_id);
   if (with_deleted == 0) {
-    wb = whereAnd(wb, where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0));
+    wb = whereAnd(wb, where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0));
   }
   res = doMetadataListQuery(sconn, modb, wb, metadata_list, n_metadatas);
   if (wb != 0) {
@@ -291,7 +291,7 @@ int modbMetadataList(stored_conn *sconn, modb_ref *modb, int with_deleted,
   int res;
 
   if (with_deleted == 0) {
-    wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
+    wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
   }
   res = doMetadataListQuery(sconn, modb, wb, metadata_list, n_metadatas);
   if (wb != 0) {
@@ -484,7 +484,7 @@ int modbMetadataDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
   int64_t qry_ret;
 
   modbTableName(&table, &table_len, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE));
-  qry_ret = softDeleteByIdQuery(sconn, table, table_len, "id", id);
+  qry_ret = softDeleteByIdQuery(sconn, table, table_len, "mdo_id", id);
   modbFreeTableName(&table);
 
   return (int)qry_ret;
@@ -496,7 +496,7 @@ int modbMetadataDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
   int64_t qry_ret;
 
   modbTableName(&table, &table_len, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE));
-  qry_ret = deleteByIdQuery(sconn, table, table_len, "id", id);
+  qry_ret = deleteByIdQuery(sconn, table, table_len, "mdo_id", id);
   modbFreeTableName(&table);
 
   return (int)qry_ret;
diff --git a/src/modb_objects.c b/src/modb_objects.c
index a9c2038..d520cea 100644
--- a/src/modb_objects.c
+++ b/src/modb_objects.c
@@ -199,7 +199,7 @@ int modbObjectList(stored_conn *sconn, modb_ref *modb, int with_deleted,
   int res;
 
   if (with_deleted == 0) {
-    wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
+    wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
   }
   res = doObjectsQuery(sconn, modb, wb, objects, n_objects);
   if (wb != 0) {
@@ -279,7 +279,7 @@ int modbObjectDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
   int64_t qry_ret;
 
   modbTableName(&table, &table_len, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE));
-  qry_ret = softDeleteByIdQuery(sconn, table, table_len, "id", id);
+  qry_ret = softDeleteByIdQuery(sconn, table, table_len, "mdo_id", id);
   modbFreeTableName(&table);
 
   return (int)qry_ret;
@@ -291,7 +291,7 @@ int modbObjectDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
   int64_t qry_ret;
 
   modbTableName(&table, &table_len, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE));
-  qry_ret = deleteByIdQuery(sconn, table, table_len, "id", id);
+  qry_ret = deleteByIdQuery(sconn, table, table_len, "mdo_id", id);
   modbFreeTableName(&table);
 
   return (int)qry_ret;
diff --git a/src/modb_users.c b/src/modb_users.c
index 5860885..68ed239 100644
--- a/src/modb_users.c
+++ b/src/modb_users.c
@@ -281,7 +281,7 @@ int modbUserList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with_
   struct user_t *user;
 
   if (with_deleted == 0) {
-    wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
+    wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
   }
   res = doUsersQuery(sconn, modb, wb, users, n_users);
   if (wb != 0) {