diff --git a/examples/cxx/common.hpp b/examples/cxx/common.hpp
index ca08c7e514124d19a676d10ce741bd8f039dce66..38ffe7f04fd8212c4f2c6bce6d46717f357597f3 100644
--- a/examples/cxx/common.hpp
+++ b/examples/cxx/common.hpp
@@ -2,7 +2,7 @@
 #define SCORD_CXX_EXAMPLES_COMMON_HPP
 
 #include <vector>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 
 std::vector<admire::node>
 prepare_nodes(size_t n);
diff --git a/src/common/api/CMakeLists.txt b/src/common/api/CMakeLists.txt
index b35531d5a14d3203f3257211839f5e83a28afe69..01d93dd2b078cd250e889d80a1e8158d5f80d979 100644
--- a/src/common/api/CMakeLists.txt
+++ b/src/common/api/CMakeLists.txt
@@ -24,7 +24,7 @@
 
 add_library(_api_types STATIC)
 
-target_sources(_api_types PUBLIC scord/types.h admire_types.hpp PRIVATE
+target_sources(_api_types PUBLIC scord/types.h scord/types.hpp PRIVATE
   types.cpp convert.hpp convert.cpp internal_types.hpp errors.c)
 
 target_include_directories(_api_types PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/common/api/convert.hpp b/src/common/api/convert.hpp
index 09e0c3739d5d070aac40dc04a776273817a64c6c..6189a5cb10a167e323156778ca28a60e34a446af 100644
--- a/src/common/api/convert.hpp
+++ b/src/common/api/convert.hpp
@@ -26,7 +26,7 @@
 #define SCORD_CONVERT_HPP
 
 #include "scord/types.h"
-#include "admire_types.hpp"
+#include "scord/types.hpp"
 
 namespace admire::api {
 
diff --git a/src/common/api/admire_types.hpp b/src/common/api/scord/types.hpp
similarity index 99%
rename from src/common/api/admire_types.hpp
rename to src/common/api/scord/types.hpp
index 65c95c97b01f9077415bb081407a64ae7fe0ff56..98a1326ae2de1595ae9e9ad5c24b328ef89867c9 100644
--- a/src/common/api/admire_types.hpp
+++ b/src/common/api/scord/types.hpp
@@ -22,8 +22,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *****************************************************************************/
 
-#ifndef SCORD_ADMIRE_TYPES_HPP
-#define SCORD_ADMIRE_TYPES_HPP
+#ifndef SCORD_TYPES_HPP
+#define SCORD_TYPES_HPP
 
 #include <string>
 #include <cstdint>
@@ -1041,4 +1041,4 @@ struct fmt::formatter<std::vector<admire::qos::limit>>
     }
 };
 
-#endif // SCORD_ADMIRE_TYPES_HPP
+#endif // SCORD_TYPES_HPP
diff --git a/src/common/api/types.cpp b/src/common/api/types.cpp
index 56f2a124ab29906d715c66e611c3dfe9bbd79ebe..dda37ccf297d0b4819701e492d38f75e228bd2a7 100644
--- a/src/common/api/types.cpp
+++ b/src/common/api/types.cpp
@@ -28,7 +28,7 @@
 #include <utility>
 #include <variant>
 #include <optional>
-#include "admire_types.hpp"
+#include "scord/types.hpp"
 #include "internal_types.hpp"
 
 /******************************************************************************/
diff --git a/src/common/net/request.hpp b/src/common/net/request.hpp
index 5c36cb8804b2628c2563559f0e9fa355525a74d2..84ead0d2ae137d0ab4a2841ccade8f29e9e1e0e4 100644
--- a/src/common/net/request.hpp
+++ b/src/common/net/request.hpp
@@ -26,7 +26,7 @@
 #define SCORD_NET_REQUEST_HPP
 
 #include <thallium.hpp>
-#include "admire_types.hpp"
+#include <scord/types.hpp>
 
 namespace scord::network {
 
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 6d5f7ed723c947b5e5bf38de43d400173a977b02..4ebb8683e68cad8f67158242d5eea5e18b6c2cc6 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -32,7 +32,7 @@ target_sources(
 
 list(APPEND public_headers "admire.h"
      "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "admire.hpp"
-     "${CMAKE_SOURCE_DIR}/src/common/api/admire_types.hpp"
+     "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.hpp"
 )
 
 set_target_properties(libscord PROPERTIES PUBLIC_HEADER "${public_headers}")
diff --git a/src/lib/admire.h b/src/lib/admire.h
index b3b82f7b4ad82f32d5631b61ff5122e2a74eed09..b9991f276682c885018ed4af04a6e0d50f9ff8fb 100644
--- a/src/lib/admire.h
+++ b/src/lib/admire.h
@@ -44,7 +44,7 @@ extern "C" {
 /* Public type definitions and type-related functions                         */
 /******************************************************************************/
 
-// See types.h
+// See scord/types.h
 
 
 /******************************************************************************/
diff --git a/src/lib/admire.hpp b/src/lib/admire.hpp
index a7106a9d71ec179b11e65de68c65d8a6b0722976..403f2e2784c08d0148ba1b51fa4d3557573a1b19 100644
--- a/src/lib/admire.hpp
+++ b/src/lib/admire.hpp
@@ -25,7 +25,7 @@
 #include <admire.h>
 #include <string>
 #include <utility>
-#include "admire_types.hpp"
+#include "scord/types.hpp"
 #include "net/proto/rpc_types.h"
 
 #ifndef SCORD_ADMIRE_HPP
@@ -35,7 +35,7 @@
 /* Public type definitions and type-related functions                         */
 /******************************************************************************/
 
-// See admire_types.hpp
+// See scord/types.hpp
 
 
 /******************************************************************************/
diff --git a/src/lib/c_wrapper.cpp b/src/lib/c_wrapper.cpp
index 72beff4886593e3d1a50fdda5962d75f434f30fe..5a8a4b466ecae37c8ed3ca4941c1539877c67d8e 100644
--- a/src/lib/c_wrapper.cpp
+++ b/src/lib/c_wrapper.cpp
@@ -27,7 +27,7 @@
 #include <logger/logger.hpp>
 #include <net/proto/rpc_types.h>
 #include <stdarg.h>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 #include <scord/types.h>
 #include <api/convert.hpp>
 #include "detail/impl.hpp"
diff --git a/src/lib/detail/impl.cpp b/src/lib/detail/impl.cpp
index 67ab4a703747743a5797e4310fbc430c5e949776..63f2ce93ee19b9f545e096a44e2a122b3d01e415 100644
--- a/src/lib/detail/impl.cpp
+++ b/src/lib/detail/impl.cpp
@@ -27,7 +27,7 @@
 #include <net/endpoint.hpp>
 #include <net/request.hpp>
 #include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 #include "impl.hpp"
 
 using namespace std::literals;
diff --git a/src/scord-ctl/rpc_handlers.hpp b/src/scord-ctl/rpc_handlers.hpp
index 199ca912eee7b954645dc6698d18352750d46e41..a896d794450e89ad51687f839c48bf2a89b893cf 100644
--- a/src/scord-ctl/rpc_handlers.hpp
+++ b/src/scord-ctl/rpc_handlers.hpp
@@ -27,7 +27,7 @@
 
 #include <net/request.hpp>
 #include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 
 namespace scord::network::handlers {
 
diff --git a/src/scord/adhoc_storage_manager.hpp b/src/scord/adhoc_storage_manager.hpp
index 65d0a1f782d868bd67e0a330f1310e0ae7b9a62e..98c87e28b4e4aee484f00f39140fab0aa01624db 100644
--- a/src/scord/adhoc_storage_manager.hpp
+++ b/src/scord/adhoc_storage_manager.hpp
@@ -26,7 +26,7 @@
 #ifndef SCORD_ADHOC_STORAGE_MANAGER_HPP
 #define SCORD_ADHOC_STORAGE_MANAGER_HPP
 
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 #include <internal_types.hpp>
 #include <utility>
 #include <utils/utils.hpp>
diff --git a/src/scord/job_manager.hpp b/src/scord/job_manager.hpp
index 2c8ead059d1067800d83bbb993940e2956ef1053..df60833190eee7a6fcab2cfc4b85c11f1e53d1ae 100644
--- a/src/scord/job_manager.hpp
+++ b/src/scord/job_manager.hpp
@@ -25,7 +25,7 @@
 #ifndef SCORD_JOB_MANAGER_HPP
 #define SCORD_JOB_MANAGER_HPP
 
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 #include <internal_types.hpp>
 #include <atomic>
 #include <utility>
diff --git a/src/scord/pfs_storage_manager.hpp b/src/scord/pfs_storage_manager.hpp
index 48b31037c274a3bdb401fab1f2825ccab2610263..c71c1b8fc43f13369032a83377dd2124cb1db04e 100644
--- a/src/scord/pfs_storage_manager.hpp
+++ b/src/scord/pfs_storage_manager.hpp
@@ -25,7 +25,7 @@
 #ifndef SCORD_PFS_STORAGE_MANAGER_HPP
 #define SCORD_PFS_STORAGE_MANAGER_HPP
 
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 #include <internal_types.hpp>
 #include <utility>
 #include <utils/utils.hpp>
diff --git a/src/scord/rpc_handlers.hpp b/src/scord/rpc_handlers.hpp
index d901fb3917f4f8b82cb9fad0d253783c183e27a5..880c69131c438894d99ca834e1b8e76c81e560a1 100644
--- a/src/scord/rpc_handlers.hpp
+++ b/src/scord/rpc_handlers.hpp
@@ -27,7 +27,7 @@
 
 #include <net/request.hpp>
 #include <net/serialization.hpp>
-#include <admire_types.hpp>
+#include <scord/types.hpp>
 
 namespace scord::network::handlers {