diff --git a/objects/board_vpd_obj.c b/objects/board_vpd_obj.c
index f7a87d6..217148b 100644
--- a/objects/board_vpd_obj.c
+++ b/objects/board_vpd_obj.c
@@ -17,7 +17,7 @@
 	loop = g_main_loop_new (NULL, FALSE);
 
 	error = NULL;
-	c = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+	c = g_bus_get_sync (DBUS_TYPE, NULL, &error);
 
 	error = NULL;
 	p = g_dbus_proxy_new_sync (c,
diff --git a/objects/button_power_obj.c b/objects/button_power_obj.c
index b535d50..30078bb 100644
--- a/objects/button_power_obj.c
+++ b/objects/button_power_obj.c
@@ -126,7 +126,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/chassis_identify_obj.c b/objects/chassis_identify_obj.c
index 4a0ecb8..1206d17 100644
--- a/objects/chassis_identify_obj.c
+++ b/objects/chassis_identify_obj.c
@@ -133,7 +133,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/control_bmc_obj.c b/objects/control_bmc_obj.c
index 617e4a7..d6f3fbf 100644
--- a/objects/control_bmc_obj.c
+++ b/objects/control_bmc_obj.c
@@ -182,7 +182,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/control_host_obj.c b/objects/control_host_obj.c
index 857f300..ec62a37 100644
--- a/objects/control_host_obj.c
+++ b/objects/control_host_obj.c
@@ -170,7 +170,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/fan_generic_obj.c b/objects/fan_generic_obj.c
index 990a5e9..afe3318 100644
--- a/objects/fan_generic_obj.c
+++ b/objects/fan_generic_obj.c
@@ -114,7 +114,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/flash_bios_obj.c b/objects/flash_bios_obj.c
index cb3f70a..637f44a 100644
--- a/objects/flash_bios_obj.c
+++ b/objects/flash_bios_obj.c
@@ -178,7 +178,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/host_watchdog_obj.c b/objects/host_watchdog_obj.c
index d038e15..65c5fa4 100644
--- a/objects/host_watchdog_obj.c
+++ b/objects/host_watchdog_obj.c
@@ -131,7 +131,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/pcie_slot_present_obj.c b/objects/pcie_slot_present_obj.c
index 64b30f5..5b150b5 100644
--- a/objects/pcie_slot_present_obj.c
+++ b/objects/pcie_slot_present_obj.c
@@ -134,7 +134,7 @@
 	loop = g_main_loop_new (NULL, FALSE);
 
 	error = NULL;
-	c = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+	c = g_bus_get_sync (DBUS_TYPE, NULL, &error);
 
 	error = NULL;
 	sys_proxy = g_dbus_proxy_new_sync (c,
diff --git a/objects/power_control_obj.c b/objects/power_control_obj.c
index 6e54787..ec48d87 100644
--- a/objects/power_control_obj.c
+++ b/objects/power_control_obj.c
@@ -262,7 +262,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/sensor_host_status_obj.c b/objects/sensor_host_status_obj.c
index 825117a..d631200 100644
--- a/objects/sensor_host_status_obj.c
+++ b/objects/sensor_host_status_obj.c
@@ -163,7 +163,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/sensor_occ_obj.c b/objects/sensor_occ_obj.c
index 91935f2..669579f 100644
--- a/objects/sensor_occ_obj.c
+++ b/objects/sensor_occ_obj.c
@@ -165,7 +165,7 @@
   loop = g_main_loop_new (NULL, FALSE);
   cmd.loop = loop;
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,
diff --git a/objects/sensor_temperature_ambient_obj.c b/objects/sensor_temperature_ambient_obj.c
index a70fb62..eb8fe8c 100644
--- a/objects/sensor_temperature_ambient_obj.c
+++ b/objects/sensor_temperature_ambient_obj.c
@@ -169,7 +169,7 @@
   guint id;
   loop = g_main_loop_new (NULL, FALSE);
 
-  id = g_bus_own_name (G_BUS_TYPE_SESSION,
+  id = g_bus_own_name (DBUS_TYPE,
                        dbus_name,
                        G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
                        G_BUS_NAME_OWNER_FLAGS_REPLACE,