diff --git a/ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridParmeterUnits.xml b/ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridParmeterUnits.xml
index bdf5e2cb0e..9d9e4baef9 100644
--- a/ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridParmeterUnits.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridParmeterUnits.xml
@@ -114,12 +114,6 @@
           <gnam>VPTMP</gnam>
           <scale>0</scale>
      </parmeterinfo>
-     <parmeterinfo>
-          <name>Specific Humidity</name>
-          <units>kg kg**-1</units>
-          <gnam>SPFH</gnam>
-          <scale>2</scale>
-     </parmeterinfo>
      <parmeterinfo>
           <name>Relative Humidity</name>
           <units>%</units>
@@ -1999,11 +1993,17 @@
           <gnam>VWND</gnam>
           <scale>0</scale>
      </parmeterinfo>
+     <parmeterinfo>
+          <name>Specific Humidity</name>
+          <units>kg/kg</units>
+          <gnam>SPFH</gnam>
+          <scale>0</scale>
+     </parmeterinfo>
      <parmeterinfo>
           <name>Specific humidity</name>
-          <units>kg kg**-1</units>
+          <units>kg/kg</units>
           <gnam>SPCH</gnam>
-          <scale>2</scale>
+          <scale>0</scale>
      </parmeterinfo>
      <parmeterinfo>
           <name>Total column water</name>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_hght.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_hght.attr
index 532393285e..2bc8150083 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_hght.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_hght.attr
@@ -17,4 +17,5 @@ WIND=18/1/1
 TITLE=5/-1/~ @ AVERAGE HEIGHT
 COLORS=3
 MARKER=2
-GRDLBL=1
\ No newline at end of file
+GRDLBL=1
+TEXT=
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_tmpc.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_tmpc.attr
index 2ed1b545e6..dbb5afe506 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_tmpc.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_avg_tmpc.attr
@@ -17,4 +17,5 @@ WIND=18/1/1
 TITLE=5/-1/~ ^  @ AVERAGE TMPC
 COLORS=3
 MARKER=2
-GRDLBL=1
\ No newline at end of file
+GRDLBL=1
+TEXT=
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_gefs_avg_hght.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_gefs_avg_hght.attr
index 98fef4a18f..1129833847 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_gefs_avg_hght.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/EnsembleFcstGridContours/500mb_gefs_avg_hght.attr
@@ -17,4 +17,5 @@ WIND=18/1/1
 TITLE=5/-1/~ @ AVERAGE HEIGHT
 COLORS=3
 MARKER=2
-GRDLBL=1
\ No newline at end of file
+GRDLBL=1
+TEXT=
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WNA_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WNA_2-standard.xml
deleted file mode 100644
index 4716fcc963..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WNA_2-standard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE4WNA_2</resource>
-    <attrSetGroupName>standard</attrSetGroupName>
-    <attrSetNames>wave_height</attrSetNames>
-</AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WC_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10AK-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WC_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10AK-standard.xml
index c6e21ca5b9..97da86163a 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4WC_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10AK-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE4WC_2</resource>
+    <resource>WAVEHURR10AK</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10EP_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10EP-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10EP_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10EP-standard.xml
index ca1d6dd840..54c9ca588b 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10EP_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10EP-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE10EP_2</resource>
+    <resource>WAVEHURR10EP</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>direction_of_wind_wave</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WC_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WC-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WC_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WC-standard.xml
index 91a8926411..1ccaa76fda 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WC_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WC-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE10WC_2</resource>
+    <resource>WAVEHURR10WC</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE30MGLOBAL-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WNA-standard.xml
similarity index 85%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE30MGLOBAL-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WNA-standard.xml
index 8eb1a370dc..32d3f3c872 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE30MGLOBAL-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR10WNA-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE30MGLOBAL</resource>
+    <resource>WAVEHURR10WNA</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4ENP_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15ENP-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4ENP_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15ENP-standard.xml
index 08137576d3..1485bb83af 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4ENP_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15ENP-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE4ENP_2</resource>
+    <resource>WAVEHURR15ENP</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>primary_wave_dir</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEP25WNA_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15WNA-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEP25WNA_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15WNA-standard.xml
index 44b932c739..460f4ff561 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEP25WNA_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR15WNA-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVEP25WNA_2</resource>
+    <resource>WAVEHURR15WNA</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>sig_wave_gridded_feet_only</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR30GLOBAL-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR30GLOBAL-standard.xml
new file mode 100644
index 0000000000..40ce19c50d
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR30GLOBAL-standard.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
+    <resource>WAVEHURR30GLOBAL</resource>
+    <attrSetGroupName>standard</attrSetGroupName>
+    <attrSetNames>wave_height</attrSetNames>
+</AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4AK_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4AK-standard.xml
similarity index 87%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4AK_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4AK-standard.xml
index 501269749d..5b4f486fcb 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE4AK_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4AK-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE4AK_2</resource>
+    <resource>WAVEHURR4AK</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height,primary_wave_dir</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10AK_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WC-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10AK_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WC-standard.xml
index 73d5aa8817..ecb6d44b4e 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10AK_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WC-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE10AK_2</resource>
+    <resource>WAVEHURR4WC</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WNA_2-standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WNA-standard.xml
similarity index 86%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WNA_2-standard.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WNA-standard.xml
index 8fafde3993..c3e32c7a6a 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVE10WNA_2-standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/WAVEHURR4WNA-standard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
-    <resource>WAVE10WNA_2</resource>
+    <resource>WAVEHURR4WNA</resource>
     <attrSetGroupName>standard</attrSetGroupName>
     <attrSetNames>wave_height</attrSetNames>
 </AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
index 41e3084d30..219a20793e 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_airep.xml
@@ -118,11 +118,11 @@ here we are using turbInten from ncairep instead of flightHazard. Is this correc
  <PlotParameterDefn  plotParamName="BRBK" metParamName="WindDirection,WindSpeed"
                      plotMode="barb" symbolFont="WindSymbolFont" plotUnit="kts"/>
 
- <!-- WEATHER
- <PlotParameterDefn  plotParamName="WSYM" metParamName="PresentWeather" 
+ <!-- WEATHER -->
+ <!-- PlotParameterDefn  plotParamName="WSYM" metParamName="PresentWeather" 
                      dbParamName="presWeather"
                      plotMode="table" symbolFont="WxSymbolFont" 
-                     plotLookupTable="wx_symbol_trans.txt"/>
-    -->
+                     plotLookupTable="wx_symbol_trans.txt"/-->
+    
  	
 </PlotParameterDefns>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_amdar.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_amdar.xml
new file mode 100644
index 0000000000..219a20793e
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_amdar.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PlotParameterDefns>
+
+	<plugin>airep</plugin>
+	<!--  From NMAP ACFT params
+brbk:1:2:112      1          
+brbm:1:2          1         
+acrt              aircraft report type
+actp              character aircraft type
+cbs1              0
+cbs2              0
+clc1              numeric cloud coverage 1
+clc2              
+ctp1              0
+ctp2              0
+ibse              base of icing in ft  
+icsy:1            icing symbol   
+itop              top of icing   
+itsy              icing type symbol
+pmsl                     
+smsl              0    
+sstc              sea surface temp in C
+stim              hr and mins as hhmm
+tbse              base of turb in ft
+tbsy:1            turb symbol
+tfsy              turb freq symbol
+ttop              top of turb in ft
+ttsy              turb typs symbol
+vsby              visibility
+wbse              base of wx in ft  
+wsym:1            wx sym      
+wtop              top of wx in ft
+-->
+	<!-- from pointDataDescription file
+  <parameter name="flightHazard" numDims="1" type="INT" />
+  <parameter name="flightWeather" numDims="1" type="INT" />
+  <parameter name="flightConditions" numDims="1" type="INT" />
+
+-->
+
+    <!-- measured parameters          
+ <PlotParameterDefn  plotParamName="PRES" metParamName="PressureLevel"  
+                     dbParamName="" plotUnit="°F" plotFormat="%3.0f"/>
+-->
+ <PlotParameterDefn  plotParamName="TMPF" metParamName="AirTemperature"  
+                     dbParamName="temperature" plotUnit="°F" plotFormat="%3.0f"/>
+
+ <PlotParameterDefn  plotParamName="TMPC" metParamName="AirTemperature"  
+                     dbParamName="temperature" plotUnit="°C" plotFormat="%3.0f"/>
+
+<!--  <PlotParameterDefn  plotParamName="TMPK" metParamName="AirTemperature"  
+                     dbParamName="temperature" plotUnit="K" plotFormat="%3.0f"/> -->
+
+ <!-- FlightLevel is an int in the DB but when converted to hecto_ft, the value becomes a Double 
+      so the plotFormat has to be 'f' -->
+ <PlotParameterDefn  plotParamName="FELV" metParamName="FlightLevel"  
+                     dbParamName="flightLevel" plotUnit="hecto_ft" plotFormat="%3.0f"/>
+<!-- 
+ <PlotParameterDefn   plotParamName="VSBY" metParamName="Visibility"  
+                      dbParamName="visibility" plotUnit="mi" plotFormat="%3.1f"/>
+ -->
+ <PlotParameterDefn   plotParamName="ICSY" metParamName="IcingIntensitySymbol"  
+                      dbParamName="iceInten"                     
+                      plotMode="table" symbolFont="WxSymbolFont" 
+					  plotLookupTable="pgen_icing.txt"/> 
+
+ <PlotParameterDefn   plotParamName="TPOI" metParamName="IceType"  
+                      dbParamName="iceType"/> 
+					  
+  <PlotParameterDefn   plotParamName="ITSY" metParamName="IcingTypeSymbol"  
+                      dbParamName="iceType"/> 
+<!-- 
+this references a raytheon lookupTable but in their airepTurbDesign.svg file the plotParam is FLT_HZD??? 
+here we are using turbInten from ncairep instead of flightHazard. Is this correct?
+ --> 
+  <PlotParameterDefn   plotParamName="TBSY" metParamName="TurbulenceIntensitySymbol"  
+                      dbParamName="turbInten"                     
+                      plotMode="table" symbolFont="WxSymbolFont" 
+					   plotLookupTable="pgen_turbulence.txt"/> 
+					  					  
+  <PlotParameterDefn   plotParamName="TFSY" metParamName="TurbulenceFrequencySymbol"  
+                       dbParamName="turbFreq"/> 
+					  
+  <PlotParameterDefn   plotParamName="TTSY" metParamName="TurbulenceTypeSymbol"  
+                       dbParamName="turbType" /> 
+<!-- SKYC -->
+ <PlotParameterDefn  plotParamName="SKYC" metParamName="SkyCoverage" 
+                     plotMode="table" symbolFont="WxSymbolFont" 
+                     dbParamName="skyCover" 
+                     prioritySelectTable="pgen_skyc.txt"
+                     plotLookupTable="cloud_chars.txt" />
+                     
+ <PlotParameterDefn  plotParamName="CLC1" metParamName="CloudCover" 
+                     dbParamName="skyCover"  />    
+
+<!-- STATION VARIABLES  -->
+ <PlotParameterDefn  plotParamName="STID" metParamName="StationID"  
+                     dbParamName="stationId" />
+ <PlotParameterDefn  plotParamName="SLAT" metParamName="StationLatitude"  
+                     dbParamName="latitude" plotUnit="°" plotFormat="%2.2f"/>
+ <PlotParameterDefn  plotParamName="SLON" metParamName="StationLongitude"  
+                     dbParamName="longitude" plotUnit="°" plotFormat="%3.2f"/>        
+ <PlotParameterDefn  plotParamName="SELV" metParamName="StationElevation"  
+                     deriveParams="all"    plotUnit="m" plotFormat="%4.0f"/>                     
+                                          
+
+<!-- These really aren't normally displayed by themselves but they need
+  == to be here since they are used to derive the WindBarbs.
+  -->
+ <PlotParameterDefn  plotParamName="DRCT" metParamName="WindDirection"  
+                    dbParamName="windDir" plotUnit="degree" plotFormat="%3.0f"/>
+ <PlotParameterDefn  plotParamName="SPED" metParamName="WindSpeed"  
+                     dbParamName="windSpeed" plotUnit="m/s" plotFormat="%3.0f"/>
+ <PlotParameterDefn  plotParamName="SKNT" metParamName="WindSpeed"  
+                     dbParamName="windSpeed" plotUnit="kts" plotFormat="%3.0f"/>
+<!-- WIND BARBS -->
+
+ <PlotParameterDefn  plotParamName="BRBK" metParamName="WindDirection,WindSpeed"
+                     plotMode="barb" symbolFont="WindSymbolFont" plotUnit="kts"/>
+
+ <!-- WEATHER -->
+ <!-- PlotParameterDefn  plotParamName="WSYM" metParamName="PresentWeather" 
+                     dbParamName="presWeather"
+                     plotMode="table" symbolFont="WxSymbolFont" 
+                     plotLookupTable="wx_symbol_trans.txt"/-->
+    
+ 	
+</PlotParameterDefns>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_pirep.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_pirep.xml
index 7849a5c0d9..80e0db5b5f 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_pirep.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/PlotParameters/plotParameters_pirep.xml
@@ -149,12 +149,13 @@ wtop              top of wx in ft
  <PlotParameterDefn  plotParamName="BRBK" metParamName="WindDirection,WindSpeed"
                      plotMode="barb" symbolFont="WindSymbolFont" plotUnit="kts" />
 
- <!-- WEATHER
+ <!-- WEATHER -->
+ <!-- Redmine 4230 -->
  <PlotParameterDefn  plotParamName="WSYM" metParamName="PresentWeather" 
-                     dbParamName="presWeather"
+                     dbParamName="weatherGroup"
                      plotMode="table" symbolFont="WxSymbolFont" 
-                     plotLookupTable="wx_symbol_trans.txt"/>
-    -->
+                     plotLookupTable="pgen_wsym.txt"/>
+   
  	
 </PlotParameterDefns>
 
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/fullPlot.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/fullPlot.xml
new file mode 100644
index 0000000000..5d3fd3775a
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/fullPlot.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<plotModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="plotModel.xsd"
+        plugin="airep" name="fullPlot"       
+        svgTemplate="standardPlotModelTemplate.svg">
+		
+		<!--  This was created from nmap full_standard plot model for ACFT
+		 but some params have been commented out since  all the parameters
+		 have not been implemented yet for amdar 
+		 
+		  -->
+		<PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="TBSY">
+            <Position>TC</Position>
+            <Color red="0" green="178" blue="238"/>
+        </PlotModelElement>
+		<!--  PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="BRBK">
+            <Position>MC</Position>
+            <Color red="0" green="255" blue="255"/>
+        </PlotModelElement> -->
+ <!-- no vsby        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="VSBY">
+            <Position>BC</Position>
+            <Color red="16" green="78" blue="139"/>
+        </PlotModelElement> -->
+        
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="TMPC">
+            <Position>UL</Position>
+            <Color red="255" green="0" blue="0"/>
+        </PlotModelElement>
+
+		<PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="FELV">
+            <Position>LL</Position>
+            <Color red="0" green="255" blue="0"/>
+        </PlotModelElement>
+        
+ <!--       <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="PRES">
+            <Position>UR</Position>
+            <Color red="0" green="0" blue="255"/>
+        </PlotModelElement>   --> 
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="ICSY">
+            <Position>MR</Position>
+            <Color red="255" green="255" blue="0"/>
+        </PlotModelElement>
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="STID">
+            <Position>LR</Position>
+            <Color red="205" green="133" blue="0"/>
+        </PlotModelElement>
+
+ <!--        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="DRCT">
+            <Position>MR</Position>
+            <Color red="255" green="255" blue="0"/>
+        </PlotModelElement>
+
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="SPED">
+            <Position>LR</Position>
+            <Color red="205" green="133" blue="0"/>
+        </PlotModelElement>
+         -->        
+</plotModel>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/standard.xml
new file mode 100644
index 0000000000..00d81e8984
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/amdar/standard.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<plotModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="plotModel.xsd"
+        plugin="airep" name="standard"       
+        svgTemplate="standardPlotModelTemplate.svg">
+		
+		<!--  This was created from nmap full_standard plot model for ACFT
+		 but some params have been commented out since  all the parameters
+		 have not been implemented yet for airep 
+		 
+		  -->
+<!--        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="TMPC">
+            <Position>UL</Position>
+            <Color red="255" green="0" blue="0"/>
+        </PlotModelElement> -->
+        <!-- 
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="BRBK">
+            <Position>MC</Position>
+            <Color red="0" green="255" blue="255"/>
+        </PlotModelElement>
+         -->                
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="TPOI">
+            <Position>UC</Position>
+            <Color red="255" green="255" blue="0"/>
+        </PlotModelElement>  
+        
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="ICSY">
+            <Position>UR</Position>
+            <Color red="255" green="0" blue="255"/>
+        </PlotModelElement>  
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="STID">
+            <Position>MC</Position>
+            <Color red="205" green="133" blue="0"/>
+        </PlotModelElement>
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="FELV">
+            <Position>LC</Position>
+            <Color red="0" green="255" blue="0"/>
+        </PlotModelElement>
+        <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="TBSY">
+            <Position>UL</Position>
+            <Color red="0" green="178" blue="238"/>
+        </PlotModelElement>   
+        <!-- <PlotModelElement symbolSize="1" textStyle="Bold" 
+textFont="Courier" textSize="14" paramName="CLC1">
+            <Position>TC</Position>
+            <Color red="0" green="178" blue="238"/>
+        </PlotModelElement>     -->  
+</plotModel>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/pirep/standard.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/pirep/standard.xml
index 73b7ff44a7..c1450aaa2a 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/pirep/standard.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/PlotModels/pirep/standard.xml
@@ -64,5 +64,5 @@ textFont="Courier" textSize="14" paramName="ICSY">
             <Position>UR</Position>
             <Color red="255" green="0" blue="255"/>
         </PlotModelElement>
-        
+              
 </plotModel>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP/WAVE4ENP.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15ENP/WAVE15ENP.xml
similarity index 93%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP/WAVE4ENP.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15ENP/WAVE15ENP.xml
index 8025ee398e..a95d1b53af 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP/WAVE4ENP.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15ENP/WAVE15ENP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE4ENP</resourceDefnName>
+    <resourceDefnName>WAVE15ENP</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA/WAVEP25WNA.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15WNA/WAVE15WNA.xml
similarity index 93%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA/WAVEP25WNA.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15WNA/WAVE15WNA.xml
index f3bc6219f0..d0d0e5df21 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA/WAVEP25WNA.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE15WNA/WAVE15WNA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVEP25WNA</resourceDefnName>
+    <resourceDefnName>WAVE15WNA</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WC_2/WAVE4WC_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10AK/WAVEHURR10AK.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WC_2/WAVE4WC_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10AK/WAVEHURR10AK.xml
index fa1b4ddf5b..264956eb72 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WC_2/WAVE4WC_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10AK/WAVEHURR10AK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE4WC_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR10AK</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=WCwave4-2
+GDFILE=waveHurr10AK
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP_2/WAVE4ENP_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10EP/WAVEHURR10EP.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP_2/WAVE4ENP_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10EP/WAVEHURR10EP.xml
index a22ea3470f..3b41a8efc3 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4ENP_2/WAVE4ENP_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10EP/WAVEHURR10EP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE4ENP_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR10EP</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=ENPWAVE253-2
+GDFILE=waveHurr10EP
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10EP_2/WAVE10EP_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WC/WAVEHURR10WC.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10EP_2/WAVE10EP_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WC/WAVEHURR10WC.xml
index c23265439f..0846baf019 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10EP_2/WAVE10EP_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WC/WAVEHURR10WC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE10EP_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR10WC</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=EPwave10-2
+GDFILE=waveHurr10WC
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WC_2/WAVE10WC_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WNA/WAVEHURR10WNA.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WC_2/WAVE10WC_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WNA/WAVEHURR10WNA.xml
index 817e898d82..60b374d5a1 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WC_2/WAVE10WC_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR10WNA/WAVEHURR10WNA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE10WC_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR10WNA</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=WCwave10-2
+GDFILE=waveHurr10WNA
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WNA_2/WAVE10WNA_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15ENP/WAVEHURR15ENP.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WNA_2/WAVE10WNA_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15ENP/WAVEHURR15ENP.xml
index 54550c3113..1aa6b3b6b4 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10WNA_2/WAVE10WNA_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15ENP/WAVEHURR15ENP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE10WNA_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR15ENP</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=WNAwave10-2
+GDFILE=waveHurr15ENP
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA_2/WAVEP25WNA_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15WNA/WAVEHURR15WNA.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA_2/WAVEP25WNA_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15WNA/WAVEHURR15WNA.xml
index a505ee8f58..00d96d29a6 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEP25WNA_2/WAVEP25WNA_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR15WNA/WAVEHURR15WNA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVEP25WNA_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR15WNA</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=WNAWAVE238-2
+GDFILE=waveHurr15WNA
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE30MGLOBAL/WAVE30MGLOBAL.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR30GLOBAL/WAVEHURR30GLOBAL.xml
similarity index 89%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE30MGLOBAL/WAVE30MGLOBAL.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR30GLOBAL/WAVEHURR30GLOBAL.xml
index 2288a9bd9c..a50c0e92cc 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE30MGLOBAL/WAVE30MGLOBAL.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR30GLOBAL/WAVEHURR30GLOBAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE30MGLOBAL</resourceDefnName>
+    <resourceDefnName>WAVEHURR30GLOBAL</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=wave30mGlobal
+GDFILE=waveHurr30Global
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4AK_2/WAVE4AK_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4AK/WAVEHURR4AK.xml
similarity index 91%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4AK_2/WAVE4AK_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4AK/WAVEHURR4AK.xml
index 59932cce63..7bb562dc61 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4AK_2/WAVE4AK_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4AK/WAVEHURR4AK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE4AK_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR4AK</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=AKwave4-2
+GDFILE=waveHurr4AK
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10AK_2/WAVE10AK_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WC/WAVEHURR4WC.xml
similarity index 91%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10AK_2/WAVE10AK_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WC/WAVEHURR4WC.xml
index 88df5d21eb..55ca0f2712 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE10AK_2/WAVE10AK_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WC/WAVEHURR4WC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE10AK_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR4WC</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=AKwave10-2
+GDFILE=waveHurr4WC
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WNA_2/WAVE4WNA_2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WNA/WAVEHURR4WNA.xml
similarity index 90%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WNA_2/WAVE4WNA_2.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WNA/WAVEHURR4WNA.xml
index 89c50de21f..cc67c05ecd 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVE4WNA_2/WAVE4WNA_2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/WAVEHURR4WNA/WAVEHURR4WNA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>WAVE4WNA_2</resourceDefnName>
+    <resourceDefnName>WAVEHURR4WNA</resourceDefnName>
     <resourceCategory>GRID</resourceCategory>
     <rscImplementation>ModelFcstGridContours</rscImplementation>
     <subTypeGenerator></subTypeGenerator>
@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=WNAwave4-2
+GDFILE=waveHurr4WNA
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/AVNMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/AVNMOS/standard.attr
index 7d6bdf5005..f1341bfe73 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/AVNMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/AVNMOS/standard.attr
@@ -1,4 +1,5 @@
 ! Attributes for the AVNMOS resource with "standard" plot model
 plotModel=@PlotModels/bufrmosAVN/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=AVNMOS Standard
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/ETAMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/ETAMOS/standard.attr
index 89053423c2..5cd492bbfe 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/ETAMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/ETAMOS/standard.attr
@@ -1,4 +1,5 @@
 ! Attributes for the ETAMOS resource with "standard" plot model
 plotModel=@PlotModels/bufrmosETA/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=ETAMOS Standard
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSMOS/standard.attr
index 83c7445d9f..341729f93e 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSMOS/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosGFS/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSMOS Standard
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/12hrpop.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/12hrpop.attr
index d0f25af46f..bf5fc0dbcd 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/12hrpop.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/12hrpop.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/12hrpop.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS 12hr POP
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/anom_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/anom_mm.attr
index 8e0a214d4f..edc01a444a 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/anom_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/anom_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/anom_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature Anomaly (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_all.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_all.attr
index 3771775513..7fc2747833 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_all.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_all.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/cli_all.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) and 24-hr Precip Anomaly
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_hpc.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_hpc.attr
index 0f7e84dd76..2ba8c5feb9 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_hpc.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/cli_hpc.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/cli_hpc.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) and 24-hr Precip Anomaly (HPC View)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/climo_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/climo_mm.attr
index 6870533e91..92ddf8b1c4 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/climo_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/climo_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/climo_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) and 24-hr Precip Anomaly (Climo View)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/dewpoint_hpc.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/dewpoint_hpc.attr
index 6cfe2ad5ea..6183243607 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/dewpoint_hpc.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/dewpoint_hpc.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/dewpoint_hpc.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Dewpoint Forecast (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_anom.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_anom.attr
index 7917f9e508..685904605d 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_anom.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_anom.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/max_anom.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day Temperature Anomaly (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_mm.attr
index 1ae4303213..d81ea43352 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/max_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/max_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day Temperature Forecast and Anomaly (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop.attr
index d35b140799..0f22c41a0b 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/maxminpop.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) and 24-hr POP Forecast
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop_an.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop_an.attr
index b206abb90b..24e322ba40 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop_an.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/maxminpop_an.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/maxminpop_an.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) Forecast and Anomaly, 24-hr POP Forecast and Anomaly
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_anom.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_anom.attr
index d75e3fad32..46f28e3f1b 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_anom.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_anom.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/min_anom.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Night Temperature Anomaly (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_mm.attr
index 3224950184..8305dd65c0 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/min_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/min_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Night Temperature Forecast and Anomaly (F)
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/mos_anom_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/mos_anom_mm.attr
index 3949c56377..0c8cb52571 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/mos_anom_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/mos_anom_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/mos_anom_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Day/Night Temperature (F) Forecast and Anomaly, 24-hr POP Forecast and Anomaly
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop12_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop12_mm.attr
index a4226ad395..34e8a351b2 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop12_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop12_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/pop12_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS 12-hr POP Forecast
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop24_mm.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop24_mm.attr
index 9b2a25118c..0698c428d3 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop24_mm.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop24_mm.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/pop24_mm.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS 24-hr POP Forecast
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop_anom.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop_anom.attr
index 51fa944cff..a6aa77632d 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop_anom.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/pop_anom.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/pop_anom.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS POP Forecast and Anomaly
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/standard.attr
index 6ca3fc5389..6f89bb0262 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/GFSXMOS/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosMRF/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=GFSXMOS Standard View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/HPCMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/HPCMOS/standard.attr
index 3d10bd9920..36c53ac9f3 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/HPCMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/HPCMOS/standard.attr
@@ -1,4 +1,5 @@
 ! Attributes for the HPCMOS resource with "standard" plot model
 plotModel=@PlotModels/bufrmosHPC/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=HPCMOS Standard View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/LAMPMOS/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/LAMPMOS/standard.attr
index e7b24c939d..f537ac6c6e 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/LAMPMOS/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/LAMPMOS/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/bufrmosLAMP/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=LAMPMOS Standard View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/simple.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/simple.attr
index 11fa9e7717..09f3fd7d94 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/simple.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/simple.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/obs/simple.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=METAR Simple
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard.attr
index cf15a9777e..8be18e8bfc 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/obs/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=METAR Standard
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard2.attr
index 4dbbf3be15..e831075802 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard2.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/METAR/standard2.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/obs/standard2.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=METAR Standard2
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/PAFM/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/PAFM/standard.attr
index 133ee90004..dc39d151d6 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/PAFM/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/PAFM/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/ncpafm/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=PAFM Standard View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/allreports.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/allreports.attr
index 54d4f9b9f1..a1df4268bd 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/allreports.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/allreports.attr
@@ -2,4 +2,5 @@
 plotModel=@PlotModels/sfcobs/ship_standard.xml
 plotDensity=12
 conditionalFilter=
-reportType=1003,1004,1005,1006,1007
\ No newline at end of file
+reportType=1003,1004,1005,1006,1007
+legendString=All Hourly SHIP Reports
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/ships_only.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/ships_only.attr
index aa74493192..03b7573c93 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/ships_only.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP/ships_only.attr
@@ -2,4 +2,5 @@
 plotModel=@PlotModels/sfcobs/ship_standard.xml
 plotDensity=12
 conditionalFilter=
-reportType=1003
\ No newline at end of file
+reportType=1003
+legendString=Hourly SHIP Only Reports
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/ships_only.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/ships_only.attr
index 4688cfb4e1..15f8314b62 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/ships_only.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/ships_only.attr
@@ -2,4 +2,5 @@
 plotModel=@PlotModels/sfcobs/ship_standard.xml
 plotDensity=12
 conditionalFilter=
-reportType=1003
\ No newline at end of file
+reportType=1003
+legendString=6-Hr Ship Only
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/simple.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/simple.attr
index b3680a500c..4bb4f9430e 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/simple.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/simple.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/nctaf/simple.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=TAF Simple View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/standard.attr
index 31b7fda292..e99c8953ee 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/standard.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/standard.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/nctaf/standard.xml
 plotDensity=10
-conditionalFilter=
\ No newline at end of file
+conditionalFilter=
+legendString=TAF Standard View
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_flt_condition.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_flt_condition.attr
index 4255611d7d..9af0eab806 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_flt_condition.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_flt_condition.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/nctaf/tempo_flt_condition.xml
 plotDensity=10
-conditionalFilter=@PlotModels/ConditionalFilters/nctaf/taf_tempo_flight_condition.xml
\ No newline at end of file
+conditionalFilter=@PlotModels/ConditionalFilters/nctaf/taf_tempo_flight_condition.xml
+legendString=TAF Cloud Coverage
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_prob.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_prob.attr
index b68d4602d0..e40af88452 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_prob.attr
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/TAF/tempo_prob.attr
@@ -2,4 +2,5 @@
 !
 plotModel=@PlotModels/nctaf/tempo_prob.xml
 plotDensity=10
-conditionalFilter=@PlotModels/ConditionalFilters/nctaf/taf_tempo_prob.xml
\ No newline at end of file
+conditionalFilter=@PlotModels/ConditionalFilters/nctaf/taf_tempo_prob.xml
+legendString=TAF Weather Symbols
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/AMDAR.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/AMDAR.xml
new file mode 100644
index 0000000000..9b38f1b2c5
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/AMDAR.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ResourceDefinition xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
+    <resourceDefnName>AMDAR</resourceDefnName>
+    <resourceCategory>UPPER_AIR</resourceCategory>
+    <resourceParameters>
+pluginName=airep
+reportType=AMDAR
+legendString=Aircraft Meteorological Data Reports
+spiFile=MTR.spi
+legendColor=RGB {0, 255, 0}
+    </resourceParameters>
+    <rscImplementation>SurfacePlot</rscImplementation>
+    <subTypeGenerator></subTypeGenerator>
+    <rscTypeGenerator></rscTypeGenerator>
+    <timeMatchMethod>CLOSEST_BEFORE_OR_AFTER</timeMatchMethod>
+    <frameSpan>60</frameSpan>
+    <timelineGenMethod>USE_FRAME_INTERVAL</timelineGenMethod>
+    <dfltFrameCount>4</dfltFrameCount>
+    <dfltTimeRange>48</dfltTimeRange>
+    <dfltGeogArea>BasicWX_US</dfltGeogArea>
+</ResourceDefinition>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/standard.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/standard.attr
new file mode 100644
index 0000000000..fa6ec63526
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/UPPER_AIR/AMDAR/standard.attr
@@ -0,0 +1,4 @@
+! Parameters and Attributes for the default AMDAR Resource
+plotModel=@PlotModels/amdar/standard.xml
+plotDensity=10
+conditionalFilter=
\ No newline at end of file