diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index 845062d..41b464e 100644
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -3,7 +3,7 @@
 
 <service name="gcube/informationsystem/registry">
 	
-		<environment 
+	<environment 
 		name="profile" 
 	 	value="@config.dir@/profile.xml" 
 	 	type="java.lang.String"
diff --git a/org/gcube/informationsystem/registry/impl/core/FactoryContext.java b/org/gcube/informationsystem/registry/impl/core/FactoryContext.java
index 25ce592..f8588a8 100644
--- a/org/gcube/informationsystem/registry/impl/core/FactoryContext.java
+++ b/org/gcube/informationsystem/registry/impl/core/FactoryContext.java
@@ -5,7 +5,7 @@ import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext;
 
 public class FactoryContext extends GCUBEStatefulPortTypeContext{
 	
-	static private final String PORTTYPE_NAME = "gcube/informationsystem/isregistryfactory";
+	static private final String PORTTYPE_NAME = "gcube/informationsystem/regitry/RegistryFactory";
 	
 	static FactoryContext cache = new FactoryContext();
 	
@@ -23,7 +23,7 @@ public class FactoryContext extends GCUBEStatefulPortTypeContext{
 	
 	
 	public String getNamespace() {
-		return "http://gcube-system.org/namespaces/informationsystem/isregistry";
+		return "http://gcube-system.org/namespaces/informationsystem/registry";
 	}
 
 	public String getServiceName() {
diff --git a/org/gcube/informationsystem/registry/impl/core/ProfileContext.java b/org/gcube/informationsystem/registry/impl/core/ProfileContext.java
index 89580ba..7c15124 100644
--- a/org/gcube/informationsystem/registry/impl/core/ProfileContext.java
+++ b/org/gcube/informationsystem/registry/impl/core/ProfileContext.java
@@ -5,7 +5,7 @@ import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext;
 
 public class ProfileContext extends GCUBEStatefulPortTypeContext{
 	
-	static private final String PORTTYPE_NAME = "gcube/informationsystem/isregistry";
+	static private final String PORTTYPE_NAME = "gcube/informationsystem/registry/Registry";
 	
 	private ProfileContext(){}
 	
@@ -22,7 +22,7 @@ public class ProfileContext extends GCUBEStatefulPortTypeContext{
 	}
 	
 	public final String getNamespace() {
-		return "http://gcube-system.org/namespaces/gcube/informationsystem/isregistry";
+		return "http://gcube-system.org/namespaces/gcube/informationsystem/registry";
 	}
 	
 	
diff --git a/org/gcube/informationsystem/registry/impl/core/ServiceContext.java b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
index d1dbc34..b3f7d2f 100644
--- a/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
+++ b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
@@ -5,7 +5,7 @@ import org.gcube.common.core.contexts.GCUBEServiceContext;
 
 public class ServiceContext extends GCUBEServiceContext{
 
-	public static final String JNDI_NAME="gcube/informationservice/registry";
+	public static final String JNDI_NAME="gcube/informationsystem/registry";
 		
 	protected static ServiceContext cache = new ServiceContext();