diff --git a/TBF/Rig/TestMethods/iPerlCommunication/communication/C4/protocolCommons/FlipMode.cs b/TBF/Rig/TestMethods/iPerlCommunication/communication/C4/protocolCommons/FlipMode.cs
index 21c7574b0..d34a19163 100644
--- a/TBF/Rig/TestMethods/iPerlCommunication/communication/C4/protocolCommons/FlipMode.cs
+++ b/TBF/Rig/TestMethods/iPerlCommunication/communication/C4/protocolCommons/FlipMode.cs
@@ -2,7 +2,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.communication.C4.protocolCommon
 {
     public enum FlipMode : byte
     {
-        DisabledConstant = 0x00, //Constant
-        EnabledRandomized = 0x01 //Randomized
+        Constant = 0x00, //Constant
+        Randomized = 0x01 //Randomized
     }
 }
\ No newline at end of file
diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index 4d1f985a4..05223a3c1 100644
--- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -887,7 +887,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
         {
             return SetFlipMode(
                 ihead,
-                FlipMode.EnabledRandomized,
+                FlipMode.Randomized,
                 iPerlCommunicationConstants.SetFlipModeRandomizedStr,
                 ref resultStr);
         }
@@ -896,7 +896,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
         {
             return SetFlipMode(
                 ihead,
-                FlipMode.DisabledConstant,
+                FlipMode.Constant,
                 iPerlCommunicationConstants.SetFlipModeConstantStr,
                 ref resultStr);
         }
diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs
index 330098735..7fafbe236 100644
--- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs
+++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs
@@ -154,7 +154,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
                             break;
                         }
 
-                        bool successful = iPerlHead.OptoHeadTest.SetFlipMode(FlipMode.DisabledConstant);
+                        bool successful = iPerlHead.OptoHeadTest.SetFlipMode(FlipMode.Constant);
                         rfidListItem.Text = successful
                             ? "Set Flip Mode Constant (0x00) - OK"
                             : "Set Flip Mode Constant (0x00) - FAILED";
@@ -168,7 +168,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
                             break;
                         }
 
-                        bool successful = iPerlHead.OptoHeadTest.SetFlipMode(FlipMode.EnabledRandomized);
+                        bool successful = iPerlHead.OptoHeadTest.SetFlipMode(FlipMode.Randomized);
                         rfidListItem.Text = successful
                             ? "Set Flip Mode Randomized (0x01) - OK"
                             : "Set Flip Mode Randomized (0x01) - FAILED";
diff --git a/TBFTests/Rig/RegisterReaders/iPerlASICReader/communication/C4/IperlHatProtocol/IperlHatIntegrationTests.cs b/TBFTests/Rig/RegisterReaders/iPerlASICReader/communication/C4/IperlHatProtocol/IperlHatIntegrationTests.cs
index ad66ff577..8fb73d79b 100644
--- a/TBFTests/Rig/RegisterReaders/iPerlASICReader/communication/C4/IperlHatProtocol/IperlHatIntegrationTests.cs
+++ b/TBFTests/Rig/RegisterReaders/iPerlASICReader/communication/C4/IperlHatProtocol/IperlHatIntegrationTests.cs
@@ -568,7 +568,7 @@ namespace TBFTests.Rig.RegisterReaders.iPerlASICReader.communication.C4.IperlHat
                 try
                 {
                     SetAndVerifyMeterState(port, ProtocolStatuses.Idle);
-                    SetAndVerifyFlipMode(port, FlipMode.DisabledConstant, "Constant");
+                    SetAndVerifyFlipMode(port, FlipMode.Constant, "Constant");
 
                     SetAndVerifyMeterState(port, ProtocolStatuses.Active);
                     SetDiagnosticLed(port, DiagnosticLedState.State4);
@@ -579,7 +579,7 @@ namespace TBFTests.Rig.RegisterReaders.iPerlASICReader.communication.C4.IperlHat
                         ComPortOptho);
                     ReadAndVerifyOpticalPacket();
 
-                    SetAndVerifyFlipMode(port, FlipMode.EnabledRandomized, "Randomized");
+                    SetAndVerifyFlipMode(port, FlipMode.Randomized, "Randomized");
                     mainTestCompleted = true;
                 }
                 finally
diff --git a/TBFTests/Rig/TestMethods/iPerlCommunication/communication/RadioServiceTest.cs b/TBFTests/Rig/TestMethods/iPerlCommunication/communication/RadioServiceTest.cs
index 562537584..08d1407cc 100644
--- a/TBFTests/Rig/TestMethods/iPerlCommunication/communication/RadioServiceTest.cs
+++ b/TBFTests/Rig/TestMethods/iPerlCommunication/communication/RadioServiceTest.cs
@@ -223,7 +223,7 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
         public void ViewFlipMode_DisabledResponse_ReturnsDisabled()
         {
             // Arrange
-            serialDriver.Response = IperlResponseFactory.CreateOkResponse( (byte)FlipMode.DisabledConstant);
+            serialDriver.Response = IperlResponseFactory.CreateOkResponse( (byte)FlipMode.Constant);
 
             // Act
             FlipMode? result = service.ViewFlipMode(head);
@@ -231,7 +231,7 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             // Assert
             Assert.IsTrue(result.HasValue);
 
-            Assert.AreEqual( FlipMode.DisabledConstant, result.Value);
+            Assert.AreEqual( FlipMode.Constant, result.Value);
             CollectionAssert.AreEqual( CreateDeviceCommandRequest( ProtocolDeviceSubCommand.ViewFlipMode), serialDriver.LastRequest);
         }
 
@@ -241,7 +241,7 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             // Arrange
             serialDriver.Response =
                 IperlResponseFactory.CreateOkResponse(
-                    (byte)FlipMode.EnabledRandomized);
+                    (byte)FlipMode.Randomized);
 
             // Act
             FlipMode? result =
@@ -251,7 +251,7 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             Assert.IsTrue(result.HasValue);
 
             Assert.AreEqual(
-                FlipMode.EnabledRandomized,
+                FlipMode.Randomized,
                 result.Value);
         }
 
@@ -295,10 +295,10 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             serialDriver.Response = IperlResponseFactory.CreateOkResponse();
             head.ConfigStruct = new ConfigStruct();
 
-            bool result = service.SetFlipMode(head, FlipMode.DisabledConstant);
+            bool result = service.SetFlipMode(head, FlipMode.Constant);
 
             Assert.IsTrue(result);
-            Assert.AreEqual(FlipMode.DisabledConstant, head.ConfigStruct.FlipMode.Value);
+            Assert.AreEqual(FlipMode.Constant, head.ConfigStruct.FlipMode.Value);
             CollectionAssert.AreEqual(
                 new byte[] { 0x53, 0x57, 0x07, 0xFD, 0xBA, 0x00, 0x0D },
                 serialDriver.LastRequest);
@@ -311,10 +311,10 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             serialDriver.Response = IperlResponseFactory.CreateOkResponse();
             head.ConfigStruct = new ConfigStruct();
 
-            bool result = service.SetFlipMode(head, FlipMode.EnabledRandomized);
+            bool result = service.SetFlipMode(head, FlipMode.Randomized);
 
             Assert.IsTrue(result);
-            Assert.AreEqual(FlipMode.EnabledRandomized, head.ConfigStruct.FlipMode.Value);
+            Assert.AreEqual(FlipMode.Randomized, head.ConfigStruct.FlipMode.Value);
             CollectionAssert.AreEqual(
                 new byte[] { 0x53, 0x57, 0x07, 0xFD, 0xBA, 0x01, 0x0D },
                 serialDriver.LastRequest);
@@ -326,13 +326,13 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
             serialDriver.Response = IperlResponseFactory.CreateNokResponse();
             head.ConfigStruct = new ConfigStruct
             {
-                FlipMode = FlipMode.DisabledConstant
+                FlipMode = FlipMode.Constant
             };
 
-            bool result = service.SetFlipMode(head, FlipMode.EnabledRandomized);
+            bool result = service.SetFlipMode(head, FlipMode.Randomized);
 
             Assert.IsFalse(result);
-            Assert.AreEqual(FlipMode.DisabledConstant, head.ConfigStruct.FlipMode.Value);
+            Assert.AreEqual(FlipMode.Constant, head.ConfigStruct.FlipMode.Value);
         }
 
         [TestMethod]
@@ -340,7 +340,7 @@ namespace TBFTests.Rig.TestMethods.iPerlCommunication.communication
         {
             serialDriver.Response = null;
 
-            bool result = service.SetFlipMode(head, FlipMode.EnabledRandomized);
+            bool result = service.SetFlipMode(head, FlipMode.Randomized);
 
             Assert.IsFalse(result);
         }