diff --git a/core/libs/CMakeLists.txt b/core/libs/CMakeLists.txt
index d65c8636d..bf4263390 100644
--- a/core/libs/CMakeLists.txt
+++ b/core/libs/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_executable(nid_patcher
         ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/Sha1.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/NidCompute.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/ElfPatcher.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/PePatcher.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/ElfNidPatcher.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/PeNidPatcher.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/BinaryPatcherFactory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/nid/src/main.cpp
 )
diff --git a/core/libs/nid/include/nid/ElfPatcher.hpp b/core/libs/nid/include/nid/ElfPatcher.hpp
index 7dae0d6c7..fc43240f7 100644
--- a/core/libs/nid/include/nid/ElfPatcher.hpp
+++ b/core/libs/nid/include/nid/ElfPatcher.hpp
@@ -5,7 +5,7 @@
 
 namespace Nid {
 
-class ElfPatcher final : public IBinaryPatcher {
+class ElfNidPatcher final : public IBinaryPatcher {
 public:
     void PatchNids(std::vector<std::uint8_t>& binary, const std::string& libraryName) const override;
 };
diff --git a/core/libs/nid/src/NidPatcherUtils.hpp b/core/libs/nid/include/nid/NidPatcherUtils.hpp
similarity index 100%
rename from core/libs/nid/src/NidPatcherUtils.hpp
rename to core/libs/nid/include/nid/NidPatcherUtils.hpp
diff --git a/core/libs/nid/include/nid/PePatcher.hpp b/core/libs/nid/include/nid/PePatcher.hpp
index 7cef7bd5f..c264786ee 100644
--- a/core/libs/nid/include/nid/PePatcher.hpp
+++ b/core/libs/nid/include/nid/PePatcher.hpp
@@ -5,7 +5,7 @@
 
 namespace Nid {
 
-class PePatcher final : public IBinaryPatcher {
+class PeNidPatcher final : public IBinaryPatcher {
 public:
     void PatchNids(std::vector<std::uint8_t>& binary, const std::string& libraryName) const override;
 };
diff --git a/core/libs/nid/src/BinaryPatcherFactory.cpp b/core/libs/nid/src/BinaryPatcherFactory.cpp
index 43cc38f57..d226f6425 100644
--- a/core/libs/nid/src/BinaryPatcherFactory.cpp
+++ b/core/libs/nid/src/BinaryPatcherFactory.cpp
@@ -7,9 +7,9 @@ namespace Nid {
 
 std::unique_ptr<IBinaryPatcher> MakePatcher(const std::vector<std::uint8_t>& binary) {
     if (binary.size() >= 4 && binary[0] == 0x7f && binary[1] == 'E' && binary[2] == 'L' && binary[3] == 'F')
-        return std::make_unique<ElfPatcher>();
+        return std::make_unique<ElfNidPatcher>();
     if (binary.size() >= 2 && binary[0] == 'M' && binary[1] == 'Z')
-        return std::make_unique<PePatcher>();
+        return std::make_unique<PeNidPatcher>();
     throw std::runtime_error("unrecognized binary format");
 }
 
diff --git a/core/libs/nid/src/ElfPatcher.cpp b/core/libs/nid/src/ElfNidPatcher.cpp
similarity index 97%
rename from core/libs/nid/src/ElfPatcher.cpp
rename to core/libs/nid/src/ElfNidPatcher.cpp
index 574be06cd..eef03f4d5 100644
--- a/core/libs/nid/src/ElfPatcher.cpp
+++ b/core/libs/nid/src/ElfNidPatcher.cpp
@@ -1,6 +1,6 @@
 #include <nid/ElfPatcher.hpp>
 #include <nid/NidCompute.hpp>
-#include "NidPatcherUtils.hpp"
+#include "nid/NidPatcherUtils.hpp"
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -57,7 +57,7 @@ constexpr std::uint16_t kShnUndef = 0u;
 
 }
 
-void ElfPatcher::PatchNids(std::vector<std::uint8_t>& elf, const std::string& libraryName) const {
+void ElfNidPatcher::PatchNids(std::vector<std::uint8_t>& elf, const std::string& libraryName) const {
     using namespace Internal;
 
     if (elf.size() < sizeof(Elf64_Ehdr)) throw std::runtime_error("file too small");
diff --git a/core/libs/nid/src/PePatcher.cpp b/core/libs/nid/src/PeNidPatcher.cpp
similarity index 98%
rename from core/libs/nid/src/PePatcher.cpp
rename to core/libs/nid/src/PeNidPatcher.cpp
index 61ca00115..823777812 100644
--- a/core/libs/nid/src/PePatcher.cpp
+++ b/core/libs/nid/src/PeNidPatcher.cpp
@@ -1,6 +1,6 @@
 #include <nid/PePatcher.hpp>
 #include <nid/NidCompute.hpp>
-#include "NidPatcherUtils.hpp"
+#include "nid/NidPatcherUtils.hpp"
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -65,7 +65,7 @@ std::size_t _rvaToOffset(const std::vector<std::uint8_t>& pe, std::uint32_t rva,
 
 }
 
-void PePatcher::PatchNids(std::vector<std::uint8_t>& pe, const std::string& libraryName) const {
+void PeNidPatcher::PatchNids(std::vector<std::uint8_t>& pe, const std::string& libraryName) const {
     using namespace Internal;
 
     if (pe.size() < 0x40) throw std::runtime_error("file too small");