diff --git a/shell_integration/windows/OCUtil/CommunicationSocket.cpp b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
index b7dd64c32c..6f6f7f9d8d 100644
--- a/shell_integration/windows/OCUtil/CommunicationSocket.cpp
+++ b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
@@ -18,6 +18,8 @@
 #include "UtilConstants.h"
 #include "StringUtil.h"
 
+#include "config.h"
+
 #include <iostream>
 #include <vector>
 #include <array>
@@ -45,7 +47,8 @@ std::wstring getUserName() {
 std::wstring CommunicationSocket::DefaultPipePath()
 {
     auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud-";
+    pipename += APPLICATION_SHORTNAME;
+    pipename += L"-"
     pipename += getUserName();
     return pipename;
 }
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index bc8ac7e9f7..04e7275cbf 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -180,7 +180,8 @@ SocketApi::SocketApi(QObject *parent)
 
     if (Utility::isWindows()) {
         socketPath = QLatin1String("\\\\.\\pipe\\")
-            + QLatin1String("ownCloud-")
+            + QLatin1String(APPLICATION_SHORTNAME)
+            + QLatin1String("-")
             + QString::fromLocal8Bit(qgetenv("USERNAME"));
         // TODO: once the windows extension supports multiple
         // client connections, switch back to the theme name