diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 69532ca3..180683b5 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -24,29 +24,29 @@
 
   <compset>
     <alias>NOINY_WW3</alias>
-    <lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_WW3</lname>
+    <lname>2000_DATM%NYF_SLND_CICE_BLOM%HYB_DROF%NYF_SGLC_WW3</lname>
   </compset>
 
   <compset>
     <alias>NOINYOC_WW3</alias>
-    <lname>2000_DATM%NYF_SLND_CICE_BLOM%ECO_DROF%NYF_SGLC_WW3</lname>
+    <lname>2000_DATM%NYF_SLND_CICE_BLOM%HYB%ECO_DROF%NYF_SGLC_WW3</lname>
   </compset>
 
   <!-- Normal year forcing - no prognostic wave -->
 
   <compset>
     <alias>NOINY</alias>
-    <lname>2000_DATM%NYF_SLND_CICE_BLOM_DROF%NYF_SGLC_SWAV</lname>
+    <lname>2000_DATM%NYF_SLND_CICE_BLOM%HYB_DROF%NYF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>NOINYOC</alias>
-    <lname>1850_DATM%NYF_SLND_CICE_BLOM%ECO_DROF%NYF_SGLC_SWAV</lname>
+    <lname>1850_DATM%NYF_SLND_CICE_BLOM%HYB%ECO_DROF%NYF_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>NOIIA</alias>
-    <lname>2000_DATM%IAF_SLND_CICE_BLOM_DROF%IAF_SGLC_SWAV</lname>
+    <lname>2000_DATM%IAF_SLND_CICE_BLOM%HYB_DROF%IAF_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -56,7 +56,7 @@
 
   <compset>
     <alias>NOIIAOC</alias>
-    <lname>2000_DATM%IAF_SLND_CICE_BLOM%ECO_DROF%IAF_SGLC_SWAV</lname>
+    <lname>2000_DATM%IAF_SLND_CICE_BLOM%HYB%ECO_DROF%IAF_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -66,7 +66,7 @@
 
   <compset>
     <alias>NOIIAOC20TR</alias>
-    <lname>20TR_DATM%IAF_SLND_CICE_BLOM%ECO_DROF%IAF_SGLC_SWAV</lname>
+    <lname>20TR_DATM%IAF_SLND_CICE_BLOM%HYB%ECO_DROF%IAF_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -78,7 +78,7 @@
 
   <compset>
     <alias>NOIIAJRA</alias>
-    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM%HYB_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -88,7 +88,7 @@
 
   <compset>
     <alias>NOIIAJRAOC</alias>
-    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM%HYB%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -98,7 +98,7 @@
 
   <compset>
     <alias>NOIIAJRAOC1850</alias>
-    <lname>1850_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
+    <lname>1850_DATM%JRA-1p4-2018_SLND_CICE_BLOM%HYB%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -108,7 +108,7 @@
 
   <compset>
     <alias>NOIIAJRAOC20TR</alias>
-    <lname>20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
+    <lname>20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%HYB%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -121,7 +121,7 @@
   
   <compset>
     <alias>NOINYJRARYF1961OC</alias>
-    <lname>1850_DATM%JRARYF1961_SLND_CICE_BLOM%ECO_DROF%JRARYF1961_SGLC_SWAV</lname>
+    <lname>1850_DATM%JRARYF1961_SLND_CICE_BLOM%HYB%ECO_DROF%JRARYF1961_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -134,7 +134,7 @@
 
   <compset>
     <alias>NOICPLHISTOC</alias>
-    <lname>1850_DATM%CPLHIST_SLND_CICE_BLOM%ECO_DROF%CPLHIST_SGLC_SWAV</lname>
+    <lname>1850_DATM%CPLHIST_SLND_CICE_BLOM%HYB%ECO_DROF%CPLHIST_SGLC_SWAV</lname>
   </compset>
 
   <entries>
@@ -142,8 +142,8 @@
       <values match="last">
         <value  compset="20TR_DATM%IAF_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
         <value  compset="20TR_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV">1653-01-01</value>
-        <value  compset="20TR_DATM%IAF_SLND_CICE_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
-        <value  compset="20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV">1653-01-01</value>
+        <value  compset="20TR_DATM%IAF_SLND_CICE_BLOM%HYB%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
+        <value  compset="20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%HYB%ECO_DROF%JRA-1p4-2018_SGLC_SWAV">1653-01-01</value>
       </values>
     </entry>
   </entries>