diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index 5a200766..3dfa8576 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -123,7 +123,7 @@
     <mask>0.125nldas2</mask>
   </model_grid>
 
-  <model_grid alias="nldas2_rUSGS_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
+  <model_grid alias="nldas2_nldas2_rUSGS_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
     <grid name="atm">0.125nldas2</grid>
     <grid name="lnd">0.125nldas2</grid>
     <grid name="ocnice">0.125nldas2</grid>
@@ -131,7 +131,7 @@
     <mask>0.125nldas2</mask>
   </model_grid>
 
-  <model_grid alias="nldas2_rHDMA_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
+  <model_grid alias="nldas2_nldas2_rHDMA_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
     <grid name="atm">0.125nldas2</grid>
     <grid name="lnd">0.125nldas2</grid>
     <grid name="ocnice">0.125nldas2</grid>
@@ -139,7 +139,7 @@
     <mask>0.125nldas2</mask>
   </model_grid>
 
-  <model_grid alias="nldas2_rMERIT_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
+  <model_grid alias="nldas2_nldas2_rMERIT_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
     <grid name="atm">0.125nldas2</grid>
     <grid name="lnd">0.125nldas2</grid>
     <grid name="ocnice">0.125nldas2</grid>
@@ -154,7 +154,7 @@
     <mask>tx0.1v3</mask>
   </model_grid>
 
-  <model_grid alias="hcru_hcru_mt13_rMERIT" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
+  <model_grid alias="hcru_hcru_rMERIT_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
     <grid name="atm">360x720cru</grid>
     <grid name="lnd">360x720cru</grid>
     <grid name="ocnice">tx0.1v3</grid>
@@ -162,7 +162,7 @@
     <mask>tx0.1v3</mask>
   </model_grid>
 
-  <model_grid alias="hcru_hcru_mt13_rHDMA" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
+  <model_grid alias="hcru_hcru_rHDMA_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
     <grid name="atm">360x720cru</grid>
     <grid name="lnd">360x720cru</grid>
     <grid name="ocnice">tx0.1v3</grid>
@@ -170,6 +170,14 @@
     <mask>tx0.1v3</mask>
   </model_grid>
 
+  <model_grid alias="hcru_hcru_rHDMAlk_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
+    <grid name="atm">360x720cru</grid>
+    <grid name="lnd">360x720cru</grid>
+    <grid name="ocnice">tx0.1v3</grid>
+    <grid name="rof">HDMA_lake_mz</grid>
+    <mask>tx0.1v3</mask>
+  </model_grid>
+
   <!-- eulerian grids -->
 
   <model_grid alias="T31_g37">
@@ -593,7 +601,7 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="f09_f09_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
+  <model_grid alias="f09_f09_rHDMA_mg17" not_compset="_POP" compset="MIZUROUTE">
     <grid name="atm">0.9x1.25</grid>
     <grid name="lnd">0.9x1.25</grid>
     <grid name="ocnice">0.9x1.25</grid>
@@ -601,7 +609,15 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="f09_f09_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
+  <model_grid alias="f09_f09_rHDMAlk_mg17" not_compset="_POP" compset="MIZUROUTE">
+    <grid name="atm">0.9x1.25</grid>
+    <grid name="lnd">0.9x1.25</grid>
+    <grid name="ocnice">0.9x1.25</grid>
+    <grid name="rof">HDMA_lake_mz</grid>
+    <mask>gx1v7</mask>
+  </model_grid>
+
+  <model_grid alias="f09_f09_rMERIT_mg17" not_compset="_POP" compset="MIZUROUTE">
     <grid name="atm">0.9x1.25</grid>
     <grid name="lnd">0.9x1.25</grid>
     <grid name="ocnice">0.9x1.25</grid>
@@ -699,7 +715,7 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="f19_f19_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
+  <model_grid alias="f19_f19_rHDMA_mg17" not_compset="_POP" compset="MIZUROUTE">
     <grid name="atm">1.9x2.5</grid>
     <grid name="lnd">1.9x2.5</grid>
     <grid name="ocnice">1.9x2.5</grid>
@@ -707,7 +723,15 @@
     <mask>gx1v7</mask>
   </model_grid>
 
-  <model_grid alias="f19_f19_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
+  <model_grid alias="f19_f19_rHDMAlk_mg17" not_compset="_POP" compset="MIZUROUTE">
+    <grid name="atm">1.9x2.5</grid>
+    <grid name="lnd">1.9x2.5</grid>
+    <grid name="ocnice">1.9x2.5</grid>
+    <grid name="rof">HDMA_lake_mz</grid>
+    <mask>gx1v7</mask>
+  </model_grid>
+
+  <model_grid alias="f19_f19_rMERIT_mg17" not_compset="_POP" compset="MIZUROUTE">
     <grid name="atm">1.9x2.5</grid>
     <grid name="lnd">1.9x2.5</grid>
     <grid name="ocnice">1.9x2.5</grid>