diff --git a/tools/sdbusplus/templates/interface.mako.server.cpp b/tools/sdbusplus/templates/interface.mako.server.cpp
index 93e66d1..50a6cad 100644
--- a/tools/sdbusplus/templates/interface.mako.server.cpp
+++ b/tools/sdbusplus/templates/interface.mako.server.cpp
@@ -5,13 +5,13 @@
 % for m in interface.methods:
 ${ m.cpp_prototype(loader, interface=interface, ptype='callback-cpp-includes') }
 % endfor
-    <%
-        namespaces = interface.name.split('.')
-        classname = namespaces.pop()
+<%
+    namespaces = interface.name.split('.')
+    classname = namespaces.pop()
 
-        def interface_instance():
-            return "_".join(interface.name.split('.') + ['interface'])
-    %>
+    def interface_instance():
+        return "_".join(interface.name.split('.') + ['interface'])
+%>
 namespace sdbusplus
 {
     % for s in namespaces:
diff --git a/tools/sdbusplus/templates/interface.mako.server.hpp b/tools/sdbusplus/templates/interface.mako.server.hpp
index b7f8c71..77b9ab9 100644
--- a/tools/sdbusplus/templates/interface.mako.server.hpp
+++ b/tools/sdbusplus/templates/interface.mako.server.hpp
@@ -2,10 +2,10 @@
 #include <tuple>
 #include <systemd/sd-bus.h>
 #include <sdbusplus/server.hpp>
-    <%
-        namespaces = interface.name.split('.')
-        classname = namespaces.pop()
-    %>
+<%
+    namespaces = interface.name.split('.')
+    classname = namespaces.pop()
+%>
 namespace sdbusplus
 {
     % for s in namespaces: