diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index ee06829..02bd6f9 100755
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -18,7 +18,7 @@
 		 	
 	</service>
 	
-	<service name="gcube/vremanagement/vremodeler/ModelFactoryService"/>
+	<service name="gcube/vremanagement/vremodeler/ModelerFactoryService"/>
 	
 	
 	<service name="gcube/vremanagement/vremodeler/ModelerService">
diff --git a/etc/deploy-server.wsdd b/etc/deploy-server.wsdd
index 7643d2b..7e6b0f3 100644
--- a/etc/deploy-server.wsdd
+++ b/etc/deploy-server.wsdd
@@ -15,7 +15,7 @@
        	<!--<parameter name="securityDescriptor" value="@config.dir@/security_descriptor.xml"/> -->
     </service>
   
-  	<service name="gcube/vremanagement/vremodeler/ModelFactoryService" provider="Handler" use="literal" style="document">
+  	<service name="gcube/vremanagement/vremodeler/ModelerFactoryService" provider="Handler" use="literal" style="document">
         <parameter name="className" value="org.gcube.vremanagement.vremodeler.impl.ModelFactoryService"/>
         <wsdlFile>share/schema/org.gcube.vremanagement.vremodeler/ModelerFactory_service.wsdl</wsdlFile>
         <parameter name="allowedMethods" value="*"/>
diff --git a/schema/ModelerFactory.wsdl b/schema/ModelerFactory.wsdl
index a8f4d92..9709fe2 100644
--- a/schema/ModelerFactory.wsdl
+++ b/schema/ModelerFactory.wsdl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="ModelFactoryService"
+<definitions name="ModelerFactoryService"
     targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
     xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
   	xmlns="http://schemas.xmlsoap.org/wsdl/"
diff --git a/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.java b/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.java
index dad0bcb..3c64ebc 100644
--- a/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.java
+++ b/src/org/gcube/vremanagement/vremodeler/test/ModelerTest.java
@@ -13,9 +13,10 @@ import org.gcube.common.core.scope.GCUBEScope;
 import org.gcube.common.core.types.VOID;
 import org.gcube.vremanagement.vremodeler.stubs.ModelerFactoryPortType;
 import org.gcube.vremanagement.vremodeler.stubs.ModelerServicePortType;
-import org.gcube.vremanagement.vremodeler.stubs.service.ModelFactoryServiceAddressingLocator;
+import org.gcube.vremanagement.vremodeler.stubs.service.ModelerFactoryServiceAddressingLocator;
 import org.gcube.vremanagement.vremodeler.stubs.service.ModelerServiceAddressingLocator;
 
+
 public class ModelerTest {
 
 	
@@ -25,7 +26,7 @@ public class ModelerTest {
 		riquery.addAtomicConditions(new AtomicCondition("//ServiceName", "VREModeler"));
 		List<GCUBERunningInstance> results=client.execute(riquery, GCUBEScope.getScope("/gcube/devsec"));
 		
-		ModelFactoryServiceAddressingLocator mfal =new ModelFactoryServiceAddressingLocator();
+		ModelerFactoryServiceAddressingLocator mfal =new ModelerFactoryServiceAddressingLocator();
 		EndpointReferenceType epr= results.get(0).getAccessPoint().getEndpoint("gcube/vremanagement/vremodeler/ModelFactoryService");
 		System.out.println(epr);
 		ModelerFactoryPortType mfptp= mfal.getModelerFactoryPortTypePort(epr);