diff --git a/control/zone.hpp b/control/zone.hpp
index 8415def..71fba32 100644
--- a/control/zone.hpp
+++ b/control/zone.hpp
@@ -202,7 +202,7 @@
                                      const std::string& interface,
                                      const std::string& property)
         {
-            return sdbusplus::message::variant_ns::get<T>(
+            return std::get<T>(
                     _properties.at(object).at(interface).at(property));
         };
 
diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
index 411bd16..e366872 100644
--- a/monitor/tach_sensor.cpp
+++ b/monitor/tach_sensor.cpp
@@ -189,8 +189,7 @@
         auto propertyMap = data.find(propertyName);
         if (propertyMap != data.end())
         {
-            value = sdbusplus::message::variant_ns::get<T>(
-                        propertyMap->second);
+            value = std::get<T>(propertyMap->second);
         }
     }
 }
diff --git a/presence/tach.cpp b/presence/tach.cpp
index a784f94..d8b6395 100644
--- a/presence/tach.cpp
+++ b/presence/tach.cpp
@@ -139,8 +139,7 @@
     auto it = props.find(tachProperty);
     if (it != props.end())
     {
-        std::get<int64_t>(s) =
-            sdbusplus::message::variant_ns::get<int64_t>(it->second);
+        std::get<int64_t>(s) = std::get<int64_t>(it->second);
 
         auto newState = std::any_of(
                 state.begin(),
diff --git a/sdbusplus.hpp b/sdbusplus.hpp
index b441d80..4064f5c 100644
--- a/sdbusplus.hpp
+++ b/sdbusplus.hpp
@@ -348,7 +348,7 @@
             }
             sdbusplus::message::variant<Property> value;
             msg.read(value);
-            return sdbusplus::message::variant_ns::get<Property>(value);
+            return std::get<Property>(value);
         }
 
         /** @brief Get a property with mapper lookup. */
@@ -442,7 +442,7 @@
             }
             sdbusplus::message::variant<Property> value;
             msg.read(value);
-            return sdbusplus::message::variant_ns::get<Property>(value);
+            return std::get<Property>(value);
         }
 
         /** @brief Get a property without mapper lookup. */
