diff --git a/.gitmodules b/.gitmodules
index 12588586..21e0eca8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,8 +13,8 @@
         fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
-        url           = https://github.com/jimmielin/atmospheric_physics
-        fxtag         = fbea5c86954f6d043d8d8a94715cb745469114b8
+        url           = https://github.com/ESCOMP/atmospheric_physics
+        fxtag         = 67bb908e
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "ccs_config"]
diff --git a/cime_config/cam_autogen.py b/cime_config/cam_autogen.py
index a07db5b0..3d5ed312 100644
--- a/cime_config/cam_autogen.py
+++ b/cime_config/cam_autogen.py
@@ -622,7 +622,7 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
         if not os.path.isdir(atm_phys_to_be_ccppized_dir):
             # CAM-SIMA will likely not run without this, so raise an error
             emsg = "ERROR: Unable to find CCPP physics to_be_ccppized directory:\n"
-            emsg += f" {atm_phys_util_dir}\n Have you run 'git-fleximod'?"
+            emsg += f" {atm_phys_to_be_ccppized_dir}\n Have you run 'git-fleximod'?"
             raise CamAutoGenError(emsg)
         # end if
 
diff --git a/src/physics/utils/cam_constituents.F90 b/src/physics/utils/cam_constituents.F90
index 9feae136..95e6cc0b 100644
--- a/src/physics/utils/cam_constituents.F90
+++ b/src/physics/utils/cam_constituents.F90
@@ -292,7 +292,7 @@ subroutine const_get_index(name, cindex, abort, warning, caller)
       use cam_abortutils,       only: endrun
       use cam_logfile,          only: iulog
       use phys_vars_init_check, only: std_name_len
-      use string_utils,         only: to_str
+      use string_utils,         only: stringify
 
       ! Get the index of a constituent with standard name, <name>.
       ! Setting optional <abort> argument to .false. returns control to
@@ -319,7 +319,7 @@ subroutine const_get_index(name, cindex, abort, warning, caller)
       call ccpp_const_get_idx(const_props, name, cindex, errmsg, errcode)
 
       if (errcode /= 0) then
-         call endrun(subname//"Error "//to_str(errcode)//": "//           &
+         call endrun(subname//"Error "//stringify(errcode)//": "//           &
                  trim(errmsg), file=__FILE__, line=__LINE__)
       endif