diff --git a/cmake/Build.cmake b/cmake/Build.cmake
index e063a5a05..af65f6d29 100644
--- a/cmake/Build.cmake
+++ b/cmake/Build.cmake
@@ -98,7 +98,7 @@ macro(post_config_all)
       deskflow
       deskflow-client
       deskflow-server
-      ${DAEMON_BINARY_NAME})
+      deskflow-daemon)
   endif()
 
 endmacro()
diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index c3ad07c84..f45457bdb 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -67,22 +67,6 @@ macro(configure_meta)
     message(VERBOSE "Not showing developer thanks message")
   endif()
 
-  configure_bin_names()
-
-endmacro()
-
-macro(configure_bin_names)
-
-  set(DAEMON_BINARY_NAME
-      "deskflow-daemon"
-      CACHE STRING "Filename of the daemon binary")
-
-
-  message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}")
-
-
-  add_definitions(-DDAEMON_BINARY_NAME="${DAEMON_BINARY_NAME}")
-
 endmacro()
 
 macro(configure_ninja)
diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in
index 688f49066..9e5e0d82e 100644
--- a/deploy/dist/wix/Include.wxi.in
+++ b/deploy/dist/wix/Include.wxi.in
@@ -25,5 +25,5 @@
     <?define ServerBin="deskflow-server.exe"?>
     <?define ClientBin="deskflow-client.exe"?>
     <?define CoreBin="deskflow-core.exe"?>
-    <?define DaemonBin="@DAEMON_BINARY_NAME@.exe"?>
+    <?define DaemonBin="deskflow-daemon.exe"?>
 </Include>
diff --git a/src/cmd/deskflowd/CMakeLists.txt b/src/cmd/deskflowd/CMakeLists.txt
index c7b10b63f..b2404bdbd 100644
--- a/src/cmd/deskflowd/CMakeLists.txt
+++ b/src/cmd/deskflowd/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 # Daemon is only needed on Windows for elevating processes to deal with UAC.
 if(WIN32)
-  set(target ${DAEMON_BINARY_NAME})
+  set(target deskflow-daemon)
   add_executable(${target} WIN32
     deskflowd.cpp
     "${PROJECT_BINARY_DIR}/src/version.rc"
diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp
index d241efaf7..9444ad993 100644
--- a/src/lib/deskflow/DaemonApp.cpp
+++ b/src/lib/deskflow/DaemonApp.cpp
@@ -60,7 +60,7 @@
 
 using namespace std;
 
-const char *const kLogFilename = DAEMON_BINARY_NAME ".log";
+const char *const kLogFilename = "deskflow-daemon.log";
 
 namespace {
 void updateSetting(const IpcMessage &message)