diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
index c7d9c02067e0420590058476aad55b2542e4497f..be7ff11543547a87e1fef03a0c0ae67dd5621702 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
@@ -18,9 +18,11 @@ public class MySQLGetAllNames extends MySQLTransaction implements GetAllNamesImp
     super(access);
   }
 
-  // TODO
   public static final String STMT_GET_ALL_NAMES =
-      "Select e.name as EntityName, e.role as EntityRole, a.acl as ACL FROM entities as e JOIN entity_acl as a ON (a.id=e.acl) WHERE e.name IS NOT NULL and e.role!='ROLE'";
+      "SELECT d.value as EntityName, e.role AS EntityRole, a.acl AS ACL "
+          + "FROM name_data AS d JOIN entities AS e JOIN entity_acl AS a "
+          + "ON (d.domain_id = 0 AND d.property_id = 20 AND d.entity_id = e.id AND a.id = e.acl) "
+          + "WHERE e.role != 'ROLE' AND e.role != 'DATATYPE'";
 
   @Override
   public List<SparseEntity> execute() {