diff --git a/src/modules/illume/e_mod_gad_gsm.c b/src/modules/illume/e_mod_gad_gsm.c
index 588539d1d..8151eea84 100644
--- a/src/modules/illume/e_mod_gad_gsm.c
+++ b/src/modules/illume/e_mod_gad_gsm.c
@@ -140,9 +140,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    if (conn)
      {
 	namech_h = e_dbus_signal_handler_add(conn,
-					     "org.freedesktop.DBus",
-					     "/org/freedesktop/DBus",
-					     "org.freedesktop.DBus",
+					     E_DBUS_FDO_BUS,
+					     E_DBUS_FDO_PATH,
+					     E_DBUS_FDO_INTERFACE,
 					     "NameOwnerChanged",
 					     name_changed, inst);
 	changed_h = e_dbus_signal_handler_add(conn,
@@ -161,9 +161,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    if (conn_system)
      {
 	namech_system_h = e_dbus_signal_handler_add(conn_system,
-						    "org.freedesktop.DBus",
-						    "/org/freedesktop/DBus",
-						    "org.freedesktop.DBus",
+						    E_DBUS_FDO_BUS,
+						    E_DBUS_FDO_PATH,
+						    E_DBUS_FDO_INTERFACE,
 						    "NameOwnerChanged",
 						    name_changed, inst);
 	changed_fso_h = e_dbus_signal_handler_add(conn_system,
diff --git a/src/modules/illume2/e_mod_kbd_device.c b/src/modules/illume2/e_mod_kbd_device.c
index e089b746a..920af740e 100644
--- a/src/modules/illume2/e_mod_kbd_device.c
+++ b/src/modules/illume2/e_mod_kbd_device.c
@@ -50,19 +50,19 @@ e_mod_kbd_device_init(void)
 
    /* setup dbus signal handlers for when a device gets added/removed/changed */
    _dev_add = 
-     e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal", 
-                               "/org/freedesktop/Hal/Manager", 
-                               "org.freedesktop.Hal.Manager", 
+     e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER, 
+                               E_HAL_MANAGER_PATH, 
+                               E_HAL_MANAGER_INTERFACE, 
                                "DeviceAdded", _e_mod_kbd_device_dbus_add, NULL);
    _dev_del = 
-     e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal", 
-                               "/org/freedesktop/Hal/Manager", 
-                               "org.freedesktop.Hal.Manager", 
+     e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER, 
+                               E_HAL_MANAGER_PATH, 
+                               E_HAL_MANAGER_INTERFACE, 
                                "DeviceRemoved", _e_mod_kbd_device_dbus_del, NULL);
    _dev_chg = 
-     e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal", 
-                               "/org/freedesktop/Hal/Manager", 
-                               "org.freedesktop.Hal.Manager", 
+     e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER, 
+                               E_HAL_MANAGER_PATH, 
+                               E_HAL_MANAGER_INTERFACE, 
                                "NewCapability", _e_mod_kbd_device_dbus_chg, NULL);
 #endif
 }