diff --git a/ccpp/framework b/ccpp/framework
index cdbbeade..40deb941 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit cdbbeade337bfec63e89fb4589d6f3a5436ba959
+Subproject commit 40deb9418409e45ef7c6514f117ae5d929c4ab52
diff --git a/ccpp/physics b/ccpp/physics
index d7e8c7e6..f20b728b 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit d7e8c7e6c96018c94a6210272efa0bd4d7c68b59
+Subproject commit f20b728b1f5d60c01d77db208be70d04887dcf77
diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90
index 420fc611..a7f0e2bb 100644
--- a/scm/src/CCPP_typedefs.F90
+++ b/scm/src/CCPP_typedefs.F90
@@ -450,8 +450,6 @@ module CCPP_typedefs
 
   end type GFS_interstitial_type
 
-  type(GFS_interstitial_type) :: GFS_interstitial_type_instance
-
 contains
 
 !----------------------
diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta
index 0a74deba..ab97f260 100644
--- a/scm/src/CCPP_typedefs.meta
+++ b/scm/src/CCPP_typedefs.meta
@@ -3014,9 +3014,3 @@
   units = count
   dimensions = ()
   type = integer
-[GFS_interstitial_type_instance]
-  standard_name = GFS_interstitial_type_instance
-  long_name = instance of type GFS_interstitial_type
-  units = DDT
-  dimensions = ()
-  type = GFS_interstitial_type
\ No newline at end of file
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
index f769ed4a..4694b889 100644
--- a/scm/src/GFS_typedefs.F90
+++ b/scm/src/GFS_typedefs.F90
@@ -2197,24 +2197,12 @@ module GFS_typedefs
 ! PUBLIC ENTITIES
 !----------------
 
-  type(GFS_init_type)     :: GFS_init_type_instance
-  type(GFS_statein_type)  :: GFS_statein_type_instance
-  type(GFS_stateout_type) :: GFS_stateout_type_instance
-  type(GFS_sfcprop_type)  :: GFS_sfcprop_type_instance
-  type(GFS_coupling_type) :: GFS_coupling_type_instance
-  type(GFS_control_type)  :: GFS_control_type_instance
-  type(GFS_grid_type)     :: GFS_grid_type_instance
-  type(GFS_tbd_type)      :: GFS_tbd_type_instance
-  type(GFS_cldprop_type)  :: GFS_cldprop_type_instance
-  type(GFS_radtend_type)  :: GFS_radtend_type_instance
-  type(GFS_diag_type)     :: GFS_diag_type_instance
-  
-  public GFS_init_type_instance
-  public GFS_statein_type_instance,  GFS_stateout_type_instance, GFS_sfcprop_type_instance, &
-         GFS_coupling_type_instance
-  public GFS_control_type_instance,  GFS_grid_type_instance,     GFS_tbd_type_instance, &
-         GFS_cldprop_type_instance,  GFS_radtend_type_instance,  GFS_diag_type_instance
-  
+  public GFS_init_type
+  public GFS_statein_type,  GFS_stateout_type, GFS_sfcprop_type, &
+         GFS_coupling_type
+  public GFS_control_type,  GFS_grid_type,     GFS_tbd_type, &
+         GFS_cldprop_type,  GFS_radtend_type,  GFS_diag_type
+
 !*******************************************************************************************
   CONTAINS
 
@@ -3297,7 +3285,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
     use physcons,         only: con_rerth, con_pi, con_p0, rhowater
     use mersenne_twister, only: random_setseed, random_number
     use parse_tracers,    only: get_tracer_index
-!    use GFS_ccpp_suite_sim_pre, only: load_ccpp_suite_sim
+    use GFS_ccpp_suite_sim_pre, only: load_ccpp_suite_sim
 !
     implicit none
 
diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
index 5e65d0d0..a7cda434 100644
--- a/scm/src/GFS_typedefs.meta
+++ b/scm/src/GFS_typedefs.meta
@@ -10154,76 +10154,11 @@
   dependencies = photochem/h2o_def.f,photochem/module_ozphys.F90
   dependencies = MP/GFDL/GFDL_parse_tracers.F90
   dependencies = Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90
+  dependencies = Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90
 
 [ccpp-arg-table]
   name = GFS_typedefs
   type = module
-[GFS_init_type]
-  standard_name = GFS_init_type_instance
-  long_name = definition of type GFS_init_type
-  units = DDT
-  dimensions = ()
-  type = GFS_init_type
-[GFS_cldprop_type_instance]
-  standard_name = GFS_cldprop_type_instance
-  long_name = definition of type GFS_cldprop_type
-  units = DDT
-  dimensions = ()
-  type = GFS_cldprop_type
-[GFS_control_type_instance]
-  standard_name = GFS_control_type_instance
-  long_name = instance of type GFS_control_type
-  units = DDT
-  dimensions = ()
-  type = GFS_control_type
-[GFS_coupling_type_instance]
-  standard_name = GFS_coupling_type_instance
-  long_name = definition of type GFS_coupling_type
-  units = DDT
-  dimensions = ()
-  type = GFS_coupling_type
-[GFS_diag_type_instance]
-  standard_name = GFS_diag_type_instance
-  long_name = definition of type GFS_diag_type
-  units = DDT
-  dimensions = ()
-  type = GFS_diag_type
-[GFS_grid_type_instance]
-  standard_name = GFS_grid_type_instance
-  long_name = definition of type GFS_grid_type
-  units = DDT
-  dimensions = ()
-  type = GFS_grid_type
-[GFS_radtend_type_instance]
-  standard_name = GFS_radtend_type_instance
-  long_name = definition of type GFS_radtend_type
-  units = DDT
-  dimensions = ()
-  type = GFS_radtend_type
-[GFS_sfcprop_type_instance]
-  standard_name = GFS_sfcprop_type_instance
-  long_name = definition of type GFS_sfcprop_type
-  units = DDT
-  dimensions = ()
-  type = GFS_sfcprop_type
-[GFS_statein_type_instance]
-  standard_name = GFS_statein_type_instance
-  long_name = definition of type GFS_statein_type
-  units = DDT
-  dimensions = ()
-  type = GFS_statein_type
-[GFS_stateout_type_instance]
-  standard_name = GFS_stateout_type_instance
-  long_name = definition of type GFS_stateout_type
-  units = DDT
-  dimensions = ()
-  type = GFS_stateout_type
-[GFS_tbd_type_instance]
-  standard_name = GFS_tbd_type_instance
-  long_name = definition of type GFS_tbd_type
-  units = DDT
-  dimensions = ()
-  type = GFS_tbd_type
 [LTP]
   standard_name = extra_top_layer
   long_name = extra top layer for radiation
diff --git a/scm/src/scm_type_defs.meta b/scm/src/scm_type_defs.meta
index bfc35b04..29693069 100644
--- a/scm/src/scm_type_defs.meta
+++ b/scm/src/scm_type_defs.meta
@@ -38,73 +38,73 @@
   name = physics_type
   type = ddt
 [Model]
-  standard_name = GFS_control_type_instance
+  standard_name = GFS_control_type
   long_name = instance of derived type GFS_control_type
   units = DDT
   dimensions = ()
   type = GFS_control_type
 [Cldprop]
-  standard_name = GFS_cldprop_type_instance
+  standard_name = GFS_cldprop_type
   long_name = instance of derived type GFS_cldprop_type
   units = DDT
   dimensions = ()
   type = GFS_cldprop_type
 [Coupling]
-  standard_name = GFS_coupling_type_instance
+  standard_name = GFS_coupling_type
   long_name = instance of derived type GFS_coupling_type
   units = DDT
   dimensions = ()
   type = GFS_coupling_type
 [Diag]
-  standard_name = GFS_diag_type_instance
+  standard_name = GFS_diag_type
   long_name = instance of derived type GFS_diag_type
   units = DDT
   dimensions = ()
   type = GFS_diag_type
 [Grid]
-  standard_name = GFS_grid_type_instance
+  standard_name = GFS_grid_type
   long_name = instance of derived type GFS_grid_type
   units = DDT
   dimensions = ()
   type = GFS_grid_type
 [Radtend]
-  standard_name = GFS_radtend_type_instance
+  standard_name = GFS_radtend_type
   long_name = instance of derived type GFS_radtend_type
   units = DDT
   dimensions = ()
   type = GFS_radtend_type
 [Sfcprop]
-  standard_name = GFS_sfcprop_type_instance
+  standard_name = GFS_sfcprop_type
   long_name = instance of derived type GFS_sfcprop_type
   units = DDT
   dimensions = ()
   type = GFS_sfcprop_type
 [Statein]
-  standard_name = GFS_statein_type_instance
+  standard_name = GFS_statein_type
   long_name = instance of derived type GFS_statein_type
   units = DDT
   dimensions = ()
   type = GFS_statein_type
 [Stateout]
-  standard_name = GFS_stateout_type_instance
+  standard_name = GFS_stateout_type
   long_name = instance of derived type GFS_stateout_type
   units = DDT
   dimensions = ()
   type = GFS_stateout_type
 [Tbd]
-  standard_name = GFS_tbd_type_instance
+  standard_name = GFS_tbd_type
   long_name = instance of derived type GFS_tbd_type
   units = DDT
   dimensions = ()
   type = GFS_tbd_type
 [Interstitial]
-  standard_name = GFS_interstitial_type_instance
+  standard_name = GFS_interstitial_type
   long_name = instance of derived type GFS_interstitial_type
   units = DDT
   dimensions = ()
   type = GFS_interstitial_type
 [Init_parm]
-  standard_name = GFS_init_type_instance
+  standard_name = GFS_init_type
   long_name = instance of derived type GFS_init_type
   units = DDT
   dimensions = ()
@@ -122,14 +122,14 @@
   type = host
 [physics]
   standard_name = physics_type
-  long_name = instance of derived data type physics_type
+  long_name = definition of derived data type physics_type
   units = DDT
   dimensions = ()
   type = physics_type
   intent = inout
 [ccpp_cfg]
-  standard_name = ccpp_configuration_instance
-  long_name = instance of derived data type ccpp_config
+  standard_name = ccpp_configuration
+  long_name = definition of derived data type ccpp_config
   units = DDT
   dimensions = ()
   type = ty_ccpp_config