diff --git a/bin/PCSX2_keys.ini.default b/bin/PCSX2_keys.ini.default
index 0cd2a9fc88..512ef0112f 100644
--- a/bin/PCSX2_keys.ini.default
+++ b/bin/PCSX2_keys.ini.default
@@ -4,9 +4,9 @@
 
 # Important: PAD bindings will override shortcuts at this file.
 
-# IMPORTANT: GSdx has fixed shortcuts. Make sure your shortcuts don't conflict.
-# Also, they will affect GSdx also when alt/ctrl/shift are pressed, so it's
-# best to completely avoid them at this file. GSdx uses:
+# IMPORTANT: GS has fixed shortcuts. Make sure your shortcuts don't conflict.
+# Also, they will affect GS also when alt/ctrl/shift are pressed, so it's
+# best to completely avoid them at this file. GS uses:
 # F5         - Deinterlace modes
 # PAGE_UP    - FXAA antialiasing (HW and SW)
 # PAGE_DOWN  - Cycles through dither modes (HW) 
diff --git a/linux_various/check_format.sh b/linux_various/check_format.sh
index 4dd8519e9a..e878d67efc 100755
--- a/linux_various/check_format.sh
+++ b/linux_various/check_format.sh
@@ -46,7 +46,6 @@ fi
 files=`git diff --name-only --diff-filter=ACMRT $diff_range  -- $PWD | \
     grep "\.\(c\|h\|inl\|cpp\|hpp\)$" | \
     grep -v "${1}pcsx2/" | \
-    grep -v "${1}plugins/GSdx/" | \
     \
     grep -v "/resource.h" | \
     grep -v "3rdparty/" | \
diff --git a/linux_various/gen_gl_func_ptr.pl b/linux_various/gen_gl_func_ptr.pl
index 04fa856f98..3b26207387 100755
--- a/linux_various/gen_gl_func_ptr.pl
+++ b/linux_various/gen_gl_func_ptr.pl
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License along with PCSX2.
 # If not, see <http://www.gnu.org/licenses/>.
 
-# Generate glfunction pointer for GSdx
+# Generate glfunction pointer for GS
 
 use File::Basename;
 use strict;
diff --git a/linux_various/validate_glsl.sh b/linux_various/validate_glsl.sh
index 356ff212dc..86422ef9d5 100755
--- a/linux_various/validate_glsl.sh
+++ b/linux_various/validate_glsl.sh
@@ -38,7 +38,7 @@ Help:
     --input <file>         : input glsl file (mandatory)
     --macro <name> <value> : set a macro. Can be repeated
     --entry <name>         : set an entry point. Note: print the ASM output of the program
-    --test_dx              : test of gsdx glsl file
+    --test_gs              : test of gs glsl file
     --nofrag               : disable fragment processing
     --novert               : disable vertex processing
 EOF
@@ -51,7 +51,7 @@ case $1 in
     --input|--i) INPUT=$2; shift 2;;
     --macro|--m) MACRO="${MACRO}#define $2 $3\n"; shift 3;;
     --entry|--e) ENTRY="-entry $2";shift 2;;
-    --test_dx )  TEST_GSDX=1; shift 1;;
+    --test_gs )  TEST_GS=1; shift 1;;
     --nofrag)    NOFRAG=1; shift 1;;
     --novert)    NOVERT=1; shift 1;;
 
@@ -114,7 +114,7 @@ fragment_test()
 # Main
 ######################################################
 
-if [ "$TEST_GSDX" = '1' ] ; then
+if [ "$TEST_GS" = '1' ] ; then
     echo "not yet implemented"
     # A very big shader example (124 instructions!)
     ./validate_glsl.sh --input $INPUT --novert --entry ps_main --macro PS_TCC 0 --macro PS_TFX 0 --macro PS_IIP 1 --macro PS_ATST 4 --macro PS_FST 1 --macro PS_BLEND 4 --macro PS_COLCLIP 3 --macro PS_SHUFFLE 1 --macro PS_LTF 1 --macro PS_FMT 6 --macro PS_AEM 0 --macro PS_FBMASK 1 --macro PS_FOG 1 --macro PS_WMS 2 --macro PS_WMT 3