diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
index 5d7fc8c..97932cd 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
@@ -222,7 +222,7 @@ public class EServiceManager {
 
 		UUID uuid = UUID.fromString(id);
 		EService eService = new EServiceImpl();
-		eService.setUUID(uuid);
+		eService.setID(uuid);
 		
 		SoftwareFacet softwareFacet = new SoftwareFacetImpl();
 		softwareFacet.setDescription(applicationConfiguration.description());
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
index 2d97a42..1a33e13 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
@@ -288,7 +288,7 @@ public class HostingNodeManager {
 
 		UUID uuid = UUID.fromString(id);
 		HostingNode hostingNode = new HostingNodeImpl();
-		hostingNode.setUUID(uuid);
+		hostingNode.setID(uuid);
 
 		NetworkingFacet networkingFacet = new NetworkingFacetImpl();
 		try {