diff --git a/GXTServiceTest-dev.launch b/GWTServiceTest-dev.launch
similarity index 90%
rename from GXTServiceTest-dev.launch
rename to GWTServiceTest-dev.launch
index 4b40850..05b867e 100644
--- a/GXTServiceTest-dev.launch
+++ b/GWTServiceTest-dev.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
 <stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tabular-data-gxtservice/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java"/>
+<listEntry value="/tabular-data-gxtservice/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -17,6 +17,6 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.gxtservice.client.GwtTestGXTService"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gxtservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.gwtservice.client.GwtTestGWTService"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gwt-service"/>
 </launchConfiguration>
diff --git a/GXTServiceTest-prod.launch b/GWTServiceTest-prod.launch
similarity index 89%
rename from GXTServiceTest-prod.launch
rename to GWTServiceTest-prod.launch
index 9147bd8..34b53d0 100644
--- a/GXTServiceTest-prod.launch
+++ b/GWTServiceTest-prod.launch
@@ -7,7 +7,7 @@
 <stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
 <stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="true"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tabular-data-information/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGXTService.java"/>
+<listEntry value="/tabular-data-information/src/test/java/org/gcube/portlets/user/td/gxtservice/client/GwtTestGWTService.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -17,6 +17,6 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.information.client.GwtTestGXTService"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gxtservice"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.gwtservice.client.GwtTestGWTService"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gwt-service"/>
 </launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 66d6f5a..58337ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,9 +242,9 @@
 					</execution>
 				</executions>
 				<configuration>
-					<runTarget>GXTService.html</runTarget>
+					<runTarget>GWTService.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
-					<module>org.gcube.portlets.user.td.gxtservice.GXTService</module>
+					<module>org.gcube.portlets.user.td.gwtservice.GWTService</module>
 				</configuration>
 			</plugin>