diff --git a/src/main/java/org/gcube/vremanagement/whnmanager/ContextManager.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/ContextManager.java
similarity index 97%
rename from src/main/java/org/gcube/vremanagement/whnmanager/ContextManager.java
rename to src/main/java/org/gcube/resourcemanagement/whnmanager/ContextManager.java
index b25816c..839f488 100644
--- a/src/main/java/org/gcube/vremanagement/whnmanager/ContextManager.java
+++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/ContextManager.java
@@ -1,4 +1,4 @@
-package org.gcube.vremanagement.whnmanager;
+package org.gcube.resourcemanagement.whnmanager;
 
 import java.net.HttpURLConnection;
 import java.util.Map.Entry;
@@ -18,13 +18,13 @@ import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
 import org.gcube.common.gxhttp.util.ContentUtils;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
+import org.gcube.resourcemanagement.whnmanager.utils.ValidationUtils;
 import org.gcube.smartgears.ContextProvider;
 import org.gcube.smartgears.context.application.ApplicationContext;
 import org.gcube.smartgears.managers.ContextEvents;
 import org.gcube.smartgears.security.SimpleCredentials;
 import org.gcube.smartgears.security.defaults.DefaultAuthorizationProvider;
 import org.gcube.smartgears.utils.InnerMethodName;
-import org.gcube.vremanagement.whnmanager.utils.ValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/vremanagement/whnmanager/WHNManager.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/WHNManager.java
similarity index 87%
rename from src/main/java/org/gcube/vremanagement/whnmanager/WHNManager.java
rename to src/main/java/org/gcube/resourcemanagement/whnmanager/WHNManager.java
index d509491..cb83098 100644
--- a/src/main/java/org/gcube/vremanagement/whnmanager/WHNManager.java
+++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/WHNManager.java
@@ -1,4 +1,4 @@
-package org.gcube.vremanagement.whnmanager;
+package org.gcube.resourcemanagement.whnmanager;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/org/gcube/vremanagement/whnmanager/utils/ValidationUtils.java b/src/main/java/org/gcube/resourcemanagement/whnmanager/utils/ValidationUtils.java
similarity index 98%
rename from src/main/java/org/gcube/vremanagement/whnmanager/utils/ValidationUtils.java
rename to src/main/java/org/gcube/resourcemanagement/whnmanager/utils/ValidationUtils.java
index bdf07bc..e37c7b3 100644
--- a/src/main/java/org/gcube/vremanagement/whnmanager/utils/ValidationUtils.java
+++ b/src/main/java/org/gcube/resourcemanagement/whnmanager/utils/ValidationUtils.java
@@ -1,4 +1,4 @@
-package org.gcube.vremanagement.whnmanager.utils;
+package org.gcube.resourcemanagement.whnmanager.utils;
 
 import java.util.Iterator;
 
diff --git a/src/test/java/org/gcube/resourcemanagement/whnmanager/ContextManagerIntegrationTest.java b/src/test/java/org/gcube/resourcemanagement/whnmanager/ContextManagerIntegrationTest.java
index f0b72d6..5bc2d0a 100644
--- a/src/test/java/org/gcube/resourcemanagement/whnmanager/ContextManagerIntegrationTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/whnmanager/ContextManagerIntegrationTest.java
@@ -16,6 +16,7 @@ import javax.ws.rs.core.Response.Status;
 import org.gcube.common.events.Hub;
 import org.gcube.common.security.credentials.Credentials;
 import org.gcube.common.security.secrets.Secret;
+import org.gcube.resourcemanagement.whnmanager.ContextManager;
 import org.gcube.smartgears.ContextProvider;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
 import org.gcube.smartgears.context.Properties;
@@ -24,7 +25,6 @@ import org.gcube.smartgears.context.container.ContainerContext;
 import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle;
 import org.gcube.smartgears.persistence.PersistenceWriter;
 import org.gcube.smartgears.security.AuthorizationProvider;
-import org.gcube.vremanagement.whnmanager.ContextManager;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.BeforeClass;