diff --git a/org/gcube/informationsystem/registry/deploy-jndi-config.xml b/org/gcube/informationsystem/registry/deploy-jndi-config.xml
index 7a82186..d59b3a6 100644
--- a/org/gcube/informationsystem/registry/deploy-jndi-config.xml
+++ b/org/gcube/informationsystem/registry/deploy-jndi-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jndiConfig xmlns="http://wsrf.globus.org/jndi/config">
 
-<service name="gcube/informationservice/registry">
+<service name="gcube/informationsystem/registry">
 	
 		<environment 
 		name="profile" 
@@ -11,11 +11,11 @@
 		 	
 </service>
 	
-<service name="gcube/informationservice/registry/Registry">
+<service name="gcube/informationsystem/registry/Registry">
 
 	<environment 
 		name="name" 
-	 	value="Registry" 
+	 	value="IS-Registry" 
 	 	type="java.lang.String"
 	 	override="false" />
 	
@@ -37,12 +37,12 @@
 			</parameter>
 			<parameter>
 				<name>fileName</name>
-				<value>@config.dir@/profileRegistration.xml</value>
+				<value>@config.dir@/Registration.xml</value>
 			</parameter>
 		</resourceParams>
 	</resource>
 	
-	<resource name="wshome" type="org.gcube.informationservice.registry.impl.core.ProfileResourceHome"> 
+	<resource name="wshome" type="org.gcube.informationsystem.registry.impl.core.ProfileResourceHome"> 
 	
 		<resourceParams>
 
@@ -52,11 +52,11 @@
 			</parameter>
 			<parameter>
 				<name>resourceClass</name>
-				<value>org.gcube.informationservice.registry.impl.core.ProfileResource</value>
+				<value>org.gcube.informationsystem.registry.impl.core.ProfileResource</value>
 			</parameter>
 			<parameter>
 				<name>persistenceDelegateClass</name>
-				<value>org.gcube.informationservice.registry.impl.core.RegistryPersistenceDelegate</value>
+				<value>org.gcube.informationsystem.registry.impl.core.RegistryPersistenceDelegate</value>
 			</parameter>
 			<parameter>
 				<name>sweeperDelay</name>
@@ -70,7 +70,7 @@
 
 </service>
 
-	<service name="gcube/informationservice/registry/RegistryFactory">
+	<service name="gcube/informationsystem/registry/RegistryFactory">
 	
 	
 		<environment 
@@ -81,7 +81,7 @@
 		
 	
 		<resource name="RegistryConfiguration"
-			type="org.gcube.informationservice.registry.impl.RegistryConfiguration">
+			type="org.gcube.informationsystem.registry.impl.RegistryConfiguration">
 			<resourceParams>
 				
 				<parameter>
@@ -132,7 +132,7 @@
 			</resourceParams>
 		</resource>
 				
-		<resource name="wshome" type="org.gcube.informationservice.registry.impl.core.RegistryFactoryResourceHome">
+		<resource name="wshome" type="org.gcube.informationsystem.registry.impl.core.RegistryFactoryResourceHome">
 				
 				<resourceParams>
 					
@@ -142,11 +142,11 @@
 					</parameter>
 					<parameter>
 						<name>resourceClass</name>
-						<value>org.gcube.informationservice.registry.impl.core.FactoryResource</value>
+						<value>org.gcube.informationsystem.registry.impl.core.FactoryResource</value>
 					</parameter>
 					<parameter>
 						<name>persistenceDelegateClass</name>
-						<value>org.gcube.informationservice.registry.impl.core.RegistrFactoryPersistenceDelegate</value>
+						<value>org.gcube.informationsystem.registry.impl.core.RegistryFactoryPersistenceDelegate</value>
 					</parameter>
 					
 				</resourceParams>
diff --git a/org/gcube/informationsystem/registry/deploy-server.wsdd b/org/gcube/informationsystem/registry/deploy-server.wsdd
index a67be96..b05e74f 100644
--- a/org/gcube/informationsystem/registry/deploy-server.wsdd
+++ b/org/gcube/informationsystem/registry/deploy-server.wsdd
@@ -4,27 +4,27 @@
     xmlns:java="http://xml.apache.org/axis/wsdd/providers/java" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-    <service name="gcube/informationservice/registry/Registry" provider="Handler" use="literal" style="document">
+    <service name="gcube/informationsystem/registry/Registry" provider="Handler" use="literal" style="document">
         <parameter name="className" value="org.gcube.informationservice.registry.impl.core.Registry"/>
-	<wsdlFile>share/schema/Registry/Registry_service.wsdl</wsdlFile>
+		<wsdlFile>share/schema/Registry/Registry_service.wsdl</wsdlFile>
         <parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
         <parameter name="scope" value="Application"/>
-  		<parameter name="providers" value="GetRPProvider GetMRPProvider SetRPProvider QueryRPProvider DestroyProvider SubscribeProvider GetCurrentMessageProvider SetTerminationTimeProvider"/>
+  		<parameter name="providers" value="GCUBEProvider SubscribeProvider GetCurrentMessageProvider "/>
    		<parameter name="loadOnStartup" value="false"/> 
 		<parameter name="securityDescriptor" value="@config.dir@/security-descriptor-Service.xml"/>
     </service>
 	
 	 
     <!-- Factory service -->
-    <service name="gcube/informationservice/registry/RegistryFactory" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.gcube.informationservice.registry.impl.core.RegistryFactory"/>
+    <service name="gcube/informationsystem/registry/RegistryFactory" provider="Handler" use="literal" style="document">
+        <parameter name="className" value="org.gcube.informationsystem.registry.impl.core.RegistryFactory"/>
         <wsdlFile>share/schema/Registry/RegistryFactory_service.wsdl</wsdlFile>
 		<parameter name="allowedMethods" value="*"/>
         <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
         <parameter name="scope" value="Application"/>
-        <parameter name="instance" value="gcube/informationservice/registry/Registry"/> 
-   		<parameter name="providers" value="org.diligentproject.common.provider.DILIGENTProviderImpl GetRPProvider GetMRPProvider SetRPProvider QueryRPProvider SubscribeProvider GetCurrentMessageProvider"/>
+        <parameter name="instance" value="gcube/informationsystem/registry/Registry"/> 
+   		<parameter name="providers" value="GCUBEProvider SubscribeProvider GetCurrentMessageProvider"/>
    		<parameter name="loadOnStartup" value="true"/>
 		<parameter name="securityDescriptor" value="@config.dir@/security-descriptor-Factory.xml"/>
 		
diff --git a/org/gcube/informationsystem/registry/deploy-server.wsdd_NOSEC b/org/gcube/informationsystem/registry/deploy-server.wsdd_NOSEC
deleted file mode 100644
index 528444a..0000000
--- a/org/gcube/informationsystem/registry/deploy-server.wsdd_NOSEC
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultServerConfig" 
-    xmlns="http://xml.apache.org/axis/wsdd/" 
-    xmlns:java="http://xml.apache.org/axis/wsdd/providers/java" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <service name="diligentproject/informationservice/disregistry/DISRegistryService" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.diligentproject.informationservice.disregistry.impl.DISRegistryService"/>
-	    <wsdlFile>share/schema/disregistry/DISRegistry_service.wsdl</wsdlFile>
-        <parameter name="allowedMethods" value="*"/>
-        <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
-        <parameter name="scope" value="Application"/>
-  		<parameter name="providers" value="GetRPProvider GetMRPProvider SetRPProvider QueryRPProvider DestroyProvider SubscribeProvider GetCurrentMessageProvider SetTerminationTimeProvider"/>
-   		<parameter name="loadOnStartup" value="false"/> 
-		<!--<parameter name="securityDescriptor" value="@config.dir@/security-descriptor-Service.xml"/>-->
-    </service>
-	
-	 
-    <!-- Factory service -->
-    <service name="diligentproject/informationservice/disregistry/DISRegistryFactoryService" provider="Handler" use="literal" style="document">
-        <parameter name="className" value="org.diligentproject.informationservice.disregistry.impl.DISRegistryFactoryService"/>
-        <wsdlFile>share/schema/disregistry/DISRegistryFactory_service.wsdl</wsdlFile>
-		<parameter name="allowedMethods" value="*"/>
-        <parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
-        <parameter name="scope" value="Application"/>
-        <parameter name="instance" value="diligentproject/informationservice/disregistry/DISRegistryService"/> 
-   		<parameter name="providers" value="org.diligentproject.common.provider.DILIGENTProviderImpl GetRPProvider GetMRPProvider SetRPProvider QueryRPProvider SubscribeProvider GetCurrentMessageProvider"/>
-   		<parameter name="loadOnStartup" value="true"/>
-		<!--<parameter name="securityDescriptor" value="@config.dir@/security-descriptor-Factory.xml"/>-->
-		<!--<parameter name="VOAuthorizationPDP-VOAuthorizationHandlerFile" value="@config.dir@/RegistrationHandler.properties"/>-->
-   		<!--<parameter name="VOAuthorizationPDP-VOMSCertificateDirectory" value="/etc/grid-security/vomsdir/*"/>-->
-    </service>
-
-</deployment>
diff --git a/org/gcube/informationsystem/registry/etc/profile.xml b/org/gcube/informationsystem/registry/etc/profile.xml
new file mode 100644
index 0000000..43ee460
--- /dev/null
+++ b/org/gcube/informationsystem/registry/etc/profile.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Resource>
+    <ID>gfgdf80-131b-11db-90fgf98-dgfgfgf66ed3f</ID>
+    <Type>Service</Type>
+    <Profile>
+        <Class>InformationSystem</Class>
+        <Name>IS-Registry</Name>
+        <Packages>
+            <Main>
+                <Name>IS-Registry-Service</Name>
+                <Version>1.0</Version>
+                <Mandatory level="VO"/>
+				<Shareable level="VO"/>
+				<GHNRequirements>
+					<Requirement category="Site"  requirement="string" value="java1.5" operator="le"/>
+				</GHNRequirements>
+				<GARArchive>org.gcube.informationsystem.registry.gar</GARArchive>
+                <PortType>
+                	<Name>gcube/informationsystem/registry/registryFactory</Name>
+                    	<Security/>			
+						<WSDL/>
+            	</PortType>
+            	<PortType>
+                	<Name>gcube/informationsystem/registry/registry</Name>
+                    	<Security/>			
+						<WSDL/>
+            	</PortType>
+            </Main>
+            <Software>
+            	<Name>IS-Registry-stubs</Name>
+				<Version>1.0</Version>
+				<MultiVersion value="true"/>
+				<Mandatory level="GHN"/>
+				<Shareable level="VO"/>
+				<GHNRequirements>
+					<Requirement category="Site" operator="le" requirement="string" value="java1.5"/>
+				</GHNRequirements>
+				<SpecificData>text</SpecificData>
+				<Type>library</Type>
+				<Files>
+					<File>org.gcube.informationsystem.registry.stubs.jar</File>
+				</Files>
+			</Software>           
+        </Packages>
+    </Profile>
+</Resource>
+