diff --git a/host/include/librmcs/agent/c_board.hpp b/host/include/librmcs/board/c_board.hpp
similarity index 98%
rename from host/include/librmcs/agent/c_board.hpp
rename to host/include/librmcs/board/c_board.hpp
index 382ed6c..837b5b8 100644
--- a/host/include/librmcs/agent/c_board.hpp
+++ b/host/include/librmcs/board/c_board.hpp
@@ -4,16 +4,16 @@
 #include <stdexcept>
 #include <string_view>
 
-#include <librmcs/agent/common.hpp>
+#include <librmcs/board/common.hpp>
 #include <librmcs/data/datas.hpp>
 #include <librmcs/protocol/handler.hpp>
 #include <librmcs/spec/c_board/gpio.hpp>
 #include <librmcs/spec/gpio.hpp>
 
-namespace librmcs::agent {
+namespace librmcs::board {
 
 /**
- * @brief High-level host agent for C Board.
+ * @brief High-level host board interface for C Board.
  *
  * This class owns the transport and protocol stack for a single board connection.
  * The supplied `Callback` is stored by reference, is not owned by the board, and must outlive the
@@ -177,4 +177,4 @@ class CBoard final {
     host::protocol::Handler handler_;
 };
 
-} // namespace librmcs::agent
+} // namespace librmcs::board
diff --git a/host/include/librmcs/agent/common.hpp b/host/include/librmcs/board/common.hpp
similarity index 94%
rename from host/include/librmcs/agent/common.hpp
rename to host/include/librmcs/board/common.hpp
index 69c039c..e637c9b 100644
--- a/host/include/librmcs/agent/common.hpp
+++ b/host/include/librmcs/board/common.hpp
@@ -4,17 +4,17 @@
 #include <type_traits>
 #include <utility>
 
-namespace librmcs::agent {
+namespace librmcs::board {
 
 /**
- * @brief Advanced transport options passed during agent construction.
+ * @brief Advanced transport options passed during board construction.
  *
  * `bind_advanced_options()` returns an object derived from `AdvancedOptions` whose `thread_setup`
  * callback depends on state stored in that derived object. Copying or moving the base type would
  * slice away that state while retaining a now-dangling function pointer, so `AdvancedOptions` is
  * intentionally non-copyable and non-movable.
  *
- * Construct `AdvancedOptions` directly during agent construction, or explicitly copy the required
+ * Construct `AdvancedOptions` directly during board construction, or explicitly copy the required
  * plain data fields into a fresh `AdvancedOptions` instance instead of copying an existing object.
  *
  * @warning Never copy, assign, or reuse any function pointer from an object returned by
@@ -87,4 +87,4 @@ auto bind_advanced_options(FunctorT&& thread_setup_impl) {
     return OptionsImpl{std::forward<FunctorT>(thread_setup_impl)};
 }
 
-} // namespace librmcs::agent
+} // namespace librmcs::board
diff --git a/host/include/librmcs/agent/rmcs_board_lite.hpp b/host/include/librmcs/board/rmcs_board_lite.hpp
similarity index 98%
rename from host/include/librmcs/agent/rmcs_board_lite.hpp
rename to host/include/librmcs/board/rmcs_board_lite.hpp
index 0c23538..c570d50 100644
--- a/host/include/librmcs/agent/rmcs_board_lite.hpp
+++ b/host/include/librmcs/board/rmcs_board_lite.hpp
@@ -4,16 +4,16 @@
 #include <stdexcept>
 #include <string_view>
 
-#include <librmcs/agent/common.hpp>
+#include <librmcs/board/common.hpp>
 #include <librmcs/data/datas.hpp>
 #include <librmcs/protocol/handler.hpp>
 #include <librmcs/spec/gpio.hpp>
 #include <librmcs/spec/rmcs_board_lite/gpio.hpp>
 
-namespace librmcs::agent {
+namespace librmcs::board {
 
 /**
- * @brief High-level host agent for RMCS Board Lite.
+ * @brief High-level host board interface for RMCS Board Lite.
  *
  * This class owns the transport and protocol stack for a single board connection.
  * The supplied `Callback` is stored by reference, is not owned by the board, and must outlive the
@@ -193,4 +193,4 @@ class RmcsBoardLite final {
     host::protocol::Handler handler_;
 };
 
-} // namespace librmcs::agent
+} // namespace librmcs::board
diff --git a/host/include/librmcs/agent/rmcs_board_pro.hpp b/host/include/librmcs/board/rmcs_board_pro.hpp
similarity index 98%
rename from host/include/librmcs/agent/rmcs_board_pro.hpp
rename to host/include/librmcs/board/rmcs_board_pro.hpp
index 3e7523f..66086c2 100644
--- a/host/include/librmcs/agent/rmcs_board_pro.hpp
+++ b/host/include/librmcs/board/rmcs_board_pro.hpp
@@ -4,16 +4,16 @@
 #include <stdexcept>
 #include <string_view>
 
-#include <librmcs/agent/common.hpp>
+#include <librmcs/board/common.hpp>
 #include <librmcs/data/datas.hpp>
 #include <librmcs/protocol/handler.hpp>
 #include <librmcs/spec/gpio.hpp>
 #include <librmcs/spec/rmcs_board_pro/gpio.hpp>
 
-namespace librmcs::agent {
+namespace librmcs::board {
 
 /**
- * @brief High-level host agent for RMCS Board Pro.
+ * @brief High-level host board interface for RMCS Board Pro.
  *
  * This class owns the transport and protocol stack for a single board connection.
  * The supplied `Callback` is stored by reference, is not owned by the board, and must outlive the
@@ -207,4 +207,4 @@ class RmcsBoardPro final {
     host::protocol::Handler handler_;
 };
 
-} // namespace librmcs::agent
+} // namespace librmcs::board
diff --git a/host/include/librmcs/protocol/handler.hpp b/host/include/librmcs/protocol/handler.hpp
index bbd8c78..e848baf 100644
--- a/host/include/librmcs/protocol/handler.hpp
+++ b/host/include/librmcs/protocol/handler.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string_view>
 
-#include <librmcs/agent/common.hpp>
+#include <librmcs/board/common.hpp>
 #include <librmcs/data/datas.hpp>
 #include <librmcs/export.hpp>
 
@@ -43,7 +43,7 @@ class LIBRMCS_API Handler {
 
     Handler(
         uint16_t usb_vid, int32_t usb_pid, std::string_view serial_filter,
-        const agent::AdvancedOptions& options, data::DataCallback& callback);
+        const board::AdvancedOptions& options, data::DataCallback& callback);
 
     Handler(const Handler&) = delete;
     Handler& operator=(const Handler&) = delete;
diff --git a/host/src/protocol/handler.cpp b/host/src/protocol/handler.cpp
index 27020de..123f8a4 100644
--- a/host/src/protocol/handler.cpp
+++ b/host/src/protocol/handler.cpp
@@ -24,7 +24,7 @@
 #include "host/src/logging/logging.hpp"
 #include "host/src/protocol/stream_buffer.hpp"
 #include "host/src/transport/transport.hpp"
-#include "librmcs/agent/common.hpp"
+#include "librmcs/board/common.hpp"
 #include "librmcs/data/datas.hpp"
 
 namespace librmcs::host::protocol {
@@ -379,7 +379,7 @@ bool Handler::PacketBuilder::write_gpio_analog_data(
 
 Handler::Handler(
     uint16_t usb_vid, int32_t usb_pid, std::string_view serial_filter,
-    const agent::AdvancedOptions& options, data::DataCallback& callback)
+    const board::AdvancedOptions& options, data::DataCallback& callback)
     : impl_(new Impl(
           transport::usb::create_transport(usb_vid, usb_pid, serial_filter, options), callback)) {}
 
diff --git a/host/src/transport/transport.hpp b/host/src/transport/transport.hpp
index 83b56b8..2c03c06 100644
--- a/host/src/transport/transport.hpp
+++ b/host/src/transport/transport.hpp
@@ -8,7 +8,7 @@
 #include <string_view>
 
 #include "core/src/protocol/constant.hpp"
-#include "librmcs/agent/common.hpp"
+#include "librmcs/board/common.hpp"
 
 namespace librmcs::host::transport {
 
@@ -141,7 +141,7 @@ class Transport {
 
 namespace usb {
 
-using ConnectionOptions = agent::AdvancedOptions;
+using ConnectionOptions = board::AdvancedOptions;
 
 std::unique_ptr<Transport> create_transport(
     uint16_t usb_vid, int32_t usb_pid, std::string_view serial_filter,