diff --git a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
index d139c81fbf5cac6d5dc961affc1c4fe9ee6ee793..1dba190052e58754edcaf4234c23600e9ad3a725 100644
--- a/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
+++ b/scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java
@@ -168,7 +168,7 @@ public class PAGateway {
      * @return the list of all available hardware
      */
     public List<Hardware> getHardwareList() {
-        return EntityManagerHelper.createQuery("SELECT hw FROM HARDWARE hw",
+        return EntityManagerHelper.createQuery("SELECT hw FROM Hardware hw",
                 Hardware.class).getResultList();
     }
 
@@ -177,7 +177,7 @@ public class PAGateway {
      * @return the list of all available locations
      */
     public List<Location> getLocationList() {
-        return EntityManagerHelper.createQuery("SELECT loc FROM LOCATION loc",
+        return EntityManagerHelper.createQuery("SELECT loc FROM Location loc",
                 Location.class).getResultList();
     }
 
@@ -186,7 +186,7 @@ public class PAGateway {
      * @return the list of all available monitors
      */
     public List<Monitor> getMonitorsList() {
-        return EntityManagerHelper.createQuery("SELECT mon FROM MONITOR mon",
+        return EntityManagerHelper.createQuery("SELECT mon FROM Monitor mon",
                 Monitor.class).getResultList();
     }