diff --git a/TDGWTServiceTest-dev.launch b/TDGWTServiceTest-dev.launch
index 10d6d7d..0cfb301 100644
--- a/TDGWTServiceTest-dev.launch
+++ b/TDGWTServiceTest-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-gwt-service/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java"/>
+<listEntry value="/tabular-data-gwt-service/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.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.gwtservice.client.GwtTestGWTService"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.gwtservice.client.GwtTestTDGWTService"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gwt-service"/>
 </launchConfiguration>
diff --git a/TDGWTServiceTest-prod.launch b/TDGWTServiceTest-prod.launch
index 1577bf2..640afb9 100644
--- a/TDGWTServiceTest-prod.launch
+++ b/TDGWTServiceTest-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-gwt-service/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java"/>
+<listEntry value="/tabular-data-gwt-service/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.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.gwtservice.client.GwtTestGWTService"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.gwtservice.client.GwtTestTDGWTService"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-gwt-service"/>
 </launchConfiguration>
diff --git a/src/main/resources/org/gcube/portlets/user/td/gwtservice/GWTService.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/gwtservice/TDGWTService.gwt.xml
similarity index 97%
rename from src/main/resources/org/gcube/portlets/user/td/gwtservice/GWTService.gwt.xml
rename to src/main/resources/org/gcube/portlets/user/td/gwtservice/TDGWTService.gwt.xml
index 896073b..8ea4ea0 100644
--- a/src/main/resources/org/gcube/portlets/user/td/gwtservice/GWTService.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/gwtservice/TDGWTService.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module rename-to='GWTService'>
+<module rename-to='TDGWTService'>
   <!-- Inherit the core Web Toolkit stuff.                        -->
   <inherits name='com.google.gwt.user.User' />
 	
diff --git a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java
similarity index 94%
rename from src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java
rename to src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java
index c1601d2..dd932a0 100644
--- a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestGWTService.java
+++ b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/GwtTestTDGWTService.java
@@ -19,13 +19,13 @@ import com.google.gwt.user.client.rpc.ServiceDefTarget;
  * http://mojo.codehaus.org/gwt-maven-plugin/user-guide/testing.html for
  * details.
  */
-public class GwtTestGWTService extends GWTTestCase {
+public class GwtTestTDGWTService extends GWTTestCase {
 
 	/**
 	 * Must refer to a valid module that sources this class.
 	 */
 	public String getModuleName() {
-		return "org.gcube.portlets.user.td.gwtservice.GWTServiceJUnit";
+		return "org.gcube.portlets.user.td.gwtservice.TDGWTServiceJUnit";
 	}
 
 	/**
diff --git a/src/test/resources/org/gcube/portlets/user/td/gwtservice/GWTServiceJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml
similarity index 75%
rename from src/test/resources/org/gcube/portlets/user/td/gwtservice/GWTServiceJUnit.gwt.xml
rename to src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml
index 775db67..1b5f789 100644
--- a/src/test/resources/org/gcube/portlets/user/td/gwtservice/GWTServiceJUnit.gwt.xml
+++ b/src/test/resources/org/gcube/portlets/user/td/gwtservice/TDGWTServiceJUnit.gwt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module rename-to="GWTServiceJUnit">
+<module rename-to="TDGWTServiceJUnit">
 	<!-- Inherit our applications main module. -->
-	<inherits name='org.gcube.portlets.user.td.gwtservice.GWTService' />
+	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
 
 	<!-- Specify the path to any remote services. -->
 	<servlet path="/TDGWTService"