diff --git a/gen/xyz/openbmc_project/Common/Callout/meson.build b/gen/xyz/openbmc_project/Common/Callout/meson.build
index f3d63c7..23a7e25 100644
--- a/gen/xyz/openbmc_project/Common/Callout/meson.build
+++ b/gen/xyz/openbmc_project/Common/Callout/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Callout__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Callout.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Callout.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Callout',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/Device/meson.build b/gen/xyz/openbmc_project/Common/Device/meson.build
index 60f7acf..b734362 100644
--- a/gen/xyz/openbmc_project/Common/Device/meson.build
+++ b/gen/xyz/openbmc_project/Common/Device/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Device__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Device.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Device.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Device',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/FactoryReset/meson.build b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
index 9bfd3cb..2d06e07 100644
--- a/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
+++ b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FactoryReset__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/FactoryReset',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/File/meson.build b/gen/xyz/openbmc_project/Common/File/meson.build
index d0ab261..405f245 100644
--- a/gen/xyz/openbmc_project/Common/File/meson.build
+++ b/gen/xyz/openbmc_project/Common/File/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/File__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/File.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/File.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/File',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/FilePath/meson.build b/gen/xyz/openbmc_project/Common/FilePath/meson.build
index adde85c..382fd79 100644
--- a/gen/xyz/openbmc_project/Common/FilePath/meson.build
+++ b/gen/xyz/openbmc_project/Common/FilePath/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FilePath__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/FilePath',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/ObjectPath/meson.build b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
index 284248f..2c23557 100644
--- a/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
+++ b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/ObjectPath__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/ObjectPath',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/Progress/meson.build b/gen/xyz/openbmc_project/Common/Progress/meson.build
index 97e7a77..15b3fee 100644
--- a/gen/xyz/openbmc_project/Common/Progress/meson.build
+++ b/gen/xyz/openbmc_project/Common/Progress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Progress__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Progress.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Progress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Progress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/TFTP/meson.build b/gen/xyz/openbmc_project/Common/TFTP/meson.build
index ceeadf2..3ed7f9a 100644
--- a/gen/xyz/openbmc_project/Common/TFTP/meson.build
+++ b/gen/xyz/openbmc_project/Common/TFTP/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/TFTP__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/TFTP',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/UUID/meson.build b/gen/xyz/openbmc_project/Common/UUID/meson.build
index 7ef4c39..5071434 100644
--- a/gen/xyz/openbmc_project/Common/UUID/meson.build
+++ b/gen/xyz/openbmc_project/Common/UUID/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/UUID__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/UUID.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/UUID.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/UUID',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/meson.build b/gen/xyz/openbmc_project/Common/meson.build
index f35e3ad..d1a806c 100644
--- a/gen/xyz/openbmc_project/Common/meson.build
+++ b/gen/xyz/openbmc_project/Common/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common__cpp'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Callout')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Callout__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Callout.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Callout.errors.yaml',  ],
     output: [ 'Callout.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Callout',
     ],
     build_by_default: true,
@@ -30,13 +30,13 @@
 subdir('Device')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Device__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Device.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Device',
     ],
     build_by_default: true,
@@ -45,13 +45,13 @@
 subdir('FactoryReset')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/FactoryReset__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
     output: [ 'FactoryReset.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/FactoryReset',
     ],
     build_by_default: true,
@@ -60,13 +60,13 @@
 subdir('File')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/File__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/File.errors.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/File.errors.yaml',  ],
     output: [ 'File.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/File',
     ],
     build_by_default: true,
@@ -75,13 +75,13 @@
 subdir('FilePath')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/FilePath__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
     output: [ 'FilePath.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/FilePath',
     ],
     build_by_default: true,
@@ -90,13 +90,13 @@
 subdir('ObjectPath')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/ObjectPath__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
     output: [ 'ObjectPath.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/ObjectPath',
     ],
     build_by_default: true,
@@ -105,13 +105,13 @@
 subdir('Progress')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Progress__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/Progress.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/Progress.interface.yaml',  ],
     output: [ 'Progress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/Progress',
     ],
     build_by_default: true,
@@ -120,13 +120,13 @@
 subdir('TFTP')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/TFTP__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
     output: [ 'TFTP.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/TFTP',
     ],
     build_by_default: true,
@@ -135,13 +135,13 @@
 subdir('UUID')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/UUID__markdown'.underscorify(),
-    input: [ meson.source_root() / 'xyz/openbmc_project/Common/UUID.interface.yaml',  ],
+    input: [ meson.project_source_root() / 'xyz/openbmc_project/Common/UUID.interface.yaml',  ],
     output: [ 'UUID.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.source_root(),
+        '--directory', meson.project_source_root(),
         'xyz/openbmc_project/Common/UUID',
     ],
     build_by_default: true,