diff --git a/distro/changelog.xml b/distro/changelog.xml
index 9e9c410..f5c79db 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,36 +1,36 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-6-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-6-0"
 		date="2015-02-16">
 		<Change>Updated dependency</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-5-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-5-0"
 		date="2015-02-16">
 		<Change>Added more feedback on csv import [issue #3218]</Change>
 		<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-csv-import-widget.2-4-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-4-0"
 		date="2014-10-31">
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-3-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-3-0"
 		date="2014-09-12">
 		<Change>Updated monitor</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-2-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-2-0"
 		date="2014-06-05">
 		<Change>Updated Import</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-1-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-1-0"
 		date="2014-04-04">
 		<Change>Added exclude and include column</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.2-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-0-0"
 		date="2014-02-01">
 		<Change>Updated interacting with workspace</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-csv-import-widget.1-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.1-0-0"
 		date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>
diff --git a/templates/changelog.xml b/templates/changelog.xml
index 4838ec6..f5c79db 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,36 +1,36 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.2-6-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-6-0"
 		date="2015-02-16">
 		<Change>Updated dependency</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-5-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-5-0"
 		date="2015-02-16">
 		<Change>Added more feedback on csv import [issue #3218]</Change>
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-4-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-4-0"
 		date="2014-10-31">
 		<Change>Fixed Final and Lock error</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-3-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-3-0"
 		date="2014-09-12">
 		<Change>Updated monitor</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-2-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-2-0"
 		date="2014-06-05">
 		<Change>Updated Import</Change>
 		<Change>Updated Pom</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-1-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-1-0"
 		date="2014-04-04">
 		<Change>Added exclude and include column</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.2-0-0"
 		date="2014-02-01">
 		<Change>Updated interacting with workspace</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0"
+	<Changeset component="org.gcube.portlets-user.tabular-data-csv-import-widget.2-6-0.1-0-0"
 		date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>