diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index f8e0adb20..753a72820 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -626,6 +626,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			{
 				allUiFields[settingData.SlicerConfigName] = uiField;
 
+				uiField.Name = $"{settingData.PresentationName} Field";
 				uiField.Initialize(tabIndexForItem++);
 
 				uiField.SetValue(sliceSettingValue, userInitiated: false);
diff --git a/SlicerConfiguration/UIFields/CheckboxField.cs b/SlicerConfiguration/UIFields/CheckboxField.cs
index 715f8fd0f..a3d98cf2a 100644
--- a/SlicerConfiguration/UIFields/CheckboxField.cs
+++ b/SlicerConfiguration/UIFields/CheckboxField.cs
@@ -41,9 +41,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 		{
 			checkBoxWidget = new CheckBox("")
 			{
-				//Name = settingData.PresentationName + " Checkbox",
-				//ToolTipText = settingData.HelpText,
 				VAnchor = VAnchor.Bottom,
+				Name = this.Name,
 				TextColor = ActiveTheme.Instance.PrimaryTextColor,
 				Checked = this.Value == "1"
 			};
@@ -73,6 +72,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 		{
 			checkBoxWidget = ImageButtonFactory.CreateToggleSwitch(false, ActiveTheme.Instance.PrimaryTextColor, useStandardLabels: false);
 			checkBoxWidget.VAnchor = VAnchor.Center;
+			checkBoxWidget.Name = this.Name;
 			checkBoxWidget.Margin = new BorderDouble(0);
 			checkBoxWidget.Click += (s, e) =>
 			{
diff --git a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
index 9c327305a..d70fa2157 100644
--- a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
+++ b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
@@ -25,9 +25,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 				testRunner.ClickByName("Printer Tab");
 
-				testRunner.ClickByName("Printer Name Edit");
+				testRunner.ClickByName("Printer Name Field");
 
-				var textWidget = testRunner.GetWidgetByName("Printer Name Edit", out _);
+				var textWidget = testRunner.GetWidgetByName("Printer Name Field", out _);
 				string newName = "Updated name";
 				textWidget.Text = newName;
 				testRunner.ClickByName("Printer Tab");
diff --git a/Tests/MatterControl.AutomationTests/PrintingTests.cs b/Tests/MatterControl.AutomationTests/PrintingTests.cs
index bbbe9fb89..fc8877156 100644
--- a/Tests/MatterControl.AutomationTests/PrintingTests.cs
+++ b/Tests/MatterControl.AutomationTests/PrintingTests.cs
@@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					testRunner.ClickByName("General Tab");
 					testRunner.ClickByName("Single Print Tab");
-					testRunner.ClickByName("Layer(s) To Pause: Edit");
+					testRunner.ClickByName("Layer(s) To Pause Field");
 					testRunner.Type("2");
 
 					// switch to controls so we can see the heights
@@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					testRunner.ClickByName("General Tab");
 					testRunner.ClickByName("Single Print Tab");
-					testRunner.ClickByName("Layer(s) To Pause: Edit");
+					testRunner.ClickByName("Layer(s) To Pause Field");
 					testRunner.Type("2;6");
 
 					testRunner.ClickByName("Pin Settings Button");
diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
index 872025027..cbe1dab33 100644
--- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
+++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
@@ -28,7 +28,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 				testRunner.SwitchToAdvancedSliceSettings();
 				testRunner.ClickByName("Raft / Priming Tab");
-				testRunner.ClickByName("Create Raft Checkbox");
+				testRunner.ClickByName("Create Raft Field");
 
 				testRunner.ClickByName("Generate Gcode Button");
 				testRunner.Delay(() => MatterControlUtilities.CompareExpectedSliceSettingValueWithActualVaue("enableRaft", "True"), 10);
@@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					testRunner.ClickByName("General Tab");
 					testRunner.ClickByName("Single Print Tab");
-					testRunner.ClickByName("Layer(s) To Pause: Edit");
+					testRunner.ClickByName("Layer(s) To Pause Field");
 					testRunner.Type("4;2;a;not;6");
 
 					testRunner.AddDefaultFileToBedplate();
@@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					testRunner.ClickByName("General Tab");
 					testRunner.ClickByName("Single Print Tab");
-					testRunner.ClickByName("Layer(s) To Pause: Edit");
+					testRunner.ClickByName("Layer(s) To Pause Field");
 					testRunner.Type("2");
 
 					testRunner.AddDefaultFileToBedplate();
@@ -357,7 +357,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		private static void SetCheckBoxSetting(AutomationRunner testRunner, string settingToChange, bool valueToSet)
 		{
 			var settingsData = SliceSettingsOrganizer.Instance.GetSettingsData(settingToChange);
-			string checkBoxName = $"{settingsData.PresentationName} Checkbox";
+			string checkBoxName = $"{settingsData.PresentationName} Field";
 
 			Assert.IsTrue(ActiveSliceSettings.Instance.GetValue<bool>(settingToChange) != valueToSet);
 
@@ -403,16 +403,20 @@ namespace MatterHackers.MatterControl.Tests.Automation
 				testRunner.ClickByName("Filament Tab");
 				testRunner.ClickByName("Temperatures Tab");
 
-				Assert.IsTrue(testRunner.WaitForName("Extruder Temperature Textbox")); 
-				Assert.IsTrue(testRunner.WaitForName("Bed Temperature Textbox"));
+				testRunner.ClickByName("Extruder Temperature Field"); 
+				testRunner.ClickByName("Bed Temperature Field");
 
 				// Uncheck Has Heated Bed checkbox and make sure Bed Temp Textbox is not visible
 				testRunner.ClickByName("Printer Tab");
 				testRunner.ClickByName("Features Tab");
+
+				// TODO: What is this doing and why? {{
 				testRunner.DragByName("Show Reset Connection Checkbox", 1, offset: new Agg.Point2D(-40, 0));
 				testRunner.MoveToByName("Show Reset Connection Checkbox", 1, offset: new Agg.Point2D(0, 120));
 				testRunner.Drop();
-				testRunner.ClickByName("Has Heated Bed Checkbox");
+				// TODO: What is this doing and why? }}
+
+				testRunner.ClickByName("Has Heated Bed Field");
 				testRunner.Delay(.5);
 
 				testRunner.ClickByName("Filament Tab");
@@ -438,7 +442,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 				testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
 				testRunner.SwitchToAdvancedSliceSettings();
 
-				testRunner.ClickByName("Layer Thickness Textbox");
+				testRunner.ClickByName("Layer Thickness Field");
 				testRunner.Type(".5\n");
 				testRunner.Delay(.5);
 				Assert.AreEqual(ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.layer_height), .5, "Layer height is what we set it to");