diff --git a/gui/lash_proxy.cpp b/gui/lash_proxy.cpp
index 8d909f44..04b368cf 100644
--- a/gui/lash_proxy.cpp
+++ b/gui/lash_proxy.cpp
@@ -27,9 +27,9 @@
 #include "globals.hpp"
 #include "dbus_helpers.h"
 
-#define LASH_SERVICE       "org.nongnu.LASH"
+#define LASH_SERVICE       DBUS_NAME_BASE
 #define LASH_OBJECT        "/"
-#define LASH_IFACE_CONTROL "org.nongnu.LASH.Control"
+#define LASH_IFACE_CONTROL DBUS_NAME_BASE ".Control"
 
 using namespace std;
 
diff --git a/ladish_control b/ladish_control
index 59e31a52..6fb4a0cd 100755
--- a/ladish_control
+++ b/ladish_control
@@ -17,8 +17,8 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-control_interface_name = 'org.nongnu.LASH.Control'
-service_name = 'org.nongnu.LASH'
+control_interface_name = 'org.ladish.Control'
+service_name = 'org.ladish'
 
 import sys
 import os
diff --git a/wscript b/wscript
index a369b900..981d5d60 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@ import Utils
 
 APPNAME='ladish'
 VERSION='1'
-DBUS_NAME_BASE = 'org.nongnu.LASH'
+DBUS_NAME_BASE = 'org.ladish'
 
 # these variables are mandatory ('/' are converted automatically)
 srcdir = '.'