diff --git a/distro/changelog.xml b/distro/changelog.xml
index f890d30..1b39b33 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,28 +1,28 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-6-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-6-0" date="2015-04-30">
 		<Change>Updated dependency</Change>
 		<Change>Added share for rules</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-5-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-5-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-4-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-4-0" date="2014-10-31">
 		<Change>Added template share</Change>
 		<Change>Fixed Final and Lock errors</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-3-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-3-0" date="2014-09-12">
 		<Change>Updated share for groups</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-2-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-2-0" date="2014-07-04">
 		<Change>Added SecurityException</Change>
 		<Change>Added share for groups</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-1-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-1-0" date="2014-06-05">
 		<Change>Updated Share</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-share-widget.1-0-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-0-0" date="2014-04-04">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/templates/changelog.xml b/templates/changelog.xml
index f9fd046..1b39b33 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,28 +1,28 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.1-6-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-6-0" date="2015-04-30">
 		<Change>Updated dependency</Change>
 		<Change>Added share for rules</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-5-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-5-0" date="2015-02-16">
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-4-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-4-0" date="2014-10-31">
 		<Change>Added template share</Change>
 		<Change>Fixed Final and Lock errors</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-3-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-3-0" date="2014-09-12">
 		<Change>Updated share for groups</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-2-0" date="2014-07-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-2-0" date="2014-07-04">
 		<Change>Added SecurityException</Change>
 		<Change>Added share for groups</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-1-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-1-0" date="2014-06-05">
 		<Change>Updated Share</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-share-widget.1-0-0" date="2014-04-04">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file