diff --git a/bin/launch_pcsx2_linux.sh b/bin/launch_pcsx2_linux.sh
index 93a6f6b63f..47fd9f391e 100755
--- a/bin/launch_pcsx2_linux.sh
+++ b/bin/launch_pcsx2_linux.sh
@@ -64,16 +64,8 @@ then
     done
 fi
 
-if [ -x "$DIR/pcsx2" ]
+if [ ! -x "$DIR/PCSX2" ]
 then
-    exe="$DIR/pcsx2"
-elif [ -x "$DIR/pcsx2-dev" ]
-then
-    exe="$DIR/pcsx2-dev"
-elif [ -x "$DIR/pcsx2-dbg" ]
-then
-    exe="$DIR/pcsx2-dbg"
-else
     echo "Error PCSX2 not found"
     echo "Maybe the script was directly 'called'"
     echo "Use either /absolute_path/launch_pcsx2_linux.sh or ./relative_path/launch_pcsx2_linux.sh"
@@ -81,4 +73,4 @@ else
 fi
 
 # And finally launch me
-LD_LIBRARY_PATH="$MY_LD_LIBRARY_PATH" __GL_THREADED_OPTIMIZATIONS=1 $exe $@
+LD_LIBRARY_PATH="$MY_LD_LIBRARY_PATH" __GL_THREADED_OPTIMIZATIONS=1 $DIR/PCSX2 $@
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 1a1705b32f..9d088c9bf9 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -75,15 +75,12 @@ endif()
 
 # Debug - Build
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(Output pcsx2-dbg)
 	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG)
 
 elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
-	set(Output pcsx2-dev)
 	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD)
 
 elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-	set(Output pcsx2)
 	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags})
 
 endif()
@@ -95,10 +92,7 @@ if(XDG_STD)
 	)
 endif()
 
-# In package mode always use pcsx2
-if(PACKAGE_MODE)
-    set(Output pcsx2)
-endif()
+set(Output PCSX2)
 
 # Main pcsx2 source
 set(pcsx2Sources