diff --git a/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface1.interface.yaml b/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface1.interface.yaml
index 5d11fd1..1333fa9 100644
--- a/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface1.interface.yaml
+++ b/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface1.interface.yaml
@@ -2,7 +2,7 @@
     Example interface for PIM.
 properties:
     - name: ExampleProperty1
-      type: std::string
+      type: string
       description: >
           An example property.
 
diff --git a/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface2.interface.yaml b/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface2.interface.yaml
index 09047a8..c4bcce0 100644
--- a/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface2.interface.yaml
+++ b/example/extra_interfaces.d/xyz/openbmc_project/Example/Iface2.interface.yaml
@@ -2,7 +2,7 @@
     Example interface for PIM.
 properties:
     - name: ExampleProperty2
-      type: std::string
+      type: string
       description: >
           An example property.
 
diff --git a/generated.mako.cpp b/generated.mako.cpp
index 44528cf..b772bb7 100644
--- a/generated.mako.cpp
+++ b/generated.mako.cpp
@@ -1,7 +1,12 @@
 ## This file is a template.  The comment below is emitted
 ## into the rendered file; feel free to edit this file.
 // This file was auto generated.  Do not edit.
-
+<%
+    def interface_type(interface):
+        lst = interface.split('.')
+        lst.insert(-1, 'server')
+        return '::'.join(lst)
+%>
 #include "manager.hpp"
 % for i in interfaces:
 #include <${'/'.join(i.split('.') + ['server.hpp'])}>
@@ -19,7 +24,7 @@
     {
         "${i}",
         details::interface::holder::Holder<
-            sdbusplus::server::${'::'.join(i.split('.'))}>::make,
+            sdbusplus::${interface_type(i)}>::make,
     },
 % endfor
 };