diff --git a/src/main/resources/connections/cognito/development.xml b/src/main/resources/connections/cognito/development.xml
index 6be85c3..4401ef8 100644
--- a/src/main/resources/connections/cognito/development.xml
+++ b/src/main/resources/connections/cognito/development.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<registry_connection index="shared-dev-registry">
+<registry_connection index="dev-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-atm.xml b/src/main/resources/connections/cognito/pds-atm.xml
index 70ad009..9e1b47b 100644
--- a/src/main/resources/connections/cognito/pds-atm.xml
+++ b/src/main/resources/connections/cognito/pds-atm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System: Atmosphers Node -->
-<registry_connection index="pds-atm-registry">
+<registry_connection index="atm-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-eng.xml b/src/main/resources/connections/cognito/pds-eng.xml
index b168e45..f2bb6d5 100644
--- a/src/main/resources/connections/cognito/pds-eng.xml
+++ b/src/main/resources/connections/cognito/pds-eng.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System: Engineering Node -->
-<registry_connection index="pds-eng-registry">
+<registry_connection index="en-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-geo.xml b/src/main/resources/connections/cognito/pds-geo.xml
index 398fc7d..dc366d0 100644
--- a/src/main/resources/connections/cognito/pds-geo.xml
+++ b/src/main/resources/connections/cognito/pds-geo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System: Geosciences Node -->
-<registry_connection index="pds-geo-registry">
+<registry_connection index="geo-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-img.xml b/src/main/resources/connections/cognito/pds-img.xml
index 5f535f1..e8cb5aa 100644
--- a/src/main/resources/connections/cognito/pds-img.xml
+++ b/src/main/resources/connections/cognito/pds-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System:  Imaging Node -->
-<registry_connection index="pds-img-registry">
+<registry_connection index="img-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-naif.xml b/src/main/resources/connections/cognito/pds-naif.xml
index 6b8f000..8cf8783 100644
--- a/src/main/resources/connections/cognito/pds-naif.xml
+++ b/src/main/resources/connections/cognito/pds-naif.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System:  NAIF Node -->
-<registry_connection index="pds-naif-registry">
+<registry_connection index="naif-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-ppi.xml b/src/main/resources/connections/cognito/pds-ppi.xml
index 0d77274..8693a5b 100644
--- a/src/main/resources/connections/cognito/pds-ppi.xml
+++ b/src/main/resources/connections/cognito/pds-ppi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System:  Planetary Plasma Interactions Node -->
-<registry_connection index="pds-ppi-registry">
+<registry_connection index="ppi-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-rms.xml b/src/main/resources/connections/cognito/pds-rms.xml
index fad7e7b..ac35373 100644
--- a/src/main/resources/connections/cognito/pds-rms.xml
+++ b/src/main/resources/connections/cognito/pds-rms.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System: Rings Node -->
-<registry_connection index="pds-rms-registry">
+<registry_connection index="rms-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/pds-sbn.xml b/src/main/resources/connections/cognito/pds-sbn-psi.xml
similarity index 90%
rename from src/main/resources/connections/cognito/pds-sbn.xml
rename to src/main/resources/connections/cognito/pds-sbn-psi.xml
index 35977b4..6e0bbd3 100644
--- a/src/main/resources/connections/cognito/pds-sbn.xml
+++ b/src/main/resources/connections/cognito/pds-sbn-psi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Planetary Data System: Small Bodies Node -->
-<registry_connection index="pds-sbn-registry">
+<registry_connection index="sbnpsi-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/cognito/roscosmos.xml b/src/main/resources/connections/cognito/pds-sbn-umd.xml
similarity index 78%
rename from src/main/resources/connections/cognito/roscosmos.xml
rename to src/main/resources/connections/cognito/pds-sbn-umd.xml
index 73fa306..4d9204b 100644
--- a/src/main/resources/connections/cognito/roscosmos.xml
+++ b/src/main/resources/connections/cognito/pds-sbn-umd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Russian State Corporation for Space Activities -->
-<registry_connection index="roscosmos-registry">
+<!-- Planetary Data System: Small Bodies Node -->
+<registry_connection index="sbnumd-registry">
   <cognitoClientId endpoint="https://p5qmxrldysl1gy759hqf.us-west-2.aoss.amazonaws.com"
                    gateway="https://c8u1zk30u5.execute-api.us-west-2.amazonaws.com/dev/credentials"
                    IDP="https://cognito-idp.us-west-2.amazonaws.com"
diff --git a/src/main/resources/connections/direct/localhost.xml b/src/main/resources/connections/direct/localhost.xml
index ae8ab14..286ddd7 100644
--- a/src/main/resources/connections/direct/localhost.xml
+++ b/src/main/resources/connections/direct/localhost.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<registry_connection index="registry">
+<registry_connection index="dev-registry">
   <server_url trust_self_signed="false">https://localhost:9200</server_url>
 </registry_connection>
diff --git a/src/main/resources/connections/direct/localhost1.xml b/src/main/resources/connections/direct/localhost1.xml
index 7b5d93e..56ae4fb 100644
--- a/src/main/resources/connections/direct/localhost1.xml
+++ b/src/main/resources/connections/direct/localhost1.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<registry_connection index="registry">
+<registry_connection index="dev-registry">
   <server_url sdk="1" trust_self_signed="false">https://localhost:9200</server_url>
 </registry_connection>
diff --git a/src/main/resources/connections/direct/localhost2.xml b/src/main/resources/connections/direct/localhost2.xml
index 8d78b7e..2c9dcdc 100644
--- a/src/main/resources/connections/direct/localhost2.xml
+++ b/src/main/resources/connections/direct/localhost2.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<registry_connection index="registry">
+<registry_connection index="dev-registry">
   <server_url sdk="2" trust_self_signed="false">https://localhost:9200</server_url>
 </registry_connection>