diff --git a/src/agsys/ctsm_interface/AgSysClimate.F90 b/src/agsys/ctsm_interface/AgSysClimateInterface.F90
similarity index 98%
rename from src/agsys/ctsm_interface/AgSysClimate.F90
rename to src/agsys/ctsm_interface/AgSysClimateInterface.F90
index 3a4cf33896..4616639e6b 100644
--- a/src/agsys/ctsm_interface/AgSysClimate.F90
+++ b/src/agsys/ctsm_interface/AgSysClimateInterface.F90
@@ -1,4 +1,4 @@
-module AgSysClimate
+module AgSysClimateInterface
 
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
@@ -119,4 +119,4 @@ subroutine InitAllocate(this, bounds, agsys_phases_inst)
 
   end subroutine InitAllocate
 
-end module AgSysClimate
+end module AgSysClimateInterface
diff --git a/src/agsys/ctsm_interface/AgSysGeneral.F90 b/src/agsys/ctsm_interface/AgSysGeneralType.F90
similarity index 98%
rename from src/agsys/ctsm_interface/AgSysGeneral.F90
rename to src/agsys/ctsm_interface/AgSysGeneralType.F90
index 21cc2fad64..ce22b19ecb 100644
--- a/src/agsys/ctsm_interface/AgSysGeneral.F90
+++ b/src/agsys/ctsm_interface/AgSysGeneralType.F90
@@ -1,4 +1,4 @@
-module AgSysGeneral
+module AgSysGeneralType
 
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
@@ -101,4 +101,4 @@ subroutine InitAllocate(this, bounds)
     end associate
   end subroutine InitAllocate
 
-end module AgSysGeneral
+end module AgSysGeneralType
diff --git a/src/agsys/ctsm_interface/AgSys.F90 b/src/agsys/ctsm_interface/AgSysInterface.F90
similarity index 94%
rename from src/agsys/ctsm_interface/AgSys.F90
rename to src/agsys/ctsm_interface/AgSysInterface.F90
index f61aaf8816..cec6db964e 100644
--- a/src/agsys/ctsm_interface/AgSys.F90
+++ b/src/agsys/ctsm_interface/AgSysInterface.F90
@@ -10,12 +10,12 @@ module AgSys
 #include "shr_assert.h"
   use clm_time_manager, only : is_beg_curr_day
   use decompMod, only : bounds_type
-  use AgSysGeneral, only : agsys_general_type
+  use AgSysGeneralType, only : agsys_general_type
   use AgSysParams, only : agsys_params_type
   use AgSysPhases, only : agsys_phases_type
   use AgSysParamReader, only : ReadParams, ReadPhases
-  use AgSysClimate, only : agsys_climate_type
-  use AgSysPhenology, only : agsys_phenology_type
+  use AgSysClimateInterface, only : agsys_climate_type
+  use AgSysPhenologyInterface, only : agsys_phenology_type
   !
   implicit none
   private
diff --git a/src/agsys/ctsm_interface/AgSysPhenology.F90 b/src/agsys/ctsm_interface/AgSysPhenologyInterface.F90
similarity index 97%
rename from src/agsys/ctsm_interface/AgSysPhenology.F90
rename to src/agsys/ctsm_interface/AgSysPhenologyInterface.F90
index da74bde20e..c0e53b556a 100644
--- a/src/agsys/ctsm_interface/AgSysPhenology.F90
+++ b/src/agsys/ctsm_interface/AgSysPhenologyInterface.F90
@@ -1,4 +1,4 @@
-module AgSysPhenology
+module AgSysPhenologyInterface
 
   !-----------------------------------------------------------------------
   ! !DESCRIPTION:
@@ -105,4 +105,4 @@ subroutine InitAllocate(this, bounds)
 
   end subroutine InitAllocate
 
-end module AgSysPhenology
+end module AgSysPhenologyInterface