diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index bdc48cd8c..af133339d 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -214,7 +214,7 @@
     'ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90',
     'ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90',
     'ccpp/physics/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90',
-    'ccpp/physics/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90',
+    'ccpp/physics/physics/SFC_Layer/MYNN/MYNN/CCPP/module_sf_mynnsfc_driver.F90',
     'ccpp/physics/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90',
     'ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f',
     'ccpp/physics/physics/SFC_Layer/UFS/sfc_diag_post.F90',
diff --git a/ccpp/physics b/ccpp/physics
index a2aa6cc70..fff5748fb 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit a2aa6cc7063a8e0d678876a5f39a37ca51d31835
+Subproject commit fff5748fb0141921592dff1c78c9ead413261cdf
diff --git a/ccpp/suites/suite_SCM_HRRR.xml b/ccpp/suites/suite_SCM_HRRR.xml
index ce7aa9a1d..676b86ae8 100644
--- a/ccpp/suites/suite_SCM_HRRR.xml
+++ b/ccpp/suites/suite_SCM_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>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
diff --git a/ccpp/suites/suite_SCM_HRRR_gf.xml b/ccpp/suites/suite_SCM_HRRR_gf.xml
index 36791f235..3d2b0ea59 100644
--- a/ccpp/suites/suite_SCM_HRRR_gf.xml
+++ b/ccpp/suites/suite_SCM_HRRR_gf.xml
@@ -36,7 +36,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_SCM_RAP.xml b/ccpp/suites/suite_SCM_RAP.xml
index 61c84460b..91dd01455 100644
--- a/ccpp/suites/suite_SCM_RAP.xml
+++ b/ccpp/suites/suite_SCM_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_SCM_RRFS_v1beta.xml b/ccpp/suites/suite_SCM_RRFS_v1beta.xml
index 4f1ecaff1..8fa5959ac 100644
--- a/ccpp/suites/suite_SCM_RRFS_v1beta.xml
+++ b/ccpp/suites/suite_SCM_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_SCM_RRFS_v1beta_no_nsst.xml b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.xml
index 45f254dc3..c91560ba0 100644
--- a/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.xml
+++ b/ccpp/suites/suite_SCM_RRFS_v1beta_no_nsst.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_ocean</scheme>
       <scheme>noahmpdrv</scheme>
diff --git a/ccpp/suites/suite_SCM_WoFS_v0.xml b/ccpp/suites/suite_SCM_WoFS_v0.xml
index b89e047bd..8a0023899 100644
--- a/ccpp/suites/suite_SCM_WoFS_v0.xml
+++ b/ccpp/suites/suite_SCM_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>
@@ -72,4 +72,4 @@
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->
-</suite>
\ No newline at end of file
+</suite>