diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java
index 7c53701..fc4b64e 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java
@@ -207,7 +207,7 @@
 		ResponsePrimitive response = new ResponsePrimitive(request);
 
 		// get the entity
-		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeEntityDAO().find(transaction, request.getTargetId());
+		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeDAO().find(transaction, request.getTargetId());
 		if (nodeEntity == null) {
 			throw new ResourceNotFoundException();
 		}
@@ -232,7 +232,7 @@
 		ResponsePrimitive response = new ResponsePrimitive(request);
 
 		// retrieve the resource from database
-		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeEntityDAO().find(transaction, request.getTargetId());
+		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeDAO().find(transaction, request.getTargetId());
 		if (nodeEntity == null) {
 			throw new ResourceNotFoundException();
 		}
@@ -338,7 +338,7 @@
 		ResponsePrimitive response = new ResponsePrimitive(request);
 
 		// retrieve the entity
-		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeEntityDAO().find(transaction, request.getTargetId());
+		NodeEntity nodeEntity = dbs.getDAOFactory().getNodeDAO().find(transaction, request.getTargetId());
 		if (nodeEntity == null) {
 			throw new ResourceNotFoundException();
 		}