diff --git a/drivers/agent/agent_imager.cpp b/drivers/agent/agent_imager.cpp
index 7e869c80b1..c3fc5866d9 100644
--- a/drivers/agent/agent_imager.cpp
+++ b/drivers/agent/agent_imager.cpp
@@ -327,11 +327,11 @@ bool Imager::updateProperties()
     }
     else
     {
-        deleteProperty(StatusLP.getName());
-        deleteProperty(ProgressNP.getName());
-        deleteProperty(BatchSP.getName());
-        deleteProperty(DownloadNP.getName());
-        deleteProperty(FitsBP.getName());
+        deleteProperty(StatusLP);
+        deleteProperty(ProgressNP);
+        deleteProperty(BatchSP);
+        deleteProperty(DownloadNP);
+        deleteProperty(FitsBP);
     }
     return true;
 }
diff --git a/drivers/agent/group.cpp b/drivers/agent/group.cpp
index 5ab44501f8..57dfb51f3e 100644
--- a/drivers/agent/group.cpp
+++ b/drivers/agent/group.cpp
@@ -93,5 +93,5 @@ void Group::defineProperties()
 
 void Group::deleteProperties()
 {
-    imager->deleteProperty(GroupSettingsNP.getName());
+    imager->deleteProperty(GroupSettingsNP);
 }
diff --git a/drivers/ccd/ccd_simulator.cpp b/drivers/ccd/ccd_simulator.cpp
index f09ad4bc22..b61a5f738e 100644
--- a/drivers/ccd/ccd_simulator.cpp
+++ b/drivers/ccd/ccd_simulator.cpp
@@ -298,10 +298,10 @@ bool CCDSim::updateProperties()
     else
     {
         if (HasCooler())
-            deleteProperty(CoolerSP.getName());
+            deleteProperty(CoolerSP);
 
-        deleteProperty(GainNP.getName());
-        deleteProperty(OffsetNP.getName());
+        deleteProperty(GainNP);
+        deleteProperty(OffsetNP);
         deleteProperty(DirectoryTP);
         deleteProperty(DirectorySP);
         deleteProperty(ResolutionSP);
diff --git a/drivers/ccd/guide_simulator.cpp b/drivers/ccd/guide_simulator.cpp
index eec3e556b8..c140143f65 100644
--- a/drivers/ccd/guide_simulator.cpp
+++ b/drivers/ccd/guide_simulator.cpp
@@ -245,9 +245,9 @@ bool GuideSim::updateProperties()
     else
     {
         if (HasCooler())
-            deleteProperty(CoolerSP.getName());
+            deleteProperty(CoolerSP);
 
-        deleteProperty(GainNP.getName());
+        deleteProperty(GainNP);
     }
 
     return true;
diff --git a/drivers/focuser/focus_simulator.cpp b/drivers/focuser/focus_simulator.cpp
index 2f0ee73d1e..610ad29c2f 100644
--- a/drivers/focuser/focus_simulator.cpp
+++ b/drivers/focuser/focus_simulator.cpp
@@ -131,9 +131,9 @@ bool FocusSim::updateProperties()
     }
     else
     {
-        deleteProperty(SeeingNP.getName());
-        deleteProperty(FWHMNP.getName());
-        deleteProperty(TemperatureNP.getName());
+        deleteProperty(SeeingNP);
+        deleteProperty(FWHMNP);
+        deleteProperty(TemperatureNP);
         deleteProperty(DelayNP);
     }
 
diff --git a/drivers/rotator/integra.cpp b/drivers/rotator/integra.cpp
index 68f62667ee..85af16976f 100644
--- a/drivers/rotator/integra.cpp
+++ b/drivers/rotator/integra.cpp
@@ -161,15 +161,15 @@ bool Integra::updateProperties()
     }
     else
     {
-        deleteProperty(MaxPositionNP.getName());
+        deleteProperty(MaxPositionNP);
 
         // Focus
-        deleteProperty(SensorNP.getName());
-        deleteProperty(FindHomeSP.getName());
+        deleteProperty(SensorNP);
+        deleteProperty(FindHomeSP);
 
         // Rotator
         RI::updateProperties();
-        deleteProperty(RotatorAbsPosNP.getName());
+        deleteProperty(RotatorAbsPosNP);
     }
 
     return true;
diff --git a/drivers/rotator/pyxis.cpp b/drivers/rotator/pyxis.cpp
index d1ca84bdbe..0794834b5d 100644
--- a/drivers/rotator/pyxis.cpp
+++ b/drivers/rotator/pyxis.cpp
@@ -119,11 +119,11 @@ bool Pyxis::updateProperties()
     }
     else
     {
-        deleteProperty(RotationRateNP.getName());
-        deleteProperty(SteppingSP.getName());
-        deleteProperty(PowerSP.getName());
-        deleteProperty(FirmwareTP.getName()) ;
-        deleteProperty(ModelTP.getName()) ;
+        deleteProperty(RotationRateNP);
+        deleteProperty(SteppingSP);
+        deleteProperty(PowerSP);
+        deleteProperty(FirmwareTP) ;
+        deleteProperty(ModelTP) ;
     }
 
     return true;
diff --git a/drivers/telescope/telescope_simulator.cpp b/drivers/telescope/telescope_simulator.cpp
index 6fe3e26e4c..d7aca85eab 100644
--- a/drivers/telescope/telescope_simulator.cpp
+++ b/drivers/telescope/telescope_simulator.cpp
@@ -198,7 +198,7 @@ bool ScopeSim::updateProperties()
     {
         deleteProperty(GuideNSNP.name);
         deleteProperty(GuideWENP.name);
-        deleteProperty(GuideRateNP.getName());
+        deleteProperty(GuideRateNP);
         deleteProperty(HomeSP);
     }
 
diff --git a/drivers/weather/mbox.cpp b/drivers/weather/mbox.cpp
index fa762ac0d8..57f80fef1f 100644
--- a/drivers/weather/mbox.cpp
+++ b/drivers/weather/mbox.cpp
@@ -96,9 +96,9 @@ bool MBox::updateProperties()
     }
     else
     {
-        deleteProperty(CalibrationNP.getName());
-        deleteProperty(ResetSP.getName());
-        deleteProperty(FirmwareTP.getName());
+        deleteProperty(CalibrationNP);
+        deleteProperty(ResetSP);
+        deleteProperty(FirmwareTP);
     }
 
     return true;
diff --git a/drivers/weather/weather_safety_proxy.cpp b/drivers/weather/weather_safety_proxy.cpp
index 6827c1b453..f99cbd6ecc 100644
--- a/drivers/weather/weather_safety_proxy.cpp
+++ b/drivers/weather/weather_safety_proxy.cpp
@@ -119,7 +119,7 @@ bool WeatherSafetyProxy::updateProperties()
     }
     else
     {
-        deleteProperty(reasonsTP.getName());
+        deleteProperty(reasonsTP);
     }
 
     return true;
diff --git a/drivers/weather/weathermeta.cpp b/drivers/weather/weathermeta.cpp
index 6db93b6436..df16a7db67 100644
--- a/drivers/weather/weathermeta.cpp
+++ b/drivers/weather/weathermeta.cpp
@@ -110,8 +110,8 @@ bool WeatherMeta::updateProperties()
     }
     else
     {
-        deleteProperty(StationLP.getName());
-        deleteProperty(UpdatePeriodNP.getName());
+        deleteProperty(StationLP);
+        deleteProperty(UpdatePeriodNP);
     }
     return true;
 }
diff --git a/drivers/weather/weathersimulator.cpp b/drivers/weather/weathersimulator.cpp
index e22fb3c50f..adaa4fef1a 100644
--- a/drivers/weather/weathersimulator.cpp
+++ b/drivers/weather/weathersimulator.cpp
@@ -87,7 +87,7 @@ bool WeatherSimulator::updateProperties()
     if (isConnected())
         defineProperty(ControlWeatherNP);
     else
-        deleteProperty(ControlWeatherNP.getName());
+        deleteProperty(ControlWeatherNP);
 
     return true;
 }