diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/ConcessioniMongoServiceIdentityProxy.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/ConcessioniMongoServiceIdentityProxy.java
index b15fb78..735f381 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/ConcessioniMongoServiceIdentityProxy.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/ConcessioniMongoServiceIdentityProxy.java
@@ -4,9 +4,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.common.portal.PortalContext;
-import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities.GcubeIdentity;
-import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities.IAMClientIdentity;
-import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities.UserIdentity;
+import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity.GcubeIdentity;
+import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity.IAMClientIdentity;
+import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity.UserIdentity;
 import org.gcube.portlets.user.geoportaldataviewer.server.util.SessionUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/IAMClientCredentialsReader.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/IAMClientCredentialsReader.java
index 6d1ab37..6df98b6 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/IAMClientCredentialsReader.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/IAMClientCredentialsReader.java
@@ -10,7 +10,7 @@ import org.gcube.common.encryption.StringEncrypter;
 import org.gcube.common.resources.gcore.ServiceEndpoint;
 import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities.IAMClientCredentials;
+import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity.IAMClientCredentials;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/GcubeIdentity.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/GcubeIdentity.java
similarity index 95%
rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/GcubeIdentity.java
rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/GcubeIdentity.java
index ac81b18..ad1e4e4 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/GcubeIdentity.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/GcubeIdentity.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities;
+package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientCredentials.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientCredentials.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientCredentials.java
rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientCredentials.java
index 267b991..21956f6 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientCredentials.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientCredentials.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities;
+package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientIdentity.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientIdentity.java
similarity index 99%
rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientIdentity.java
rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientIdentity.java
index 01d319f..45dbc63 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/IAMClientIdentity.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/IAMClientIdentity.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities;
+package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/UserIdentity.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/UserIdentity.java
similarity index 96%
rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/UserIdentity.java
rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/UserIdentity.java
index c59f0c0..f2ee8f9 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentities/UserIdentity.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/mongoservice/accessidentity/UserIdentity.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities;
+package org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
index 3a81e6b..0aa3b91 100644
--- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
+++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/IAMClient.java
@@ -5,7 +5,7 @@ import java.util.List;
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.IAMClientCredentialsReader;
-import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentities.IAMClientCredentials;
+import org.gcube.portlets.user.geoportaldataviewer.server.mongoservice.accessidentity.IAMClientCredentials;
 import org.junit.Test;
 
 public class IAMClient {