diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
index 55c62ca255..9728dfb130 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
@@ -36,6 +36,8 @@
     <vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />
     <vbSource key="AVN-NorthernHemisphere" category="Volume" />
     <vbSource key="HFR-EAST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-EAST_PR_6KM" category="Volume"
+        views="PLANVIEW TIMESERIES" />
     <vbSource key="HFR-US_EAST_DELAWARE_1KM" category="Volume"
         views="PLANVIEW TIMESERIES" />
     <vbSource key="HFR-US_EAST_FLORIDA_2KM" category="Volume"
@@ -46,8 +48,12 @@
         views="PLANVIEW TIMESERIES" />
     <vbSource key="HFR-US_EAST_VIRGINIA_1KM" category="Volume"
         views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_HAWAII_1KM" category="Volume" views="PLANVIEW TIMESERIES" />
-    <vbSource key="HFR-US_HAWAII_2KM" category="Volume" views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_HAWAII_1KM" category="Volume"
+        views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_HAWAII_2KM" category="Volume"
+        views="PLANVIEW TIMESERIES" />
+    <vbSource key="HFR-US_HAWAII_6KM" category="Volume"
+        views="PLANVIEW TIMESERIES" />
     <vbSource key="HFR-WEST_6KM" category="Volume" views="PLANVIEW TIMESERIES" />
     <vbSource key="HFR-US_WEST_CENCAL_2KM" category="Volume"
         views="PLANVIEW TIMESERIES" />
@@ -71,7 +77,7 @@
     <vbSource key="HiResW-NMM-PR" category="Volume" />
     <vbSource key="HiResW-NMM-SJU" category="Volume" />
     <vbSource key="HiResW-NMM-West" category="Volume" />
-	<vbSource key="HRRR" category="Volume" />
+    <vbSource key="HRRR" category="Volume" />
     <vbSource key="MRF204" category="Volume" />
     <vbSource key="LAMPQPF" category="Volume" />
     <vbSource key="LAPS" category="Volume" />
@@ -100,12 +106,13 @@
     <vbSource key="AKwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="AKwave4" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="BHPE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="CPCoutlook211" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="CPCoutlook211" category="SfcGrid"
+        views="PLANVIEW TIMESERIES" />
     <vbSource key="DHM" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="ENPWAVE253" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="EPwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-	<vbSource key="estofsUS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-	<vbSource key="estofsPR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="estofsUS" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="estofsPR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFE" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFSGuide" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="GFSLAMPTstorm" name="GFSLAMP-Grid" category="SfcGrid"
@@ -154,25 +161,34 @@
         views="TIMESERIES" />
     <vbSource key="Ldad" category="Point" views="TIMESERIES" />
     <vbSource key="obs" name="Metar" category="Point" views="TIMESERIES" />
-    <vbSource key="obsOA" name="MetarOA" category="Point" views="PLANVIEW TIMESERIES" />
-    <vbSource key="radar149" name="DMD" category="Point" subCategory="Column"
-        views="CROSSSECTION TIMEHEIGHT VARVSHGT TIMESERIES" />
+    <vbSource key="obsOA" name="MetarOA" category="Point"
+        views="PLANVIEW TIMESERIES" />
+    <vbSource key="radar149" name="DMD" category="Point"
+        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT TIMESERIES" />
     <vbSource key="modelsoundingGFS" name="GFSBufr" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="goessounding" name="GoesBufr" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="acarssounding" name="MDCRS" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="modelsoundingETA" name="NAMBufr" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="poessounding" name="PoesBufr" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="profiler" name="Profiler" category="Point"
-        subCategory="Column" views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
-    <vbSource key="bufrua" name="Raob" category="Point" subCategory="Column"
+        subCategory="Column"
+        views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
+    <vbSource key="bufrua" name="Raob" category="Point"
+        subCategory="Column"
         views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
     <vbSource key="bufruaOA" name="RaobOA" category="Point"
         subCategory="Column" />
-    <vbSource key="radarVWP" name="VWP" category="Point" subCategory="Column"
+    <vbSource key="radarVWP" name="VWP" category="Point"
+        subCategory="Column"
         views="CROSSSECTION TIMEHEIGHT VARVSHGT SOUNDING TIMESERIES" />
 </vbSourceList>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_6KM.xml
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_6KM.xml
index b8be73e955..9da255684d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST1_6KM.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_6KM.xml
@@ -19,7 +19,7 @@
     further_licensing_information.
 -->
 <latLonGridCoverage>
-    <name>gridHFR-EAST1_6KM</name>
+    <name>gridHFR-EAST_6KM</name>
     <description>High Frequency Radar (EAST_6KM) total vector velocity (TVV)
         Lon/Lat Resolution
     </description>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_PR_6KM.xml
similarity index 90%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_PR_6KM.xml
index 5ca706b6ad..54243ffc14 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST2_6KM.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-EAST_PR_6KM.xml
@@ -19,8 +19,8 @@
     further_licensing_information.
 -->
 <latLonGridCoverage>
-    <name>gridHFR-EAST2_6KM</name>
-    <description>High Frequency Radar (EAST_6KM) total vector velocity (TVV)
+    <name>gridHFR-EAST_PR_6KM</name>
+    <description>High Frequency Radar (PUERTO RICO_6KM) total vector velocity (TVV)
         Lon/Lat Resolution
     </description>
     <la1>14.5</la1>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_6KM.xml
similarity index 90%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_6KM.xml
index f3b54b6923..3f9dda70d4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST2_6KM.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-US_HAWAII_6KM.xml
@@ -19,8 +19,8 @@
     further_licensing_information.
 -->
 <latLonGridCoverage>
-    <name>gridHFR-WEST2_6KM</name>
-    <description>High Frequency Radar (WEST_6KM) total vector velocity (TVV)
+    <name>gridHFR-US_HAWAII_6KM</name>
+    <description>High Frequency Radar (US_WEST_HAWAII_6KM) total vector velocity (TVV)
         Lon/Lat Resolution
     </description>
     <la1>16.2204</la1>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST_6KM.xml
similarity index 97%
rename from edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml
rename to edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST_6KM.xml
index d3625d69ad..1fafaa7c9a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST1_6KM.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/gridHFR-WEST_6KM.xml
@@ -19,7 +19,7 @@
     further_licensing_information.
 -->
 <latLonGridCoverage>
-    <name>gridHFR-WEST1_6KM</name>
+    <name>gridHFR-WEST_6KM</name>
     <description>High Frequency Radar (WEST_6KM) total vector velocity (TVV)
         Lon/Lat Resolution
     </description>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml
index e3083aca2e..df942c5d73 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_HFR-9.xml
@@ -138,17 +138,17 @@
         <name>HFR-EAST_6KM</name>
         <center>9</center>
         <subcenter>0</subcenter>
-        <grid>gridHFR-EAST1_6KM</grid>
+        <grid>gridHFR-EAST_6KM</grid>
         <process>
             <id>255</id>
         </process>
     </model>
 
     <model>
-        <name>HFR-EAST_6KM</name>
+        <name>HFR-EAST_PR_6KM</name>
         <center>9</center>
         <subcenter>0</subcenter>
-        <grid>gridHFR-EAST2_6KM</grid>
+        <grid>gridHFR-EAST_PR_6KM</grid>
         <process>
             <id>255</id>
         </process>
@@ -168,17 +168,17 @@
         <name>HFR-WEST_6KM</name>
         <center>9</center>
         <subcenter>0</subcenter>
-        <grid>gridHFR-WEST1_6KM</grid>
+        <grid>gridHFR-WEST_6KM</grid>
         <process>
             <id>255</id>
         </process>
     </model>
 
     <model>
-        <name>HFR-WEST_6KM</name>
+        <name>HFR-US_HAWAII_6KM</name>
         <center>9</center>
         <subcenter>0</subcenter>
-        <grid>gridHFR-WEST2_6KM</grid>
+        <grid>gridHFR-US_HAWAII_6KM</grid>
         <process>
             <id>255</id>
         </process>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/thinnedModels/UkmetHR-NH.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/thinnedModels/UkmetHR-NH.xml
index 5325335d6b..964db69089 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/thinnedModels/UkmetHR-NH.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/thinnedModels/UkmetHR-NH.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.