diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs
index 47e3218cc..4a6785bc2 100644
--- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs
+++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs
@@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
 
 		public CommunicationStates PrePauseCommunicationState { get; private set; } = CommunicationStates.Printing;
 
-		private DetailedPrintingState _printingStatePrivate;
+		private DetailedPrintingState _detailedPrintingState;
 
 		private ContainsStringLineActions ReadLineContainsCallBacks = new ContainsStringLineActions();
 
@@ -758,12 +758,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication
 
 		public DetailedPrintingState DetailedPrintingState
 		{
-			get => _printingStatePrivate;
+			get => _detailedPrintingState;
 			set
 			{
-				if (_printingStatePrivate != value)
+				if (_detailedPrintingState != value)
 				{
-					_printingStatePrivate = value;
+					_detailedPrintingState = value;
 					DetailedPrintingStateChanged?.Invoke(this, null);
 				}
 			}
@@ -2354,7 +2354,7 @@ You will then need to logout and log back in to the computer for the changes to
 				timeSinceStartedPrint.Stop();
 				DetailedPrintingState = DetailedPrintingState.HeatingT0;
 			}
-			if (waitForTempStream?.HeatingT1 ?? false)
+			else if (waitForTempStream?.HeatingT1 ?? false)
 			{
 				// don't time the heating extruder operation
 				timeSinceStartedPrint.Stop();
diff --git a/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs
index 998007be4..49f4d43e9 100644
--- a/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs
+++ b/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs
@@ -117,8 +117,8 @@ namespace MatterHackers.MatterControl.PrinterControls
 			};
 
 			// Register listeners
-			printer.Connection.CommunicationStateChanged += onPrinterStatusChanged;
-			printer.Connection.EnableChanged += onPrinterStatusChanged;
+			printer.Connection.CommunicationStateChanged += Printer_StatusChanged;
+			printer.Connection.EnableChanged += Printer_StatusChanged;
 			SetVisibleControls();
 		}
 
@@ -130,13 +130,13 @@ namespace MatterHackers.MatterControl.PrinterControls
 		public override void OnClosed(EventArgs e)
 		{
 			// Unregister listeners
-			printer.Connection.CommunicationStateChanged -= onPrinterStatusChanged;
-			printer.Connection.EnableChanged -= onPrinterStatusChanged;
+			printer.Connection.CommunicationStateChanged -= Printer_StatusChanged;
+			printer.Connection.EnableChanged -= Printer_StatusChanged;
 
 			base.OnClosed(e);
 		}
 
-		private void onPrinterStatusChanged(object sender, EventArgs e)
+		private void Printer_StatusChanged(object sender, EventArgs e)
 		{
 			SetVisibleControls();
 			UiThread.RunOnIdle(this.Invalidate);
diff --git a/MatterControlLib/PrinterControls/ManualPrinterControls.cs b/MatterControlLib/PrinterControls/ManualPrinterControls.cs
index bcb05645e..5567113f5 100644
--- a/MatterControlLib/PrinterControls/ManualPrinterControls.cs
+++ b/MatterControlLib/PrinterControls/ManualPrinterControls.cs
@@ -112,9 +112,9 @@ namespace MatterHackers.MatterControl
 			UiThread.RunOnIdle(() => tuningAdjustmentControlsContainer.Width = tuningAdjustmentControlsContainer.Width + 1);
 
 			// Register listeners
-			printer.Connection.CommunicationStateChanged += OnPrinterStatusChanged;
-			printer.Connection.DetailedPrintingStateChanged += OnPrinterStatusChanged;
-			printer.Connection.EnableChanged += OnPrinterStatusChanged;
+			printer.Connection.CommunicationStateChanged += Printer_StatusChanged;
+			printer.Connection.DetailedPrintingStateChanged += Printer_StatusChanged;
+			printer.Connection.EnableChanged += Printer_StatusChanged;
 
 			SetVisibleControls();
 		}
@@ -164,14 +164,14 @@ namespace MatterHackers.MatterControl
 		public override void OnClosed(EventArgs e)
 		{
 			// Unregister listeners
-			printer.Connection.CommunicationStateChanged -= OnPrinterStatusChanged;
-			printer.Connection.DetailedPrintingStateChanged -= OnPrinterStatusChanged;
-			printer.Connection.EnableChanged -= OnPrinterStatusChanged;
+			printer.Connection.CommunicationStateChanged -= Printer_StatusChanged;
+			printer.Connection.DetailedPrintingStateChanged -= Printer_StatusChanged;
+			printer.Connection.EnableChanged -= Printer_StatusChanged;
 
 			base.OnClosed(e);
 		}
 
-		private void OnPrinterStatusChanged(object sender, EventArgs e)
+		private void Printer_StatusChanged(object sender, EventArgs e)
 		{
 			SetVisibleControls();
 			UiThread.RunOnIdle(this.Invalidate);