diff --git a/.gitmodules b/.gitmodules
index 40489a646..be6f91202 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,14 +1,14 @@
 [submodule "atmos_cubed_sphere"]
 	path = atmos_cubed_sphere
-	url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
-	branch = dev/emc
+	url = https://github.com/NCAR/GFDL_atmos_cubed_sphere
+	branch = dtc/develop
 [submodule "ccpp/framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
-	branch = master
+	branch = dtc/develop
 [submodule "ccpp/physics"]
 	path = ccpp/physics
 	#url = https://github.com/NCAR/ccpp-physics
 	#branch = dtc/hwrf-physics
 	url = https://github.com/climbfuji/ccpp-physics
-	branch = HAFS_fer_hires_for_dtc_hwrf-physics
\ No newline at end of file
+	branch = HAFS_fer_hires_for_dtc_hwrf-physics
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index 83b6500bb..cd217862d 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -339,7 +339,6 @@
             'rime_factor',
             ],
         },
-
     #'subroutine_name_1' : 'all',
     #'subroutine_name_2' : 'none',
     #'subroutine_name_2' : [ 'var1', 'var3'],
diff --git a/ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml b/ccpp/suites/suite_FV3_HAFS_ferhires.xml
similarity index 97%
rename from ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
rename to ccpp/suites/suite_FV3_HAFS_ferhires.xml
index e1d70f035..d4b265b99 100644
--- a/ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+++ b/ccpp/suites/suite_FV3_HAFS_ferhires.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_HAFS_ferhires_update_moist" lib="ccppphys" ver="3">
+<suite name="FV3_HAFS_ferhires" lib="ccppphys" ver="3">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">