diff --git a/distro/changelog.xml b/distro/changelog.xml
index ae191e7..f86f686 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,37 +1,37 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-7-0" date="2015-04-30">
 		<Change>Updated i18n support</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-6-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Fixed Creation Date in TabResourcesProperties [issue #3149]</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-5-0" date="2014-10-31">
 		<Change>Added Multi Tab Management</Change>
 		<Change>Added Resources Button</Change>
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-4-0" date="2014-09-12">
 		<Change>Added valid from and valid until</Change>
 		<Change>Added licences</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-3-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-3-0" date="2014-07-04">
 		<Change>Added Owner Information</Change>
 		<Change>Added Share Information</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-2-0" date="2014-06-05">
 		<Change>Added Validation</Change>
 		<Change>Added Final</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-1-0" date="2014-04-04">
 		<Change>Added save operation on tabular resource metadata</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-0-0" date="2014-02-01">
 		<Change>Table Metadata View</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-information-widget.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.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 d2df718..f86f686 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,37 +1,37 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-7-0" date="2015-04-30">
 		<Change>Updated i18n support</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-6-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Fixed Creation Date in TabResourcesProperties [issue #3149]</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-5-0" date="2014-10-31">
 		<Change>Added Multi Tab Management</Change>
 		<Change>Added Resources Button</Change>
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-4-0" date="2014-09-12">
 		<Change>Added valid from and valid until</Change>
 		<Change>Added licences</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-3-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-3-0" date="2014-07-04">
 		<Change>Added Owner Information</Change>
 		<Change>Added Share Information</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-2-0" date="2014-06-05">
 		<Change>Added Validation</Change>
 		<Change>Added Final</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-1-0" date="2014-04-04">
 		<Change>Added save operation on tabular resource metadata</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.2-0-0" date="2014-02-01">
 		<Change>Table Metadata View</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-information-widget.1-0-0" date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file