diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs
index 6e0266c5e..31a4b5415 100644
--- a/PrinterCommunication/PrinterConnectionAndCommunication.cs
+++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs
@@ -1315,16 +1315,16 @@ namespace MatterHackers.MatterControl.PrinterCommunication
 
 			// TODO: Shouldn't this logic be in the UI layer where the controls are owned and hooked in via PrintFinished?
 			bool oneOrMoreValuesReset = false;
-			foreach (var kvp in ActiveSliceSettings.Instance.BaseLayer)
+			foreach (var keyValue in ActiveSliceSettings.Instance.BaseLayer)
 			{
-				string currentValue = ActiveSliceSettings.Instance.ActiveValue(kvp.Key);
+				string currentValue = ActiveSliceSettings.Instance.ActiveValue(keyValue.Key);
 
 				bool valueIsClear = currentValue == "0" | currentValue == "";
-				OrganizerSettingsData data = SliceSettingsOrganizer.Instance.GetSettingsData(kvp.Key);
+				OrganizerSettingsData data = SliceSettingsOrganizer.Instance.GetSettingsData(keyValue.Key);
 				if (data?.ResetAtEndOfPrint == true && !valueIsClear)
 				{
 					oneOrMoreValuesReset = true;
-					ActiveSliceSettings.Instance.ClearValue(kvp.Key);
+					ActiveSliceSettings.Instance.ClearValue(keyValue.Key);
 				}
 			}
 
diff --git a/SlicerConfiguration/Settings/SettingsProfile.cs b/SlicerConfiguration/Settings/SettingsProfile.cs
index 6e43fc6e3..65cb65756 100644
--- a/SlicerConfiguration/Settings/SettingsProfile.cs
+++ b/SlicerConfiguration/Settings/SettingsProfile.cs
@@ -622,10 +622,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			{
 				var bigStringForHashCode = new StringBuilder();
 
-				foreach (var kvp in this.BaseLayer)
+				foreach (var keyValue in this.BaseLayer)
 				{
-					string activeValue = ActiveValue(kvp.Key);
-					bigStringForHashCode.Append(kvp.Key);
+					string activeValue = ActiveValue(keyValue.Key);
+					bigStringForHashCode.Append(keyValue.Key);
 					bigStringForHashCode.Append(activeValue);
 				}
 
@@ -638,14 +638,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 		{
 			using (var outstream = new StreamWriter(fileName))
 			{
-				foreach (var kvp in this.BaseLayer)
+				foreach (var keyValue in this.BaseLayer)
 				{
-					string activeValue = ActiveValue(kvp.Key);
+					string activeValue = ActiveValue(keyValue.Key);
 					if (replaceMacroValues)
 					{
 						activeValue = GCodeProcessing.ReplaceMacroValues(activeValue);
 					}
-					outstream.Write(string.Format("{0} = {1}\n", kvp.Key, activeValue));
+					outstream.Write(string.Format("{0} = {1}\n", keyValue.Key, activeValue));
 					activeValue = GCodeProcessing.ReplaceMacroValues(activeValue);
 				}
 			}
@@ -1028,9 +1028,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 		public SettingsLayer(Dictionary<string, string> settingsDictionary)
 		{
-			foreach(var kvp in settingsDictionary)
+			foreach(var keyValue in settingsDictionary)
 			{
-				this[kvp.Key] = kvp.Value;
+				this[keyValue.Key] = keyValue.Value;
 			}
 		}
 
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index 2698bd5a1..86e5815b4 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -521,11 +521,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				FlowLayoutWidget topToBottomSettings = new FlowLayoutWidget(FlowDirection.TopToBottom);
 				topToBottomSettings.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth;
 
-				foreach (var kvp in ActiveSliceSettings.Instance.BaseLayer)
+				foreach (var keyValue in ActiveSliceSettings.Instance.BaseLayer)
 				{
-					if (!SliceSettingsOrganizer.Instance.Contains(UserLevel, kvp.Key))
+					if (!SliceSettingsOrganizer.Instance.Contains(UserLevel, keyValue.Key))
 					{
-						OrganizerSettingsData settingInfo = new OrganizerSettingsData(kvp.Key, kvp.Key, OrganizerSettingsData.DataEditTypes.STRING);
+						OrganizerSettingsData settingInfo = new OrganizerSettingsData(keyValue.Key, keyValue.Key, OrganizerSettingsData.DataEditTypes.STRING);
 						if (ActiveSliceSettings.Instance.ActiveSliceEngine().MapContains(settingInfo.SlicerConfigName))
 						{
 							GuiWidget controlsForThisSetting = CreateSettingInfoUIControls(settingInfo, rightContentWidth, 0);