diff --git a/Makefile.common b/Makefile.common
index f5f0fd0..e3337c5 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -52,49 +52,49 @@ Default_CXX          := g++
 Default_STRIP        := strip
 Default_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC
 Default_LINKFLAGS    := -shared -static
-Default_LIBNAME      := libsnappy.so
+Default_LIBNAME      := libsnappyjava.so
 Default_SNAPPY_FLAGS := 
 
 Linux-i386_CXX       := g++
 Linux-i386_STRIP     := strip
 Linux-i386_CXXFLAGS  := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -m32
 Linux-i386_LINKFLAGS := -shared -static-libgcc -static-libstdc++ 
-Linux-i386_LIBNAME   := libsnappy.so
+Linux-i386_LIBNAME   := libsnappyjava.so
 Linux-i386_SNAPPY_FLAGS:= 
 
 Linux-amd64_CXX       := g++ 
 Linux-amd64_STRIP     := strip
 Linux-amd64_CXXFLAGS  := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -m64
 Linux-amd64_LINKFLAGS :=  -shared -static-libgcc -static-libstdc++
-Linux-amd64_LIBNAME   := libsnappy.so
+Linux-amd64_LIBNAME   := libsnappyjava.so
 Linux-amd64_SNAPPY_FLAGS  := 
 
 Mac-i386_CXX       := g++ -arch $(OS_ARCH) 
 Mac-i386_STRIP     := strip -x
 Mac-i386_CXXFLAGS  := -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4
 Mac-i386_LINKFLAGS := -dynamiclib -static-libgcc
-Mac-i386_LIBNAME   := libsnappy.jnilib
+Mac-i386_LIBNAME   := libsnappyjava.jnilib
 Mac-i386_SNAPPY_FLAGS  :=
 
 Mac-x86_64_CXX       := g++ -arch $(OS_ARCH) 
 Mac-x86_64_STRIP     := strip -x
 Mac-x86_64_CXXFLAGS  := -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.5
 Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc 
-Mac-x86_64_LIBNAME   := libsnappy.jnilib 
+Mac-x86_64_LIBNAME   := libsnappyjava.jnilib 
 Mac-x86_64_SNAPPY_FLAGS  := 
 
 Windows-x86_CXX          := mingw32-g++
 Windows-x86_STRIP        := strip
 Windows-x86_CXXFLAGS     := -Ilib/inc_win -O2
 Windows-x86_LINKFLAGS    := -Wl,--kill-at -shared -static
-Windows-x86_LIBNAME      := snappy.dll
+Windows-x86_LIBNAME      := snappyjava.dll
 Windows-x86_SNAPPY_FLAGS := 
 
 Windows-amd64_CXX          := x86_64-w64-mingw32-g++
 Windows-amd64_STRIP        := x86_64-w64-mingw32-strip
 Windows-amd64_CXXFLAGS     := -Ilib/inc_win -O2
 Windows-amd64_LINKFLAGS    := -Wl,--kill-at -shared -static 
-Windows-amd64_LIBNAME      := snappy.dll
+Windows-amd64_LIBNAME      := snappyjava.dll
 Windows-amd64_SNAPPY_FLAGS := 
 
 
diff --git a/src/main/java/org/xerial/snappy/LoadSnappy.java b/src/main/java/org/xerial/snappy/LoadSnappy.java
index 206804c..22da8ec 100755
--- a/src/main/java/org/xerial/snappy/LoadSnappy.java
+++ b/src/main/java/org/xerial/snappy/LoadSnappy.java
@@ -175,7 +175,7 @@ public class LoadSnappy
 
         // Resolve the library file name with a suffix (e.g., dll, .so, etc.) 
         if (snappyNativeLibraryName == null)
-            snappyNativeLibraryName = System.mapLibraryName("snappy");
+            snappyNativeLibraryName = System.mapLibraryName("snappyjava");
 
         if (snappyNativeLibraryPath != null) {
             if (loadNativeLibrary(snappyNativeLibraryPath, snappyNativeLibraryName)) {
@@ -196,9 +196,10 @@ public class LoadSnappy
             }
         }
         try {
-            System.loadLibrary("snappy");
+            System.loadLibrary("snappyjava");
             isLoaded = true;
-        } catch (UnsatisfiedLinkError e) {
+        }
+        catch (UnsatisfiedLinkError e) {
             isLoaded = false;
         }
         return;
diff --git a/src/main/resources/org/xerial/snappy/native/Windows/amd64/snappy.dll b/src/main/resources/org/xerial/snappy/native/Windows/amd64/snappyjava.dll
similarity index 96%
rename from src/main/resources/org/xerial/snappy/native/Windows/amd64/snappy.dll
rename to src/main/resources/org/xerial/snappy/native/Windows/amd64/snappyjava.dll
index 319dd6f..91eec3d 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Windows/amd64/snappy.dll and b/src/main/resources/org/xerial/snappy/native/Windows/amd64/snappyjava.dll differ
diff --git a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappy.dll b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll
similarity index 65%
rename from src/main/resources/org/xerial/snappy/native/Windows/x86/snappy.dll
rename to src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll
index c7f8293..e456e5d 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappy.dll and b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll differ