diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index 03dfcbe5..ea73c46d 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -2256,42 +2256,6 @@
     </values>
   </entry>
 
-  <entry id="glc2ocn_liq_rmapname"    modify_via_xml="GLC2OCN_LIQ_RMAPNAME">
-    <type>char</type>
-    <category>mapping</category>
-    <input_pathname>abs</input_pathname>
-    <group>MED_attributes</group>
-    <desc>
-      glc2ocn runoff mapping file for liquid runoff
-    </desc>
-    <values>
-      <value>$GLC2OCN_LIQ_RMAPNAME</value>
-    </values>
-  </entry>
-  <entry id="glc2ice_rmapname"    modify_via_xml="GLC2ICE_RMAPNAME">
-    <type>char</type>
-    <category>mapping</category>
-    <input_pathname>abs</input_pathname>
-    <group>MED_attributes</group>
-    <desc>
-      glc to ice runoff conservative mapping file
-    </desc>
-    <values>
-      <value>$GLC2ICE_RMAPNAME</value>
-    </values>
-  </entry>
-  <entry id="glc2ocn_ice_rmapname"    modify_via_xml="GLC2OCN_ICE_RMAPNAME">
-    <type>char</type>
-    <category>mapping</category>
-    <input_pathname>abs</input_pathname>
-    <group>MED_attributes</group>
-    <desc>
-      glc2ocn runoff mapping file for ice runoff
-    </desc>
-    <values>
-      <value>$GLC2OCN_ICE_RMAPNAME</value>
-    </values>
-  </entry>
   <entry id="rof2ocn_fmapname"    modify_via_xml="ROF2OCN_FMAPNAME">
     <type>char</type>
     <category>mapping</category>
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
index 3a2d4c8c..645aa83a 100644
--- a/mediator/esmFldsExchange_cesm_mod.F90
+++ b/mediator/esmFldsExchange_cesm_mod.F90
@@ -74,16 +74,16 @@ module esmFldsExchange_cesm_mod
   character(len=CX)   :: atm2ice_map  = 'unset'
   character(len=CX)   :: atm2ocn_map  = 'unset'
   character(len=CX)   :: atm2lnd_map  = 'unset'
+  character(len=CX)   :: atm2wav_map  = 'unset'
   character(len=CX)   :: ice2atm_map  = 'unset'
-  character(len=CX)   :: ocn2atm_map  = 'unset'
+  character(len=CX)   :: ice2wav_smap = 'unset'
   character(len=CX)   :: lnd2atm_map  = 'unset'
   character(len=CX)   :: lnd2rof_map  = 'unset'
-  character(len=CX)   :: rof2lnd_map  = 'unset'
-  character(len=CX)   :: atm2wav_map  = 'unset'
-  character(len=CX)   :: wav2ocn_smap = 'unset'
-  character(len=CX)   :: ice2wav_smap = 'unset'
+  character(len=CX)   :: ocn2atm_map  = 'unset'
   character(len=CX)   :: ocn2wav_smap = 'unset'
+  character(len=CX)   :: rof2lnd_map  = 'unset'
   character(len=CX)   :: rof2ocn_fmap = 'unset'
+  character(len=CX)   :: wav2ocn_smap = 'unset'
 
   logical             :: mapuv_with_cart3d              ! Map U/V vector wind fields from ATM to OCN/ICE by rotating in Cartesian 3D space and then back
   logical             :: flds_i2o_per_cat               ! Ice thickness category fields passed to OCN