diff --git a/user_channel/shadowlock.hpp b/user_channel/shadowlock.hpp
index 8b09f21..c869aca 100644
--- a/user_channel/shadowlock.hpp
+++ b/user_channel/shadowlock.hpp
@@ -12,7 +12,7 @@
 {
 
 using InternalFailure =
-    sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+    sdbusplus::error::xyz::openbmc_project::common::InternalFailure;
 using namespace phosphor::logging;
 
 /** @class Lock
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index 2e6e841..017b8f6 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -116,10 +116,10 @@
 using PrivAndGroupType = std::variant<std::string, std::vector<std::string>>;
 
 using NoResource =
-    sdbusplus::xyz::openbmc_project::User::Common::Error::NoResource;
+    sdbusplus::error::xyz::openbmc_project::user::common::NoResource;
 
 using InternalFailure =
-    sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+    sdbusplus::error::xyz::openbmc_project::common::InternalFailure;
 
 std::unique_ptr<sdbusplus::bus::match_t> userUpdatedSignal
     __attribute__((init_priority(101)));
@@ -175,7 +175,7 @@
     }
 }
 
-static std::string getUserServiceName()
+std::string getUserServiceName()
 {
     static sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
     static std::string userMgmtService;