diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
index 0785dec..2f537ac 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
@@ -44,8 +44,8 @@ import org.gcube.common.homelibrary.home.workspace.trash.WorkspaceTrashFolder;
 import org.gcube.common.homelibrary.home.workspace.trash.WorkspaceTrashItem;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.datacatalogue.ckanutillibrary.ApplicationProfileScopePerUrlReader;
-import org.gcube.datacatalogue.ckanutillibrary.CKanUtils;
-import org.gcube.datacatalogue.ckanutillibrary.CkanUtilsFactory;
+import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue;
+import org.gcube.datacatalogue.ckanutillibrary.DataCatalogueFactory;
 import org.gcube.datacatalogue.ckanutillibrary.utils.SessionCatalogueAttributes;
 import org.gcube.datacatalogue.ckanutillibrary.utils.UtilMethods;
 import org.gcube.portlets.user.urlshortener.UrlShortener;
@@ -3452,14 +3452,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	 * @param scope if it is null it is evaluated from the session
 	 * @return the ckan utils obj
 	 */
-	public CKanUtils getCkanUtilsObj(String scope){
+	public DataCatalogue getCatalogue(String scope){
 		HttpSession httpSession = this.getThreadLocalRequest().getSession();
 		ASLSession asl = WsUtil.getAslSession(httpSession);
-		CKanUtils instance = null;
+		DataCatalogue instance = null;
 		try{
 			String scopeInWhichDiscover = scope != null && !scope.isEmpty() ? scope : asl.getScope();
 			workspaceLogger.debug("Discovering ckan instance into scope " + scopeInWhichDiscover);
-			instance = CkanUtilsFactory.getFactory().getUtilsPerScope(scopeInWhichDiscover);
+			instance = DataCatalogueFactory.getFactory().getUtilsPerScope(scopeInWhichDiscover);
 		}catch(Exception e){
 			workspaceLogger.error("Unable to retrieve ckan utils", e);
 		}
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java
index 6f572ad..5f7eee1 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.gcube.datacatalogue.ckanutillibrary.CKanUtils;
-import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization;
+import org.gcube.datacatalogue.ckanutillibrary.DataCatalogue;
+import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg;
 import org.gcube.portlets.user.workspace.client.model.InfoContactModel;
 import org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
@@ -206,7 +206,7 @@ public class UserUtil {
 					List<GCubeRole> roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName));
 
 					// get highest role
-					RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
+					RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
 
 					checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
 							groupManager, gCubeGroup.getGroupId(), orgsInWhichAtLeastEditorRole);
@@ -227,7 +227,7 @@ public class UserUtil {
 					List<GCubeRole> roles = roleManager.listRolesByUserAndGroup(userid, groupManager.getGroupId(gCubeGroupName));
 
 					// get highest role
-					RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
+					RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
 
 					checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
 							groupManager, gCubeGroup.getGroupId(), orgsInWhichAtLeastEditorRole);
@@ -239,7 +239,7 @@ public class UserUtil {
 				logger.debug("The current scope is the vre " + groupName);
 
 				// get highest role
-				RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
+				RolesCkanGroupOrOrg correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
 
 				checkIfRoleIsSetInCkanInstance(username, groupName, correspondentRoleToCheck, workspaceInstance,
 						groupManager, currentGroupId, orgsInWhichAtLeastEditorRole);
@@ -273,20 +273,20 @@ public class UserUtil {
 	 */
 	private static void checkIfRoleIsSetInCkanInstance(String username,
 			String gCubeGroupName,
-			RolesIntoOrganization correspondentRoleToCheck,
+			RolesCkanGroupOrOrg correspondentRoleToCheck,
 			GWTWorkspaceServiceImpl workspaceInstance,
 			GroupManager groupManager, long groupId, List<OrganizationBean> orgsInWhichAdminRole) throws UserManagementSystemException, GroupRetrievalFault {
 
 		// with this invocation, we check if the role is present in ckan and if it is not it will be added
-		CKanUtils ckanUtils = workspaceInstance.getCkanUtilsObj(groupManager.getInfrastructureScope(groupId));
+		DataCatalogue catalogue = workspaceInstance.getCatalogue(groupManager.getInfrastructureScope(groupId));
 
 		// if there is an instance of ckan in this scope..
-		if(ckanUtils != null){
-			boolean res = ckanUtils.checkRole(username, gCubeGroupName, correspondentRoleToCheck);
+		if(catalogue != null){
+			boolean res = catalogue.checkRoleIntoOrganization(username, gCubeGroupName, correspondentRoleToCheck);
 			
-			if(res && !correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)){
+			if(res && !correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.MEMBER)){
 				// get the orgs of the user
-				List<CkanOrganization> ckanOrgs = ckanUtils.getOrganizationsByUser(username);
+				List<CkanOrganization> ckanOrgs = catalogue.getOrganizationsByUser(username);
 				for (CkanOrganization ckanOrganization : ckanOrgs) {
 					if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase())){//|| ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){
 						orgsInWhichAdminRole.add(new OrganizationBean(ckanOrganization.getTitle(), ckanOrganization.getName()));
@@ -305,18 +305,18 @@ public class UserUtil {
 	 * @param roles
 	 * @return MEMBER/EDITOR/ADMIN role
 	 */
-	private static RolesIntoOrganization getLiferayHighestRoleInOrg(
+	private static RolesCkanGroupOrOrg getLiferayHighestRoleInOrg(
 			List<GCubeRole> roles) {
 
 		// NOTE: it is supposed that there is just one role for this person correspondent to the one in the catalog
 		for (GCubeRole gCubeRole : roles) {
 			if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_ADMIN.getRoleName())){
-				return RolesIntoOrganization.ADMIN;
+				return RolesCkanGroupOrOrg.ADMIN;
 			}
 			if(gCubeRole.getRoleName().equalsIgnoreCase(GatewayRolesNames.CATALOGUE_EDITOR.getRoleName())){
-				return RolesIntoOrganization.EDITOR;
+				return RolesCkanGroupOrOrg.EDITOR;
 			}
 		}
-		return RolesIntoOrganization.MEMBER;
+		return RolesCkanGroupOrOrg.MEMBER;
 	}
 }