diff --git a/distro/changelog.xml b/distro/changelog.xml
index fe07ced..7fdbcd7 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,14 +1,14 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-mainbox-widget.1-2-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-2-0" date="2015-04-30">
 		<Change>Updated i18n support</Change>
 		<Change>Added Downscale to menu</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-mainbox-widget.1-1-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-1-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Added support Tabular Resource on Multi Scope [issue #3237]</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-mainbox-widget.1-0-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-0-0" date="2014-10-31">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/templates/changelog.xml b/templates/changelog.xml
index ef30fbb..7fdbcd7 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,14 +1,14 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.1-2-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-2-0" date="2015-04-30">
 		<Change>Updated i18n support</Change>
 		<Change>Added Downscale to menu</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-1-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-1-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 		<Change>Added support Tabular Resource on Multi Scope [issue #3237]</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-mainbox-widget.1-0-0" date="2014-10-31">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file