diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml
index 14735238be..8ab492837a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/creatingEntities.xml
@@ -1,44 +1,25 @@
 <?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.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
 <numericLookupTable id="creatingEntities">
-    <entry index="2" value="Miscellaneous" />
+    <entry index="2" value="GOES" />
     <entry index="3" value="JERS" />
     <entry index="4" value="ERS-QuickSCAT-Scatterometer" />
-    <entry index="5" value="POES-NPOESS" />
-    <entry index="6" value="Composite" />
+    <entry index="5" value="GOES" />
+    <entry index="6" value="GOES" />
     <entry index="7" value="DMSP" />
     <entry index="8" value="GMS" />
     <entry index="9" value="METEOSAT" />
     <entry index="10" value="GOES-7(H) Reserved for future use." />
-    <entry index="11" value="GOES-8(I)" />
-    <entry index="12" value="GOES-9(J)" />
-    <entry index="13" value="GOES-10(K)" />
-    <entry index="14" value="GOES-11(L)" />
-    <entry index="15" value="GOES-12(M)" />
-    <entry index="16" value="GOES-13(N)" />
-    <entry index="17" value="GOES-14(O)" />
-    <entry index="18" value="GOES-15(P)" />
+    <entry index="11" value="GOES" />
+    <entry index="12" value="GOES" />
+    <entry index="13" value="GOES" />
+    <entry index="14" value="GOES" />
+    <entry index="15" value="GOES" />
+    <entry index="16" value="GOES" />
+    <entry index="17" value="GOES" />
+    <entry index="18" value="GOES" />
     <entry index="26" value="NOAA16" />
     <entry index="27" value="NOAA17" />
     <entry index="28" value="NOAA18" />
     <entry index="29" value="NOAA19" />
-    <entry index="99" value="NEXRCOMP" />
+    <entry index="99" value="UCAR" />
 </numericLookupTable>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/sources.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/sources.xml
index ce2710a7a7..ce23c4fc0f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/sources.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/sources.xml
@@ -1,23 +1,4 @@
 <?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.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
 <numericLookupTable id="sources">
     <entry index="1" value="NESDIS" />
     <entry index="101" value="UCAR" />
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
index 07c63b734b..7b0231cf75 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@@ -94,8 +94,8 @@ REQUEST FNEXRAD|IDS|DDPLUS ".*" idd.unidata.ucar.edu
 REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu	# AREA/GINI
 REQUEST EXP "WwWind" idd.unidata.ucar.edu		# ESPL/PSD Profilers
 REQUEST DIFAX "GLM" idd.unidata.ucar.edu		# GOES GLM
+REQUEST NIMAGE ".*" conduit.unidata.ucar.edu			# GOES ABI netCDF4 (full sector)
 #REQUEST DIFAX "OR_ABI" idd.unidata.ucar.edu		# GOES ABI netCDF4 (tiles)
-REQUEST EXP ".*" lead.unidata.ucar.edu			# GOES ABI netCDF4 (full sector)
 #REQUEST NOTHER "^TI[PRS]... KNES" idd.unidata.ucar.edu	# GOES ABI gini
 REQUEST NGRID ".*" idd.unidata.ucar.edu
 REQUEST HDS ".*" idd.unidata.ucar.edu
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
index 10b9c19b91..e5da165dce 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@@ -8,7 +8,7 @@
 # 20160801	16.2.2	"GFS" is now 0.25deg global (previously 0.5deg which is now named "GFS0p5")
 # 20170322      16.4.1  GOES-16(R) Experimental/Provisional Products on NOTHER
 # 20171010      17.1.1  Split files by feedtype, rm gridsi retired from NOAAport (DGEX-AK,GFS201,GFS80)
-# 20190109      18.1.1  GOES17 from EXP
+# 20190109      18.1.1  GOES17 from  NIMAGE feed
 #
 # USPLN
 LIGHTNING	USPLN1EX
@@ -141,9 +141,15 @@ ANY	^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/
 #NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..)
 #	FILE	-overwrite -close -edex	/awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
 #
-# NOAAPORT GINI images - CONUS, NH, COMP sectors
+# National/Global GINI: CONUS (EW) NHEM (F), SuperNational (N)
 #
-NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.[EFNW]..) ([^ ]*) (..)(..)(..)
+NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.[EWFN]..) ([^ ]*) (..)(..)(..)
+	FILE	-overwrite -close -edex
+	/awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
+#
+# Regional GINI images: AK-REGIONAL (A), AK-NATIONAL (B), HI-REGIONAL (H), HI-NATIONAL (I), PR-NATIONAL }(Q)
+#
+NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.[ABHIQ]..) ([^ ]*) (..)(..)(..)
 	FILE	-overwrite -close -edex
 	/awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
 #
@@ -151,47 +157,47 @@ NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.
 #
 NOTHER	^(TI....) (KNES) (......) (...)
 	FILE	-close -edex
-	/awips2/data_store/goesr/noaaport/\1_\2_\3_\4_(seq).gini
+	/awips2/data_store/GOES/GINI/\1_\2_\3_\4_(seq).gini
 #
 # GOES 16/17 ABI
 #
-EXP	^/data/ldm/pub/native/satellite/GOES/GOES(16|17)/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc4
+NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudAndMoistureImagery/([^/]*)/([^/]*)/([0-9]{8})/([^/]*).nc
 	FILE	-close -edex
-	/awips2/data_store/goesr/exp/\5.nc4
+	/awips2/data_store/GOES/CMI/\5.nc4
 #
 # GOES derived products
 #
 HDS	^(IXT.99) KNES (......)
 	FILE	-close -edex
-	/awips2/data_store/goesr/derived/KNES_\1_\2-(seq)
+	/awips2/data_store/GOES/derived/KNES_\1_\2-(seq)
 #
 # DIFAX|SATELLITE feed netCDF4
 #
 # GLM
 DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_GLM-L2-([^/]*).nc
 	FILE	-close -edex
-	/awips2/data_store/goesr/glm/\1_OR_GLM-L2-\2.nc
+	/awips2/data_store/GOES/GLM/\1_OR_GLM-L2-\2.nc
 # ABI
 DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_ABI-L1b-([^/]*).nc
 	FILE	-close -edex
-	/awips2/data_store/goesr/abi/\1_OR_ABI-L1b-\2.nc
+	/awips2/data_store/GOES/L1bABI/\1_OR_ABI-L1b-\2.nc
 # derived products (still unsupported)
 # EXIS
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_EXIS-L1b-([^/]*).nc
 #	FILE	-close -edex
-#	/awips2/data_store/goesr/exis/\1_OR_EXIS-L1b-\2.nc
+#	/awips2/data_store/GOES/L1bDerived/\1_OR_EXIS-L1b-\2.nc
 # SEIS
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_SEIS-L1b-([^/]*).nc
 #	FILE	-close -edex
-#	/awips2/data_store/goesr/seis/\1_OR_SEIS-L1b-\2.nc
+#	/awips2/data_store/GOES/L1bDerived/\1_OR_SEIS-L1b-\2.nc
 # MAG
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_MAG-L1b-([^/]*).nc
 #	FILE	-close -edex
-#	/awips2/data_store/goesr/mag/\1_OR_MAG-L1b-\2.nc
+#	/awips2/data_store/GOES/L1bDerived/\1_OR_MAG-L1b-\2.nc
 # SUVI
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_SUVI-L1b-([^/]*).nc
 #	FILE	-close -edex
-#	/awips2/data_store/goesr/suvi/\1_OR_SUVI-L1b-\2.nc
+#	/awips2/data_store/GOES/L1bDerived/\1_OR_SUVI-L1b-\2.nc
 #
 # NPP/VIIRS
 #