diff --git a/src/entity_manager/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
index f9560f3..796f6e7 100644
--- a/src/entity_manager/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -23,6 +23,10 @@
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <xyz/openbmc_project/Association/Definitions/common.hpp>
+#include <xyz/openbmc_project/Inventory/Item/Bmc/common.hpp>
+#include <xyz/openbmc_project/Inventory/Item/System/common.hpp>
+#include <xyz/openbmc_project/Inventory/Item/common.hpp>
 
 #include <filesystem>
 #include <fstream>
@@ -92,7 +96,9 @@
         }
 
         auto ifacePtr = dbus_interface.createInterface(
-            assocPath, "xyz.openbmc_project.Association.Definitions",
+            assocPath,
+            sdbusplus::common::xyz::openbmc_project::association::Definitions::
+                interface,
             findBoard->second);
 
         ifacePtr->register_property("Associations", assocPropValue);
@@ -131,12 +137,17 @@
 
     std::shared_ptr<sdbusplus::asio::dbus_interface> inventoryIface =
         dbus_interface.createInterface(
-            boardPath, "xyz.openbmc_project.Inventory.Item", boardName);
+            boardPath,
+            sdbusplus::common::xyz::openbmc_project::inventory::Item::interface,
+            boardName);
+
+    const std::string invItemIntf = std::format(
+        "{}.{}",
+        sdbusplus::common::xyz::openbmc_project::inventory::Item::interface,
+        boardType);
 
     std::shared_ptr<sdbusplus::asio::dbus_interface> boardIface =
-        dbus_interface.createInterface(
-            boardPath, "xyz.openbmc_project.Inventory.Item." + boardType,
-            boardNameOrig);
+        dbus_interface.createInterface(boardPath, invItemIntf, boardNameOrig);
 
     dbus_interface.createAddObjectMethod(jsonPointerPath, boardPath,
                                          systemConfiguration, boardNameOrig);
@@ -228,7 +239,9 @@
     {
         std::shared_ptr<sdbusplus::asio::dbus_interface> bmcIface =
             dbus_interface.createInterface(
-                ifacePath, "xyz.openbmc_project.Inventory.Item.Bmc",
+                ifacePath,
+                sdbusplus::common::xyz::openbmc_project::inventory::item::Bmc::
+                    interface,
                 boardNameOrig);
         dbus_interface.populateInterfaceFromJson(
             systemConfiguration, jsonPointerPath, bmcIface, item,
@@ -238,7 +251,9 @@
     {
         std::shared_ptr<sdbusplus::asio::dbus_interface> systemIface =
             dbus_interface.createInterface(
-                ifacePath, "xyz.openbmc_project.Inventory.Item.System",
+                ifacePath,
+                sdbusplus::common::xyz::openbmc_project::inventory::item::
+                    System::interface,
                 boardNameOrig);
         dbus_interface.populateInterfaceFromJson(
             systemConfiguration, jsonPointerPath, systemIface, item,