diff --git a/.gitmodules b/.gitmodules
index 3f8ac165..86f669c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "src/external/dbcd-cpp"]
-	path = src/external/dbcd-cpp
-	url = https://gitlab.com/prophecy-rp/dbcd-cpp.git
+[submodule "src/external/blizzard-database-library"]
+	path = src/external/blizzard-database-library
+	url = https://gitlab.com/prophecy-rp/blizzard-database-library.git
+[submodule "src/external/blizzard-archive-library"]
+	path = src/external/blizzard-archive-library
+	url = https://gitlab.com/prophecy-rp/blizzard-archive-library.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0adb403e..5a461e59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/qtimgui")
 ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/QtAdvancedDockingSystem")
 ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/NodeEditor")
 ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/libnoise")
-ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/dbcd-cpp")
+ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/blizzard-database-library")
 ADD_SUBDIRECTORY("${EXTERNAL_SOURCE_DIR}/glm")
 
 # Add the found include directories to our include list.
@@ -178,7 +178,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/imguipiemenu")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/libnoise/src")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/qtgradienteditor")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/tracy")
-INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/dbcd-cpp/include")
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/${EXTERNAL_SOURCE_DIR}/blizzard-database-library/include")
 INCLUDE_DIRECTORIES(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 
 collect_files(noggit_root_sources src/noggit FALSE "*.cpp" "")
@@ -219,7 +219,7 @@ collect_files(imguizmo_headers src/external/imguizmo FALSE "*.h;*.hpp" "")
 collect_files(imguipiemenu_headers src/external/imguipiemenu FALSE "*.h;*.hpp" "")
 collect_files(gradienteditor_headers src/external/qtgradienteditor FALSE "*.h;*.hpp" "")
 collect_files(tracy_headers src/external/tracy FALSE "*.h;*.hpp" "")
-collect_files(blizzard_database_headers src/external/dbcd-cpp/include FALSE "*.h;*.hpp" "")
+collect_files(blizzard_database_headers src/external/blizzard-database-library/include FALSE "*.h;*.hpp" "")
 
 IF(WIN32)
   SET(os_sources include/win/StackWalker.cpp)
diff --git a/src/external/blizzard-archive-library b/src/external/blizzard-archive-library
new file mode 160000
index 00000000..e2d57eb3
--- /dev/null
+++ b/src/external/blizzard-archive-library
@@ -0,0 +1 @@
+Subproject commit e2d57eb3a0d37a462828787ace3ca4d55247d5e4
diff --git a/src/external/dbcd-cpp b/src/external/blizzard-database-library
similarity index 100%
rename from src/external/dbcd-cpp
rename to src/external/blizzard-database-library