diff --git a/include/clinkahead.h b/include/clinkahead.h
index 592b66837cc737d8947a3c7054bc6a44ba83e852..5f50f593fae7445ed2def525b873f31c325f7a7b 100644
--- a/include/clinkahead.h
+++ b/include/clinkahead.h
@@ -225,7 +225,7 @@ int linkahead_authentication_delete_authenticator(
  * Create a connection instance.
  *
  * The connection is needed to create transactions and to initiate any other
- * interaction with a CaosDB server.
+ * interaction with a LinkAhead server.
  *
  * Use the destructor function
  * `linkahead_connection_delete_connection` to free the wrapped
diff --git a/include/linkahead/acm/user.h b/include/linkahead/acm/user.h
index aa0d20525891f5479866ce806e037509558295e0..9a9943ab978ad4dbf72e1cb1b705e8642e6f06aa 100644
--- a/include/linkahead/acm/user.h
+++ b/include/linkahead/acm/user.h
@@ -21,7 +21,7 @@
 
 /**
  * @brief Users, together with roles, and permissions are a fundamental concept
- * of the access controll management of CaosDB.
+ * of the access controll management of LinkAhead.
  *
  * @file linkahead/acm/user.h
  * @author Timm Fitchen
diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index e7180f1867ce336f0ded0ab213eb3963e8597b7f..844f46a0e5f40488bed6f2ff045a9c2c218e8fe6 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -63,7 +63,7 @@ using linkahead::transaction::TransactionStatus;
 using std::filesystem::path;
 
 /**
- * @brief A reusable connection to a CaosDBServer.
+ * @brief A reusable connection to a LinkAheadServer.
  */
 class Connection {
 public:
diff --git a/include/linkahead/entity.h b/include/linkahead/entity.h
index b80df206f9e9fcb3cdeae02d035707cabc08d584..1c75813c3ab4af95f4deb30cd6c4c60eaf135cb7 100644
--- a/include/linkahead/entity.h
+++ b/include/linkahead/entity.h
@@ -669,7 +669,7 @@ private:
 // class Entity ///////////////////////////////////////////////////////////////
 
 /**
- * Entity is the central and basic data object of CaosDB.
+ * Entity is the central and basic data object of LinkAhead.
  *
  * This class is a wrapper of the Entity class auto-generated by protobuf
  * (henceforth "ProtoEntity").
diff --git a/include/linkahead/exceptions.h b/include/linkahead/exceptions.h
index 85eec4f36e6f03e80060887c4fb5b739b648738e..2fad1e194e34d623f50470d6302a38050d214b1e 100644
--- a/include/linkahead/exceptions.h
+++ b/include/linkahead/exceptions.h
@@ -52,7 +52,7 @@ public:
 };
 
 /**
- * @brief The connection to the CaosDB server is down.
+ * @brief The connection to the LinkAhead server is down.
  */
 class ConnectionError : public Exception {
 public:
diff --git a/include/linkahead/info.h b/include/linkahead/info.h
index c71c8f27d0163f14ded3e89dc85a4ee97d6fe7a4..237564a7a6f61f01dd2de073542a13465911a585 100644
--- a/include/linkahead/info.h
+++ b/include/linkahead/info.h
@@ -25,7 +25,7 @@
  * @file linkahead/info.h
  * @author Timm Fitschen
  * @date 2021-07-02
- * @brief General information about the CaosDBServer.
+ * @brief General information about the LinkAheadServer.
  */
 #include "caosdb/info/v1/main.pb.h" // for VersionInfo
 #include <cstdint>                  // for uint32_t
@@ -49,8 +49,8 @@ public:
    * Wrapp a Protobuf VersionInfo object.
    *
    * Don't instantiate this version info class. The constructor is only public
-   * for simpler testing. Create a CaosDBConnection and use
-   * CaosDBConnection::GetVersionInfo() instead to get the version of the
+   * for simpler testing. Create a LinkAheadConnection and use
+   * LinkAheadConnection::GetVersionInfo() instead to get the version of the
    * server behind the given connection.
    */
   explicit inline VersionInfo(ProtoVersionInfo *info) : info(info){};
diff --git a/include/linkahead/message_code.h b/include/linkahead/message_code.h
index e3063d2d69d8a1b7c357a93efbca649ef7beb82e..0103d40b6cbddbc1a5ed2d6f843bc9efa781c9b7 100644
--- a/include/linkahead/message_code.h
+++ b/include/linkahead/message_code.h
@@ -27,7 +27,7 @@
 /**
  * MessageCodes for entity messages.
  *
- * In contrast to the status codes, the message codes are part of the CaosDB
+ * In contrast to the status codes, the message codes are part of the LinkAhead
  * API. Messages (and their codes) represent the state of the entities in a
  * transaction or the server.
  *
diff --git a/include/linkahead/transaction.h b/include/linkahead/transaction.h
index 6394c222ca608a98f766dc29471466be6a0e1dfe..efe2ae0ff69b244ffb09245d1ff3b31a92e9b5bf 100644
--- a/include/linkahead/transaction.h
+++ b/include/linkahead/transaction.h
@@ -189,7 +189,7 @@ using linkahead::utility::get_arena;
 class Transaction;
 
 /**
- * @brief Create a transaction via `CaosDBConnection.createTransaction()`
+ * @brief Create a transaction via `LinkAheadConnection.createTransaction()`
  */
 class Transaction {
 public:
diff --git a/include/linkahead/utility.h b/include/linkahead/utility.h
index d5d9a1422a9c978c4aa8245d4c05dbeffa596213..1b739d7e9f0a919df2501c6e8a0fb981407447be 100644
--- a/include/linkahead/utility.h
+++ b/include/linkahead/utility.h
@@ -35,7 +35,7 @@ using std::filesystem::exists;
 using std::filesystem::path;
 
 /**
- * @brief Get the name of the enum value.  May be useful for higher-order CaosDB clients.
+ * @brief Get the name of the enum value.  May be useful for higher-order LinkAhead clients.
  */
 template <typename Enum> auto getEnumNameFromValue(Enum v) -> std::string;
 
@@ -52,7 +52,7 @@ auto getEnumNameFromValue<linkahead::entity::Role>(linkahead::entity::Role v) ->
 /**
  * @brief Get the enum value from a string.
  *
- * @detail May be useful for higher-order CaosDB clients and only makes sense if specialized.
+ * @detail May be useful for higher-order LinkAhead clients and only makes sense if specialized.
  */
 template <typename Enum> auto getEnumValueFromName(const std::string &name) -> Enum;
 
diff --git a/include/linkahead/value.h b/include/linkahead/value.h
index 42b59eecc36ba7bc36128a31ddd0c8000950346f..78407a3f418a44e26d8f6ee50e751437e072bae2 100644
--- a/include/linkahead/value.h
+++ b/include/linkahead/value.h
@@ -66,7 +66,7 @@ public:
    */
   virtual ~AbstractValue() = 0;
   /**
-   * Return true iff the value is a NULL value (NULL in the CaosDB sense).
+   * Return true iff the value is a NULL value (NULL in the LinkAhead sense).
    */
   [[nodiscard]] virtual auto IsNull() const noexcept -> bool = 0;
   /**
diff --git a/src/linkahead/configuration.cpp b/src/linkahead/configuration.cpp
index 481fb09224b542f8aed01b5a71b89cd3f0537a69..8db1f791960eaab01c17052a7f989fc7123aa726 100644
--- a/src/linkahead/configuration.cpp
+++ b/src/linkahead/configuration.cpp
@@ -52,21 +52,21 @@
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define GET_CONNECTIONS                                                                            \
   if (!this->json_configuration.wrapped) {                                                         \
-    throw ConfigurationError("This CaosDB client has not been configured.");                       \
+    throw ConfigurationError("This LinkAhead client has not been configured.");                    \
   }                                                                                                \
   assert(WRAPPED_JSON_CONFIGURATION(this)->is_object());                                           \
   const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object();                     \
   if (!configuration.contains("connections")) {                                                    \
-    throw ConfigurationError("This CaosDB client hasn't any configured connections.");             \
+    throw ConfigurationError("This LinkAhead client hasn't any configured connections.");          \
   }                                                                                                \
   const auto &connections_value = configuration.at("connections");                                 \
   if (connections_value.is_null()) {                                                               \
-    throw ConfigurationError("This CaosDB client hasn't any configured connections.");             \
+    throw ConfigurationError("This LinkAhead client hasn't any configured connections.");          \
   }                                                                                                \
   assert(connections_value.is_object());                                                           \
   const auto &connections = connections_value.as_object();                                         \
   if (connections.empty()) {                                                                       \
-    throw ConfigurationError("This CaosDB client hasn't any configured connections.");             \
+    throw ConfigurationError("This LinkAhead client hasn't any configured connections.");          \
   }
 
 namespace linkahead::configuration {
@@ -383,7 +383,7 @@ auto ConfigurationManager::mClear() noexcept -> int {
 
 auto ConfigurationManager::mLoadSingleJSONConfiguration(const path &json_file) -> void {
   if (json_configuration.wrapped) {
-    throw ConfigurationError("This CaosDB client has already been configured.");
+    throw ConfigurationError("This LinkAhead client has already been configured.");
   }
   if (!exists(json_file)) {
     throw ConfigurationError("Configuration file does not exist.");
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index 65d3ffe0c5d129ea8015c3f2f86c24ffe3b976ee..aa805ad09d202f19d59828f3712255c52008fbb4 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -47,7 +47,8 @@ class test_connection : public ::testing::Test {
 protected:
   void SetUp() override {
     ConfigurationManager::Clear();
-    ConfigurationManager::LoadSingleJSONConfiguration(TEST_DATA_DIR + "/test_linkahead_client.json");
+    ConfigurationManager::LoadSingleJSONConfiguration(TEST_DATA_DIR +
+                                                      "/test_linkahead_client.json");
   };
   void TearDown() override { ConfigurationManager::Clear(); };
 };
diff --git a/test/test_data/test_linkahead.json b/test/test_data/test_linkahead_client.json
similarity index 100%
rename from test/test_data/test_linkahead.json
rename to test/test_data/test_linkahead_client.json