diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b8c9572a..6b79886db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -876,7 +876,7 @@ ADD_MANPAGE_TARGET()
 # build a bcrypt static library
 set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
 set(BUILD_SHARED_LIBS OFF)
-add_subdirectory(src/bcrypt)
+add_subdirectory(src/libbcrypt)
 set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b8660aad..3155fb920 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_conf
 
 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})
-link_directories(bcrypt)
+link_directories(libbcrypt)
 
 add_executable(zmc zmc.cpp)
 add_executable(zma zma.cpp)
@@ -17,7 +17,7 @@ add_executable(zmu zmu.cpp)
 add_executable(zms zms.cpp)
 
 # JWT is a header only library. 
-include_directories(bcrypt/include/bcrypt)
+include_directories(libbcrypt/include/bcrypt)
 include_directories(jwt-cpp/include/jwt-cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
diff --git a/src/bcrypt/CMakeLists.txt b/src/libbcrypt/CMakeLists.txt
similarity index 100%
rename from src/bcrypt/CMakeLists.txt
rename to src/libbcrypt/CMakeLists.txt
diff --git a/src/bcrypt/LICENSE b/src/libbcrypt/LICENSE
similarity index 100%
rename from src/bcrypt/LICENSE
rename to src/libbcrypt/LICENSE
diff --git a/src/bcrypt/README.md b/src/libbcrypt/README.md
similarity index 100%
rename from src/bcrypt/README.md
rename to src/libbcrypt/README.md
diff --git a/src/bcrypt/include/bcrypt/BCrypt.hpp b/src/libbcrypt/include/bcrypt/BCrypt.hpp
similarity index 100%
rename from src/bcrypt/include/bcrypt/BCrypt.hpp
rename to src/libbcrypt/include/bcrypt/BCrypt.hpp
diff --git a/src/bcrypt/include/bcrypt/bcrypt.h b/src/libbcrypt/include/bcrypt/bcrypt.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/bcrypt.h
rename to src/libbcrypt/include/bcrypt/bcrypt.h
diff --git a/src/bcrypt/include/bcrypt/crypt.h b/src/libbcrypt/include/bcrypt/crypt.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/crypt.h
rename to src/libbcrypt/include/bcrypt/crypt.h
diff --git a/src/bcrypt/include/bcrypt/crypt_blowfish.h b/src/libbcrypt/include/bcrypt/crypt_blowfish.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/crypt_blowfish.h
rename to src/libbcrypt/include/bcrypt/crypt_blowfish.h
diff --git a/src/bcrypt/include/bcrypt/crypt_gensalt.h b/src/libbcrypt/include/bcrypt/crypt_gensalt.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/crypt_gensalt.h
rename to src/libbcrypt/include/bcrypt/crypt_gensalt.h
diff --git a/src/bcrypt/include/bcrypt/ow-crypt.h b/src/libbcrypt/include/bcrypt/ow-crypt.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/ow-crypt.h
rename to src/libbcrypt/include/bcrypt/ow-crypt.h
diff --git a/src/bcrypt/include/bcrypt/winbcrypt.h b/src/libbcrypt/include/bcrypt/winbcrypt.h
similarity index 100%
rename from src/bcrypt/include/bcrypt/winbcrypt.h
rename to src/libbcrypt/include/bcrypt/winbcrypt.h
diff --git a/src/bcrypt/src/bcrypt.c b/src/libbcrypt/src/bcrypt.c
similarity index 100%
rename from src/bcrypt/src/bcrypt.c
rename to src/libbcrypt/src/bcrypt.c
diff --git a/src/bcrypt/src/crypt_blowfish.c b/src/libbcrypt/src/crypt_blowfish.c
similarity index 100%
rename from src/bcrypt/src/crypt_blowfish.c
rename to src/libbcrypt/src/crypt_blowfish.c
diff --git a/src/bcrypt/src/crypt_gensalt.c b/src/libbcrypt/src/crypt_gensalt.c
similarity index 100%
rename from src/bcrypt/src/crypt_gensalt.c
rename to src/libbcrypt/src/crypt_gensalt.c
diff --git a/src/bcrypt/src/main.cpp b/src/libbcrypt/src/main.cpp
similarity index 100%
rename from src/bcrypt/src/main.cpp
rename to src/libbcrypt/src/main.cpp
diff --git a/src/bcrypt/src/wrapper.c b/src/libbcrypt/src/wrapper.c
similarity index 100%
rename from src/bcrypt/src/wrapper.c
rename to src/libbcrypt/src/wrapper.c
diff --git a/src/bcrypt/src/x86.S b/src/libbcrypt/src/x86.S
similarity index 100%
rename from src/bcrypt/src/x86.S
rename to src/libbcrypt/src/x86.S
diff --git a/src/bcrypt/vs2017/libbcrypt/libbcrypt.sln b/src/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
similarity index 100%
rename from src/bcrypt/vs2017/libbcrypt/libbcrypt.sln
rename to src/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
diff --git a/src/bcrypt/vs2017/libbcrypt/libbcrypt.vcxproj b/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
similarity index 100%
rename from src/bcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
rename to src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
diff --git a/src/bcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters b/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
similarity index 100%
rename from src/bcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
rename to src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
diff --git a/src/bcrypt/vs2017/test/main.cpp b/src/libbcrypt/vs2017/test/main.cpp
similarity index 100%
rename from src/bcrypt/vs2017/test/main.cpp
rename to src/libbcrypt/vs2017/test/main.cpp
diff --git a/src/bcrypt/vs2017/test/test.vcxproj b/src/libbcrypt/vs2017/test/test.vcxproj
similarity index 100%
rename from src/bcrypt/vs2017/test/test.vcxproj
rename to src/libbcrypt/vs2017/test/test.vcxproj
diff --git a/src/bcrypt/vs2017/test/test.vcxproj.filters b/src/libbcrypt/vs2017/test/test.vcxproj.filters
similarity index 100%
rename from src/bcrypt/vs2017/test/test.vcxproj.filters
rename to src/libbcrypt/vs2017/test/test.vcxproj.filters