diff --git a/chassishandler.C b/chassishandler.C
index d5b3404..6a9a28f 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -27,9 +27,9 @@
 const char *settings_intf_name    =  "org.freedesktop.DBus.Properties";
 const char *host_intf_name        =  "org.openbmc.settings.Host";
 
-const char *objmapper_service_name =  "org.openbmc.objectmapper";
-const char *objmapper_object_name  =  "/org/openbmc/objectmapper/objectmapper";
-const char *objmapper_intf_name    =  "org.openbmc.objectmapper.ObjectMapper";
+const char *objmapper_service_name =  "org.openbmc.ObjectMapper";
+const char *objmapper_object_name  =  "/org/openbmc/ObjectMapper";
+const char *objmapper_intf_name    =  "org.openbmc.ObjectMapper";
 
 int object_mapper_get_connection(char **buf, const char *obj_path)
 {
diff --git a/globalhandler.C b/globalhandler.C
index 2d3af92..889d127 100644
--- a/globalhandler.C
+++ b/globalhandler.C
@@ -7,9 +7,9 @@
 const char  *control_object_name  =  "/org/openbmc/control/bmc0";
 const char  *control_intf_name    =  "org.openbmc.control.Bmc";
 
-const char  *objectmapper_service_name =  "org.openbmc.objectmapper";
-const char  *objectmapper_object_name  =  "/org/openbmc/objectmapper/objectmapper";
-const char  *objectmapper_intf_name    =  "org.openbmc.objectmapper.ObjectMapper";
+const char  *objectmapper_service_name =  "org.openbmc.ObjectMapper";
+const char  *objectmapper_object_name  =  "/org/openbmc/ObjectMapper";
+const char  *objectmapper_intf_name    =  "org.openbmc.ObjectMapper";
 
 void register_netfn_global_functions() __attribute__((constructor));