diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90
index 847f1acb..01dd5477 100644
--- a/src/module_EARTH_GRID_COMP.F90
+++ b/src/module_EARTH_GRID_COMP.F90
@@ -52,8 +52,11 @@ MODULE module_EARTH_GRID_COMP
 #ifdef FRONT_FV3
       use FRONT_FV3,        only: FV3_SS   => SetServices
 #endif
-#ifdef FRONT_DATM
-      use FRONT_DATM,       only: DATM_SS  => SetServices
+#ifdef FRONT_NEMS_DATM
+      use FRONT_NEMS_DATM,  only: DATM_SS  => SetServices
+#endif
+#ifdef FRONT_CDEPS_DATM
+      use FRONT_CDEPS_DATM, only: DATM_SS  => SetServices
 #endif
   ! - Handle build time OCN options:
 #ifdef FRONT_HYCOM
@@ -353,8 +356,8 @@ subroutine SetModelServices(driver, rc)
             found_comp = .true.
           end if
 #endif
-#ifdef FRONT_DATM
-          if (trim(model) == "datm") then
+#if defined FRONT_NEMS_DATM || defined FRONT_CDEPS_DATM
+          if (trim(model) == "nems_datm" .or. trim(model) == "datm" ) then
             call NUOPC_DriverAddComp(driver, trim(prefix), DATM_SS, &
               petList=petList, comp=comp, rc=rc)
             if (ChkErr(rc,__LINE__,u_FILE_u)) return