diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml
index 1f0f5720bd..a403cd3d1f 100644
--- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml
+++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15Min.xml
@@ -36,8 +36,8 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="binlightning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml
index 8945b3f2b8..d8b1b65423 100644
--- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml
+++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot15MinPN.xml
@@ -38,8 +38,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -58,8 +58,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml
index 9b42ff61a4..2c6463c587 100644
--- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml
+++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot5Min.xml
@@ -36,8 +36,8 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="binlightning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml
index c946207b7c..4b9aa8acb1 100644
--- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml
+++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningPlot60Min.xml
@@ -36,8 +36,8 @@
 							<mapping key="pluginName">
 								<constraint constraintValue="binlightning" constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml b/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml
index 8a7bda7739..7477d46ca0 100644
--- a/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml
+++ b/cave/com.raytheon.viz.lightning/localization/bundles/LightningSeq.xml
@@ -43,8 +43,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -69,8 +69,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -95,8 +95,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -121,8 +121,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -147,8 +147,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
@@ -173,8 +173,8 @@
 								<constraint constraintValue="binlightning"
 									constraintType="EQUALS" />
 							</mapping>
-							<mapping key="lightSource">
-                                <constraint constraintValue="${lightSource}" constraintType="EQUALS" />
+							<mapping key="source">
+                                <constraint constraintValue="${source}" constraintType="EQUALS" />
                             </mapping>
 						</metadataMap>
 					</resourceData>
diff --git a/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml b/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml
index 1af6b96598..9b035bb497 100644
--- a/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml
+++ b/cave/com.raytheon.viz.lightning/localization/menus/lightning/lightningMenuItems.xml
@@ -21,12 +21,12 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<contribute xsi:type="subMenu" menuText="NLDN" id="NLDNSubMenu">
 		<contribute xsi:type="subinclude" fileName="menus/lightning/nldnLightningBundleItems.xml">
-			<substitute key="lightSource" value="NLDN"/>
+			<substitute key="source" value="NLDN"/>
 		</contribute>
 	</contribute>
 	<contribute xsi:type="subMenu" menuText="GLD" id="GLDSubMenu">
 		<contribute xsi:type="subinclude" fileName="menus/lightning/gldLightningBundleItems.xml">
-			<substitute key="lightSource" value="GLD"/>
+			<substitute key="source" value="GLD"/>
 		</contribute>
 	</contribute>	
 </menuTemplate>
\ No newline at end of file
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG/LTNG.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG/LTNG.xml
index 45cb3d3c8e..9a59b6a4e9 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG/LTNG.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG/LTNG.xml
@@ -4,7 +4,7 @@
     <resourceCategory>MISC</resourceCategory>
     <resourceParameters>
 pluginName=binlightning
-lightSource=NLDN,GLN
+source=NLDN,GLN
 colorByIntensity=false
 legendColor=RGB {200, 200, 200}
     </resourceParameters>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml
index f763f9e8bb..b759b0a2c0 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/LTNG2/LTNG2.xml
@@ -4,7 +4,7 @@
     <resourceCategory>MISC</resourceCategory>
     <resourceParameters>
 pluginName=binlightning
-lightSource=NLDN,GLN
+source=NLDN,GLN
 colorByIntensity=true
 legendColor=RGB {200, 200, 200}
     </resourceParameters>
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/localization/ncep/resourceTemplates/Lightning.xml b/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/localization/ncep/resourceTemplates/Lightning.xml
index 576bf3ce7b..c1248ea6ea 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/localization/ncep/resourceTemplates/Lightning.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/localization/ncep/resourceTemplates/Lightning.xml
@@ -26,9 +26,9 @@
             <mapping key="pluginName">
 				<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
             </mapping>
-            <!-- Uncomment this when the baseline is updated for lightSource
-            <mapping key="lightSource">
-				<constraint constraintValue="${lightSource}" constraintType="IN" />
+            <!-- Uncomment this when the baseline is updated for source
+            <mapping key="source">
+				<constraint constraintValue="${source}" constraintType="IN" />
             </mapping>
 			-->
          </metadataMap>
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/plugin.xml b/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/plugin.xml
index 2ebf9d08c2..94e4dc1368 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.lightning/plugin.xml
@@ -72,11 +72,11 @@
       </nc-resourceParameter>
 
 <!-- Change this to a REQUEST_CONSTRAINT when our baseline is updated to get 
-     the latest binlightning decoder implementing the lightSource column -->
+     the latest binlightning decoder implementing the source column -->
       <nc-resourceParameter
             ncResourceName="Lightning"
             paramClass="String"
-            paramName="lightSource"
+            paramName="source"
             defaultValue="NLDN"
             paramType="IMPLEMENTATION_PARAM">
       </nc-resourceParameter>