diff --git a/distro/changelog.xml b/distro/changelog.xml
index ffda598..1b89430 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,12 +1,12 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-7-0" date="2015-04-30">
 		<Change>Added JobClassifier</Change>
 		<Change>Added PositionColumn</Change>
 		<Change>Added Open TR with parameter on url</Change>
 		<Change>Updated Geospatial operations</Change>
 		<Change>Updated Resource management</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-6-0" date="2015-02-16">
 		<Change>Updated background operation monitor</Change>
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
@@ -18,7 +18,7 @@
 		<Change>Added support Tabular Resource on Multi Scope [issue #3237]
 		</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-5-0" date="2014-10-31">
 		<Change>Updated Discard</Change>
 		<Change>Updated CSVExportSession</Change>
 		<Change>Added JSON Export</Change>
@@ -29,26 +29,26 @@
 		<Change>Added Resume UI State</Change>
 		<Change>Added Time Aggregation</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-4-0" date="2014-09-12">
 		<Change>Added union</Change>
 		<Change>Added replace by expression</Change>
 		<Change>Added background monitor</Change>
 		<Change>Updated operation factory</Change>
 		<Change>Updated monitor</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-3-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-3-0" date="2014-06-05">
 		<Change>Added GroupBy</Change>
 		<Change>Added SecurtyException</Change>
 		<Change>Updated OperationInvocation</Change>
 		<Change>Updated Replace</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-2-0" date="2014-06-05">
 		<Change>Added replace batch operation</Change>
 		<Change>Added history</Change>
 		<Change>Added resubmit task</Change>
 		<Change>Added resume task</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-1-0" date="2014-04-04">
 		<Change>Added replace value operation</Change>
 		<Change>Added share</Change>
 		<Change>Added clone operation</Change>
@@ -56,7 +56,7 @@
 		<Change>Added delete and apply template operation</Change>
 		<Change>Added the management of views</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-0-0" date="2014-02-01">
 		<Change>Added column delete operation</Change>
 		<Change>Added column change type operation</Change>
 		<Change>Added CSV Export operation</Change>
@@ -64,7 +64,7 @@
 		<Change>Updated CSV Import operation</Change>
 		<Change>Updated SDMX Import operation</Change>
 	</Changeset>
-	<Changeset component="org.gcube.portlets.user.tabular-data-gwt-service.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.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 cb09a60..1b89430 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,12 +1,12 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.2-7-0" date="2015-04-30">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-7-0" date="2015-04-30">
 		<Change>Added JobClassifier</Change>
 		<Change>Added PositionColumn</Change>
 		<Change>Added Open TR with parameter on url</Change>
 		<Change>Updated Geospatial operations</Change>
 		<Change>Updated Resource management</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-6-0" date="2015-02-16">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-6-0" date="2015-02-16">
 		<Change>Updated background operation monitor</Change>
 		<Change>Updated to GWT 2.6.1</Change>
 		<Change>Updated to GXT 3.1.1</Change>
@@ -18,7 +18,7 @@
 		<Change>Added support Tabular Resource on Multi Scope [issue #3237]
 		</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-5-0" date="2014-10-31">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-5-0" date="2014-10-31">
 		<Change>Updated Discard</Change>
 		<Change>Updated CSVExportSession</Change>
 		<Change>Added JSON Export</Change>
@@ -29,26 +29,26 @@
 		<Change>Added Resume UI State</Change>
 		<Change>Added Time Aggregation</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-4-0" date="2014-09-12">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-4-0" date="2014-09-12">
 		<Change>Added union</Change>
 		<Change>Added replace by expression</Change>
 		<Change>Added background monitor</Change>
 		<Change>Updated operation factory</Change>
 		<Change>Updated monitor</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-3-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-3-0" date="2014-06-05">
 		<Change>Added GroupBy</Change>
 		<Change>Added SecurtyException</Change>
 		<Change>Updated OperationInvocation</Change>
 		<Change>Updated Replace</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-2-0" date="2014-06-05">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-2-0" date="2014-06-05">
 		<Change>Added replace batch operation</Change>
 		<Change>Added history</Change>
 		<Change>Added resubmit task</Change>
 		<Change>Added resume task</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-1-0" date="2014-04-04">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-1-0" date="2014-04-04">
 		<Change>Added replace value operation</Change>
 		<Change>Added share</Change>
 		<Change>Added clone operation</Change>
@@ -56,7 +56,7 @@
 		<Change>Added delete and apply template operation</Change>
 		<Change>Added the management of views</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.2-0-0" date="2014-02-01">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-0-0" date="2014-02-01">
 		<Change>Added column delete operation</Change>
 		<Change>Added column change type operation</Change>
 		<Change>Added CSV Export operation</Change>
@@ -64,7 +64,7 @@
 		<Change>Updated CSV Import operation</Change>
 		<Change>Updated SDMX Import operation</Change>
 	</Changeset>
-	<Changeset component="${groupId}.${artifactId}.1-0-0" date="2013-10-18">
+	<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.1-0-0" date="2013-10-18">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file