From 7d416919bd2fa4d9dcc47fd09b05c5e2464ed5e5 Mon Sep 17 00:00:00 2001
From: AWIPS User <mjames@unidata.ucar.edu>
Date: Tue, 28 Apr 2015 21:42:24 -0600
Subject: [PATCH] forecast models: menus and names

Former-commit-id: 4b87f72098ef45d7a0c1c4e2678b6469355b6f65 [formerly 65f6b45d4d053b402fe0920b825c373335ee600f] [formerly bdfcbe7a62f07dbb7dad0a823ee463b3f326122d [formerly 33dd7cec73aeecad8e7bf04c17e05a033a70c3a1]]
Former-commit-id: 1df28483f1d2e2d5f4673d0ca790856eb6241706 [formerly 2895d9ddb6ca857fe876382b95b5c0340279353b]
Former-commit-id: 22b168b5dc462c4594aafa120ef8fad141c18762
---
 .../menus/volume/ModelFamilies.xml            | 794 +++++++++---------
 .../menus/volume/baseFamilies.xml             |  12 +-
 .../menus/volume/baseFourPanelFamilies.xml    |  50 +-
 .../menus/volume/baseStdEnvPackage.xml        |  66 +-
 .../menus/volume/baseSurfaceFamilies.xml      |  24 +-
 .../localization/menus/volume/index.xml       |   4 +-
 .../fields/planview-timeseries/sfc2D.xml      |   4 +-
 .../volumebrowser/VbSources/volume.xml        |   9 +-
 ...els_FNMO-58.xml => gribModels_FNMO-58.xml} |   2 +-
 .../base/grib/models/gribModels_NCEP-7.xml    |   2 +-
 10 files changed, 480 insertions(+), 487 deletions(-)
 rename edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/{GribModels_FNMO-58.xml => gribModels_FNMO-58.xml} (99%)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml
index 2e7865cdb2..475bc60a30 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml
@@ -21,94 +21,95 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<!--ModFamU (Briefing Family)-->
 		<contribute xsi:type="subMenu" menuText="Mid-Level Divergence / Vorticity">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
-				<substitute key="TP" value="TP6hr"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyU.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
+				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 		</contribute>
 		
 		<!--ModFamA (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="Nonsupercell Tornado Threat / Wind">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA-ECMW.xml"
-				menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
 				menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
+				menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -119,75 +120,71 @@
  				<substitute key="frameCount" value="16"/>
  			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
-				menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA-UKMET.xml"
-				menuText="UKMET" id="ukmet" useReferenceTime="true">
-				<substitute key="TP" value="TP6hr"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyA.xml"
+				menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
+				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 		</contribute>
 		
 		<!--ModFamB (Storm Init Family)-->
 		<contribute xsi:type="subMenu" menuText="Storm Initiation / CAPE">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="NamDNG5" id="NamDNG5" useReferenceTime="true">
-				<substitute key="modelName" value="NamDNG5"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
-				<substitute key="TP" value="TP3hr"/>
-				<substitute key="frameCount" value="29"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyB.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -195,55 +192,56 @@
 		
 		<!--ModFamC (Hail Family)-->
 		<contribute xsi:type="subMenu" menuText="Hail Family">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
-				<substitute key="TP" value="TP3hr"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
+				<substitute key="TP" value="TP1hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
-				<substitute key="TP" value="TP3hr"/>
-				<substitute key="frameCount" value="9"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
+				<substitute key="TP" value="TP1hr"/>
+				<substitute key="frameCount" value="17"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyC.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -251,55 +249,56 @@
 		
 		<!--ModFamYY (Supercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="CAPE / CIN / Helicity">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyYY.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -307,55 +306,56 @@
 		
 		<!--ModFamX (MCS Family)-->
 		<contribute xsi:type="subMenu" menuText="MCS Parameters">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyX.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -363,46 +363,47 @@
 
 		<!--ModFamH (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="Lapse Rate / Buoyancy / Wind">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyH.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -410,46 +411,47 @@
 		
 		<!--ModFamE (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Nonsupercell Tornado Threat">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyE.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -457,46 +459,47 @@
 		
 		<!--ModFamF (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Nonsupercell / Isentropic">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyF.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -504,46 +507,47 @@
 		
 		<!--ModFamI (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Instability / Divergence">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyI.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -551,46 +555,47 @@
 		
 		<!--ModFamJ (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Frontogenesis / Precipitation">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyJ.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -598,46 +603,47 @@
 		
 		<!--ModFamL (NonSupercell Tor Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Moisture / Precipiation">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL-ECMW.xml" menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL-UKMET.xml" menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyL.xml" menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -645,55 +651,56 @@
 		
 		<!--ModFamV (Severe Type Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Bulk Shear / Buoyancy">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyV.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -701,55 +708,56 @@
 		
 		<!--ModFamW (Supercell Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Supercell Parameters">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyW.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -757,55 +765,56 @@
 
 		<!--ModFamY (Supercell Tor 4P Family)-->
 		<contribute xsi:type="subMenu" menuText="4-Panel Helicity / Shear / Buoyancy">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyY.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -813,55 +822,56 @@
 		<!--ModFamD (Winter: Family)-->
 		
 		<contribute xsi:type="subMenu" menuText="Winter: Thickness / Divergence / Snow">
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD-ECMW.xml"
-				    menuText="ECMWF-HiRes" id="ecmwfHiRes" useReferenceTime="true">
-				<substitute key="TP" value="TP"/>
-				<substitute key="frameCount" value="41"/>
-			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="GFS40" id="gfs40" useReferenceTime="true">
-				<substitute key="modelName" value="GFS212"/> 
+				    menuText="DGEX" id="dgex" useReferenceTime="true">
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
 				    menuText="GFS" id="gfs" useReferenceTime="true">
-				<substitute key="modelName" value="${GFSmodel}"/>
+				<substitute key="modelName" value="GFS"/> 
 				<substitute key="TP" value="TP"/>
 				<substitute key="frameCount" value="41"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="NAM12" id="nam12" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM12model}"/>
+				    menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+				<substitute key="modelName" value="GFS-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
+				    menuText="NAM 12km" id="nam12" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="NAM40" id="nam40" useReferenceTime="true">
-				<substitute key="modelName" value="${NAM40model}"/>
+				    menuText="NAM 40km" id="nam40" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="29"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="NAM80" id="nam80" useReferenceTime="true">
-				<substitute key="modelName" value="ETA"/>
+				    menuText="NamDNG" id="namdng" useReferenceTime="true">
+				<substitute key="modelName" value="NamDNG"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="RAP13" id="rap13" useReferenceTime="true">
-				<substitute key="modelName" value="${RAP13model}"/>
+				    menuText="RAP 13km" id="rap13" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="19"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
-				    menuText="RAP" id="rap" useReferenceTime="true">
-				<substitute key="modelName" value="${RAPmodel}"/>
+				    menuText="HRRR" id="hrrr" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
 				<substitute key="TP" value="TP3hr"/>
 				<substitute key="frameCount" value="9"/>
 			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD-UKMET.xml"
-				    menuText="UKMET" id="ukmet" useReferenceTime="true">
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyD.xml"
+				    menuText="NAVGEM" id="navgem" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/>
 				<substitute key="TP" value="TP6hr"/>
 				<substitute key="frameCount" value="15"/>
 			</contribute>
@@ -869,84 +879,78 @@
 		
 		<!--ModFamM (Winter: Big3 Qn Family)-->
 		<contribute xsi:type="subMenu" menuText="Winter: 4-Panel Slantwise Instability">
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="GFS" id="GFS" useReferenceTime="true">
-			<substitute key="modelName" value="GFS"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="GFS 40km" id="GFS-40km" useReferenceTime="true">
-			<substitute key="modelName" value="GFS212"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="DGEX" id="DGEX" useReferenceTime="true">
-			<substitute key="modelName" value="DGEX"/>
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="NAM 12km" id="NAM-12km" useReferenceTime="true">
-			<substitute key="modelName" value="NAM-12km"/>
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="NAM 40km" id="NAM-40km" useReferenceTime="true">
-			<substitute key="modelName" value="NAM-40km"/>
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="RAP 13km" id="RAP-13km" useReferenceTime="true">
-			<substitute key="modelName" value="RAP-13km"/>
-			<substitute key="TP" value="TP1hr"/>
-			<substitute key="frameCount" value="16"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="RAP 20km" id="RAP-20km" useReferenceTime="true">
-			<substitute key="modelName" value="RAP-20km"/>
-			<substitute key="TP" value="TP1hr"/>
-			<substitute key="frameCount" value="16"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="HRRR" id="HRRR" useReferenceTime="true">
-			<substitute key="modelName" value="HRRR"/>
-			<substitute key="TP" value="TP1hr"/>
-			<substitute key="frameCount" value="16"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="FNMOC NAVGEM" id="NAVGEM" useReferenceTime="true">
-			<substitute key="modelName" value="NAVGEM"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-	        menuText="CMC GEM" id="CMC" useReferenceTime="true">
-			<substitute key="modelName" value="CMC"/>
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="12"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="RTMA" id="RTMA" useReferenceTime="true">
-			<substitute key="modelName" value="RTMA"/> 
-			<substitute key="TP" value="TP1hr"/>
-			<substitute key="frameCount" value="16"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="SREF" id="SREF" useReferenceTime="true">
-			<substitute key="modelName" value="SREF"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
-			menuText="NDFD" id="NDFD" useReferenceTime="true">
-			<substitute key="modelName" value="NDFD"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="41"/>
-		</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="GFS" id="GFS" useReferenceTime="true">
+				<substitute key="modelName" value="GFS"/> 
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="GFS 40km" id="GFS-40km" useReferenceTime="true">
+				<substitute key="modelName" value="GFS"/> 
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="DGEX" id="DGEX" useReferenceTime="true">
+				<substitute key="modelName" value="DGEX"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="NAM 12km" id="NAM-12km" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-12km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="NAM 40km" id="NAM-40km" useReferenceTime="true">
+				<substitute key="modelName" value="NAM-40km"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="RAP 13km" id="RAP-13km" useReferenceTime="true">
+				<substitute key="modelName" value="RAP-13km"/>
+				<substitute key="TP" value="TP1hr"/>
+				<substitute key="frameCount" value="16"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="HRRR" id="HRRR" useReferenceTime="true">
+				<substitute key="modelName" value="HRRR"/>
+				<substitute key="TP" value="TP1hr"/>
+				<substitute key="frameCount" value="16"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="NAVGEM" id="NAVGEM" useReferenceTime="true">
+				<substitute key="modelName" value="NAVGEM"/> 
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+		        menuText="CMC GEM" id="CMC" useReferenceTime="true">
+				<substitute key="modelName" value="CMC"/>
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="12"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="RTMA" id="RTMA" useReferenceTime="true">
+				<substitute key="modelName" value="RTMA"/> 
+				<substitute key="TP" value="TP1hr"/>
+				<substitute key="frameCount" value="16"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="SREF" id="SREF" useReferenceTime="true">
+				<substitute key="modelName" value="SREF"/> 
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
+			<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
+				menuText="NDFD" id="NDFD" useReferenceTime="true">
+				<substitute key="modelName" value="NDFD"/> 
+				<substitute key="TP" value="TP"/>
+				<substitute key="frameCount" value="41"/>
+			</contribute>
 		</contribute>
 		
 </menuTemplate>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
index 92c3345139..0639be0a5f 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
@@ -27,8 +27,8 @@
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
-			menuText="GFS 40km" id="GFS-40km" useReferenceTime="true">
-			<substitute key="modelName" value="GFS212"/> 
+			menuText="GFS 40km" id="gfs40" useReferenceTime="true">
+			<substitute key="modelName" value="GFS-40km"/> 
 			<substitute key="TP" value="TP"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
@@ -69,7 +69,7 @@
 			<substitute key="frameCount" value="16"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
-			menuText="FNMOC - NAVGEM" id="NAVGEM" useReferenceTime="true">
+			menuText="NAVGEM" id="NAVGEM" useReferenceTime="true">
 			<substitute key="modelName" value="NAVGEM"/> 
 			<substitute key="TP" value="TP"/>
 			<substitute key="frameCount" value="41"/>
@@ -86,12 +86,6 @@
 			<substitute key="TP" value="TP1hr"/>
 			<substitute key="frameCount" value="16"/>
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
-			menuText="UKMET-MODEL1" id="UKMET-MODEL1" useReferenceTime="true">
-			<substitute key="modelName" value="UKMET-MODEL1"/> 
-			<substitute key="TP" value="TP"/>
-			<substitute key="frameCount" value="13"/>
-		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
 			menuText="NDFD" id="NDFD" useReferenceTime="true">
 			<substitute key="modelName" value="NDFD"/> 
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml
index 423a23da3b..d0b1f7a5a9 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml
@@ -21,60 +21,56 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
 			menuText="DGEX" id="dgex4panel" useReferenceTime="true">
-			<substitute key="modelName" value="DGEX185"/>
-			<substitute key="TP" value="TP6hr"/>
-			<substitute key="frameCount" value="18"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/ECMWFHiResFourPanel.xml"
-			menuText="ECMWF-HiRes" id="ecmwf4panel" useReferenceTime="true">
-			<substitute key="frameCount" value="41"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="GFS40" id="gfs404panel" useReferenceTime="true">
-			<substitute key="modelName" value="GFS212"/>
+			<substitute key="modelName" value="DGEX"/>
 			<substitute key="TP" value="TP"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
 			menuText="GFS" id="gfs4panel" useReferenceTime="true">
-			<substitute key="modelName" value="${GFSmodel}"/>
+			<substitute key="modelName" value="GFS"/>
+			<substitute key="TP" value="TP"/>
+			<substitute key="frameCount" value="41"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
+			menuText="GFS 40km" id="gfs404panel" useReferenceTime="true">
+			<substitute key="modelName" value="GFS-40km"/>
 			<substitute key="TP" value="TP6hr"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="NAM12" id="nam124panel" useReferenceTime="true">
-			<substitute key="modelName" value="${NAM12model}"/>
+			menuText="NAM 12km" id="nam124panel" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-12km"/>
 			<substitute key="TP" value="TP3hr"/>
 			<substitute key="frameCount" value="29"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="NAM40" id="nam404panel" useReferenceTime="true">
-			<substitute key="modelName" value="${NAM40model}"/>
+			menuText="NAM 40km" id="nam404panel" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-40km"/>
 			<substitute key="TP" value="TP3hr"/>
 			<substitute key="frameCount" value="29"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="NAM80" id="nam804panel" useReferenceTime="true">
-			<substitute key="modelName" value="ETA"/>
+			menuText="NamDNG" id="namDng4panel" useReferenceTime="true">
+			<substitute key="modelName" value="NamDNG"/>
 			<substitute key="TP" value="TP6hr"/>
 			<substitute key="frameCount" value="15"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="RAP13" id="rap134panel" useReferenceTime="true">
-			<substitute key="modelName" value="${RAP13model}"/>
+			menuText="RAP 13km" id="rap134panel" useReferenceTime="true">
+			<substitute key="modelName" value="RAP-13km"/>
 			<substitute key="TP" value="TP3hr"/>
 			<substitute key="frameCount" value="19"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
-			menuText="RAP" id="rap4panel" useReferenceTime="true">
-			<substitute key="modelName" value="${RAPmodel}"/>
+			menuText="HRRR" id="rap4panel" useReferenceTime="true">
+			<substitute key="modelName" value="HRRR"/>
 			<substitute key="TP" value="TP3hr"/>
 			<substitute key="frameCount" value="9"/>
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/UKMETFourPanel.xml"
-			menuText="UKMET" id="ukmet4panel" useReferenceTime="true">
-			<substitute key="modelName" value="UKMET-NorthernHemisphere"/>
-			<substitute key="TP" value="TP6hr"/>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFourPanel.xml"
+			menuText="NAVGEM" id="navgem4panel" useReferenceTime="true">
+			<substitute key="modelName" value="NAVGEM"/>
+			<substitute key="TP" value="TP3hr"/>
 			<substitute key="frameCount" value="15"/>
 		</contribute>
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml
index 44444355cd..71962551da 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml
@@ -22,36 +22,40 @@
 	<contribute xsi:type="titleItem" titleText="------ Std Env Data Package ------"
 		id="StdEnvPackageLine" />
 	<contribute xsi:type="subMenu" menuText="Std Env Data Package">
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="LAPS" id="lapsstdenv" useReferenceTime="true">
-		<substitute key="modelName" value="LAPS"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="NAM40" id="nam40stdenv" useReferenceTime="true">
-		<substitute key="modelName" value="${NAM40model}"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="RAP40" id="rap40stdenv" useReferenceTime="true">
-		<substitute key="modelName" value="${RAPmodel}"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="HRRR" id="hrrrstdenv" useReferenceTime="true">
-		<substitute key="modelName" value="${HRRRmodel}"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="NAM12" id="nam12stdenv" useReferenceTime="true">
-		<substitute key="modelName" value="${NAM12model}"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="GFS40" id="gfs40stdenv" useReferenceTime="true">
-		<substitute key="modelName" value="GFS212"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
-		menuText="RAP13" id="rap13stdenv" useReferenceTime="true">
-		<substitute key="modelName" value="${RAP13model}"/>
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/volume/RaobStdEnv.xml"
-		menuText="RaobOA" id="raoboastdenv" useReferenceTime="true">
-	</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="GFS" id="gfsstdenv" useReferenceTime="true">
+			<substitute key="modelName" value="GFS"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="GFS 40km" id="gfs40stdenv" useReferenceTime="true">
+			<substitute key="modelName" value="GFS-40km"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="DGEX" id="dgexstdenv" useReferenceTime="true">
+			<substitute key="modelName" value="DGEX"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="HRRR" id="hrrrstdenv" useReferenceTime="true">
+			<substitute key="modelName" value="HRRR"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="NAM 12km" id="nam12stdenv" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-12km"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="NAM 40km" id="nam40stdenv" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-40km"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="NamDNG" id="namDngstdenv" useReferenceTime="true">
+			<substitute key="modelName" value="NamDNG"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultStdEnv.xml"
+			menuText="RAP 13km" id="rap13stdenv" useReferenceTime="true">
+			<substitute key="modelName" value="RAP-13km"/>
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/volume/RaobStdEnv.xml"
+			menuText="RaobOA" id="raoboastdenv" useReferenceTime="true">
+		</contribute>
 	</contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml
index 2e68e932cc..5873368939 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml
@@ -20,8 +20,8 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
-			menuText="GFS40" id="gfs40surface" useReferenceTime="true">
-			<substitute key="modelName" value="GFS212"/>
+			menuText="GFS" id="gfssurface" useReferenceTime="true">
+			<substitute key="modelName" value="GFS"/>
 			<substitute key="TP" value="TP"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
@@ -47,27 +47,23 @@
 		<contribute xsi:type="bundleItem" file="bundles/volume/HRRR.xml"
 			menuText="HRRR" id="hrrrsurface" useReferenceTime="true">
 			<substitute key="modelName" value="HRRR"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TP1hr"/>
 			<substitute key="frameCount" value="16"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
-			menuText="NAM12" id="nam12surface" useReferenceTime="true">
-			<substitute key="modelName" value="${NAM12model}"/>
+			menuText="NAM 12km" id="nam12surface" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-12km"/>
 			<substitute key="TP" value="TP3hr"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
-			menuText="NAM40" id="nam40surface" useReferenceTime="true">
-			<substitute key="modelName" value="${NAM40model}"/>
+			menuText="NAM 40km" id="nam40surface" useReferenceTime="true">
+			<substitute key="modelName" value="NAM-40km"/>
 			<substitute key="TP" value="TP3hr"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
-			menuText="RAP13" id="rap13surface" useReferenceTime="true">
-			<substitute key="modelName" value="${RAP13model}"/>
-			<substitute key="TP" value="TP3hr"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/volume/DefaultSurface.xml"
-			menuText="RAP" id="rapsurface" useReferenceTime="true">
-			<substitute key="modelName" value="${RAPmodel}"/>
+			menuText="RAP 13km" id="rap13surface" useReferenceTime="true">
+			<substitute key="modelName" value="RAP-13km"/>
 			<substitute key="TP" value="TP3hr"/>
 		</contribute>
+
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
index 571a91dd15..a5b5b88422 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml
@@ -19,7 +19,7 @@
         further_licensing_information.
     -->
 <menuContributionFile>
-	<substitute key="GFSmodel" value="GFS" />
+	<substitute key="GFSmodel" value="GFS 40km" />
 	<substitute key="NAM12model" value="NAM-12km" />
 	<substitute key="NAM40model" value="NAM-40km" />
 	<substitute key="ARWmodel1" value="HiResW-ARW-East" />
@@ -27,7 +27,7 @@
 	<substitute key="MMMmodel1" value="HiResW-NMM-East" />
 	<substitute key="MMMmodel2" value="HiResW-NMM-West" />
 	<substitute key="HRRRmodel" value="HRRR" />
-	<substitute key="RAP13" value="RAP-13km" />
+	<substitute key="RAP13model" value="RAP-13km" />
 	<substitute key="RAPmodel" value="RAP-40km" />
 	<substitute key="RAP20model" value="RAP-20km" />
     <include installTo="menu:models" 
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
index f366dece73..d4bfd0653c 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml
@@ -95,8 +95,8 @@
             fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/PHISHAboveGround.xml" />
     </contribute>
 
-    <contribute xsi:type="toolbarSubMenu" menuText="NAM DNG 5km">
+    <contribute xsi:type="toolbarSubMenu" menuText="NamDNG">
         <contribute xsi:type="subinclude"
             fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NAMDNG5km.xml" />
     </contribute>
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
index c8639cdf1a..1f093e2988 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
@@ -19,7 +19,7 @@
         further_licensing_information.
     -->
 <vbSourceList>
-    <vbSource key="DGEX185" category="Volume" />
+    <vbSource key="DGEX" category="Volume" />
     <vbSource key="GFS" category="Volume" />
     <vbSource key="GFS201" category="Volume" />
     <vbSource key="GFS212" category="Volume" />
@@ -41,13 +41,12 @@
     <vbSource key="FNMOC-NCODA" category="Volume" />
     <vbSource key="COAMPS-EU" category="Volume" />
     <vbSource key="COAMPS-WA" category="Volume" />
-    <vbSource key="URMA25" category="Volume" />
+    <vbSource key="URMA25" category="Volume" />    
     <vbSource key="RTMA" category="Volume" />
     <vbSource key="RTMA-5km" category="Volume" />
     <vbSource key="RAP-13km" category="Volume" />
     <vbSource key="RAP-20km" category="Volume" />
     <vbSource key="RAP-40km" category="Volume" />
     <vbSource key="GFS254" category="Volume" />
-    <vbSource key="URMA25" category="Volume" />
-    <vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES" />
-</vbSourceList>
\ No newline at end of file
+    <vbSource key="SREF-40km" category="Volume" views="PLANVIEW TIMESERIES" />
+</vbSourceList>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FNMO-58.xml
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FNMO-58.xml
index 28203b77f1..d7a994df5a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FNMO-58.xml
@@ -254,4 +254,4 @@
 
 
 	<!-- END SUBCENTER 20 -->
-</gribModelSet>
\ No newline at end of file
+</gribModelSet>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index 5559db55c7..a9546152db 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -1010,7 +1010,7 @@
 	</model>
 
 	<model>
-		<name>DGEX185</name>
+		<name>DGEX</name>
 		<center>7</center>
 		<subcenter>0</subcenter>
 		<grid>185</grid>