diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidget.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidgetEntryPoint.java
similarity index 92%
rename from src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidget.java
rename to src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidgetEntryPoint.java
index ddaadbf..90a4756 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidget.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/client/WorkspaceSharingWidgetEntryPoint.java
@@ -5,7 +5,7 @@ import com.google.gwt.core.client.EntryPoint;
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
  */
-public class WorkspaceSharingWidget implements EntryPoint {
+public class WorkspaceSharingWidgetEntryPoint implements EntryPoint {
 
 	public static String ITEMID = "3f461fcf-c60f-4243-9212-4f7c89dbf7bc";
 
diff --git a/workspacesharingwidgetTest-dev.launch b/workspacesharingwidgetTest-dev.launch
index 75500ed..efa8103 100644
--- a/workspacesharingwidgetTest-dev.launch
+++ b/workspacesharingwidgetTest-dev.launch
@@ -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.widgets.workspacesharingwidget.client.GwtTestworkspacesharingwidget"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.widgets.workspacesharingwidget.client.client.GwtTestworkspacesharingwidget"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="workspace-sharing-widget"/>
 </launchConfiguration>
diff --git a/workspacesharingwidgetTest-prod.launch b/workspacesharingwidgetTest-prod.launch
index 405f4bd..35e7a8d 100644
--- a/workspacesharingwidgetTest-prod.launch
+++ b/workspacesharingwidgetTest-prod.launch
@@ -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.widgets.workspacesharingwidget.client.GwtTestworkspacesharingwidget"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.widgets.workspacesharingwidget.client.client.GwtTestworkspacesharingwidget"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="workspace-sharing-widget"/>
 </launchConfiguration>