diff --git a/tools/sdbusplus/templates/property.aserver.get.hpp.mako b/tools/sdbusplus/templates/property.aserver.get.hpp.mako
index 00bb69f..6d2c246 100644
--- a/tools/sdbusplus/templates/property.aserver.get.hpp.mako
+++ b/tools/sdbusplus/templates/property.aserver.get.hpp.mako
@@ -19,5 +19,5 @@
             !server_details::has_get_property_missing_const<${p_tag},
                                                             Instance>,
             "Missing const on get_property(${p_tag})?");
-        return _${p_name};
+        return ${p_name}_;
     }
diff --git a/tools/sdbusplus/templates/property.aserver.set.hpp.mako b/tools/sdbusplus/templates/property.aserver.set.hpp.mako
index e6dfc49..139a153 100644
--- a/tools/sdbusplus/templates/property.aserver.set.hpp.mako
+++ b/tools/sdbusplus/templates/property.aserver.set.hpp.mako
@@ -41,8 +41,8 @@
             !server_details::has_get_property<${p_tag}, Instance>,
             "Cannot create default set-property for '${p_tag}' with get-property overload.");
 
-        bool changed = (new_value != _${p_name});
-        _${p_name} = std::forward<Arg>(new_value);
+        bool changed = (new_value != ${p_name}_);
+        ${p_name}_ = std::forward<Arg>(new_value);
 
         if (changed && EmitSignal)
         {
diff --git a/tools/sdbusplus/templates/property.aserver.value.hpp.mako b/tools/sdbusplus/templates/property.aserver.value.hpp.mako
index 452bab3..c7794e8 100644
--- a/tools/sdbusplus/templates/property.aserver.value.hpp.mako
+++ b/tools/sdbusplus/templates/property.aserver.value.hpp.mako
@@ -14,4 +14,4 @@
     return f" = {enum_prefix}{value}"
 
 %>\
-    ${p_type} _${p_name}${p_value()};
+    ${p_type} ${p_name}_${p_value()};