diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ContextPath.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java
similarity index 72%
rename from io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ContextPath.java
rename to io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java
index 81dbf02..a88cc11 100644
--- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ContextPath.java
+++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java
@@ -1,12 +1,12 @@
 package org.gcube.resourcemanagement.manager.io.rs;
 
 /**
- * REST paths exposed by the webapp.
+ * REST paths for the RMContext exposed by the webapp.
  * 
  * @author Manuele Simi (ISTI - CNR)
  *
  */
-public class ContextPath {
+public class RMContextPath {
 
 	public static final String CONTEXT_ROOT = "context";
 	
diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcePath.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMResourcePath.java
similarity index 65%
rename from io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcePath.java
rename to io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMResourcePath.java
index 7bb28a5..aca2505 100644
--- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcePath.java
+++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMResourcePath.java
@@ -1,12 +1,12 @@
 package org.gcube.resourcemanagement.manager.io.rs;
 
 /**
- * REST paths exposed by the webapp.
+ * REST paths exposed by the webapp for RMResource.
  * 
  * @author Manuele Simi (ISTI - CNR)
  *
  */
-public class ResourcePath {
+public class RMResourcePath {
 	public static final String ROOT = "resource";
 
 }
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java
index 5cd7e90..d24ae24 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java
@@ -11,7 +11,7 @@ import javax.ws.rs.core.Response.Status;
 
 import org.gcube.informationsystem.impl.utils.ISMapper;
 import org.gcube.informationsystem.model.entity.Context;
-import org.gcube.resourcemanagement.manager.io.rs.ContextPath;
+import org.gcube.resourcemanagement.manager.io.rs.RMContextPath;
 import org.gcube.resourcemanagement.manager.webapp.ResourceInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
  * @author Manuele Simi (ISTI-CNR) 
  *
  */
-@Path(ContextPath.CONTEXT_ROOT)
+@Path(RMContextPath.CONTEXT_ROOT)
 public class RMContext {
 	
 	private static Logger logger = LoggerFactory.getLogger(RMContext.class);
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/Resource.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMResource.java
similarity index 70%
rename from webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/Resource.java
rename to webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMResource.java
index e1db644..d289d45 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/Resource.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMResource.java
@@ -3,7 +3,7 @@ package org.gcube.resourcemanagement.manager.webapp.rs;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 
-import org.gcube.resourcemanagement.manager.io.rs.ResourcePath;
+import org.gcube.resourcemanagement.manager.io.rs.RMResourcePath;
 
 /**
  * Methods for {@link org.gcube.informationsystem.model.entity.Resource} operations.
@@ -11,8 +11,8 @@ import org.gcube.resourcemanagement.manager.io.rs.ResourcePath;
  * @author Manuele Simi (ISTI-CNR)
  *
  */
-@Path(ResourcePath.ROOT)
-public class Resource {
+@Path(RMResourcePath.ROOT)
+public class RMResource {
 
 	@PUT
 	public void addToContext() {
diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContextTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContextTest.java
index efd74f3..bec9bbc 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContextTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContextTest.java
@@ -42,8 +42,7 @@ public class RMContextTest extends JerseyTest {
 
 	
 	/**
-	 * Test method for
-	 * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(java.lang.String)}.
+	 * Test method for marshal/unmarshal contexts.
 	 */
 	@Test
 	public void step0_Context() {