diff --git a/distro/changelog.xml b/distro/changelog.xml
index 1c3be65..b1542b6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,5 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-7-0" date="2015-04-30">
 		<Change>Added column position</Change>
 		<Change>Added downscale C-Square</Change>
 		<Change>Added JobClassifier</Change>
@@ -19,7 +19,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-6-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Added creation of Geospatial C-Square and Ocean Area</Change>
@@ -42,7 +42,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-5-0" date="2014-10-31">
 		<Change>Added Export JSON</Change>
 		<Change>Added multi tabular resources management</Change>
 		<Change>Added Main Box</Change>
@@ -62,7 +62,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-4-0" date="2014-09-12">
 		<Change>Added validation from and validation until to</Change>
 		<Change>Added licences</Change>
 		<Change>Added union</Change>
@@ -82,7 +82,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-3-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-3-0" date="2014-07-04">
 		<Change>Added GroupBy</Change>
 		<Change>Added Column Mapping</Change>
 		<Change>Added context menu to Validations</Change>
@@ -106,7 +106,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-2-0" date="2014-06-05">
 		<Change>Added Replace Bacth</Change>
 		<Change>Added History</Change>
 		<Change>Added Validations</Change>
@@ -130,7 +130,7 @@
 		<Change>Updated TabularDataController</Change>
 		<Change>Updated Ribbon</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-1-0" date="2014-04-04">
 		<Change>Added Clone</Change>
 		<Change>Added Share</Change>
 		<Change>Added New, Delete and Apply Template</Change>
@@ -152,7 +152,7 @@
 		<Change>Updated TabularDataController</Change>
 		<Change>Updated Ribbon</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-0-0" date="2014-02-01">
 		<Change>Added Timeline</Change>
 		<Change>Added Menù to grid</Change>
 		<Change>Added Common Event</Change>
@@ -167,7 +167,7 @@
 		<Change>Updated information on tabular resources</Change>
 		<Change>Fixed rows display on grid</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-manager.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.1-0-0" date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/templates/changelog.xml b/templates/changelog.xml
index 2aee973..b1542b6 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,5 +1,5 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-7-0" date="2015-04-30">
 		<Change>Added column position</Change>
 		<Change>Added downscale C-Square</Change>
 		<Change>Added JobClassifier</Change>
@@ -19,7 +19,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-6-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Added creation of Geospatial C-Square and Ocean Area</Change>
@@ -42,7 +42,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-5-0" date="2014-10-31">
 		<Change>Added Export JSON</Change>
 		<Change>Added multi tabular resources management</Change>
 		<Change>Added Main Box</Change>
@@ -62,7 +62,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-4-0" date="2014-09-12">
 		<Change>Added validation from and validation until to</Change>
 		<Change>Added licences</Change>
 		<Change>Added union</Change>
@@ -82,7 +82,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-3-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-3-0" date="2014-07-04">
 		<Change>Added GroupBy</Change>
 		<Change>Added Column Mapping</Change>
 		<Change>Added context menu to Validations</Change>
@@ -106,7 +106,7 @@
 		<Change>Updated Ribbon</Change>
 		<Change>Updated GwtService</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-2-0" date="2014-06-05">
 		<Change>Added Replace Bacth</Change>
 		<Change>Added History</Change>
 		<Change>Added Validations</Change>
@@ -130,7 +130,7 @@
 		<Change>Updated TabularDataController</Change>
 		<Change>Updated Ribbon</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-1-0" date="2014-04-04">
 		<Change>Added Clone</Change>
 		<Change>Added Share</Change>
 		<Change>Added New, Delete and Apply Template</Change>
@@ -152,7 +152,7 @@
 		<Change>Updated TabularDataController</Change>
 		<Change>Updated Ribbon</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-0-0" date="2014-02-01">
 		<Change>Added Timeline</Change>
 		<Change>Added Menù to grid</Change>
 		<Change>Added Common Event</Change>
@@ -167,7 +167,7 @@
 		<Change>Updated information on tabular resources</Change>
 		<Change>Fixed rows display on grid</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.1-0-0" date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file