diff --git a/Makefile.ps3 b/Makefile.ps3
index a154ed892e..7481f5accc 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -46,7 +46,7 @@ GIT			= git.exe
 endif
 
 PPU_SRCS		= console/griffin/griffin.c \
-			console/szlib/szlib.c
+			console/rzlib/rzlib.c
 
 ifeq ($(HAVE_RGL), 1)
 DEFINES			= -DHAVE_RGL
diff --git a/Makefile.wii b/Makefile.wii
index 0304f14834..ae4deb2bd7 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -26,7 +26,7 @@ CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
 LIBS := -lfat -lretro -lwiiuse -logc -lbte -lfreetype
 
-OBJ = console/griffin/griffin.o console/font.bmpobj console/szlib/szlib.o
+OBJ = console/griffin/griffin.o console/font.bmpobj console/rzlib/rzlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/console/console_ext.c b/console/console_ext.c
index 4ad0217ca4..faca0cbdc2 100644
--- a/console/console_ext.c
+++ b/console/console_ext.c
@@ -28,7 +28,7 @@
 #include "../file.h"
 
 #ifdef HAVE_ZLIB
-#include "szlib/zlib.h"
+#include "rzlib/zlib.h"
 #define WRITEBUFFERSIZE (1024 * 512)
 #endif
 
diff --git a/console/szlib/szlib.c b/console/rzlib/rzlib.c
similarity index 99%
rename from console/szlib/szlib.c
rename to console/rzlib/rzlib.c
index 217aa02fb6..e1de22bdc1 100644
--- a/console/szlib/szlib.c
+++ b/console/rzlib/rzlib.c
@@ -1,8 +1,3 @@
-/* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
 /* This source as presented is a modified version of original zlib for use 
  * with RetroArch, and must not be confused with the original software. */
 
diff --git a/console/szlib/zconf.h b/console/rzlib/zconf.h
similarity index 100%
rename from console/szlib/zconf.h
rename to console/rzlib/zconf.h
diff --git a/console/szlib/zlib.h b/console/rzlib/zlib.h
similarity index 99%
rename from console/szlib/zlib.h
rename to console/rzlib/zlib.h
index 20a4a48e6f..e72705ac9f 100644
--- a/console/szlib/zlib.h
+++ b/console/rzlib/zlib.h
@@ -6,8 +6,8 @@
 /* This source as presented is a modified version of original zlib for use with
  * RetroArch, and must not be confused with the original software. */
 
-#ifndef _SZLIB_H
-#define _SZLIB_H
+#ifndef _RZLIB_H
+#define _RZLIB_H
 
 #if defined(__cplusplus)
 extern "C" {
@@ -682,4 +682,4 @@ extern int  unzSetOffset (unzFile file, unsigned long pos);
 }
 #endif
 
-#endif /* _SZLIB_H */
+#endif /* _RZLIB_H */
diff --git a/hash.h b/hash.h
index 10750ed31f..5a470f122a 100644
--- a/hash.h
+++ b/hash.h
@@ -23,7 +23,7 @@
 void sha256_hash(char *out, const uint8_t *in, size_t size);
 
 #ifdef HAVE_ZLIB
-#include "console/szlib/zlib.h"
+#include "console/rzlib/zlib.h"
 static inline uint32_t crc32_calculate(const uint8_t *data, size_t length)
 {
    return crc32(0, data, length);
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 5df379f6fd..2168fadcd3 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -349,7 +349,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\console\griffin\griffin.c" />
-    <ClCompile Include="..\..\console\szlib\szlib.c">
+    <ClCompile Include="..\..\console\rzlib\rzlib.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
@@ -650,4 +650,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index a587f0c6e1..b3be3dd9d4 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -24,7 +24,7 @@
     <Filter Include="Source Files\console">
       <UniqueIdentifier>{e45d1737-2bab-4209-87c0-3d66cf3aee07}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\console\szlib">
+    <Filter Include="Source Files\console\rzlib">
       <UniqueIdentifier>{60603fec-c1c0-4562-8573-b1dc3af0ee40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\media\shader">
@@ -44,8 +44,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\console\szlib\szlib.c">
-      <Filter>Source Files\console\szlib</Filter>
+    <ClCompile Include="..\..\console\rzlib\rzlib.c">
+      <Filter>Source Files\console\rzlib</Filter>
     </ClCompile>
     <ClCompile Include="..\..\console\griffin\griffin.c">
       <Filter>Source Files\console\griffin</Filter>
@@ -187,4 +187,4 @@
       <Filter>Source Files\media</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>