diff --git a/.gitignore b/.gitignore
index a3c8f8f6d2..d6f02fe1b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ Release/
 Contents/
 verdata.*
 StepMania-debug
+stepmania-debug
 Xcode/Info.StepMania.plist
 Xcode/plistHelper.hpp
 src/version_updater/VersionUpdater
diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index 66f2399f4b..8e2994a399 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -14,11 +14,7 @@ set(SM_DOC_DIR "${CMAKE_CURRENT_LIST_DIR}/Docs")
 set(SM_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 # TODO: Reconsile the OS dependent naming scheme.
-if (WIN32 OR APPLE)
-  set(SM_EXE_NAME "StepMania")
-else()
-  set(SM_EXE_NAME "stepmania")
-endif()
+set(SM_EXE_NAME "StepMania")
 
 # Some OS specific helpers.
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58dce1bbd3..590764644b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -171,10 +171,17 @@ if(NOT APPLE)
   source_group("" FILES "Main.cpp")
 endif()
 
-set(SM_NAME_RELEASE "StepMania")
-set(SM_NAME_DEBUG "StepMania-debug")
-set(SM_NAME_MINSIZEREL "StepMania-min-size")
-set(SM_NAME_RELWITHDEBINFO "StepMania-release-symbols")
+if(MSVC OR APPLE)
+  set(SM_NAME_RELEASE "StepMania")
+  set(SM_NAME_DEBUG "StepMania-debug")
+  set(SM_NAME_MINSIZEREL "StepMania-min-size")
+  set(SM_NAME_RELWITHDEBINFO "StepMania-release-symbols")
+else()
+  set(SM_NAME_RELEASE "stepmania")
+  set(SM_NAME_DEBUG "stepmania-debug")
+  set(SM_NAME_MINSIZEREL "stepmania-min-size")
+  set(SM_NAME_RELWITHDEBINFO "stepmania-release-symbols")
+endif()
 
 # Configure generated files here.
 configure_file("${SM_XCODE_DIR}/Info.plist.in.xml" "${SM_XCODE_DIR}/Info.StepMania.plist")
@@ -189,6 +196,14 @@ else()
   add_executable("${SM_EXE_NAME}" ${SMDATA_ALL_FILES_SRC} ${SMDATA_ALL_FILES_HPP})
 endif()
 
+set_target_properties("${SM_EXE_NAME}" PROPERTIES
+  OUTPUT_NAME "${SM_NAME_RELEASE}"
+  RELEASE_OUTPUT_NAME "${SM_NAME_RELEASE}"
+  DEBUG_OUTPUT_NAME "${SM_NAME_DEBUG}"
+  MINSIZEREL_OUTPUT_NAME "${SM_NAME_MINSIZEREL}"
+  RELWITHDEBINFO_OUTPUT_NAME "${SM_NAME_RELWITHDEBINFO}"
+)
+
 if (WITH_PORTABLE_TOMCRYPT)
   sm_add_compile_definition("${SM_EXE_NAME}" LTC_NO_ASM)
 elseif (WITH_NO_ROLC_TOMCRYPT OR APPLE)