diff --git a/mediator/esmFldsExchange_ufs_mod.F90 b/mediator/esmFldsExchange_ufs_mod.F90
index dd342cf07..9b4a590c6 100644
--- a/mediator/esmFldsExchange_ufs_mod.F90
+++ b/mediator/esmFldsExchange_ufs_mod.F90
@@ -312,7 +312,7 @@ subroutine esmFldsExchange_ufs(gcomp, phase, rc)
        deallocate(flds)
     end if
 
-    ! to atm: unmerged from mediator, merge will be done under FV3/CCPP composite step
+    ! to atm: unmerged from mediator, merge will be done under UFSATM/CCPP composite step
     ! - zonal surface stress, meridional surface stress
     ! - surface latent heat flux,
     ! - surface sensible heat flux
diff --git a/ufs/ccpp/config/ccpp_prebuild_config.py b/ufs/ccpp/config/ccpp_prebuild_config.py
index 8d8963bad..c9c3add7d 100755
--- a/ufs/ccpp/config/ccpp_prebuild_config.py
+++ b/ufs/ccpp/config/ccpp_prebuild_config.py
@@ -10,7 +10,7 @@
 # Query required information/s                                                 #
 ###############################################################################
 
-fv3_path = os.environ['FV3_PATH']
+ufsatm_path = os.environ['UFSATM_PATH']
 
 ###############################################################################
 # Definitions                                                                 #
@@ -24,8 +24,8 @@
 # dependencies of these files to the list.
 VARIABLE_DEFINITION_FILES = [
     # actual variable definition files
-    '{}/ccpp/framework/src/ccpp_types.F90'.format(fv3_path),
-    '{}/ccpp/physics/physics/hooks/machine.F'.format(fv3_path),
+    '{}/ccpp/framework/src/ccpp_types.F90'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/hooks/machine.F'.format(ufsatm_path),
     'CMEPS/ufs/ccpp/data/MED_typedefs.F90',
     'CMEPS/ufs/ccpp/data/MED_data.F90'
     ]
@@ -58,13 +58,13 @@
 
 # Add all physics scheme files relative to basedir
 SCHEME_FILES = [
-    '{}/ccpp/physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F'.format(fv3_path),
-    '{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f'.format(fv3_path),
-    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90'.format(fv3_path),
-    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90'.format(fv3_path),
-    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90'.format(fv3_path),
-    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90'.format(fv3_path),
-    '{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f'.format(fv3_path)
+    '{}/ccpp/physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90'.format(ufsatm_path),
+    '{}/ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f'.format(ufsatm_path)
     ]
 
 # Default build dir, relative to current working directory,
diff --git a/ufs/ccpp/data/MED_typedefs.meta b/ufs/ccpp/data/MED_typedefs.meta
index 046e4bfa6..6f89e4842 100644
--- a/ufs/ccpp/data/MED_typedefs.meta
+++ b/ufs/ccpp/data/MED_typedefs.meta
@@ -1358,7 +1358,7 @@
 [ccpp-table-properties]
   name = MED_typedefs
   type = module
-  relative_path = ../../../../../FV3/ccpp/physics/physics/hooks
+  relative_path = ../../../../../UFSATM/ccpp/physics/physics/hooks
   dependencies = machine.F,physcons.F90
 
 [ccpp-arg-table]