diff --git a/distro/changelog.xml b/distro/changelog.xml
index 1476354..611aa7c 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,18 +1,18 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-unionwizard-widget.1-3-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-3-0" date="2015-04-30">
 		<Change>Updated dependency</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-unionwizard-widget.1-2-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-2-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 TabResourcesSelectionPanel [issue #3149]</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-unionwizard-widget.1-1-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-1-0"
 		date="2014-10-31">
 		<Change>Added flows</Change>
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-unionwizard-widget.1-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-0-0"
 		date="2014-09-12">
 		<Change>First Release</Change>
 	</Changeset>
diff --git a/templates/changelog.xml b/templates/changelog.xml
index 5a5dd81..611aa7c 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,18 +1,18 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.1-3-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-3-0" date="2015-04-30">
 		<Change>Updated dependency</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-2-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-2-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 TabResourcesSelectionPanel [issue #3149]</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-1-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-1-0"
 		date="2014-10-31">
 		<Change>Added flows</Change>
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-unionwizard-widget.1-0-0"
 		date="2014-09-12">
 		<Change>First Release</Change>
 	</Changeset>