diff --git a/.gitmodules b/.gitmodules
index ff98f992..257ce8a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,7 +20,7 @@
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
 	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = atmos_phys0_08_000
+	fxtag         = 252b500a93c89f36ece7d8ba08fd8eb025279eaa
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "ccs_config"]
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
index fbf520ab..617bfa8e 100644
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
@@ -1 +1 @@
- ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler"
+ ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler_test"
diff --git a/src/data/registry.xml b/src/data/registry.xml
index ca875b67..f0c5c858 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -256,7 +256,7 @@
       <ic_file_input_names>tw_cur state_tw_cur</ic_file_input_names>
     </variable>
     <variable local_name="teout"
-              standard_name="vertically_integrated_total_energy_at_end_of_physics_timestep"
+              standard_name="vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep"
               units="J m-2" type="real" kind="kind_phys"
               allocatable="allocatable">
       <long_name>Total energy using dynamical core formula at the end of physics timestep</long_name>
@@ -343,7 +343,7 @@
       <data>vertically_integrated_total_energy_using_dycore_energy_formula</data>
       <data>vertically_integrated_total_water_at_start_of_physics_timestep</data>
       <data>vertically_integrated_total_water</data>
-      <data>vertically_integrated_total_energy_at_end_of_physics_timestep</data>
+      <data>vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep</data>
     </ddt>
     <ddt type="physics_tend">
       <data>tendency_of_air_temperature_due_to_model_physics</data>
diff --git a/src/dynamics/mpas/dyn_comp.F90 b/src/dynamics/mpas/dyn_comp.F90
index f6e3a10a..0ef66d33 100644
--- a/src/dynamics/mpas/dyn_comp.F90
+++ b/src/dynamics/mpas/dyn_comp.F90
@@ -1072,8 +1072,8 @@ subroutine mark_variables_as_initialized()
         ! While we are not responsible for initializing or updating them, we still need to help mark them as initialized.
 
         ! These variables are to be set externally by the `check_energy_chng` CCPP physics scheme.
-        call mark_as_initialized('vertically_integrated_total_energy_at_end_of_physics_timestep')
         call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula')
+        call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep')
         call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep')
         call mark_as_initialized('vertically_integrated_total_energy_using_physics_energy_formula')
         call mark_as_initialized('vertically_integrated_total_energy_using_physics_energy_formula_at_start_of_physics_timestep')
diff --git a/src/dynamics/none/dyn_grid.F90 b/src/dynamics/none/dyn_grid.F90
index ba1bf0ba..8d2b0431 100644
--- a/src/dynamics/none/dyn_grid.F90
+++ b/src/dynamics/none/dyn_grid.F90
@@ -703,7 +703,7 @@ subroutine find_energy_formula(file, grid_is_latlon)
       call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula")
       call mark_as_initialized("vertically_integrated_total_water_at_start_of_physics_timestep")
       call mark_as_initialized("vertically_integrated_total_water")
-      call mark_as_initialized("vertically_integrated_total_energy_at_end_of_physics_timestep")
+      call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep")
 
    end subroutine find_energy_formula
 
diff --git a/src/dynamics/se/dyn_comp.F90 b/src/dynamics/se/dyn_comp.F90
index 4f70ae2c..3ce1fee6 100644
--- a/src/dynamics/se/dyn_comp.F90
+++ b/src/dynamics/se/dyn_comp.F90
@@ -1873,7 +1873,7 @@ subroutine read_inidat(dyn_in)
    call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula")
    call mark_as_initialized("vertically_integrated_total_water_at_start_of_physics_timestep")
    call mark_as_initialized("vertically_integrated_total_water")
-   call mark_as_initialized("vertically_integrated_total_energy_at_end_of_physics_timestep")
+   call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep")
 
 end subroutine read_inidat
 
diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp
index 89b62864..252b500a 160000
--- a/src/physics/ncar_ccpp
+++ b/src/physics/ncar_ccpp
@@ -1 +1 @@
-Subproject commit 89b628646b1506f36b35e67038552f09fb0662e6
+Subproject commit 252b500a93c89f36ece7d8ba08fd8eb025279eaa
diff --git a/test/existing-test-failures.txt b/test/existing-test-failures.txt
index 2328b59d..75ca84fd 100644
--- a/test/existing-test-failures.txt
+++ b/test/existing-test-failures.txt
@@ -1 +1,4 @@
-All clear!
+SMS_Ln9.ne5pg3_ne5pg3_mg37.FCAM7.derecho_intel.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
+SMS_Ln9.ne5pg3_ne5pg3_mg37.FCAM7.derecho_gnu.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
+- CAM7 suite will not work without a PBL scheme
+- CAM7 suite will not work with snapshot fields in registry.xml even if initial_value is defined (CAM-SIMA#359)