diff --git a/ccpp/config/ccpp_prebuild_config_fv3.py b/ccpp/config/ccpp_prebuild_config_fv3.py
index 968c48a77..ec69586ac 100755
--- a/ccpp/config/ccpp_prebuild_config_fv3.py
+++ b/ccpp/config/ccpp_prebuild_config_fv3.py
@@ -200,7 +200,7 @@
     'physics/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90',
     'physics/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90',
     'physics/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90',
-    'physics/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90',
+    'physics/physics/SFC_Layer/MYNN/MYNN/CCPP/module_sf_mynnsfc_driver.F90',
     'physics/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90',
     'physics/physics/SFC_Layer/UFS/sfc_diag.f',
     'physics/physics/SFC_Layer/UFS/sfc_diag_post.F90',
diff --git a/ccpp/physics b/ccpp/physics
index 525174d8b..fa51a5610 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 525174d8b976b7bdce68ac2899dc889856d78f1c
+Subproject commit fa51a56100cb49dc39796090ae4dedb63a9e4800
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
index af490fe83..d4a9d1894 100644
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml
index 10ac55112..080fbdf17 100644
--- a/ccpp/suites/suite_FV3_HRRR.xml
+++ b/ccpp/suites/suite_FV3_HRRR.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml
index f2ded8fe5..158c66cc3 100644
--- a/ccpp/suites/suite_FV3_HRRR_c3.xml
+++ b/ccpp/suites/suite_FV3_HRRR_c3.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml
index 58d390295..2802f0e21 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf.xml
+++ b/ccpp/suites/suite_FV3_HRRR_gf.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
index 0f5d26e2f..d9815bff2 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml
index 36ab67bcb..9cb49afb0 100644
--- a/ccpp/suites/suite_FV3_RAP.xml
+++ b/ccpp/suites/suite_FV3_RAP.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
index 43b439343..bfa9504b3 100644
--- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml
index 091415e6e..fa61e6b29 100644
--- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml
+++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml
index f69c2e144..c14beff4e 100644
--- a/ccpp/suites/suite_FV3_RAP_flake.xml
+++ b/ccpp/suites/suite_FV3_RAP_flake.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml
index fd5d64e67..a2d4788da 100644
--- a/ccpp/suites/suite_FV3_RAP_noah.xml
+++ b/ccpp/suites/suite_FV3_RAP_noah.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
index 36ce5ed89..c6e5d4425 100644
--- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
index 003c7b8cc..42713f07f 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml
+++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
index 160dd0ecf..e5982de85 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml
index 2e32afd48..cc54892c9 100644
--- a/ccpp/suites/suite_FV3_WoFS_v0.xml
+++ b/ccpp/suites/suite_FV3_WoFS_v0.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml
index e74dbff5b..94e02e6bd 100644
--- a/ccpp/suites/suite_FV3_global_nest_v1.xml
+++ b/ccpp/suites/suite_FV3_global_nest_v1.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml b/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
index f9fbab7e9..118ef0822 100644
--- a/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
+++ b/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml
index f7dd9295b..acd38e723 100644
--- a/ccpp/suites/suite_RRFS_sas.xml
+++ b/ccpp/suites/suite_RRFS_sas.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml
index 0c83bb46a..aecd53fc1 100644
--- a/ccpp/suites/suite_RRFS_sas_nogwd.xml
+++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml
index 71edcfcde..66af0815a 100644
--- a/ccpp/suites/suite_RRFSens_phy2.xml
+++ b/ccpp/suites/suite_RRFSens_phy2.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml
index 5fe718e1e..b5bcb317b 100644
--- a/ccpp/suites/suite_RRFSens_phy3.xml
+++ b/ccpp/suites/suite_RRFSens_phy3.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>
diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml
index b5ccb4060..843aadd3c 100644
--- a/ccpp/suites/suite_RRFSens_phy5.xml
+++ b/ccpp/suites/suite_RRFSens_phy5.xml
@@ -37,7 +37,7 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
+      <scheme>module_sf_mynnsfc_driver</scheme>
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>lsm_ruc</scheme>
       <scheme>clm_lake</scheme>