diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index ca3c3b646..7d4b9fce4 100644
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -1,10 +1,10 @@
 #include "e_mod_notifier_host_private.h"
 
-#define WATCHER_BUS "org.kde.StatusNotifierWatcher"
+#define WATCHER_BUS DOMAIN".StatusNotifierWatcher"
 #define WATCHER_PATH "/StatusNotifierWatcher"
-#define WATCHER_IFACE "org.kde.StatusNotifierWatcher"
+#define WATCHER_IFACE DOMAIN".StatusNotifierWatcher"
 
-#define ITEM_IFACE "org.kde.StatusNotifierItem"
+#define ITEM_IFACE DOMAIN".StatusNotifierItem"
 
 const char *Category_Names[] = {
    "unknown", "SystemServices", NULL
diff --git a/src/modules/systray/e_mod_notifier_host_dbus.c b/src/modules/systray/e_mod_notifier_host_dbus.c
index 79b2fd121..6efbed9a1 100644
--- a/src/modules/systray/e_mod_notifier_host_dbus.c
+++ b/src/modules/systray/e_mod_notifier_host_dbus.c
@@ -1,10 +1,10 @@
 #include "e_mod_notifier_host_private.h"
 
-#define WATCHER_BUS "org.kde.StatusNotifierWatcher"
+#define WATCHER_BUS DOMAIN".StatusNotifierWatcher"
 #define WATCHER_PATH "/StatusNotifierWatcher"
-#define WATCHER_IFACE "org.kde.StatusNotifierWatcher"
+#define WATCHER_IFACE DOMAIN".StatusNotifierWatcher"
 
-#define ITEM_IFACE "org.kde.StatusNotifierItem"
+#define ITEM_IFACE DOMAIN".StatusNotifierItem"
 
 #define HOST_REGISTRER "/bla" //TODO check what watcher expect we send to him
 
diff --git a/src/modules/systray/e_mod_notifier_host_private.h b/src/modules/systray/e_mod_notifier_host_private.h
index a7e2ea8d8..1a1904d52 100644
--- a/src/modules/systray/e_mod_notifier_host_private.h
+++ b/src/modules/systray/e_mod_notifier_host_private.h
@@ -1,5 +1,10 @@
 #include "e_mod_main.h"
 
+// eventually we need to support this too...
+// https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem
+//#define DOMAIN "org.freedesktop"
+#define DOMAIN "org.kde"
+
 typedef enum {
    CATEGORY_UNKNOWN = 0,
    CATEGORY_SYSTEM_SERVICES,
diff --git a/src/modules/systray/e_mod_notifier_watcher.c b/src/modules/systray/e_mod_notifier_watcher.c
index 56beeb021..22189a038 100644
--- a/src/modules/systray/e_mod_notifier_watcher.c
+++ b/src/modules/systray/e_mod_notifier_watcher.c
@@ -1,11 +1,11 @@
 #include "e_mod_notifier_host_private.h"
 
 #define PATH "/StatusNotifierWatcher"
-#define IFACE "org.kde.StatusNotifierWatcher"
+#define IFACE DOMAIN".StatusNotifierWatcher"
 #define PROTOCOL_VERSION 1
 
-#define ERROR_HOST_ALREADY_REGISTERED "org.kde.StatusNotifierWatcher.Host.AlreadyRegistered"
-#define ERROR_ITEM_ALREADY_REGISTERED "org.kde.StatusNotifierWatcher.Item.AlreadyRegistered"
+#define ERROR_HOST_ALREADY_REGISTERED DOMAIN".StatusNotifierWatcher.Host.AlreadyRegistered"
+#define ERROR_ITEM_ALREADY_REGISTERED DOMAIN".StatusNotifierWatcher.Item.AlreadyRegistered"
 
 static Eldbus_Connection *conn = NULL;
 static Eldbus_Service_Interface *iface = NULL;