diff --git a/cave/build/static/linux/cave/cave.sh b/cave/build/static/linux/cave/cave.sh
index e237b0be79..30d2e39713 100644
--- a/cave/build/static/linux/cave/cave.sh
+++ b/cave/build/static/linux/cave/cave.sh
@@ -129,7 +129,8 @@ if [[ -z $IGNORE_NUM_CAVES ]]; then
    lookupINI "$@"
    launcherRegex='--launcher.ini\s(.+\.ini)'
    # default to cave.ini
-   targetIni="/awips2/cave/cave.ini"
+   # targetIni="/awips2/cave/cave.ini"
+   targetIni="/awips2/cave/NCP.ini"
    if [[ $CAVE_INI_ARG =~ $launcherRegex ]]
    then
         targetIni="${BASH_REMATCH[1]}"
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml
index 63078edbfb..835efd3586 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/FNEXRAD/FNEXRAD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>FNEXRAD</resourceDefnName>
+    <resourceDefnName>NEXRCOMP</resourceDefnName>
     <resourceCategory>SATELLITE</resourceCategory>
     <rscImplementation>GiniSatellite</rscImplementation>
     <subTypeGenerator>sectorID</subTypeGenerator>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr
deleted file mode 100644
index eca32eb472..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DHR.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=DHR
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=DHR
-displayUnitStr=dBZ
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr
deleted file mode 100644
index c2db8d8255..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/DVL.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=DVL
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=DVL
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr
deleted file mode 100644
index 0fcc84552c..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/EET.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=EET
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=EET
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr
deleted file mode 100644
index 1e4b4559ea..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/HHC.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=HHC NEXRCOMP
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=HHC
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr
deleted file mode 100644
index 6a91f90dab..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N0R.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=nids_ref16
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=N0R
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr
deleted file mode 100644
index b137d76880..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/N1P.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=OHA
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=N1P
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml
deleted file mode 100644
index 835efd3586..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NEXRCOMP.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ResourceDefinition xmlns:ns2="http://www.example.org/productType">
-    <resourceDefnName>NEXRCOMP</resourceDefnName>
-    <resourceCategory>SATELLITE</resourceCategory>
-    <rscImplementation>GiniSatellite</rscImplementation>
-    <subTypeGenerator>sectorID</subTypeGenerator>
-    <rscTypeGenerator></rscTypeGenerator>
-    <timeMatchMethod>CLOSEST_BEFORE_OR_AFTER</timeMatchMethod>
-    <frameSpan>5</frameSpan>
-    <timelineGenMethod>USE_DATA_TIMES</timelineGenMethod>
-    <dfltFrameCount>20</dfltFrameCount>
-    <dfltTimeRange>1</dfltTimeRange>
-    <attrSetOrg>DETERMINE_BY_RSC_CATEGORY</attrSetOrg>
-    <dfltGeogArea>BasicWX_US</dfltGeogArea>
-    <resourceParameters>
-legendColor=RGB {200, 200, 200}
-pluginName=satellite
-satelliteName=NEXRCOMP
-! satellite DB table valid values are
-! This must match the &quot;creatingEntity&quot; in the
-
-</resourceParameters>
-    <inventoryEnabled>true</inventoryEnabled>
-    <addToURICatalog>false</addToURICatalog>
-</ResourceDefinition>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr
deleted file mode 100644
index 7d2d6187ed..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/RADAR/NEXRCOMP/NTP.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-colorMapName=OHA
-colorBar=@ColorBars/Satellite/dfltMcidasColorBar.xml
-! The DB values have spaces but imageType must use " "s. 
-imageType=NTP
-displayUnitStr=IRPixel
-alpha=1.0
-brightness=1.0
-contrast=1.0
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/Arctic.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/Arctic Composite.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/Arctic.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/Arctic Composite.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR2.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/IR2.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/IR2.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/WV.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic/WV.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/Arctic Composite/WV.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/GINI_Miscellaneous.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/GINI_Miscellaneous.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/GINI_Miscellaneous.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/NORMAL_TPW_PERCENT.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/NORMAL_TPW_PERCENT.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/NORMAL_TPW_PERCENT.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/NORMAL_TPW_PERCENT.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/SND_PRECIP_WATER.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_PRECIP_WATER.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Precip/SND_PRECIP_WATER.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_Miscellaneous/SND_PRECIP_WATER.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/GOES 13 - GINI.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/GINI_GOES13.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/GOES 13 - GINI.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR13.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR13.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/IR13.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/IR13.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_11.03.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_11.03.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_11.03.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_11.03.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.06.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_14.06.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_14.06.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_14.06.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.98.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_3.98.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_3.98.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_3.98.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.45.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_4.45.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_4.45.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_4.45.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_6.51.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_6.51.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_6.51.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_6.51.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.02.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.02.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.02.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.02.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.43.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.43.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_7.43.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_7.43.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/SND_VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/SND_VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/WV.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/WV.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/WV.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/default.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/default.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES13/default.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - GINI/default.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/GOES 13 - McIDAS.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/GOES13.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/GOES 13 - McIDAS.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR2.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/IR2.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/IR2.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/WV.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES13/WV.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 13 - McIDAS/WV.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/GOES 15 - GINI.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/GINI_GOES15.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/GOES 15 - GINI.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR13.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR13.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/IR13.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/IR13.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_11.03.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_11.03.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_11.03.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_11.03.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.06.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_14.06.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_14.06.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_14.06.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.98.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_3.98.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_3.98.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_3.98.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.45.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_4.45.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_4.45.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_4.45.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_6.51.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_6.51.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_6.51.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_6.51.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.02.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.02.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.02.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.02.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.43.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.43.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_7.43.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_7.43.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/SND_VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/SND_VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/WV.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/WV.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/WV.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/default.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/default.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES15/default.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - GINI/default.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/GOES 15 - McIDAS.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/GOES15.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/GOES 15 - McIDAS.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR2.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR2.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/IR2.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/IR2.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/VIS.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/VIS.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/VIS.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/VIS.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/WV.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/WV.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES15/WV.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GOES 15 - McIDAS/WV.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LCI East.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/GINI_GOES12.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LCI East.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/LOW_CLOUD_IMG.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LOW_CLOUD_IMG.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/LOW_CLOUD_IMG.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI East/LOW_CLOUD_IMG.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LCI West.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES11/GINI_GOES11.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LCI West.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/LOW_CLOUD_IMG.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LOW_CLOUD_IMG.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_GOES12/LOW_CLOUD_IMG.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/LCI West/LOW_CLOUD_IMG.attr
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/POES-NPOESS.xml
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/GINI_POES-NPOESS.xml
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/POES-NPOESS.xml
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/RAIN_RATE.attr b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/RAIN_RATE.attr
similarity index 100%
rename from ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/GINI_POES-NPOESS/RAIN_RATE.attr
rename to ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SATELLITE/POES-NPOESS/RAIN_RATE.attr