diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
index ea582c5..0e869e4 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Button/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Button__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Button.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
index 7f6ba72..62175c5 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/HostSelector/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/HostSelector__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/HostSelector.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
index 8bf93e6..0239954 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/ID__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/ID.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
index 465d9d3..ace0c8e 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/NMI__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/NMI.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
index aeacd96..f15ac93 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Power__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Power.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
index f937a09..0c0e511 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Reset__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Reset.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
index 5d6e824..c9431b4 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/NMISource__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/NMISource.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
index d3b6190..99160c0 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/Power__cpp'.underscorify(),
     input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/Power.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
diff --git a/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
index 92deb78..e0230e7 100644
--- a/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
@@ -2,7 +2,7 @@
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Intrusion__cpp'.underscorify(),
     input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Intrusion.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
+    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',