diff --git a/.classpath b/.classpath
index ca05db0..58ce5ac 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/gwt"/>
 	<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
diff --git a/pom.xml b/pom.xml
index db5f3ce..e4287c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,9 @@
 	<artifactId>vre-manager</artifactId>
 	<packaging>war</packaging>
 	<version>3.0.0-SNAPSHOT</version>
-	<name>VRE Definition Portlet</name>
+	<name>VRE Manager Portlet</name>
 	<description>
-		gCube VRE Definition Portlet shows a Wizard to create VREs.
+		gCube VRE Manager Portlet shows a Wizard to create VREs.
 	</description>
 	<scm>
 		<connection>scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/${project.artifactId}</connection>
diff --git a/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java
index b04c9c6..7f35e3c 100644
--- a/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/vredeployment/server/VREDeploymentServiceImpl.java
@@ -28,6 +28,11 @@ import org.gcube.application.framework.vremanagement.vremanagement.impl.VREGener
 import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portlets.admin.vredeployment.client.VREDeploymentService;
 import org.gcube.portlets.admin.vredeployment.shared.VREDefinitionBean;
+import org.gcube.vomanagement.usermanagement.UserManager;
+import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException;
+import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault;
+import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
+import org.gcube.vomanagement.usermanagement.model.UserModel;
 import org.gcube.vremanagement.vremodel.cl.stubs.types.FunctionalityItem;
 import org.gcube.vremanagement.vremodel.cl.stubs.types.Report;
 import org.gcube.vremanagement.vremodel.cl.stubs.types.ResourceDescriptionItem;
@@ -65,21 +70,20 @@ public class VREDeploymentServiceImpl extends RemoteServiceServlet implements VR
 		ArrayList<VREDefinitionBean> toReturn = new ArrayList<VREDefinitionBean>();
 		System.out.println("getAllVREs");
 		VREGeneratorEvo evo = new VREGeneratorEvo(aslSession);
-		List<Report> list = evo.getAllVREs(aslSession);
-		if (list == null || list.isEmpty()) {
+		List<Report> vres = evo.getAllVREs(aslSession);
+		
+		if (vres == null || vres.isEmpty()) {
 			return  toReturn;
 		}
 		else {
-			Report[] vres = list.toArray(new Report[0]);
-
-			for (int i = 0; i < vres.length; i++) {
-				if (vres[i].name().equals("notCompletedVirtualResearchEnv.")) {
-					_log.debug("removing fake vre" + vres[i].name());
-					doRemove(vres[i].id());
+			for (Report vre: vres) {
+				if (vre.name().equals("notCompletedVirtualResearchEnv.")) {
+					_log.debug("removing fake vre" +vre.name());
+					doRemove(vre.id());
 				}
 				else {
-					toReturn.add(new VREDefinitionBean(vres[i].id(), vres[i].name(), vres[i].description(), "", "", new Date(), new Date(), vres[i].state(), ""));
-					_log.debug(vres[i].name() + " id=" + vres[i].id());
+					toReturn.add(new VREDefinitionBean(vre.id(), vre.name(), vre.description(), "", "", new Date(), new Date(), vre.state(), ""));
+					_log.debug(vre.name() + " id=" + vre.id());
 				}
 			}
 		}
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index 65547b4..7ff9c2b 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE display PUBLIC "-//Liferay//DTD Display 5.2.0//EN" "http://www.liferay.com/dtd/liferay-display_5_2_0.dtd">
 
 <display>
-	<category name="gCube Applications">
-		<portlet id="VREDeployment" />
+	<category name="gCube Enabling Apps">
+		<portlet id="VREManager" />
 	</category>
 </display>
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 60006ff..ac0306c 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,4 +1,4 @@
-name=VRE Deployment
+name=VRE Manager
 module-group-id=liferay
 module-incremental-version=1
 tags=
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 24136d0..c7058dc 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -3,7 +3,7 @@
 
 <liferay-portlet-app>
 	<portlet>
-		<portlet-name>VREDeployment</portlet-name>
+		<portlet-name>VREManager</portlet-name>
 		<layout-cacheable>false</layout-cacheable>
 		<instanceable>false</instanceable>
 		<ajaxable>false</ajaxable> 
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index 53ada59..7b11d2f 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -2,8 +2,8 @@
 
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
 	<portlet>
-		<portlet-name>VREDeployment</portlet-name>
-		<display-name>=VRE Deployment</display-name>
+		<portlet-name>VREManager</portlet-name>
+		<display-name>=VRE Manager</display-name>
 		<portlet-class>org.gcube.portlets.admin.vredeployment.server.portlet.VREDeploymentPortlet</portlet-class>
 		<init-param>
 			<name>view-jsp</name>
@@ -14,9 +14,9 @@
 			<mime-type>text/html</mime-type>
 		</supports>
 		<portlet-info>
-			<title>VRE Deployment</title>
-			<short-title>VRE Deployment</short-title>
-			<keywords>VRE Deployment</keywords>
+			<title>VRE Manager</title>
+			<short-title>VRE Manager</short-title>
+			<keywords>VRE Manager</keywords>
 		</portlet-info>
 		<security-role-ref>
 			<role-name>administrator</role-name>