diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index 0aa828780..c3ad07c84 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -73,20 +73,14 @@ endmacro()
 
 macro(configure_bin_names)
 
-  set(CORE_BINARY_NAME
-      "deskflow-core"
-      CACHE STRING "Filename of the core binary")
-
   set(DAEMON_BINARY_NAME
       "deskflow-daemon"
       CACHE STRING "Filename of the daemon binary")
 
 
-  message(VERBOSE "Core binary: ${CORE_BINARY_NAME}")
   message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}")
 
 
-  add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}")
   add_definitions(-DDAEMON_BINARY_NAME="${DAEMON_BINARY_NAME}")
 
 endmacro()
diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in
index 7f990fe17..688f49066 100644
--- a/deploy/dist/wix/Include.wxi.in
+++ b/deploy/dist/wix/Include.wxi.in
@@ -24,6 +24,6 @@
     <?define GuiBin="deskflow.exe"?>
     <?define ServerBin="deskflow-server.exe"?>
     <?define ClientBin="deskflow-client.exe"?>
-    <?define CoreBin="@CORE_BINARY_NAME@.exe"?>
+    <?define CoreBin="deskflow-core.exe"?>
     <?define DaemonBin="@DAEMON_BINARY_NAME@.exe"?>
 </Include>
diff --git a/src/cmd/deskflow-core/CMakeLists.txt b/src/cmd/deskflow-core/CMakeLists.txt
index 13f651d79..df9ff7b83 100644
--- a/src/cmd/deskflow-core/CMakeLists.txt
+++ b/src/cmd/deskflow-core/CMakeLists.txt
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(target ${CORE_BINARY_NAME})
+set(target deskflow-core)
 
 add_executable(${target} "${target}.cpp")
 if(WIN32)
diff --git a/src/cmd/deskflow-core/deskflow-core.cpp b/src/cmd/deskflow-core/deskflow-core.cpp
index 59f4a9046..cb2e4785e 100644
--- a/src/cmd/deskflow-core/deskflow-core.cpp
+++ b/src/cmd/deskflow-core/deskflow-core.cpp
@@ -31,7 +31,7 @@ void showHelp()
   std::cout << "Usage: " CORE_BINARY_NAME " <server | client> [...options]" << std::endl;
   std::cout << "server - start as a server ( deskflow-server)" << std::endl;
   std::cout << "client - start as a client ( deslflow-client)" << std::endl;
-  std::cout << "use " CORE_BINARY_NAME " <server|client> --help for more information." << std::endl;
+  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
 }
 
 bool isServer(int argc, char **argv)
diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp
index 3f1492887..d241efaf7 100644
--- a/src/lib/deskflow/DaemonApp.cpp
+++ b/src/lib/deskflow/DaemonApp.cpp
@@ -79,7 +79,7 @@ bool isServerCommandLine(const std::vector<String> &cmd)
 
   if (cmd.size() > 1) {
     isServer = (cmd[0].find("deskflow-server") != String::npos) ||
-               (cmd[0].find(CORE_BINARY_NAME) != String::npos && cmd[1] == "server");
+               (cmd[0].find("deskflow-core") != String::npos && cmd[1] == "server");
   }
 
   return isServer;
diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp
index 4101492f9..a565e4427 100644
--- a/src/lib/platform/MSWindowsWatchdog.cpp
+++ b/src/lib/platform/MSWindowsWatchdog.cpp
@@ -572,7 +572,7 @@ void MSWindowsWatchdog::shutdownExistingProcesses()
 
       if (_stricmp(entry.szExeFile, "deskflow-client.exe") == 0 ||
           _stricmp(entry.szExeFile, "deskflow-server.exe") == 0 ||
-          _stricmp(entry.szExeFile, CORE_BINARY_NAME ".exe") == 0) {
+          _stricmp(entry.szExeFile, "deskflow-core.exe") == 0) {
 
         HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
         shutdownProcess(handle, entry.th32ProcessID, 10);