diff --git a/miniunz.c b/miniunz.c
index fef9317..dad92a0 100644
--- a/miniunz.c
+++ b/miniunz.c
@@ -22,9 +22,8 @@
 #include <time.h>
 #include <errno.h>
 
-#include "mzstrm.h"
-
-#include "unzip.h"
+#include "mz_strm.h"
+#include "mz_unzip.h"
 
 /***************************************************************************/
 
diff --git a/minizip.c b/minizip.c
index 2617d5c..fc45417 100755
--- a/minizip.c
+++ b/minizip.c
@@ -22,9 +22,8 @@
 #include <time.h>
 #include <errno.h>
 
-#include "zip.h"
-
-#include "mzstrm.h"
+#include "mz_zip.h"
+#include "mz_strm.h"
 
 /***************************************************************************/
 
diff --git a/mz_compat.c b/mz_compat.c
index ab0e4ef..2d43586 100644
--- a/mz_compat.c
+++ b/mz_compat.c
@@ -17,8 +17,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "zip.h"
-#include "unzip.h"
+#include "mz_zip.h"
+#include "mz_unzip.h"
 
 #include "mz_compat.h"
 
diff --git a/mz_strm.c b/mz_strm.c
index 1ecdece..ae3a281 100755
--- a/mz_strm.c
+++ b/mz_strm.c
@@ -19,7 +19,7 @@
 
 #include <time.h>
 
-#include "mzstrm.h"
+#include "mz_strm.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm.h b/mz_strm.h
index 659c235..c4fe154 100755
--- a/mz_strm.h
+++ b/mz_strm.h
@@ -115,7 +115,7 @@ void    mz_stream_passthru_delete(void **stream);
 /***************************************************************************/
 
 #if !defined(_WIN32) && !defined(USEWIN32IOAPI)
-#include "mzstrm_posix.h"
+#include "mz_strm_posix.h"
 
 #define mz_stream_os_open    mz_stream_posix_open
 #define mz_stream_os_is_open mz_stream_posix_is_open
@@ -135,7 +135,7 @@ void    mz_stream_passthru_delete(void **stream);
 #define mz_os_change_dir     mz_posix_change_dir
 #define mz_os_make_dir       mz_posix_make_dir
 #else
-#include "mzstrm_win32.h"
+#include "mz_strm_win32.h"
 
 #define mz_stream_os_open    mz_stream_win32_open
 #define mz_stream_os_is_open mz_stream_win32_is_open
diff --git a/mz_strm_aes.c b/mz_strm_aes.c
index 8228f10..f3baa34 100644
--- a/mz_strm_aes.c
+++ b/mz_strm_aes.c
@@ -12,8 +12,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mzstrm.h"
-#include "mzstrm_aes.h"
+#include "mz_strm.h"
+#include "mz_strm_aes.h"
 
 #include "aes/aes.h"
 #include "aes/fileenc.h"
diff --git a/mz_strm_buf.c b/mz_strm_buf.c
index f39356b..9e49c8f 100755
--- a/mz_strm_buf.c
+++ b/mz_strm_buf.c
@@ -16,8 +16,8 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "mzstrm.h"
-#include "mzstrm_buf.h"
+#include "mz_strm.h"
+#include "mz_strm_buf.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_bzip.c b/mz_strm_bzip.c
index e4eb267..5e19a15 100644
--- a/mz_strm_bzip.c
+++ b/mz_strm_bzip.c
@@ -16,8 +16,8 @@
 
 #include "bzip2\bzlib.h"
 
-#include "mzstrm.h"
-#include "mzstrm_bzip.h"
+#include "mz_strm.h"
+#include "mz_strm_bzip.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_crypt.c b/mz_strm_crypt.c
index 53c02e5..6c6551a 100644
--- a/mz_strm_crypt.c
+++ b/mz_strm_crypt.c
@@ -31,8 +31,8 @@
 
 #include "zlib.h"
 
-#include "mzstrm.h"
-#include "mzstrm_crypt.h"
+#include "mz_strm.h"
+#include "mz_strm_crypt.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_lzma.c b/mz_strm_lzma.c
index 8334e88..3e492ee 100644
--- a/mz_strm_lzma.c
+++ b/mz_strm_lzma.c
@@ -17,8 +17,8 @@
 
 #include <lzma.h>
 
-#include "mzstrm.h"
-#include "mzstrm_lzma.h"
+#include "mz_strm.h"
+#include "mz_strm_lzma.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_mem.c b/mz_strm_mem.c
index 672a3ee..1925f0a 100644
--- a/mz_strm_mem.c
+++ b/mz_strm_mem.c
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mzstrm.h"
-#include "mzstrm_mem.h"
+#include "mz_strm.h"
+#include "mz_strm_mem.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_posix.c b/mz_strm_posix.c
index 1ea7b3b..9e0129b 100644
--- a/mz_strm_posix.c
+++ b/mz_strm_posix.c
@@ -35,8 +35,8 @@
 #  define mkdir(x,y) _mkdir(x)
 #endif
 
-#include "mzstrm.h"
-#include "mzstrm_posix.h"
+#include "mz_strm.h"
+#include "mz_strm_posix.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_win32.c b/mz_strm_win32.c
index 4546fc2..ef610fd 100644
--- a/mz_strm_win32.c
+++ b/mz_strm_win32.c
@@ -19,8 +19,8 @@
 #include <windows.h>
 #include <wincrypt.h>
 
-#include "mzstrm.h"
-#include "mzstrm_win32.h"
+#include "mz_strm.h"
+#include "mz_strm_win32.h"
 
 /***************************************************************************/
 
diff --git a/mz_strm_zlib.c b/mz_strm_zlib.c
index 7cfe51b..ec8acf8 100644
--- a/mz_strm_zlib.c
+++ b/mz_strm_zlib.c
@@ -16,8 +16,8 @@
 
 #include "zlib.h"
 
-#include "mzstrm.h"
-#include "mzstrm_zlib.h"
+#include "mz_strm.h"
+#include "mz_strm_zlib.h"
 
 /***************************************************************************/
 
diff --git a/mz_unzip.c b/mz_unzip.c
index 973856b..9d7e2c3 100644
--- a/mz_unzip.c
+++ b/mz_unzip.c
@@ -25,23 +25,23 @@
 
 #include "zlib.h"
 
-#include "mzstrm.h"
+#include "mz_strm.h"
 #ifdef HAVE_AES
-#include "mzstrm_aes.h"
+#include "mz_strm_aes.h"
 #endif
 #ifdef HAVE_BZIP2
-#include "mzstrm_bzip.h"
+#include "mz_strm_bzip.h"
 #endif
 #ifndef NOUNCRYPT
-#  include "mzstrm_crypt.h"
+#  include "mz_strm_crypt.h"
 #endif
 #ifdef HAVE_LZMA
-#include "mzstrm_lzma.h"
+#include "mz_strm_lzma.h"
 #endif
-#include "mzstrm_mem.h"
-#include "mzstrm_zlib.h"
+#include "mz_strm_mem.h"
+#include "mz_strm_zlib.h"
 
-#include "unzip.h"
+#include "mz_unzip.h"
 
 /***************************************************************************/
 
diff --git a/mz_unzip.h b/mz_unzip.h
index 2c11f69..ca0e97c 100644
--- a/mz_unzip.h
+++ b/mz_unzip.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIBIOAPI_H
-#include "mzstrm.h"
+#include "mz_strm.h"
 #endif
 
 /***************************************************************************/
diff --git a/mz_zip.c b/mz_zip.c
index 93e9636..54c0c64 100755
--- a/mz_zip.c
+++ b/mz_zip.c
@@ -23,23 +23,23 @@
 
 #include "zlib.h"
 
-#include "mzstrm.h"
+#include "mz_strm.h"
 #ifdef HAVE_AES
-#  include "mzstrm_aes.h"
+#  include "mz_strm_aes.h"
 #endif
 #ifdef HAVE_BZIP2
-#  include "mzstrm_bzip.h"
+#  include "mz_strm_bzip.h"
 #endif
 #ifndef NOCRYPT
-#  include "mzstrm_crypt.h"
+#  include "mz_strm_crypt.h"
 #endif
 #ifdef HAVE_LZMA
-#  include "mzstrm_lzma.h"
+#  include "mz_strm_lzma.h"
 #endif
-#include "mzstrm_mem.h"
-#include "mzstrm_zlib.h"
+#include "mz_strm_mem.h"
+#include "mz_strm_zlib.h"
 
-#include "zip.h"
+#include "mz_zip.h"
 
 /***************************************************************************/
 
diff --git a/mz_zip.h b/mz_zip.h
index e610eae..f711784 100644
--- a/mz_zip.h
+++ b/mz_zip.h
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIBIOAPI_H
-#  include "mzstrm.h"
+#  include "mz_strm.h"
 #endif
 
 /***************************************************************************/
diff --git a/test.c b/test.c
index 3d9c853..e0941dd 100644
--- a/test.c
+++ b/test.c
@@ -5,11 +5,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "mzstrm.h"
-#include "mzstrm_bzip.h"
-#include "mzstrm_crypt.h"
-#include "mzstrm_aes.h"
-#include "mzstrm_zlib.h"
+#include "mz_strm.h"
+#include "mz_strm_bzip.h"
+#include "mz_strm_crypt.h"
+#include "mz_strm_aes.h"
+#include "mz_strm_zlib.h"
 
 void test_encrypt(char *method, mz_stream_create_cb crypt_create, char *password)
 {
diff --git a/windows/libminizip.vcxproj b/windows/libminizip.vcxproj
index 085fa84..50cdc12 100644
--- a/windows/libminizip.vcxproj
+++ b/windows/libminizip.vcxproj
@@ -133,16 +133,6 @@
     <ClCompile Include="..\lib\bzip2\compress.c" />
     <ClCompile Include="..\lib\bzip2\crctable.c" />
     <ClCompile Include="..\lib\bzip2\decompress.c" />
-    <ClCompile Include="..\mzstrm.c" />
-    <ClCompile Include="..\mzstrm_aes.c" />
-    <ClCompile Include="..\mzstrm_buf.c" />
-    <ClCompile Include="..\mzstrm_bzip.c" />
-    <ClCompile Include="..\mzstrm_crypt.c" />
-    <ClCompile Include="..\mzstrm_lzma.c" />
-    <ClCompile Include="..\mzstrm_mem.c" />
-    <ClCompile Include="..\mzstrm_posix.c" />
-    <ClCompile Include="..\mzstrm_zlib.c" />
-    <ClCompile Include="..\mzstrm_win32.c" />
     <ClCompile Include="..\lib\aes\aescrypt.c" />
     <ClCompile Include="..\lib\aes\aeskey.c" />
     <ClCompile Include="..\lib\aes\aestab.c" />
@@ -155,9 +145,19 @@
     <ClCompile Include="..\lib\bzip2\huffman.c" />
     <ClCompile Include="..\lib\bzip2\randtable.c" />
     <ClCompile Include="..\mz_compat.c" />
+    <ClCompile Include="..\mz_strm.c" />
+    <ClCompile Include="..\mz_strm_aes.c" />
+    <ClCompile Include="..\mz_strm_buf.c" />
+    <ClCompile Include="..\mz_strm_bzip.c" />
+    <ClCompile Include="..\mz_strm_crypt.c" />
+    <ClCompile Include="..\mz_strm_lzma.c" />
+    <ClCompile Include="..\mz_strm_mem.c" />
+    <ClCompile Include="..\mz_strm_posix.c" />
+    <ClCompile Include="..\mz_strm_win32.c" />
+    <ClCompile Include="..\mz_strm_zlib.c" />
+    <ClCompile Include="..\mz_unzip.c" />
+    <ClCompile Include="..\mz_zip.c" />
     <ClCompile Include="..\test.c" />
-    <ClCompile Include="..\unzip.c" />
-    <ClCompile Include="..\zip.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\crc32.h" />
@@ -171,16 +171,6 @@
     <ClInclude Include="..\..\..\zlib.h" />
     <ClInclude Include="..\..\..\zutil.h" />
     <ClInclude Include="..\lib\bzip2\bzlib_private.h" />
-    <ClInclude Include="..\mzstrm.h" />
-    <ClInclude Include="..\mzstrm_aes.h" />
-    <ClInclude Include="..\mzstrm_buf.h" />
-    <ClInclude Include="..\mzstrm_bzip.h" />
-    <ClInclude Include="..\mzstrm_crypt.h" />
-    <ClInclude Include="..\mzstrm_lzma.h" />
-    <ClInclude Include="..\mzstrm_mem.h" />
-    <ClInclude Include="..\mzstrm_posix.h" />
-    <ClInclude Include="..\mzstrm_zlib.h" />
-    <ClInclude Include="..\mzstrm_win32.h" />
     <ClInclude Include="..\lib\aes\aes.h" />
     <ClInclude Include="..\lib\aes\aesopt.h" />
     <ClInclude Include="..\lib\aes\aestab.h" />
@@ -193,9 +183,19 @@
     <ClInclude Include="..\lib\aes\sha1.h" />
     <ClInclude Include="..\lib\bzip2\bzlib.h" />
     <ClInclude Include="..\mz_compat.h" />
+    <ClInclude Include="..\mz_strm.h" />
+    <ClInclude Include="..\mz_strm_aes.h" />
+    <ClInclude Include="..\mz_strm_buf.h" />
+    <ClInclude Include="..\mz_strm_bzip.h" />
+    <ClInclude Include="..\mz_strm_crypt.h" />
+    <ClInclude Include="..\mz_strm_lzma.h" />
+    <ClInclude Include="..\mz_strm_mem.h" />
+    <ClInclude Include="..\mz_strm_posix.h" />
+    <ClInclude Include="..\mz_strm_win32.h" />
+    <ClInclude Include="..\mz_strm_zlib.h" />
+    <ClInclude Include="..\mz_unzip.h" />
+    <ClInclude Include="..\mz_zip.h" />
     <ClInclude Include="..\test.h" />
-    <ClInclude Include="..\unzip.h" />
-    <ClInclude Include="..\zip.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="liblzma.vcxproj">
diff --git a/windows/libminizip.vcxproj.filters b/windows/libminizip.vcxproj.filters
index d5be43b..52aee67 100644
--- a/windows/libminizip.vcxproj.filters
+++ b/windows/libminizip.vcxproj.filters
@@ -20,9 +20,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\zutil.c">
       <Filter>Zlib</Filter>
     </ClCompile>
@@ -56,9 +53,6 @@
     <ClCompile Include="..\..\..\uncompr.c">
       <Filter>Zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\aes\aes_ni.c">
       <Filter>AES</Filter>
     </ClCompile>
@@ -92,62 +86,65 @@
     <ClCompile Include="..\lib\bzip2\randtable.c">
       <Filter>BZip</Filter>
     </ClCompile>
-    <ClCompile Include="..\mzstrm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_aes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_buf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_crypt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_mem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_posix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_zlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\mzstrm_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\bzip2\bzlib.c">
       <Filter>BZip</Filter>
     </ClCompile>
-    <ClCompile Include="..\mz_compat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\test.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\mzstrm_bzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\bzip2\crctable.c">
       <Filter>BZip</Filter>
     </ClCompile>
-    <ClCompile Include="..\mzstrm_lzma.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib\bzip2\compress.c">
       <Filter>BZip</Filter>
     </ClCompile>
     <ClCompile Include="..\lib\bzip2\decompress.c">
       <Filter>BZip</Filter>
     </ClCompile>
+    <ClCompile Include="..\mz_compat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_aes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_buf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_bzip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_crypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_lzma.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_mem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_posix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_strm_zlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_unzip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mz_zip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\inffixed.h">
       <Filter>Zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\unzip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\trees.h">
       <Filter>Zlib</Filter>
     </ClInclude>
@@ -175,9 +172,6 @@
     <ClInclude Include="..\..\..\crc32.h">
       <Filter>Zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\zip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib\aes\aes.h">
       <Filter>AES</Filter>
     </ClInclude>
@@ -211,43 +205,49 @@
     <ClInclude Include="..\lib\bzip2\bzlib.h">
       <Filter>BZip</Filter>
     </ClInclude>
-    <ClInclude Include="..\mzstrm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_aes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_buf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_crypt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_mem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_posix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\mzstrm_win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\mz_compat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\test.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\mzstrm_bzip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\lib\bzip2\bzlib_private.h">
       <Filter>BZip</Filter>
     </ClInclude>
-    <ClInclude Include="..\mzstrm_lzma.h">
+    <ClInclude Include="..\mz_strm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_aes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_buf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_bzip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_lzma.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_mem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_posix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_strm_zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_unzip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\mz_zip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>