diff --git a/serval.h b/serval.h
index 1c41c116..371a6b89 100755
--- a/serval.h
+++ b/serval.h
@@ -1541,11 +1541,9 @@ void sigPipeHandler(int signal);
 void sigIoHandler(int signal);
 
 #ifdef USE_ABSTRACT_NAMESPACE
-/* Long ones for abstract name space */
-#define DEFAULT_MONITOR_SOCKET_NAME "org.servalproject.servald.monitor.socket"
-#define DEFAULT_MDP_SOCKET_NAME "org.servalproject.servald.mdp.socket"
-#else
-/* Short ones elsewhere */
+#define DEFAULT_ABSTRACT_PREFIX "org.servalproject.servald"
+#endif
+
 #define DEFAULT_MONITOR_SOCKET_NAME "monitor.socket"
 #define DEFAULT_MDP_SOCKET_NAME "mdp.socket"
-#endif
+
diff --git a/socket.c b/socket.c
index f9086a40..2e6d36ef 100644
--- a/socket.c
+++ b/socket.c
@@ -78,7 +78,8 @@ socket_setname(struct sockaddr_un *sockname, const char *name, socklen_t *len) {
 #ifdef USE_ABSTRACT_NAMESPACE
   sockname->sun_path[0] = 0;
   /* Note: -2 here not -1 because sprintf will put the trailling nul in */
-  *len = snprintf(sockname->sun_path + 1, sizeof(sockname->sun_path) - 2, "%s", name);
+  *len = snprintf(sockname->sun_path + 1, sizeof(sockname->sun_path) - 2, "%s.%s", 
+		  DEFAULT_ABSTRACT_PREFIX, name);
   if (*len > sizeof(sockname->sun_path) - 2)
     FATALF("Socket path too long (%d > %d)", *len, sizeof(sockname->sun_path) - 2);
 
diff --git a/tests/dnaprotocol b/tests/dnaprotocol
index 6a07befd..d8194cab 100755
--- a/tests/dnaprotocol
+++ b/tests/dnaprotocol
@@ -37,8 +37,8 @@ setup_servald_instance() {
    push_instance
    set_instance "$1"
    executeOk_servald config set interfaces "+>$2"
-   executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$1"
-   executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$1"
+   executeOk_servald config set monitor.socket "monitor.socket.$1"
+   executeOk_servald config set mdp.socket "mdp.socket.$1"
    executeOk_servald keyring add
    assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
    executeOk_servald keyring list