diff --git a/etc/build.properties b/etc/build.properties
index 90df516..b0de9c3 100755
--- a/etc/build.properties
+++ b/etc/build.properties
@@ -1,8 +1,10 @@
 
 package = org.gcube.informationsystem.registry
+package.2 = resourceregistration
 lib.dir = Dependencies/ISREGISTRY
 wsdl.1 = RegistryFactory
 wsdl.2 = Registry
 wsdl.3 = ResourceRegistration
 namespace.1=http://gcube-system.org/namespaces/informationsystem/registry
+namespace.2=http://gcube-system.org/namespaces/informationsystem/registry/resourceregistration
 
diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index 351118b..429034e 100644
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -82,6 +82,12 @@
 
 	</service>
 
+	<service name="gcube/informationsystem/registry/ResourceRegistration">
+
+		<environment name="name" value="ResourceRegistration" type="java.lang.String"
+			override="false" />
+	</service>
+	
 	<service name="gcube/informationsystem/registry/RegistryFactory">
 
 		<environment name="name" value="RegistryFactory" type="java.lang.String"
diff --git a/schema/ResourceRegistration.wsdl b/schema/ResourceRegistration.wsdl
index 4ccc5b4..629c843 100644
--- a/schema/ResourceRegistration.wsdl
+++ b/schema/ResourceRegistration.wsdl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="Registry"
-	targetNamespace="http://gcube-system.org/namespaces/informationsystem/registry"
+<definitions name="ResourceRegistration"
+	targetNamespace="http://gcube-system.org/namespaces/informationsystem/registry/resourceregistration"
 	xmlns="http://schemas.xmlsoap.org/wsdl/" 
-	xmlns:tns="http://gcube-system.org/namespaces/informationsystem/registry"
+	xmlns:tns="http://gcube-system.org/namespaces/informationsystem/registry/resourceregistration"
 	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 	xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider"
 	xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor"
@@ -11,8 +11,8 @@
 
 	<types>
 		<xsd:schema
-			targetNamespace="http://gcube-system.org/namespaces/informationsystem/registry"
-			xmlns:tns="http://gcube-system.org/namespaces/informationsystem/registry"
+			targetNamespace="http://gcube-system.org/namespaces/informationsystem/registry/resourceregistration"
+			xmlns:tns="http://gcube-system.org/namespaces/informationsystem/registry/resourceregistration"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
 			<!-- MESSAGES -->