diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/SystemEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/SystemEnvironment.java
index e55069e..90273ba 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/environments/SystemEnvironment.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/environments/SystemEnvironment.java
@@ -87,7 +87,7 @@ public abstract class SystemEnvironment {
 		}
 	}
 	
-	protected final UUID environmentId;
+	protected final UUID environmentUUID;
 	
 	protected final Map<Boolean,Map<PermissionMode,ODatabasePool>> poolMap;
 	
@@ -121,7 +121,7 @@ public abstract class SystemEnvironment {
 	}
 	
 	protected SystemEnvironment(UUID context, boolean hierarchical) throws ResourceRegistryException {
-		this.environmentId = context;
+		this.environmentUUID = context;
 		this.poolMap = new HashMap<>();
 		
 		this.allowedRoles = new HashSet<>(SystemEnvironment.allOperationAllowedRoles);
@@ -299,7 +299,7 @@ public abstract class SystemEnvironment {
 	}
 	
 	public UUID getUUID() {
-		return environmentId;
+		return environmentUUID;
 	}
 	
 	public static String getRoleOrUserName(PermissionMode permissionMode, SecurityType securityType) {
@@ -322,7 +322,7 @@ public abstract class SystemEnvironment {
 		StringBuilder stringBuilder = new StringBuilder();
 		stringBuilder.append(getRoleOrUserName(permissionMode, securityType, hierarchic));
 		stringBuilder.append("_");
-		stringBuilder.append(environmentId.toString());
+		stringBuilder.append(environmentUUID.toString());
 		return stringBuilder.toString();
 	}
 	
@@ -624,7 +624,7 @@ public abstract class SystemEnvironment {
 	public void create(ODatabaseDocument oDatabaseDocument) {
 		OSecurity oSecurity = getOSecurity(oDatabaseDocument);
 		createRolesAndUsers(oSecurity);
-		logger.trace("Security Context (roles and users) with UUID {} successfully created", environmentId.toString());
+		logger.trace("Security Context (roles and users) with UUID {} successfully created", environmentUUID.toString());
 	}
 	
 	private void drop(OSecurity oSecurity, String name, SecurityType securityType) {
@@ -731,9 +731,9 @@ public abstract class SystemEnvironment {
 	}
 	
 	private void delete(OSecurity oSecurity) {
-		logger.trace("Going to remove Security Context (roles and users) with UUID {}", environmentId.toString());
+		logger.trace("Going to remove Security Context (roles and users) with UUID {}", environmentUUID.toString());
 		deleteRolesAndUsers(oSecurity);
-		logger.trace("Security Context (roles and users) with UUID {} successfully removed", environmentId.toString());
+		logger.trace("Security Context (roles and users) with UUID {} successfully removed", environmentUUID.toString());
 	}
 	
 	public ODatabaseDocument getDatabaseDocument(PermissionMode permissionMode) throws ResourceRegistryException {