diff --git a/examples/cxx/ADM_cancel_transfer.cpp b/examples/cxx/ADM_cancel_transfer.cpp
index 4543974f99bababf96c4014ba25d6a79bf9b783d..3f4dada024754752575a52b3d72f208df6da0450 100644
--- a/examples/cxx/ADM_cancel_transfer.cpp
+++ b/examples/cxx/ADM_cancel_transfer.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_connect_data_operation.cpp b/examples/cxx/ADM_connect_data_operation.cpp
index 62614f9285521ce800c988fbe9917453ab09a648..0c48a4ad46b8f116b93207e2381a03e6cbd45b91 100644
--- a/examples/cxx/ADM_connect_data_operation.cpp
+++ b/examples/cxx/ADM_connect_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_define_data_operation.cpp b/examples/cxx/ADM_define_data_operation.cpp
index 1d2a0297363c79cd7ed894415039f0044663f22a..fb75b042d74498cb942f0fe4d8d51e222eb523c9 100644
--- a/examples/cxx/ADM_define_data_operation.cpp
+++ b/examples/cxx/ADM_define_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_deploy_adhoc_storage.cpp b/examples/cxx/ADM_deploy_adhoc_storage.cpp
index ccfc76c14c5b4473d471d118eda75be9a4cc14c1..ab8296f7ac16188ed774f49b115f9c7add075c84 100644
--- a/examples/cxx/ADM_deploy_adhoc_storage.cpp
+++ b/examples/cxx/ADM_deploy_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_finalize_data_operation.cpp b/examples/cxx/ADM_finalize_data_operation.cpp
index c3eab90cb65330e23f348e2e4495751344695504..9b422dd63822997cdeab61a61ef7769449b4be51 100644
--- a/examples/cxx/ADM_finalize_data_operation.cpp
+++ b/examples/cxx/ADM_finalize_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_get_pending_transfers.cpp b/examples/cxx/ADM_get_pending_transfers.cpp
index 4d3c69f5fa7c6e054a42bec6ec92c5cd7fde0c7d..9df1504c3731f5e9849b381f5f3f28e9b5f91c4f 100644
--- a/examples/cxx/ADM_get_pending_transfers.cpp
+++ b/examples/cxx/ADM_get_pending_transfers.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_get_qos_constraints.cpp b/examples/cxx/ADM_get_qos_constraints.cpp
index c1828aa46efcda74f096b04c911a4b5dc3139610..13d5955d5c4a81fe4f1dedf5271992fb91a1706c 100644
--- a/examples/cxx/ADM_get_qos_constraints.cpp
+++ b/examples/cxx/ADM_get_qos_constraints.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_get_statistics.cpp b/examples/cxx/ADM_get_statistics.cpp
index b3c78675240aa188f7be55e7336b84e07c7c5f2b..9fa1723e124a742ad2ba00b5247422d516804d64 100644
--- a/examples/cxx/ADM_get_statistics.cpp
+++ b/examples/cxx/ADM_get_statistics.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_get_transfer_priority.cpp b/examples/cxx/ADM_get_transfer_priority.cpp
index 8fef9925adc2a3ac8c70b683fa31b7928c290aa2..0436c0d06ff23f8e455ea14501915ddefb36fa37 100644
--- a/examples/cxx/ADM_get_transfer_priority.cpp
+++ b/examples/cxx/ADM_get_transfer_priority.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_link_transfer_to_data_operation.cpp b/examples/cxx/ADM_link_transfer_to_data_operation.cpp
index 8ebb02c39d7007630583a4cabf0f61261eb0700b..d7b6b6b8399fdca23fced55cc4ef4effb67e702d 100644
--- a/examples/cxx/ADM_link_transfer_to_data_operation.cpp
+++ b/examples/cxx/ADM_link_transfer_to_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_ping.cpp b/examples/cxx/ADM_ping.cpp
index d687e60f11c106be87507880964a163c7705916a..a5916892a7b6e0b5e434b599a942b4ab1502d477 100644
--- a/examples/cxx/ADM_ping.cpp
+++ b/examples/cxx/ADM_ping.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_register_adhoc_storage.cpp b/examples/cxx/ADM_register_adhoc_storage.cpp
index 4b00c3d44f3d61c2ed9e06aeb2d2408bb887e0e3..a6708966077b32758be6b79b2931835e8c6e6f48 100644
--- a/examples/cxx/ADM_register_adhoc_storage.cpp
+++ b/examples/cxx/ADM_register_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_register_job.cpp b/examples/cxx/ADM_register_job.cpp
index a016ea2f6fa82fdf6ab9096f6945c04200f07d04..e940903758e4b409b9e9f76d51b3b0ae7fef78f4 100644
--- a/examples/cxx/ADM_register_job.cpp
+++ b/examples/cxx/ADM_register_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_register_pfs_storage.cpp b/examples/cxx/ADM_register_pfs_storage.cpp
index b3ad5e47419ccbd3e01442b0378c0f3ab4bd720c..ad56507cb66472842a9d6d5a1a3ca0c0b9835bcd 100644
--- a/examples/cxx/ADM_register_pfs_storage.cpp
+++ b/examples/cxx/ADM_register_pfs_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_remove_adhoc_storage.cpp b/examples/cxx/ADM_remove_adhoc_storage.cpp
index a9714cc3b5be3017ce874beb76ba0454bc593009..5acbc03935537fa14caef8f87e20cd0d806d49b0 100644
--- a/examples/cxx/ADM_remove_adhoc_storage.cpp
+++ b/examples/cxx/ADM_remove_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_remove_job.cpp b/examples/cxx/ADM_remove_job.cpp
index 1320946fb85e081649a1c3233b0ace9310555783..45b190c2bcbaa72c5421e5805ea32b105cedcc7b 100644
--- a/examples/cxx/ADM_remove_job.cpp
+++ b/examples/cxx/ADM_remove_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_remove_pfs_storage.cpp b/examples/cxx/ADM_remove_pfs_storage.cpp
index d03833a4c795f2ef9e21048b9c244e356ba3d3fd..903b5dcac537f0ef0b97d9eb3f524c4ad4562721 100644
--- a/examples/cxx/ADM_remove_pfs_storage.cpp
+++ b/examples/cxx/ADM_remove_pfs_storage.cpp
@@ -22,8 +22,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *****************************************************************************/
 
-#include "fmt/format.h"
-#include "admire.hpp"
+#include <fmt/format.h>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_dataset_information.cpp b/examples/cxx/ADM_set_dataset_information.cpp
index 3d1ac5ba7df4e3e58b1761e335d355d64f8da67c..863dd322521d4912a40e7417d7023ffd687a7ec8 100644
--- a/examples/cxx/ADM_set_dataset_information.cpp
+++ b/examples/cxx/ADM_set_dataset_information.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_io_resources.cpp b/examples/cxx/ADM_set_io_resources.cpp
index ab9108a4c80d3172028099bb066e94015ce06d43..342a0cb3a26784e406edd4555e2ebde479cf43ee 100644
--- a/examples/cxx/ADM_set_io_resources.cpp
+++ b/examples/cxx/ADM_set_io_resources.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_qos_constraints.cpp b/examples/cxx/ADM_set_qos_constraints.cpp
index 3b3f84fe44406033a5073fb3dcc98fd0690aacba..2a46f1106110203ebc39777fa73cc1f8db066293 100644
--- a/examples/cxx/ADM_set_qos_constraints.cpp
+++ b/examples/cxx/ADM_set_qos_constraints.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_transfer_priority.cpp b/examples/cxx/ADM_set_transfer_priority.cpp
index f9fe2e69f714cfba409afa600e9be78c6d307b06..1e2e9fa5e4090ea42b22e0b5a503919bc7211592 100644
--- a/examples/cxx/ADM_set_transfer_priority.cpp
+++ b/examples/cxx/ADM_set_transfer_priority.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_transfer_datasets.cpp b/examples/cxx/ADM_transfer_datasets.cpp
index efd6214497fc07435fc9d67a45dfacb281318972..0d3571a4245810ebc67c44a00aa9d062d4516ff9 100644
--- a/examples/cxx/ADM_transfer_datasets.cpp
+++ b/examples/cxx/ADM_transfer_datasets.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_update_adhoc_storage.cpp b/examples/cxx/ADM_update_adhoc_storage.cpp
index 54b6033b7345cf0a1111b91dd698690116774fdb..7787aae0f0a70230a414b9646c4fddde4399fb07 100644
--- a/examples/cxx/ADM_update_adhoc_storage.cpp
+++ b/examples/cxx/ADM_update_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NADHOC_NODES 25
diff --git a/examples/cxx/ADM_update_job.cpp b/examples/cxx/ADM_update_job.cpp
index 1d8152f69abe4a9a8da1cd475489b9fa62b73ca8..cf70a97141c60b0a19eaf0c5a17957be9946ee06 100644
--- a/examples/cxx/ADM_update_job.cpp
+++ b/examples/cxx/ADM_update_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_update_pfs_storage.cpp b/examples/cxx/ADM_update_pfs_storage.cpp
index 6a090a6c26d8fd6e6235dc055711de1903df075d..696af2e464d750153241cef1a50f07d142b97a2f 100644
--- a/examples/cxx/ADM_update_pfs_storage.cpp
+++ b/examples/cxx/ADM_update_pfs_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 670171e98882910275167fb5ea5606cfd0c6a905..5fd26b592bed004ce5dc2e66cf9f32badd4eaa74 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -26,12 +26,12 @@ add_library(libscord SHARED)
 
 target_sources(
   libscord
-  PUBLIC scord/scord.h admire.hpp
+  PUBLIC scord/scord.h scord/scord.hpp
   PRIVATE admire.cpp c_wrapper.cpp detail/impl.hpp detail/impl.cpp env.hpp
 )
 
 list(APPEND public_headers "scord/scord.h"
-     "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "admire.hpp"
+     "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "scord/scord.hpp"
      "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.hpp"
 )
 
diff --git a/src/lib/admire.cpp b/src/lib/admire.cpp
index 63a704158fcf5b0b50114aa2c675469a648cda42..ca1f21029c7463f63abbc4ad39e9470ee065c0cf 100644
--- a/src/lib/admire.cpp
+++ b/src/lib/admire.cpp
@@ -22,7 +22,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *****************************************************************************/
 
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <net/proto/rpc_types.h>
 #include <logger/logger.hpp>
 #include <utils/ctype_ptr.hpp>
diff --git a/src/lib/c_wrapper.cpp b/src/lib/c_wrapper.cpp
index 15b930e04c1b59d129124e6d41fda4e7ab7e04ed..15e06703bc08608e13016d1704ee463fb5e8790d 100644
--- a/src/lib/c_wrapper.cpp
+++ b/src/lib/c_wrapper.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <scord/scord.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <logger/logger.hpp>
 #include <net/proto/rpc_types.h>
 #include <stdarg.h>
diff --git a/src/lib/detail/impl.hpp b/src/lib/detail/impl.hpp
index bb24d14eed84045e3c0aebaaf61b4932629432d3..337f6e189078fd1129880977852d5cc3de093993 100644
--- a/src/lib/detail/impl.hpp
+++ b/src/lib/detail/impl.hpp
@@ -26,7 +26,7 @@
 #ifndef SCORD_ADMIRE_IMPL_HPP
 #define SCORD_ADMIRE_IMPL_HPP
 
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <tl/expected.hpp>
 
 namespace admire::detail {
diff --git a/src/lib/admire.hpp b/src/lib/scord/scord.hpp
similarity index 98%
rename from src/lib/admire.hpp
rename to src/lib/scord/scord.hpp
index c2dfc0e3080d196e880fe44f060037d0991821fe..4933f574341677b50ae08ac85cc824e36a4a35f4 100644
--- a/src/lib/admire.hpp
+++ b/src/lib/scord/scord.hpp
@@ -28,8 +28,8 @@
 #include "scord/types.hpp"
 #include "net/proto/rpc_types.h"
 
-#ifndef SCORD_ADMIRE_HPP
-#define SCORD_ADMIRE_HPP
+#ifndef SCORD_HPP
+#define SCORD_HPP
 
 /******************************************************************************/
 /* Public type definitions and type-related functions                         */
@@ -146,4 +146,4 @@ get_statistics(const server& srv, ADM_job_t job, ADM_job_stats_t** stats);
 
 } // namespace admire
 
-#endif // SCORD_ADMIRE_HPP
+#endif // SCORD_HPP