diff --git a/.gitmodules b/.gitmodules
index 2b0f218a..2e09f9e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "ccpp-framework"]
         path          = ccpp_framework
         url           = https://github.com/NCAR/ccpp-framework
-        fxtag         = 2025-01-06-dev
+        fxtag         = 2025-06-03-dev
         fxrequired    = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework
 [submodule "history"]
diff --git a/ccpp_framework b/ccpp_framework
index fca3a9e3..9254784f 160000
--- a/ccpp_framework
+++ b/ccpp_framework
@@ -1 +1 @@
-Subproject commit fca3a9e3df101bd07a228631e5509ec4a93a9906
+Subproject commit 9254784f55757cdc8386509fedc7e6fdd02517ab
diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90
index 6cd57f99..490a022a 100644
--- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90
+++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90
@@ -143,7 +143,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
 
                   select case (trim(phys_var_stdnames(name_idx)))
                      case ('potential_temperature')
-                        call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%theta)
+                        call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%thermo%theta)
 
                      case ('air_pressure_at_sea_level')
                         call read_field(file, 'air_pressure_at_sea_level', input_var_names(:,name_idx), timestep, phys_state%slp)
@@ -321,8 +321,8 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
 
                select case (trim(phys_var_stdnames(name_idx)))
                case ('potential_temperature')
-                  call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%theta, 'potential_temperature', min_difference,      &
-                       min_relative_value, is_first, diff_found)
+                  call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%thermo%theta, 'potential_temperature',               &
+                       min_difference, min_relative_value, is_first, diff_found)
 
                case ('air_pressure_at_sea_level')
                   call check_field(file, input_var_names(:,name_idx), timestep, phys_state%slp, 'air_pressure_at_sea_level', min_difference,           &
diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90
index d5d46fc6..a23b6561 100644
--- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90
+++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90
@@ -143,7 +143,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
 
                   select case (trim(phys_var_stdnames(name_idx)))
                      case ('potential_temperature')
-                        call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%T(:, :, ix_theta))
+                        call read_field(file, 'potential_temperature', input_var_names(:,name_idx), 'lev', timestep, phys_state%t(:, :, ix_theta))
 
                      case ('air_pressure_at_sea_level')
                         call read_field(file, 'air_pressure_at_sea_level', input_var_names(:,name_idx), timestep, phys_state%slp)
@@ -321,7 +321,7 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference,
 
                select case (trim(phys_var_stdnames(name_idx)))
                case ('potential_temperature')
-                  call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%T(:, :, ix_theta), 'potential_temperature',          &
+                  call check_field(file, input_var_names(:,name_idx), 'lev', timestep, phys_state%t(:, :, ix_theta), 'potential_temperature',          &
                        min_difference, min_relative_value, is_first, diff_found)
 
                case ('air_pressure_at_sea_level')