diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index 048d461d0..4e58f8fc9 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -191,10 +191,9 @@
     'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90',
     'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90',
     'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90',
-    'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_aerosol_optics.F90',
     'ccpp/physics/physics/rrtmgp_lw_rte.F90',
     'ccpp/physics/physics/rrtmgp_sw_rte.F90',
-    'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90',
     'ccpp/physics/physics/GFS_rrtmgp_setup.F90',
     'ccpp/physics/physics/GFS_rrtmgp_pre.F90',
     'ccpp/physics/physics/rrtmgp_lw_pre.F90',
diff --git a/ccpp/physics b/ccpp/physics
index 5f7d6970b..2f6e70814 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 5f7d6970b7d420601dc86c2db91d953feebe1a7b
+Subproject commit 2f6e70814fdaae4ba33b00c7d5c7ec421a8e69e8
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
index 29d4e4561..5885769b0 100644
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
+++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
@@ -17,17 +17,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_thompsonmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
       <scheme>GFS_rrtmgp_sw_pre</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
index 983b7b2e7..99d61f3f9 100644
--- a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+++ b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
@@ -21,17 +21,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
       <scheme>GFS_rrtmgp_sw_pre</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>
diff --git a/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
index 92d040f6b..796c8167b 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
@@ -21,17 +21,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
       <scheme>GFS_rrtmgp_sw_pre</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>
diff --git a/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml b/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
index 76f22cfed..b1b536957 100644
--- a/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
+++ b/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
@@ -17,17 +17,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_thompsonmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
       <scheme>GFS_rrtmgp_sw_pre</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>