diff --git a/src/main.cpp b/src/main.cpp
index 356095f..36f8cbb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -230,7 +230,7 @@
     unitsToMonitor.emplace(
         "phosphor_2dusb_2dcode_2dupdate",
         std::make_tuple(
-            "phosphor_usb_code_update", "",
+            phosphor::service::usbCodeUpdateUnitName, "",
             "/org/freedesktop/systemd1/unit/usb_2dcode_2dupdate_2eservice",
             ""));
 #endif
diff --git a/src/srvcfg_manager.cpp b/src/srvcfg_manager.cpp
index dab6316..cbe1afc 100644
--- a/src/srvcfg_manager.cpp
+++ b/src/srvcfg_manager.cpp
@@ -53,8 +53,6 @@
     "/var/lib/srvcfg_manager/usb-code-update-state";
 static constexpr const char* emptyUsbCodeUpdateRulesFile =
     "/etc/udev/rules.d/70-bmc-usb.rules";
-static constexpr const char* usbCodeUpdateObjectPath =
-    "/xyz/openbmc_project/control/service/phosphor_2dusb_2dcode_2dupdate";
 
 using UsbCodeUpdateStateMap = std::unordered_map<std::string, bool>;
 
@@ -217,7 +215,7 @@
     }
 
 #ifdef USB_CODE_UPDATE
-    if (objPath == usbCodeUpdateObjectPath)
+    if (baseUnitName == usbCodeUpdateUnitName)
     {
         getUSBCodeUpdateStateFromFile();
     }
@@ -566,7 +564,7 @@
             if (!internalSet)
             {
 #ifdef USB_CODE_UPDATE
-                if (objPath == usbCodeUpdateObjectPath)
+                if (baseUnitName == usbCodeUpdateUnitName)
                 {
                     unitMaskedState = req;
                     unitEnabledState = !unitMaskedState;
@@ -616,7 +614,7 @@
             if (!internalSet)
             {
 #ifdef USB_CODE_UPDATE
-                if (objPath == usbCodeUpdateObjectPath)
+                if (baseUnitName == usbCodeUpdateUnitName)
                 {
                     if (unitMaskedState)
                     { // block updating if masked
@@ -666,7 +664,7 @@
             if (!internalSet)
             {
 #ifdef USB_CODE_UPDATE
-                if (objPath == usbCodeUpdateObjectPath)
+                if (baseUnitName == usbCodeUpdateUnitName)
                 {
                     if (unitMaskedState)
                     { // block updating if masked