diff --git a/.gitignore b/.gitignore
index 440e8458..048e86c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,13 +16,13 @@ msvc2003/devilution/compare.asm
 
 # Exclude build output on Linux (exclude normally produced executable files and out files)
 build_en/CSE2
-build_en/CSE2d
+build_en/CSE2_debug
 build_en/DoConfig
-build_en/DoConfigd
+build_en/DoConfig_debug
 build_jp/CSE2
-build_jp/CSE2d
+build_jp/CSE2_debug
 build_jp/DoConfig
-build_jp/DoConfigd
+build_jp/DoConfig_debug
 build_en/*.out
 build_jp/*.out
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b62868ed..949f10e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,9 +294,9 @@ set_target_properties(CSE2 PROPERTIES
 	CXX_EXTENSIONS OFF
 )
 
-# Name debug builds "CSE2d", to distinguish them
+# Name debug builds "CSE2_debug", to distinguish them
 set_target_properties(CSE2 PROPERTIES
-	DEBUG_OUTPUT_NAME "CSE2d"
+	DEBUG_OUTPUT_NAME "CSE2_debug"
 )
 
 # Send executable to the build_en/build_jp directory
diff --git a/DoConfig/CMakeLists.txt b/DoConfig/CMakeLists.txt
index 6c1d9776..443d6477 100644
--- a/DoConfig/CMakeLists.txt
+++ b/DoConfig/CMakeLists.txt
@@ -10,8 +10,8 @@ project(DoConfig LANGUAGES CXX)
 
 add_executable(DoConfig "DoConfig.cpp" "icon.rc")
 
-# Name debug builds "DoConfigd", to distinguish them
-set_target_properties(CSE2 PROPERTIES DEBUG_OUTPUT_NAME "DoConfigd")
+# Name debug builds "DoConfig_debug", to distinguish them
+set_target_properties(CSE2 PROPERTIES DEBUG_OUTPUT_NAME "DoConfig_debug")
 
 # Windows tweak
 if(WIN32)
diff --git a/Makefile b/Makefile
index 6d86c2d4..52c81047 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ifeq ($(RELEASE), 1)
 	FILENAME_DEF = CSE2
 else
 	CXXFLAGS = -Og -g3
-	FILENAME_DEF = CSE2d
+	FILENAME_DEF = CSE2_debug
 endif
 
 ifeq ($(JAPANESE), 1)