diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index b6c995a..7b86a61 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="GeoPortalDataEntryApp" />
+        <portlet id="GeoPortalDataEntryAppPortlet" />
      </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 62a126b..e717c8b 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=GeoPortalDataEntryApp
+name=GeoPortalDataEntryAppPortlet
 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 8c15f3a..5253710 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>GeoPortalDataEntryApp</portlet-name>
+		<portlet-name>GeoPortalDataEntryAppPortlet</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 25b1418..e085ce6 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>GeoPortalDataEntry Application</description>
-		<portlet-name>GeoPortalDataEntryApp</portlet-name>
-		<display-name>GeoPortal-DataEntry-App</display-name>
+		<description>GeoPortalDataEntryApp Portlet</description>
+		<portlet-name>GeoPortalDataEntryAppPortlet</portlet-name>
+		<display-name>GeoPortal-DataEntry-Portlet</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 DataEntry Application</title>
-			<short-title>GeoPortal DataEntry App</short-title>
+			<title>GeoPortal Data Entry Portlet</title>
+			<short-title>GeoPortal Data Entry Portlet</short-title>
 		</portlet-info>
 		<portlet-preferences>
 			<preference>