diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index d83ce5a696..06bd183ce0 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -185,7 +185,7 @@
         <includeMode>excludeDpaAndOgc</includeMode>
         <includeMode>statsTemplate</includeMode>
 	</mode>
-	<mode name="registry">
+	<mode name="wfoRegistry">
         <!-- WFO Registry production mode -->
         <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
@@ -251,16 +251,13 @@
 
 	<!-- modes listed below are not supported in a production setting, they 
 		are for DEVELOPMENT purposes only -->
-    <mode name="devWfoRegistry">
-         <!-- This is the development WFO registry mode.
-         It runs the sbn simulator for development. -->
+    <mode name="devRegistry">
+         <!-- This is the development registry mode that acts as both
+         an NCF and WFO. It also runs the sbn simulator. -->
         <include>.*sbn-simulator.*</include>
         <include>ebxml.*\.xml</include>
         <includeMode>statsTemplate</includeMode>
         <includeMode>dataDeliveryTemplate</includeMode>
-        <exclude>.*datadelivery-ncf.*</exclude>
-        <exclude>harvester-*</exclude>
-        <exclude>crawler-*</exclude>
     </mode>
 	<mode name="grib">
 		<include>grib-common.xml</include>
diff --git a/edexOsgi/build.edex/esb/etc/devWfoRegistry.sh b/edexOsgi/build.edex/esb/etc/devRegistry.sh
similarity index 100%
rename from edexOsgi/build.edex/esb/etc/devWfoRegistry.sh
rename to edexOsgi/build.edex/esb/etc/devRegistry.sh
diff --git a/edexOsgi/build.edex/esb/etc/ncfRegistry.sh b/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
index 011e0bf375..5c32e7ab57 100644
--- a/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
+++ b/edexOsgi/build.edex/esb/etc/ncfRegistry.sh
@@ -31,4 +31,4 @@ export MGMT_PORT=9607
 export EBXML_REGISTRY_WEBSERVER_PORT=8084
 export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8446
 export EBXML_QUERY_SERVICE_SOAP_PORT=10146
-export EBXML_THRIFT_SERVICE_PORT=9590
\ No newline at end of file
+export EBXML_THRIFT_SERVICE_PORT=9588
diff --git a/edexOsgi/build.edex/esb/etc/registry.sh b/edexOsgi/build.edex/esb/etc/wfoRegistry.sh
similarity index 100%
rename from edexOsgi/build.edex/esb/etc/registry.sh
rename to edexOsgi/build.edex/esb/etc/wfoRegistry.sh