diff --git a/include/l3/circuit_mode_control_entity_packet.hpp b/include/l3/circuit_mode_control_entity_packet.hpp
index d4c4f8e..b54ffd5 100644
--- a/include/l3/circuit_mode_control_entity_packet.hpp
+++ b/include/l3/circuit_mode_control_entity_packet.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "l3/mobile_link_entity_packet.hpp"
-#include "nlohmann_std_variant.hpp" // IWYU pragma: keep
+#include "nlohmann/std_variant.hpp" // IWYU pragma: keep
 #include "utils/address.hpp"
 #include "utils/bit_vector.hpp"
 #include "utils/type234_parser.hpp"
diff --git a/include/l3/mobile_management_packet.hpp b/include/l3/mobile_management_packet.hpp
index a34ee4a..ac2c5ef 100644
--- a/include/l3/mobile_management_packet.hpp
+++ b/include/l3/mobile_management_packet.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "l3/mobile_link_entity_packet.hpp"
-#include "nlohmann_std_variant.hpp" // IWYU pragma: keep
+#include "nlohmann/std_variant.hpp" // IWYU pragma: keep
 #include "utils/bit_vector.hpp"
 #include "utils/type234_parser.hpp"
 #include <optional>
diff --git a/include/nlohmann_slots.hpp b/include/nlohmann/slots.hpp
similarity index 100%
rename from include/nlohmann_slots.hpp
rename to include/nlohmann/slots.hpp
diff --git a/include/nlohmann_std_optional.hpp b/include/nlohmann/std_optional.hpp
similarity index 100%
rename from include/nlohmann_std_optional.hpp
rename to include/nlohmann/std_optional.hpp
diff --git a/include/nlohmann_std_unique_ptr_logical_link_control_packet.hpp b/include/nlohmann/std_unique_ptr_logical_link_control_packet.hpp
similarity index 100%
rename from include/nlohmann_std_unique_ptr_logical_link_control_packet.hpp
rename to include/nlohmann/std_unique_ptr_logical_link_control_packet.hpp
diff --git a/include/nlohmann_std_variant.hpp b/include/nlohmann/std_variant.hpp
similarity index 100%
rename from include/nlohmann_std_variant.hpp
rename to include/nlohmann/std_variant.hpp
diff --git a/include/nlohmann_unsigned_bitint.hpp b/include/nlohmann/unsigned_bitint.hpp
similarity index 100%
rename from include/nlohmann_unsigned_bitint.hpp
rename to include/nlohmann/unsigned_bitint.hpp
diff --git a/include/utils/address.hpp b/include/utils/address.hpp
index 9a65e5c..7677696 100644
--- a/include/utils/address.hpp
+++ b/include/utils/address.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "nlohmann_std_optional.hpp"    // IWYU pragma: keep
-#include "nlohmann_unsigned_bitint.hpp" // IWYU pragma: keep
+#include "nlohmann/std_optional.hpp"    // IWYU pragma: keep
+#include "nlohmann/unsigned_bitint.hpp" // IWYU pragma: keep
 #include "utils/bit_vector.hpp"
 #include <iostream>
 #include <nlohmann/json.hpp>
diff --git a/src/borzoi/borzoi_sender.cpp b/src/borzoi/borzoi_sender.cpp
index 8997050..5110ba4 100644
--- a/src/borzoi/borzoi_sender.cpp
+++ b/src/borzoi/borzoi_sender.cpp
@@ -12,8 +12,8 @@
 #include "l3/mobile_link_entity_packet.hpp"
 #include "l3/mobile_management_packet.hpp"
 #include "l3/short_data_service_packet.hpp"
-#include "nlohmann_slots.hpp"                                      // IWYU pragma: keep
-#include "nlohmann_std_unique_ptr_logical_link_control_packet.hpp" // IWYU pragma: keep
+#include "nlohmann/slots.hpp"                                      // IWYU pragma: keep
+#include "nlohmann/std_unique_ptr_logical_link_control_packet.hpp" // IWYU pragma: keep
 #include <cpr/body.h>
 #include <cpr/cprtypes.h>
 #include <cpr/payload.h>