diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs
index 9640e76..ef15c19 100644
--- a/EduNetworkBuilder/NB.cs
+++ b/EduNetworkBuilder/NB.cs
@@ -48,7 +48,7 @@ namespace EduNetworkBuilder
         DHCPServerEnabled, SuccessfullyTraceroutes,
         LockAll, LockIP, LockRoute, LockNic, LockDHCP, LockGateway,
         LockVLANsOnHost, LockNicVLAN, LockInterfaceVLAN, LockVLANNames,
-        DeviceIsBad,
+        DeviceIsFrozen,
     }
     public enum ContextTest {  ping, arp, traceroute }
     public enum NetTestVerbosity { none, basic, hints, full }
diff --git a/EduNetworkBuilder/NetTest.cs b/EduNetworkBuilder/NetTest.cs
index f5c8aa2..9e9b231 100644
--- a/EduNetworkBuilder/NetTest.cs
+++ b/EduNetworkBuilder/NetTest.cs
@@ -133,7 +133,7 @@ namespace EduNetworkBuilder
                 case NetTestVerbosity.hints:
                     switch (TheTest)
                     {
-                        case NetTestType.DeviceIsBad:
+                        case NetTestType.DeviceIsFrozen:
                             toreturn = NB.Translate("NT_TstDscriptBadDevice");
                             break;
                         case NetTestType.NeedsDefaultGW:
@@ -220,7 +220,7 @@ namespace EduNetworkBuilder
                 case NetTestVerbosity.full:
                     switch (TheTest)
                     {
-                        case NetTestType.DeviceIsBad:
+                        case NetTestType.DeviceIsFrozen:
                             toreturn = NB.Translate("NT_TstDscriptBadDevice2");
                             break;
                         case NetTestType.NeedsDefaultGW:
@@ -513,7 +513,7 @@ namespace EduNetworkBuilder
                 case NetTestType.HelpRequest:
                 case NetTestType.ReadContextHelp:
                 case NetTestType.FailedPing:
-                case NetTestType.DeviceIsBad:
+                case NetTestType.DeviceIsFrozen:
                     return TaskWasDone; //This variable will tell us if these tests have been done.
                 case NetTestType.DHCPServerEnabled:
                     if (Source == null) return false; //Unable to do it.  Do not count it against them.
diff --git a/EduNetworkBuilder/NetTestEditor.cs b/EduNetworkBuilder/NetTestEditor.cs
index 470eac1..ad2ffc3 100644
--- a/EduNetworkBuilder/NetTestEditor.cs
+++ b/EduNetworkBuilder/NetTestEditor.cs
@@ -226,7 +226,7 @@ namespace EduNetworkBuilder
                 {
                     cbDest.Items.Add(NB.Translate("_All"));
                 }
-                else if (ToEdit.TheTest == NetTestType.DeviceIsBad)
+                else if (ToEdit.TheTest == NetTestType.DeviceIsFrozen)
                 {
                     cbDest.Items.Add(ToEdit.sHost);
                 }
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 1ce0682..786911b 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -1693,7 +1693,7 @@ namespace EduNetworkBuilder
         {
             foreach(NetTest one in NetTests)
             {
-                if(one.sHost == source && one.TheTest == NetTestType.DeviceIsBad)
+                if(one.sHost == source && one.TheTest == NetTestType.DeviceIsFrozen)
                 {
                     one.SetDone();
                 }
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index faa6761..743cb71 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -878,15 +878,16 @@ namespace EduNetworkBuilder
                         pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_PowerOff"));
                         pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_PowerOff_Click;
                     }
-                    if(myNetwork.ItemHasTest(ReleasedOn.hostname,NetTestType.DeviceIsBad))
-                    {
-                        if(!myNetwork.ItemTestIsComplete(ReleasedOn.hostname, NetTestType.DeviceIsBad))
-                        {
-                            //If the item is bad and has not been replaced, then add a context menu to replace it
-                            pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_Replace"));
-                            pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Replace_Click;
-                        }
-                    }
+                    //We power off to fix this.
+                    //if(myNetwork.ItemHasTest(ReleasedOn.hostname,NetTestType.DeviceIsBad))
+                    //{
+                    //    if(!myNetwork.ItemTestIsComplete(ReleasedOn.hostname, NetTestType.DeviceIsBad))
+                    //    {
+                    //        //If the item is bad and has not been replaced, then add a context menu to replace it
+                    //        pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_Replace"));
+                    //        pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Replace_Click;
+                    //    }
+                    //}
                 }
             }
             else //we are locked out.
@@ -947,11 +948,14 @@ namespace EduNetworkBuilder
             if (ItemClickedOn != null)
             {
                 ItemClickedOn.PowerOff = true;
+                //Mark the replace test as "done"
+                myNetwork.RegisterDeviceReset(ItemClickedOn.hostname);
                 UpdateLinks();
                 UpdateVisuals();
             }
         }
 
+        //We will still do this for devices that are spraying the network
         private void pbNetworkView_Replace_Click(object sender, EventArgs e)
         {
             if (ItemClickedOn != null)
@@ -959,7 +963,7 @@ namespace EduNetworkBuilder
                 if (ItemClickedOn == null) return;
                 ItemClickedOn.ClearIPs(); //reset the device
                 //Mark the replace test as "done"
-                myNetwork.RegisterDeviceReset(ItemClickedOn.hostname);
+                //myNetwork.RegisterDeviceReplaced(ItemClickedOn.hostname);
                 UpdateVisuals();
             }
         }
diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs
index 70e5c7e..e8072e8 100644
--- a/EduNetworkBuilder/NetworkCard.cs
+++ b/EduNetworkBuilder/NetworkCard.cs
@@ -730,9 +730,9 @@ namespace EduNetworkBuilder
             mynet = NB.GetNetwork();
             nd = mynet.GetDeviceFromID(myID);
             
-            if(mynet.ItemHasTest(nd.hostname,NetTestType.DeviceIsBad))
+            if(mynet.ItemHasTest(nd.hostname,NetTestType.DeviceIsFrozen))
             {
-                if(!mynet.ItemTestIsComplete(nd.hostname, NetTestType.DeviceIsBad))
+                if(!mynet.ItemTestIsComplete(nd.hostname, NetTestType.DeviceIsFrozen))
                 {
                     //the device is busted and nonfunctional.  No response.
                     tPacket.AddMessage(DebugLevel.info, "");