diff --git a/.classpath b/.classpath
index 309416b..733ce15 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.0.0/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/geoportal-data-entry-app-3.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/geoportal-data-entry-app-3.0.0/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 6dbb288..f1cb019 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.0.0-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.0.0
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cb1bb0b..8970fcf 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                    	
+                                                                                                                                                                                                                                                                                        	
     
     
     
@@ -64,8 +64,18 @@
     
     
     
-    <wb-module deploy-name="geoportal-data-entry-app-3.0.0-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+    
+    
+    
+    
+    
+    <wb-module deploy-name="geoportal-data-entry-app-3.0.0">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
+        
+        
+        
+        
         
         
         
@@ -131,7 +141,12 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
+        
+        
+        
+        
         
         
         
@@ -197,7 +212,12 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
+        
+        
+        
+        
         
         
         
@@ -263,7 +283,12 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                
+                                                                                                                                                                                        
+        
+        
+        
+        
+        
         
         
         
@@ -281,7 +306,15 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        <dependent-module archiveName="geoportal-data-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
+        
         
         
         
@@ -347,7 +380,12 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
+        
+        
+        
+        
         
         
         
@@ -413,7 +451,12 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                	
+    
+    
+    
+    
+    
     
     
     
@@ -479,7 +522,12 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                        
+
+
+
+
+
 
 
 
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index 7b86a61..b6c995a 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,5 +1,5 @@
  <display>
      <category name="gCube Applications">
-        <portlet id="GeoPortalDataEntryAppPortlet" />
+        <portlet id="GeoPortalDataEntryApp" />
      </category>
   </display>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index e717c8b..62a126b 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=GeoPortalDataEntryAppPortlet
+name=GeoPortalDataEntryApp
 module-group-id=liferay
 module-incremental-version=2
 tags=
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 5253710..8c15f3a 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>GeoPortalDataEntryAppPortlet</portlet-name>
+		<portlet-name>GeoPortalDataEntryApp</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 e085ce6..25b1418 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <portlet-app>
 	<portlet>
-		<description>GeoPortalDataEntryApp Portlet</description>
-		<portlet-name>GeoPortalDataEntryAppPortlet</portlet-name>
-		<display-name>GeoPortal-DataEntry-Portlet</display-name>
+		<description>GeoPortalDataEntry Application</description>
+		<portlet-name>GeoPortalDataEntryApp</portlet-name>
+		<display-name>GeoPortal-DataEntry-App</display-name>
 		<portlet-class>org.gcube.portlets.user.geoportaldataentry.portlet.GeoPortalDataEntryAppPortlet
 		</portlet-class>
 		<expiration-cache>0</expiration-cache>
@@ -12,8 +12,8 @@
 			<portlet-mode>VIEW</portlet-mode>
 		</supports>
 		<portlet-info>
-			<title>GeoPortal Data Entry Portlet</title>
-			<short-title>GeoPortal Data Entry Portlet</short-title>
+			<title>GeoPortal DataEntry Application</title>
+			<short-title>GeoPortal DataEntry App</short-title>
 		</portlet-info>
 		<portlet-preferences>
 			<preference>