diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
index 8e98b8f..15489bd 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
@@ -20,7 +20,9 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.events.Observes;
 import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
-import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;import org.gcube.resourcemanagement.model.reference.entities.resources.EService;
+import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;
+import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet;
+import org.gcube.resourcemanagement.model.reference.entities.resources.EService;
 import org.gcube.smartgears.context.Property;
 import org.gcube.smartgears.context.application.ApplicationContext;
 import org.gcube.smartgears.handler.resourceregistry.resourcemanager.EServiceManager;
@@ -40,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * <ul>
  * <li>creates the {@link EService} {@link Resource} and the facets it
  * {@link ConsistsOf} when the application starts for the first time;</li>
- * <li>update the {@link ServiceStateFacet} when the application becomes active,
+ * <li>update the {@link StateFacet} when the application becomes active,
  * and at any lifecycle change thereafter;</li>
  * </ul>
  * </p>
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
index 633bb2e..3b34200 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
@@ -29,6 +29,7 @@ import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
+import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet;
 import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode;
 import org.gcube.smartgears.context.Property;
 import org.gcube.smartgears.context.container.ContainerContext;
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
  * <ul>
  * <li>creates the {@link HostingNode} {@link Resource} and the facets it
  * {@link ConsistsOf} when the container starts for the first time;</li>
- * <li>update the {@link ContainerStateFacet} when the application becomes
+ * <li>update the {@link StateFacet} when the application becomes
  * active, and at any lifecycle change thereafter;</li>
  * <li>schedule a periodic update of {@link Facet}s containing variables
  * information.</li>