diff --git a/EPD-RMU-Simulator/installation.md b/EPD-RMU-Simulator/installation.md
index 41a808a4b028d46e43706448eb615f87ee2bfebb..f1d92eac437f6db7259d7a0e8d70fe510a8d2854 100644
--- a/EPD-RMU-Simulator/installation.md
+++ b/EPD-RMU-Simulator/installation.md
@@ -17,14 +17,14 @@ customer: IHE-EUROPE
 
 The RMU MockUp is a SoapUI webservice (mock) that provides Cross-Gateway Update Document Set [ITI-X1] Response. This mock requires that the Update Metadata Registry MockUp is started.
 
-* default_wsdl_url: http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl
-* default_path: /xcmu-responding-gateway
+* default_wsdl_url: http://ehealthsuisse.ihe-europe.net:8095/restricted-metadata-update?wsdl
+* default_path: /restricted-metadata-update
 * default_port: 8095
 * default_mock_name: RespondingGateway_Binding_Soap12 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
-* default_soapui_mock_log: /var/log/soapui/epr-xcmu-responding-gateway.log
-* default_init.d: /etc/init.d/xcmuRespondingGatewayMock
+* default_soapui_mock_log: /var/log/soapui/epr-restricted-metadata-update.log
+* default_init.d: /etc/init.d/rmuRespondingGatewayMock
 * default_keystore_path: /opt/gazelle/cert/jboss.jks
 
 
@@ -37,7 +37,7 @@ The RMU MockUp is a SoapUI webservice (mock) that provides Cross-Gateway Update
 ### Get the git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -45,7 +45,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -59,15 +59,15 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` an
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock /etc/init.d/xcmuRespondingGatewayMock
-sudo chmod u+x /etc/init.d/xcmuRespondingGatewayMock
-sudo chmod 775 /etc/init.d/xcmuRespondingGatewayMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock /etc/init.d/rmuRespondingGatewayMock
+sudo chmod u+x /etc/init.d/rmuRespondingGatewayMock
+sudo chmod 775 /etc/init.d/rmuRespondingGatewayMock
 ```
 
 If you want the service to start at each machine start up
 
 ```bash
-sudo update-rc.d xcmuRespondingGatewayMock defaults
+sudo update-rc.d rmuRespondingGatewayMock defaults
 ```
 
 Be careful to allow the service to write logs into your target directory. As example
@@ -82,19 +82,19 @@ sudo chmod 775 /var/log/soapui
 To run the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock start
+sudo /etc/init.d/rmuRespondingGatewayMock start
 ```
 
 To stop the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock stop
+sudo /etc/init.d/rmuRespondingGatewayMock stop
 ```
 
 To get status of the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock status
+sudo /etc/init.d/rmuRespondingGatewayMock status
 ```
 
 
@@ -124,7 +124,7 @@ The ITI-18 Registry Stored Query MockUp is a SoapUI webservice (mock) that provi
 * default_path: /registry-stored-query
 * default_port: 8093
 * default_mock_name: DocumentRegistry_Binding_Soap11 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
 * default_soapui_mock_log: /var/log/soapui/epr-registry-stored-query.log
 * default_init.d: /etc/init.d/RegistryStoredQueryMock
@@ -140,7 +140,7 @@ The ITI-18 Registry Stored Query MockUp is a SoapUI webservice (mock) that provi
 ### Get the git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -148,7 +148,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -162,7 +162,7 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock /etc/init.d/RegistryStoredQueryMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/RegistryStoredQueryMock /etc/init.d/RegistryStoredQueryMock
 sudo chmod u+x /etc/init.d/RegistryStoredQueryMock
 sudo chmod 775 /etc/init.d/RegistryStoredQueryMock
 ```
@@ -227,7 +227,7 @@ The ITI-57 Update Metadata Set MockUp is a SoapUI webservice (mock) that provide
 * default_path: /update-document-set
 * default_port: 8094
 * default_mock_name: DocumentRegistry_Binding_Soap12 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
 * default_soapui_mock_log: /var/log/soapui/epr-update-document-set.log
 * default_init.d: /etc/init.d/UpdateMetadataSetMock
@@ -243,7 +243,7 @@ The ITI-57 Update Metadata Set MockUp is a SoapUI webservice (mock) that provide
 ### Get the Git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -251,7 +251,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -265,7 +265,7 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` an
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/UpdateMetadataSetMock /etc/init.d/UpdateMetadataSetMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/UpdateMetadataSetMock /etc/init.d/UpdateMetadataSetMock
 sudo chmod u+x /etc/init.d/UpdateMetadataSetMock
 sudo chmod 775 /etc/init.d/UpdateMetadataSetMock
 ```
diff --git a/EPD-RMU-Simulator/user.md b/EPD-RMU-Simulator/user.md
index 253c2286d443be7f739f4ba47f231992d60fbe55..b9d8f1b1f4f8bf0ce0276a017e28e6fb69717227 100755
--- a/EPD-RMU-Simulator/user.md
+++ b/EPD-RMU-Simulator/user.md
@@ -35,26 +35,25 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
 
 | PatientID | SourceID | UniqueID | HomeCommunityID |
 |--------|:---:|-----:|------|
-| CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO       | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1218     | urn:oid:1.2.3.4.5.6.2.333.23     | 
-| CHPAM0998^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1229     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM9810^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1232     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM4489^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1111     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM1416^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1112     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM0456^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1113     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM9127^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1114     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM2987^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1115     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM7647^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1116     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM1945^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1117     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM5763^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1118     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM3946^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1119     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM4489^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO       | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1218     | urn:oid:1.2.3.4.5.6.2.333.23     | 
+| CHPAM1416^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1229     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM0456^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1232     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM9127^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1111     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM2987^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1112     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM7647^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1113     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM1945^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1114     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM5763^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1115     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM3946^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1116     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| 761337610435209810^^^SPID&2.16.756.5.30.1.127.3.10.3&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1117     | urn:oid:1.2.3.4.5.6.2.333.23     |
+
 
 
 
 ### EndPoint
 
-*   [RMU : http://ehealthsuisse.ihe-europe.net:8093/xcmu-responding-gateway?wsdl](http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl)
-*   [ITI-57 : http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl](http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl)
-*   [ITI-18 : http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl](http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl)
+*   [RMU : http://ehealthsuisse.ihe-europe.net/restricted-metadata-update?wsdl](http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl)
+*   [ITI-57 : http://ehealthsuisse.ihe-europe.net/update-document-set?wsdl](http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl)
+*   [ITI-18 : http://ehealthsuisse.ihe-europe.net/registry-stored-query?wsdl](http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl)
 *   It requires TLS mutual authentication with testing certificate (from GSS PKI). [The wsdl can be browsed here](https://ehealthsuisse.ihe-europe.net:10443/xcmu-responding-gateway?wsdl)
     
   
@@ -73,9 +72,11 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
       <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
   </soap12:Header>
    <soap12:Body>
+   
       <lcm:SubmitObjectsRequest xmlns:lcm="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:3.0" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0" xmlns:xdsb="urn:ihe:iti:xds-b:2007" xmlns:xop="http://www.w3.org/2004/08/xop/include">
-         <rim:RegistryObjectList>         
-            <rim:RegistryPackage id="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
+         <rim:RegistryObjectList> 
+                 
+            <rim:RegistryPackage id="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" home="urn:oid:1.2.3.4.5.6.2.333.23">
                <rim:Slot name="submissionTime">
                   <rim:ValueList>
                      <rim:Value>20180115120619</rim:Value>
@@ -95,7 +96,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                   </rim:Name>
                </rim:Classification>
                <rim:Classification classificationNode="urn:uuid:a54d6aa5-d40d-43f9-88c5-b4633d873bdd" classifiedObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" id="urn:uuid:d2947dde-7346-437b-87d5-6f4812f68509" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification"/>
-               <rim:ExternalIdentifier id="urn:uuid:c8f14902-d156-43a4-8513-f3f67d2f5dce" identificationScheme="urn:uuid:554ac39e-e3fe-47fe-b233-965d2a147832" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="1.3.6.1.4.1.21367.2012.2.1.4"\>
+               <rim:ExternalIdentifier id="urn:uuid:c8f14902-d156-43a4-8513-f3f67d2f5dce" identificationScheme="urn:uuid:554ac39e-e3fe-47fe-b233-965d2a147832" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="1.3.6.1.4.1.21367.2012.2.1.4">
                   <rim:Name>
                      <rim:LocalizedString value="XDSSubmissionSet.sourceId"/>
                   </rim:Name>
@@ -105,7 +106,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                      <rim:LocalizedString value="XDSSubmissionSet.uniqueId"/>
                   </rim:Name>
                </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="c5a27d7a-069a-43c9-b3d5-495110b61575" identificationScheme="urn:uuid:6b5aea1a-874d-4603-a4bc-96a0a7b38446" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
+               <rim:ExternalIdentifier id="c5a27d7a-069a-43c9-b3d5-495110b61575" identificationScheme="urn:uuid:6b5aea1a-874d-4603-a4bc-96a0a7b38446" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSSubmissionSet.patientId"/>
                   </rim:Name>
@@ -113,44 +114,8 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
             </rim:RegistryPackage>
             <!--==== /Submission Part ====-->
 
-            <!--==== Folder Part ====-->
-            <rim:RegistryPackage id="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
-               <rim:Slot name="lastUpdateTime">
-                  <rim:ValueList>
-                     <rim:Value>20180115120619</rim:Value>
-                  </rim:ValueList>
-               </rim:Slot>
-               <rim:Name>
-                  <rim:LocalizedString value="XDS Folder 1"/>
-               </rim:Name>
-               <rim:Classification classificationScheme="urn:uuid:1ba97051-7806-41a8-a48b-8fce7af683c5" classifiedObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" id="urn:uuid:1ebeeb2e-3e78-4132-a8d9-65120824b764" nodeRepresentation="Referrals" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification">
-                  <rim:Slot name="codingScheme">
-                     <rim:ValueList>
-                        <rim:Value>Connect-a-thon folderCodeList</rim:Value>
-                     </rim:ValueList>
-                  </rim:Slot>
-                  <rim:Name>
-                     <rim:LocalizedString value="Referrals"/>
-                  </rim:Name>
-               </rim:Classification>
-               <rim:Classification classificationNode="urn:uuid:d9d542f3-6cc4-48b6-8870-ea235fbc94c2" classifiedObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" id="urn:uuid:a6faddff-c304-42e3-9645-750e975d0470" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification"/>
-               <rim:ExternalIdentifier id="urn:uuid:72c6f02b-0fd0-499a-bdbe-4089ac929d95" identificationScheme="urn:uuid:75df8f67-9973-4fbe-a900-df66cefecc5a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" value="1.3.6.1.4.1.12559.11.1.2.2.1.1.4.101633">
-                  <rim:Name>
-                     <rim:LocalizedString value="XDSFolder.uniqueId"/>
-                  </rim:Name>
-               </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="4c762dfb-fba3-4567-95da-2afcb91828a2" identificationScheme="urn:uuid:f64ffdf0-4b97-4e06-b79f-a52b38ec2f8a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
-                  <rim:Name>
-                     <rim:LocalizedString value="XDSFolder.patientId"/>
-                  </rim:Name>
-               </rim:ExternalIdentifier>
-            </rim:RegistryPackage>
-            <!--==== /Folder Part ====-->
-
-            <rim:Association associationType="urn:oasis:names:tc:ebxml-regrep:AssociationType:HasMember" id="efd55471-b598-4c13-870c-202360a8450d" sourceObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" targetObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a"/>
-
             <!--==== Document Entry Part ====-->
-            <rim:ExtrinsicObject id="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" mimeType="text/xml" objectType="urn:uuid:7edca82f-054d-47f2-a032-9b2a5b5186c1" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" lid="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
+            <rim:ExtrinsicObject id="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" mimeType="text/xml" objectType="urn:uuid:7edca82f-054d-47f2-a032-9b2a5b5186c1" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" lid="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" home="urn:oid:1.2.3.4.5.6.2.333.23">
                <rim:Slot name="repositoryUniqueId">
                   <rim:ValueList>
                      <rim:Value>1.3.6.1.4.1.12559.11.25.1.11.2</rim:Value>
@@ -257,7 +222,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                   </rim:Name>
                   <rim:VersionInfo versionName="1"/>
                </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="urn:uuid:355feb7f-a3d2-41f5-9e4e-698ed3ffc4bd" identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
+               <rim:ExternalIdentifier id="urn:uuid:355feb7f-a3d2-41f5-9e4e-698ed3ffc4bd" identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSDocumentEntry.patientId"/>
                   </rim:Name>
@@ -496,7 +461,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                                             identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427"
                                             objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier"
                                             registryObject="urn:uuid:e72a86d7-9d50-4b24-9c8c-2f57f6560ff8"
-                                            value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO">
+                                            value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSDocumentEntry.patientId"/>
                   </rim:Name>
@@ -522,5 +487,5 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
          <Error>no documents with this PatientID 333^^^&amp;2.16.756.5.30.1.127.3.10.3&amp;ISO</Error>
       </query:AdhocQueryResponse>
    </S:Body>
-</S:Envelope
+</S:Envelope>
 ```
\ No newline at end of file
diff --git a/EPD-XDSMU-Simulator/installation.md b/EPD-XDSMU-Simulator/installation.md
index d6ab2164634d60d94e81bbb71cae259e40ccbf72..f1d92eac437f6db7259d7a0e8d70fe510a8d2854 100644
--- a/EPD-XDSMU-Simulator/installation.md
+++ b/EPD-XDSMU-Simulator/installation.md
@@ -7,25 +7,24 @@ date: 28/06/2019
 toolversion: 1.1.0
 version: 0.01
 status: to be reviewed
-reference: KER1-MAN-IHE-XDSMU_SIMULATOR_INSTALLATION_USER
+reference: KER1-MAN-IHE-RMU_SIMULATOR_INSTALLATION_USER
 customer: IHE-EUROPE
 ---
 
-
 # EPR RMU MockUp
 
 ## Overview
 
 The RMU MockUp is a SoapUI webservice (mock) that provides Cross-Gateway Update Document Set [ITI-X1] Response. This mock requires that the Update Metadata Registry MockUp is started.
 
-* default_wsdl_url: http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl
-* default_path: /xcmu-responding-gateway
+* default_wsdl_url: http://ehealthsuisse.ihe-europe.net:8095/restricted-metadata-update?wsdl
+* default_path: /restricted-metadata-update
 * default_port: 8095
 * default_mock_name: RespondingGateway_Binding_Soap12 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
-* default_soapui_mock_log: /var/log/soapui/epr-xcmu-responding-gateway.log
-* default_init.d: /etc/init.d/xcmuRespondingGatewayMock
+* default_soapui_mock_log: /var/log/soapui/epr-restricted-metadata-update.log
+* default_init.d: /etc/init.d/rmuRespondingGatewayMock
 * default_keystore_path: /opt/gazelle/cert/jboss.jks
 
 
@@ -38,7 +37,7 @@ The RMU MockUp is a SoapUI webservice (mock) that provides Cross-Gateway Update
 ### Get the git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -46,7 +45,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -60,15 +59,15 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` an
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock /etc/init.d/xcmuRespondingGatewayMock
-sudo chmod u+x /etc/init.d/xcmuRespondingGatewayMock
-sudo chmod 775 /etc/init.d/xcmuRespondingGatewayMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock /etc/init.d/rmuRespondingGatewayMock
+sudo chmod u+x /etc/init.d/rmuRespondingGatewayMock
+sudo chmod 775 /etc/init.d/rmuRespondingGatewayMock
 ```
 
 If you want the service to start at each machine start up
 
 ```bash
-sudo update-rc.d xcmuRespondingGatewayMock defaults
+sudo update-rc.d rmuRespondingGatewayMock defaults
 ```
 
 Be careful to allow the service to write logs into your target directory. As example
@@ -83,19 +82,19 @@ sudo chmod 775 /var/log/soapui
 To run the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock start
+sudo /etc/init.d/rmuRespondingGatewayMock start
 ```
 
 To stop the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock stop
+sudo /etc/init.d/rmuRespondingGatewayMock stop
 ```
 
 To get status of the mock
 
 ```bash
-sudo /etc/init.d/xcmuRespondingGatewayMock status
+sudo /etc/init.d/rmuRespondingGatewayMock status
 ```
 
 
@@ -125,7 +124,7 @@ The ITI-18 Registry Stored Query MockUp is a SoapUI webservice (mock) that provi
 * default_path: /registry-stored-query
 * default_port: 8093
 * default_mock_name: DocumentRegistry_Binding_Soap11 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
 * default_soapui_mock_log: /var/log/soapui/epr-registry-stored-query.log
 * default_init.d: /etc/init.d/RegistryStoredQueryMock
@@ -141,7 +140,7 @@ The ITI-18 Registry Stored Query MockUp is a SoapUI webservice (mock) that provi
 ### Get the git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -149,7 +148,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -163,7 +162,7 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock` and
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/RegistryStoredQueryMock /etc/init.d/RegistryStoredQueryMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/RegistryStoredQueryMock /etc/init.d/RegistryStoredQueryMock
 sudo chmod u+x /etc/init.d/RegistryStoredQueryMock
 sudo chmod 775 /etc/init.d/RegistryStoredQueryMock
 ```
@@ -228,7 +227,7 @@ The ITI-57 Update Metadata Set MockUp is a SoapUI webservice (mock) that provide
 * default_path: /update-document-set
 * default_port: 8094
 * default_mock_name: DocumentRegistry_Binding_Soap12 MockService
-* default_mock_path: /opt/simulators/epr-xcmu-responding-gateway-mockup
+* default_mock_path: /opt/simulators/epr-restricted-metadata-update-mockup
 * default_soapui_path: /usr/local/SmartBear/SoapUI-5.3.0/
 * default_soapui_mock_log: /var/log/soapui/epr-update-document-set.log
 * default_init.d: /etc/init.d/UpdateMetadataSetMock
@@ -244,7 +243,7 @@ The ITI-57 Update Metadata Set MockUp is a SoapUI webservice (mock) that provide
 ### Get the Git project
 
 ```bash
-git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_XCMU_MOCK_DIR
+git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-responders.git $EPR_RMU_MOCK_DIR
 ```
 
 
@@ -252,7 +251,7 @@ git clone https://gitlab.inria.fr/gazelle/specific-tools/epr/metadata-update-res
 
 ### Prepare the init.d script
 
-Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` and set the following environment variables
+Edit the init.d scripts `$EPR_RMU_MOCK_DIR/init.d/rmuRespondingGatewayMock` and set the following environment variables
 
 * SOAPUI_PATH => Path of SoapUI folder
 * SOAPUI_PROJECT_PATH => Path of SoapUI project script
@@ -266,7 +265,7 @@ Edit the init.d scripts `$EPR_XCMU_MOCK_DIR/init.d/xcmuRespondingGatewayMock` an
 Type the following commands register the init.d script as service
 
 ```bash
-sudo cp $EPR_XCMU_MOCK_DIR/init.d/UpdateMetadataSetMock /etc/init.d/UpdateMetadataSetMock
+sudo cp $EPR_RMU_MOCK_DIR/init.d/UpdateMetadataSetMock /etc/init.d/UpdateMetadataSetMock
 sudo chmod u+x /etc/init.d/UpdateMetadataSetMock
 sudo chmod 775 /etc/init.d/UpdateMetadataSetMock
 ```
diff --git a/EPD-XDSMU-Simulator/user.md b/EPD-XDSMU-Simulator/user.md
index 04f8cb242183a1edbaebd640d65a12e6fe4b2eb7..b9d8f1b1f4f8bf0ce0276a017e28e6fb69717227 100755
--- a/EPD-XDSMU-Simulator/user.md
+++ b/EPD-XDSMU-Simulator/user.md
@@ -7,7 +7,7 @@ date: 28/06/2019
 toolversion: 1.1.0
 version: 0.01
 status: to be reviewed
-reference: KER1-MAN-IHE-XDSMU_SIMULATOR_USER
+reference: KER1-MAN-IHE-RMU_SIMULATOR_USER
 customer: IHE-EUROPE
 ---
 
@@ -35,26 +35,25 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
 
 | PatientID | SourceID | UniqueID | HomeCommunityID |
 |--------|:---:|-----:|------|
-| CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO       | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1218     | urn:oid:1.2.3.4.5.6.2.333.23     | 
-| CHPAM0998^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1229     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM9810^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1232     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM4489^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1111     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM1416^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1112     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM0456^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1113     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM9127^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1114     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM2987^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1115     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM7647^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1116     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM1945^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1117     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM5763^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1118     | urn:oid:1.2.3.4.5.6.2.333.23     |
-| CHPAM3946^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1119     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM4489^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO       | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1218     | urn:oid:1.2.3.4.5.6.2.333.23     | 
+| CHPAM1416^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1229     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM0456^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1232     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM9127^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1111     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM2987^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1112     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM7647^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1113     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM1945^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1114     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM5763^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1115     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| CHPAM3946^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1116     | urn:oid:1.2.3.4.5.6.2.333.23     |
+| 761337610435209810^^^SPID&2.16.756.5.30.1.127.3.10.3&ISO     | 1.3.6.1.4.1.12559.11.13.2.5    | 1.3.6.1.4.1.12559.11.13.2.6.1117     | urn:oid:1.2.3.4.5.6.2.333.23     |
+
 
 
 
 ### EndPoint
 
-*   [RMU : http://ehealthsuisse.ihe-europe.net:8093/xcmu-responding-gateway?wsdl](http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl)
-*   [ITI-57 : http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl](http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl)
-*   [ITI-18 : http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl](http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl)
+*   [RMU : http://ehealthsuisse.ihe-europe.net/restricted-metadata-update?wsdl](http://ehealthsuisse.ihe-europe.net:8095/xcmu-responding-gateway?wsdl)
+*   [ITI-57 : http://ehealthsuisse.ihe-europe.net/update-document-set?wsdl](http://ehealthsuisse.ihe-europe.net:8094/update-document-set?wsdl)
+*   [ITI-18 : http://ehealthsuisse.ihe-europe.net/registry-stored-query?wsdl](http://ehealthsuisse.ihe-europe.net:8095/registry-stored-query?wsdl)
 *   It requires TLS mutual authentication with testing certificate (from GSS PKI). [The wsdl can be browsed here](https://ehealthsuisse.ihe-europe.net:10443/xcmu-responding-gateway?wsdl)
     
   
@@ -73,9 +72,11 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
       <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
   </soap12:Header>
    <soap12:Body>
+   
       <lcm:SubmitObjectsRequest xmlns:lcm="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:3.0" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0" xmlns:xdsb="urn:ihe:iti:xds-b:2007" xmlns:xop="http://www.w3.org/2004/08/xop/include">
-         <rim:RegistryObjectList>         
-            <rim:RegistryPackage id="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
+         <rim:RegistryObjectList> 
+                 
+            <rim:RegistryPackage id="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" home="urn:oid:1.2.3.4.5.6.2.333.23">
                <rim:Slot name="submissionTime">
                   <rim:ValueList>
                      <rim:Value>20180115120619</rim:Value>
@@ -95,7 +96,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                   </rim:Name>
                </rim:Classification>
                <rim:Classification classificationNode="urn:uuid:a54d6aa5-d40d-43f9-88c5-b4633d873bdd" classifiedObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" id="urn:uuid:d2947dde-7346-437b-87d5-6f4812f68509" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification"/>
-               <rim:ExternalIdentifier id="urn:uuid:c8f14902-d156-43a4-8513-f3f67d2f5dce" identificationScheme="urn:uuid:554ac39e-e3fe-47fe-b233-965d2a147832" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="1.3.6.1.4.1.21367.2012.2.1.4"\>
+               <rim:ExternalIdentifier id="urn:uuid:c8f14902-d156-43a4-8513-f3f67d2f5dce" identificationScheme="urn:uuid:554ac39e-e3fe-47fe-b233-965d2a147832" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="1.3.6.1.4.1.21367.2012.2.1.4">
                   <rim:Name>
                      <rim:LocalizedString value="XDSSubmissionSet.sourceId"/>
                   </rim:Name>
@@ -105,7 +106,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                      <rim:LocalizedString value="XDSSubmissionSet.uniqueId"/>
                   </rim:Name>
                </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="c5a27d7a-069a-43c9-b3d5-495110b61575" identificationScheme="urn:uuid:6b5aea1a-874d-4603-a4bc-96a0a7b38446" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
+               <rim:ExternalIdentifier id="c5a27d7a-069a-43c9-b3d5-495110b61575" identificationScheme="urn:uuid:6b5aea1a-874d-4603-a4bc-96a0a7b38446" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSSubmissionSet.patientId"/>
                   </rim:Name>
@@ -113,44 +114,8 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
             </rim:RegistryPackage>
             <!--==== /Submission Part ====-->
 
-            <!--==== Folder Part ====-->
-            <rim:RegistryPackage id="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:RegistryPackage" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
-               <rim:Slot name="lastUpdateTime">
-                  <rim:ValueList>
-                     <rim:Value>20180115120619</rim:Value>
-                  </rim:ValueList>
-               </rim:Slot>
-               <rim:Name>
-                  <rim:LocalizedString value="XDS Folder 1"/>
-               </rim:Name>
-               <rim:Classification classificationScheme="urn:uuid:1ba97051-7806-41a8-a48b-8fce7af683c5" classifiedObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" id="urn:uuid:1ebeeb2e-3e78-4132-a8d9-65120824b764" nodeRepresentation="Referrals" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification">
-                  <rim:Slot name="codingScheme">
-                     <rim:ValueList>
-                        <rim:Value>Connect-a-thon folderCodeList</rim:Value>
-                     </rim:ValueList>
-                  </rim:Slot>
-                  <rim:Name>
-                     <rim:LocalizedString value="Referrals"/>
-                  </rim:Name>
-               </rim:Classification>
-               <rim:Classification classificationNode="urn:uuid:d9d542f3-6cc4-48b6-8870-ea235fbc94c2" classifiedObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" id="urn:uuid:a6faddff-c304-42e3-9645-750e975d0470" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification"/>
-               <rim:ExternalIdentifier id="urn:uuid:72c6f02b-0fd0-499a-bdbe-4089ac929d95" identificationScheme="urn:uuid:75df8f67-9973-4fbe-a900-df66cefecc5a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" value="1.3.6.1.4.1.12559.11.1.2.2.1.1.4.101633">
-                  <rim:Name>
-                     <rim:LocalizedString value="XDSFolder.uniqueId"/>
-                  </rim:Name>
-               </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="4c762dfb-fba3-4567-95da-2afcb91828a2" identificationScheme="urn:uuid:f64ffdf0-4b97-4e06-b79f-a52b38ec2f8a" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
-                  <rim:Name>
-                     <rim:LocalizedString value="XDSFolder.patientId"/>
-                  </rim:Name>
-               </rim:ExternalIdentifier>
-            </rim:RegistryPackage>
-            <!--==== /Folder Part ====-->
-
-            <rim:Association associationType="urn:oasis:names:tc:ebxml-regrep:AssociationType:HasMember" id="efd55471-b598-4c13-870c-202360a8450d" sourceObject="urn:uuid:fd22545f-d7f6-4ca1-8ff1-d8bae7364ac1" targetObject="urn:uuid:966276d6-6486-4d0b-a673-a4cf76c90c7a"/>
-
             <!--==== Document Entry Part ====-->
-            <rim:ExtrinsicObject id="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" mimeType="text/xml" objectType="urn:uuid:7edca82f-054d-47f2-a032-9b2a5b5186c1" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" lid="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" home="urn:oid:1.2.3.4.5.6.2.333.23"\>
+            <rim:ExtrinsicObject id="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" mimeType="text/xml" objectType="urn:uuid:7edca82f-054d-47f2-a032-9b2a5b5186c1" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved" lid="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" home="urn:oid:1.2.3.4.5.6.2.333.23">
                <rim:Slot name="repositoryUniqueId">
                   <rim:ValueList>
                      <rim:Value>1.3.6.1.4.1.12559.11.25.1.11.2</rim:Value>
@@ -257,7 +222,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                   </rim:Name>
                   <rim:VersionInfo versionName="1"/>
                </rim:ExternalIdentifier>
-               <rim:ExternalIdentifier id="urn:uuid:355feb7f-a3d2-41f5-9e4e-698ed3ffc4bd" identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO"\>
+               <rim:ExternalIdentifier id="urn:uuid:355feb7f-a3d2-41f5-9e4e-698ed3ffc4bd" identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="urn:uuid:811da817-e516-4331-b9e2-f649086a5481" value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSDocumentEntry.patientId"/>
                   </rim:Name>
@@ -496,7 +461,7 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
                                             identificationScheme="urn:uuid:58a6f841-87b3-4a3e-92fd-a8ffeff98427"
                                             objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier"
                                             registryObject="urn:uuid:e72a86d7-9d50-4b24-9c8c-2f57f6560ff8"
-                                            value="CHPAM34^^^CHPAM&1.3.6.1.4.1.12559.11.20.1&ISO">
+                                            value="CHPAM34^^^CHPAM&amp;1.3.6.1.4.1.12559.11.20.1&amp;ISO">
                   <rim:Name>
                      <rim:LocalizedString value="XDSDocumentEntry.patientId"/>
                   </rim:Name>
@@ -522,5 +487,5 @@ The actors involved in this profile are : Initiator, Responder and Document Regi
          <Error>no documents with this PatientID 333^^^&amp;2.16.756.5.30.1.127.3.10.3&amp;ISO</Error>
       </query:AdhocQueryResponse>
    </S:Body>
-</S:Envelope
+</S:Envelope>
 ```
\ No newline at end of file