diff --git a/dbus.c b/dbus.c
index 0cd8fd70d..e5b5820e8 100644
--- a/dbus.c
+++ b/dbus.c
@@ -541,8 +541,7 @@ a_dbus_bus_getbyname(const char *name, size_t len)
  * \return The number of elements pushed on stack.
  * \luastack
  * \lparam A string indicating if we are using system or session bus.
- * \lparam A string with the name of the D-Bus name to register. Note that
- * org.awesome is registered by default.
+ * \lparam A string with the name of the D-Bus name to register.
  * \lreturn True if everything worked fine, false otherwise.
  */
 static int
diff --git a/lib/awful/remote.lua.in b/lib/awful/remote.lua.in
index b604f0767..86e32f810 100644
--- a/lib/awful/remote.lua.in
+++ b/lib/awful/remote.lua.in
@@ -18,8 +18,8 @@ local type = type
 module("awful.remote")
 
 if hooks.dbus then
-    dbus.request_name("session", "org.awesome")
-    hooks.dbus.register("org.awesome.Remote", function(data, code)
+    dbus.request_name("session", "org.naquadah.awesome")
+    hooks.dbus.register("org.naquadah.awesome.Remote", function(data, code)
         if data.member == "Eval" then
             local f, e = loadstring(code)
             if f then
diff --git a/utils/awesome-client b/utils/awesome-client
index 4daa64eb2..a5fd4779c 100755
--- a/utils/awesome-client
+++ b/utils/awesome-client
@@ -31,9 +31,9 @@ then
     exit 1
 fi
 
-DBUS_METHOD=org.awesome.Remote.Eval
+DBUS_METHOD=org.naquadah.awesome.Remote.Eval
 DBUS_PATH=/
-DBUS_DEST=org.awesome
+DBUS_DEST=org.naquadah.awesome
 
 a_dbus_send()
 {