diff --git a/src/main/java/org/gcube/common/portal/Portal.java b/src/main/java/org/gcube/common/portal/PortalContext.java
similarity index 79%
rename from src/main/java/org/gcube/common/portal/Portal.java
rename to src/main/java/org/gcube/common/portal/PortalContext.java
index 5a0586b..ef3ac7c 100644
--- a/src/main/java/org/gcube/common/portal/Portal.java
+++ b/src/main/java/org/gcube/common/portal/PortalContext.java
@@ -14,32 +14,32 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * Clients can obtain the single instance of the {@link Portal} by invoking its static method {@link #getConfiguration()}. 
+ * Clients can obtain the single instance of the {@link PortalContext} by invoking its static method {@link #getConfiguration()}. 
  * The first invocation of the method triggers the initialisation of the instance.
  * 
  * @author Massimiliano Assante (ISTI-CNR)
  *
  */
-public class Portal {
-	private static final Logger _log = LoggerFactory.getLogger(Portal.class);
+public class PortalContext {
+	private static final Logger _log = LoggerFactory.getLogger(PortalContext.class);
 
 	public static final String INFRASTRUCTURE_NAME = "infrastructure";  
 	public static final String SCOPES = "scopes";  
 
-	protected static Portal singleton = new Portal();
+	protected static PortalContext singleton = new PortalContext();
 
 	private String infra;
 	private String vos;
 
-	private Portal() {
+	private PortalContext() {
 		initialize();
 	}
 	/**
 	 * 
 	 * @return the instance
 	 */
-	public synchronized static Portal getConfiguration() {
-		return singleton == null ? new Portal() : singleton;
+	public synchronized static PortalContext getConfiguration() {
+		return singleton == null ? new PortalContext() : singleton;
 	}
 
 
@@ -58,7 +58,7 @@ public class Portal {
 			vos = "";
 			_log.error("infrastructure.properties file not found under $CATALINA_HOME/ dir, setting default infrastructure Name and no Scopes" + infra);
 		}		
-		_log.info("Portal configurator correctly initialized on " + infra);
+		_log.info("PortalContext configurator correctly initialized on " + infra);
 	}
 
 	public String getInfrastructureName() {