From 383f543fb753b13fc218748d297e5c22710174fe Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Sat, 31 Aug 2024 20:56:23 +0200
Subject: [PATCH] Rename #include directives except proto

---
 include/linkahead/authentication.h            |  2 +-
 include/linkahead/configuration.h             |  8 +++---
 include/linkahead/connection.h                | 14 +++++-----
 include/linkahead/data_type.h                 |  2 +-
 include/linkahead/entity.h                    | 14 +++++-----
 include/linkahead/exceptions.h                |  2 +-
 .../download_request_handler.h                |  8 +++---
 .../register_file_upload_handler.h            |  6 ++---
 .../upload_request_handler.h                  |  8 +++---
 include/linkahead/handler_interface.h         |  2 +-
 include/linkahead/info.h                      |  4 +--
 include/linkahead/logging.h                   |  2 +-
 include/linkahead/result_set.h                |  2 +-
 include/linkahead/result_table.h              |  2 +-
 include/linkahead/transaction.h               | 24 ++++++++---------
 include/linkahead/transaction_handler.h       |  6 ++---
 include/linkahead/transaction_status.h        |  4 +--
 include/linkahead/unary_rpc_handler.h         |  4 +--
 include/linkahead/utility.h                   |  4 +--
 include/linkahead/value.h                     |  2 +-
 src/clinkahead.cpp                            | 18 ++++++-------
 src/clinkaheadcli.c                           |  4 +--
 src/cxxlinkaheadcli.cpp                       | 16 ++++++------
 src/linkahead/acm/user.cpp                    |  6 ++---
 src/linkahead/acm/user_impl.h                 |  4 +--
 src/linkahead/authentication.cpp              |  4 +--
 src/linkahead/configuration.cpp               | 18 ++++++-------
 src/linkahead/connection.cpp                  | 14 +++++-----
 src/linkahead/entity.cpp                      |  8 +++---
 .../download_request_handler.cpp              | 10 +++----
 .../file_transmission/file_reader.cpp         |  4 +--
 .../file_transmission/file_writer.cpp         |  4 +--
 .../register_file_upload_handler.cpp          |  4 +--
 .../upload_request_handler.cpp                | 10 +++----
 src/linkahead/logging.cpp                     |  4 +--
 src/linkahead/protobuf_helper.cpp             |  4 +--
 src/linkahead/result_set.cpp                  |  2 +-
 src/linkahead/result_table.cpp                |  8 +++---
 src/linkahead/result_table_impl.h             | 20 +++++++-------
 src/linkahead/status_code_description.cpp     |  2 +-
 src/linkahead/transaction.cpp                 | 26 +++++++++----------
 src/linkahead/transaction_handler.cpp         |  4 +--
 src/linkahead/unary_rpc_handler.cpp           |  6 ++---
 src/linkahead/utility.cpp                     |  6 ++---
 test/test_ccaosdb.cpp                         |  6 ++---
 test/test_configuration.cpp                   |  8 +++---
 test/test_connection.cpp                      | 10 +++----
 test/test_data_type.cpp                       |  8 +++---
 test/test_entity.cpp                          | 16 ++++++------
 test/test_file_transmission.cpp               |  4 +--
 test/test_info.cpp                            |  2 +-
 test/test_issues.cpp                          | 12 ++++-----
 test/test_list_properties.cpp                 |  6 ++---
 test/test_protobuf.cpp                        |  4 +--
 test/test_transaction.cpp                     | 18 ++++++-------
 test/test_user.cpp                            |  2 +-
 test/test_utility.cpp                         |  8 +++---
 test/test_value.cpp                           |  4 +--
 58 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/include/linkahead/authentication.h b/include/linkahead/authentication.h
index 0ea818c..ecc20c6 100644
--- a/include/linkahead/authentication.h
+++ b/include/linkahead/authentication.h
@@ -27,7 +27,7 @@
  * @date 2021-06-28
  * @brief Configuration and setup of the client authentication.
  */
-#include "caosdb/utility.h"               // for base64_encode
+#include "linkahead/utility.h"               // for base64_encode
 #include <grpcpp/security/auth_context.h> // for AuthContext
 #include <grpcpp/security/credentials.h>  // for CallCredentials
 #include <grpcpp/support/interceptor.h>   // for Status
diff --git a/include/linkahead/configuration.h b/include/linkahead/configuration.h
index 11b29f3..e6c1d48 100644
--- a/include/linkahead/configuration.h
+++ b/include/linkahead/configuration.h
@@ -22,10 +22,10 @@
 #ifndef CAOSDB_CONFIGURATION_H
 #define CAOSDB_CONFIGURATION_H
 
-#include "caosdb/authentication.h"         // for Authenticator, PlainPassw...
-#include "caosdb/certificate_provider.h"   // for CertificateProvider, path
-#include "caosdb/exceptions.h"             // for ConfigurationError
-#include "caosdb/utility.h"                // for load_json_file
+#include "linkahead/authentication.h"         // for Authenticator, PlainPassw...
+#include "linkahead/certificate_provider.h"   // for CertificateProvider, path
+#include "linkahead/exceptions.h"             // for ConfigurationError
+#include "linkahead/utility.h"                // for load_json_file
 #include <google/protobuf/arena.h>         // for Arena
 #include <google/protobuf/extension_set.h> // for Arena
 #include <grpcpp/security/credentials.h>   // for ChannelCredentials
diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index d3f1048..8ac22da 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -28,16 +28,16 @@
  * @brief Configuration and setup of the connection.
  */
 #ifdef BUILD_ACM
-#include "caosdb/acm/user.h"                  // for User
+#include "linkahead/acm/user.h"                  // for User
 #include "caosdb/acm/v1alpha1/main.grpc.pb.h" // for AccessControlMan...
 #endif
-#include "caosdb/authentication.h"         // for Authenticator
-#include "caosdb/configuration.h"          // for ConnectionConfigura...
-#include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransactionSe...
-#include "caosdb/info.h"                   // for VersionInfo
+#include "linkahead/authentication.h"         // for Authenticator
+#include "linkahead/configuration.h"          // for ConnectionConfigura...
+#include "caosdb/entity/v1/main.pb.h" // for EntityTransactionSe...
+#include "linkahead/info.h"                   // for VersionInfo
 #include "caosdb/info/v1/main.grpc.pb.h"   // for GeneralInfoService:...
-#include "caosdb/transaction.h"            // for Transaction
-#include "caosdb/transaction_status.h"     // for TransactionStatus
+#include "linkahead/transaction.h"            // for Transaction
+#include "linkahead/transaction_status.h"     // for TransactionStatus
 #include <filesystem>                      // for path
 #include <grpcpp/channel.h>                // for Channel
 #include <map>                             // for map
diff --git a/include/linkahead/data_type.h b/include/linkahead/data_type.h
index 11909c0..8accd29 100644
--- a/include/linkahead/data_type.h
+++ b/include/linkahead/data_type.h
@@ -28,7 +28,7 @@
 
 #ifndef CAOSDB_DATA_TYPE_H
 #define CAOSDB_DATA_TYPE_H
-#include "caosdb/protobuf_helper.h"   // for ProtoMessageWrapper
+#include "linkahead/protobuf_helper.h"   // for ProtoMessageWrapper
 #include "caosdb/entity/v1/main.pb.h" // for RepeatedPtrField, Message
 #include <memory>                     // for unique_ptr
 #include <string>                     // for string
diff --git a/include/linkahead/entity.h b/include/linkahead/entity.h
index 354f60f..ba5907d 100644
--- a/include/linkahead/entity.h
+++ b/include/linkahead/entity.h
@@ -29,14 +29,14 @@
 #ifndef CAOSDB_ENTITY_H
 #define CAOSDB_ENTITY_H
 
-#include "caosdb/data_type.h"         // for DataType
+#include "linkahead/data_type.h"         // for DataType
 #include "caosdb/entity/v1/main.pb.h" // for RepeatedPtrField
-#include "caosdb/file_descriptor.h"   // for FileDescriptor
-#include "caosdb/logging.h"           // for CAOSDB_LOG_WARN
-#include "caosdb/message_code.h"      // for get_message_code
-#include "caosdb/protobuf_helper.h"   // for get_arena
-#include "caosdb/status_code.h"       // for StatusCode
-#include "caosdb/value.h"             // for Value
+#include "linkahead/file_descriptor.h"   // for FileDescriptor
+#include "linkahead/logging.h"           // for CAOSDB_LOG_WARN
+#include "linkahead/message_code.h"      // for get_message_code
+#include "linkahead/protobuf_helper.h"   // for get_arena
+#include "linkahead/status_code.h"       // for StatusCode
+#include "linkahead/value.h"             // for Value
 #include <cstdint>                    // for int64_t
 #include <filesystem>                 // for path
 #include <google/protobuf/arena.h>    // for Arena
diff --git a/include/linkahead/exceptions.h b/include/linkahead/exceptions.h
index 415d072..f9bcdce 100644
--- a/include/linkahead/exceptions.h
+++ b/include/linkahead/exceptions.h
@@ -21,7 +21,7 @@
 
 #ifndef CAOSDB_EXCEPTIONS_H
 #define CAOSDB_EXCEPTIONS_H
-#include "caosdb/status_code.h"
+#include "linkahead/status_code.h"
 #include <stdexcept>
 #include <string>
 
diff --git a/include/linkahead/file_transmission/download_request_handler.h b/include/linkahead/file_transmission/download_request_handler.h
index 9c82b23..b13844d 100644
--- a/include/linkahead/file_transmission/download_request_handler.h
+++ b/include/linkahead/file_transmission/download_request_handler.h
@@ -49,11 +49,11 @@
 #ifndef CAOSDB_FILE_TRANSMISSION_DOWNLOAD_REQUEST_HANDLER_H
 #define CAOSDB_FILE_TRANSMISSION_DOWNLOAD_REQUEST_HANDLER_H
 
-#include "caosdb/file_descriptor.h"               // for FileDescriptor
-#include "caosdb/entity/v1/main.grpc.pb.h"        // for FileTransmissionS...
+#include "linkahead/file_descriptor.h"               // for FileDescriptor
+#include "caosdb/entity/v1/main.pb.h"        // for FileTransmissionS...
 #include "caosdb/entity/v1/main.pb.h"             // for FileDownloadResponse
-#include "caosdb/file_transmission/file_writer.h" // for FileWriter
-#include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
+#include "linkahead/file_transmission/file_writer.h" // for FileWriter
+#include "linkahead/handler_interface.h"             // for HandlerTag, Handl...
 #include <cstdint>                                // for uint64_t
 #include <grpcpp/client_context.h>                // for ClientContext
 #include <grpcpp/completion_queue.h>              // for CompletionQueue
diff --git a/include/linkahead/file_transmission/register_file_upload_handler.h b/include/linkahead/file_transmission/register_file_upload_handler.h
index 37cc6cf..67e4181 100644
--- a/include/linkahead/file_transmission/register_file_upload_handler.h
+++ b/include/linkahead/file_transmission/register_file_upload_handler.h
@@ -49,10 +49,10 @@
 #ifndef CAOSDB_FILE_TRANSMISSION_REGISTER_FILE_UPLOAD_H
 #define CAOSDB_FILE_TRANSMISSION_REGISTER_FILE_UPLOAD_H
 
-#include "caosdb/entity/v1/main.grpc.pb.h"   // for FileTransmissionS...
+#include "caosdb/entity/v1/main.pb.h"   // for FileTransmissionS...
 #include "caosdb/entity/v1/main.pb.h"        // for FileDownloadResponse
-#include "caosdb/handler_interface.h"        // for HandlerTag, Handl...
-#include "caosdb/unary_rpc_handler.h"        // for  UnaryRpcHandler
+#include "linkahead/handler_interface.h"        // for HandlerTag, Handl...
+#include "linkahead/unary_rpc_handler.h"        // for  UnaryRpcHandler
 #include <grpcpp/completion_queue.h>         // for CompletionQueue
 #include <grpcpp/support/async_unary_call.h> // for ClientAsyncResponseReader
 #include <memory>                            // for unique_ptr
diff --git a/include/linkahead/file_transmission/upload_request_handler.h b/include/linkahead/file_transmission/upload_request_handler.h
index f9d6aab..89dd16c 100644
--- a/include/linkahead/file_transmission/upload_request_handler.h
+++ b/include/linkahead/file_transmission/upload_request_handler.h
@@ -49,11 +49,11 @@
 #ifndef CAOSDB_FILE_TRANSMISSION_UPLOAD_REQUEST_HANDLER_H
 #define CAOSDB_FILE_TRANSMISSION_UPLOAD_REQUEST_HANDLER_H
 
-#include "caosdb/entity/v1/main.grpc.pb.h"        // for FileTransmissionS...
+#include "caosdb/entity/v1/main.pb.h"        // for FileTransmissionS...
 #include "caosdb/entity/v1/main.pb.h"             // for FileUploadRequest
-#include "caosdb/file_descriptor.h"               // for FileDescriptor
-#include "caosdb/file_transmission/file_reader.h" // for FileReader
-#include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
+#include "linkahead/file_descriptor.h"               // for FileDescriptor
+#include "linkahead/file_transmission/file_reader.h" // for FileReader
+#include "linkahead/handler_interface.h"             // for HandlerTag, Handl...
 #include <cstdint>                                // for uint64_t
 #include <grpcpp/client_context.h>                // for ClientContext
 #include <grpcpp/completion_queue.h>              // for CompletionQueue
diff --git a/include/linkahead/handler_interface.h b/include/linkahead/handler_interface.h
index f5d77f8..2896bfb 100644
--- a/include/linkahead/handler_interface.h
+++ b/include/linkahead/handler_interface.h
@@ -49,7 +49,7 @@
 #ifndef CAOSDB_HANDLER_INTERFACE_H
 #define CAOSDB_HANDLER_INTERFACE_H
 
-#include "caosdb/transaction_status.h" // for TransactionStatus
+#include "linkahead/transaction_status.h" // for TransactionStatus
 #include <memory>
 #include <string>
 
diff --git a/include/linkahead/info.h b/include/linkahead/info.h
index 4b7c948..6bc5637 100644
--- a/include/linkahead/info.h
+++ b/include/linkahead/info.h
@@ -22,12 +22,12 @@
 #ifndef CAOSDB_INFO_H
 #define CAOSDB_INFO_H
 /**
- * @file caosdb/info.h
+ * @file linkahead/info.h
  * @author Timm Fitschen
  * @date 2021-07-02
  * @brief General information about the CaosDBServer.
  */
-#include "caosdb/info/v1/main.pb.h" // for VersionInfo
+#include "linkahead/info/v1/main.pb.h" // for VersionInfo
 #include <cstdint>                  // for uint32_t
 #include <string>                   // for string
 
diff --git a/include/linkahead/logging.h b/include/linkahead/logging.h
index a0afefb..d9f90a4 100644
--- a/include/linkahead/logging.h
+++ b/include/linkahead/logging.h
@@ -23,7 +23,7 @@
 #ifndef CAOSDB_LOGGING_H
 #define CAOSDB_LOGGING_H
 
-#include "caosdb/log_level.h" // for CAOSDB_LOG_...
+#include "linkahead/log_level.h" // for CAOSDB_LOG_...
 #include <cstdint>            // for uint64_t
 #include <iosfwd>             // for streamsize
 #include <memory>             // for shared_ptr
diff --git a/include/linkahead/result_set.h b/include/linkahead/result_set.h
index 2ce70e6..03d9874 100644
--- a/include/linkahead/result_set.h
+++ b/include/linkahead/result_set.h
@@ -21,7 +21,7 @@
 #ifndef CAOSDB_RESULT_SET_H
 #define CAOSDB_RESULT_SET_H
 
-#include "caosdb/entity.h" // for Entity, FileDe...
+#include "linkahead/entity.h" // for Entity, FileDe...
 #include <algorithm>       // for max
 #include <iterator>        // for iterator, next
 #include <memory>          // for unique_ptr
diff --git a/include/linkahead/result_table.h b/include/linkahead/result_table.h
index 6795e27..5479383 100644
--- a/include/linkahead/result_table.h
+++ b/include/linkahead/result_table.h
@@ -21,7 +21,7 @@
 #ifndef CAOSDB_RESULT_TABLE_H
 #define CAOSDB_RESULT_TABLE_H
 
-#include "caosdb/value.h" // for Value
+#include "linkahead/value.h" // for Value
 #include <iterator>       // for iterator, next
 #include <memory>         // for unique_ptr
 #include <string>         // for string
diff --git a/include/linkahead/transaction.h b/include/linkahead/transaction.h
index 3d99416..9759477 100644
--- a/include/linkahead/transaction.h
+++ b/include/linkahead/transaction.h
@@ -21,19 +21,19 @@
 #ifndef CAOSDB_TRANSACTION_H
 #define CAOSDB_TRANSACTION_H
 
-#include "caosdb/entity.h"                  // for Entity, FileDe...
-#include "caosdb/entity/v1/main.grpc.pb.h"  // for EntityTransact...
+#include "linkahead/entity.h"                  // for Entity, FileDe...
+#include "caosdb/entity/v1/main.pb.h"  // for EntityTransact...
 #include "caosdb/entity/v1/main.pb.h"       // for MultiTransacti...
-#include "caosdb/file_descriptor.h"         // for FileDescriptor
-#include "caosdb/handler_interface.h"       // for HandlerInterface
-#include "caosdb/transaction_handler.h"     // for EntityTransactionHandler
-#include "caosdb/logging.h"                 // for CAOSDB_LOG_ERR...
-#include "caosdb/protobuf_helper.h"         // for get_arena
-#include "caosdb/status_code.h"             // for StatusCode
-#include "caosdb/result_set.h"              // for ResultSet
-#include "caosdb/result_table.h"            // for ResultTable
-#include "caosdb/transaction_status.h"      // for StatusCode
-#include "caosdb/value.h"                   // for Value
+#include "linkahead/file_descriptor.h"         // for FileDescriptor
+#include "linkahead/handler_interface.h"       // for HandlerInterface
+#include "linkahead/transaction_handler.h"     // for EntityTransactionHandler
+#include "linkahead/logging.h"                 // for CAOSDB_LOG_ERR...
+#include "linkahead/protobuf_helper.h"         // for get_arena
+#include "linkahead/status_code.h"             // for StatusCode
+#include "linkahead/result_set.h"              // for ResultSet
+#include "linkahead/result_table.h"            // for ResultTable
+#include "linkahead/transaction_status.h"      // for StatusCode
+#include "linkahead/value.h"                   // for Value
 #include <future>                           // for async, future
 #include <google/protobuf/arena.h>          // for Arena
 #include <google/protobuf/util/json_util.h> // for MessageToJsonS...
diff --git a/include/linkahead/transaction_handler.h b/include/linkahead/transaction_handler.h
index 3f9fc81..933deb7 100644
--- a/include/linkahead/transaction_handler.h
+++ b/include/linkahead/transaction_handler.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "caosdb/entity/v1/main.grpc.pb.h"   // for FileTransmissionS...
+#include "caosdb/entity/v1/main.pb.h"   // for FileTransmissionS...
 #include "caosdb/entity/v1/main.pb.h"        // for FileDownloadResponse
-#include "caosdb/handler_interface.h"        // for HandlerTag
-#include "caosdb/unary_rpc_handler.h"        // for HandlerTag, Handl...
+#include "linkahead/handler_interface.h"        // for HandlerTag
+#include "linkahead/unary_rpc_handler.h"        // for HandlerTag, Handl...
 #include <grpcpp/completion_queue.h>         // for CompletionQueue
 #include <grpcpp/support/async_unary_call.h> // for ClientAsyncResponseReader
 #include <memory>                            // for unique_ptr
diff --git a/include/linkahead/transaction_status.h b/include/linkahead/transaction_status.h
index 020da73..cac4c77 100644
--- a/include/linkahead/transaction_status.h
+++ b/include/linkahead/transaction_status.h
@@ -22,8 +22,8 @@
 #ifndef CAOSDB_TRANSACTION_STATUS_H
 #define CAOSDB_TRANSACTION_STATUS_H
 
-#include "caosdb/status_code.h"
-#include "caosdb/exceptions.h"
+#include "linkahead/status_code.h"
+#include "linkahead/exceptions.h"
 #include <memory> // for shared_ptr, unique_ptr
 #include <string> // for string
 
diff --git a/include/linkahead/unary_rpc_handler.h b/include/linkahead/unary_rpc_handler.h
index 06b9457..b3cb8b0 100644
--- a/include/linkahead/unary_rpc_handler.h
+++ b/include/linkahead/unary_rpc_handler.h
@@ -49,8 +49,8 @@
 #ifndef CAOSDB_UNARY_RPC_HANDLER_H
 #define CAOSDB_UNARY_RPC_HANDLER_H
 
-#include "caosdb/handler_interface.h"  // for HandlerTag, Handl...
-#include "caosdb/transaction_status.h" // for TransactionStatus
+#include "linkahead/handler_interface.h"  // for HandlerTag, Handl...
+#include "linkahead/transaction_status.h" // for TransactionStatus
 #include <grpcpp/client_context.h>     // for ClientContext
 #include <grpcpp/completion_queue.h>   // for CompletionQueue
 #include <grpcpp/support/status.h>     // for Status
diff --git a/include/linkahead/utility.h b/include/linkahead/utility.h
index 2ae2d6d..ab2ff23 100644
--- a/include/linkahead/utility.h
+++ b/include/linkahead/utility.h
@@ -21,8 +21,8 @@
 
 #ifndef CAOSDB_UTILS_H
 #define CAOSDB_UTILS_H
-#include "caosdb/data_type.h" // for AtomicDataType
-#include "caosdb/entity.h"    // for Importance, Role
+#include "linkahead/data_type.h" // for AtomicDataType
+#include "linkahead/entity.h"    // for Importance, Role
 #include <cstdlib>            // for getenv
 #include <filesystem>         // for path
 #include <fstream>            // for basic_istream<>::__ist...
diff --git a/include/linkahead/value.h b/include/linkahead/value.h
index e17fc55..0531a21 100644
--- a/include/linkahead/value.h
+++ b/include/linkahead/value.h
@@ -21,7 +21,7 @@
 
 #ifndef CAOSDB_VALUE_H
 #define CAOSDB_VALUE_H
-#include "caosdb/protobuf_helper.h"   // for ProtoMessageWrapper
+#include "linkahead/protobuf_helper.h"   // for ProtoMessageWrapper
 #include "caosdb/entity/v1/main.pb.h" // for RepeatedPtrField, Message
 #include <cstdint>                    // for int64_t
 #include <google/protobuf/arena.h>    // for Arena
diff --git a/src/clinkahead.cpp b/src/clinkahead.cpp
index 82bcbae..bce000b 100644
--- a/src/clinkahead.cpp
+++ b/src/clinkahead.cpp
@@ -19,15 +19,15 @@
  * <https://www.gnu.org/licenses/>.
  *
  */
-#include "ccaosdb.h"
-#include "caosdb/connection.h"
-#include "caosdb/constants.h"
-#include "caosdb/data_type.h" // for DataType, AtomicDat...
-#include "caosdb/entity.h"
-#include "caosdb/value.h"
-#include "caosdb/utility.h"
-#include "caosdb/status_code.h"
-#include "caosdb/logging.h"
+#include "clinkahead.h"
+#include "linkahead/connection.h"
+#include "linkahead/constants.h"
+#include "linkahead/data_type.h" // for DataType, AtomicDat...
+#include "linkahead/entity.h"
+#include "linkahead/value.h"
+#include "linkahead/utility.h"
+#include "linkahead/status_code.h"
+#include "linkahead/logging.h"
 #include <cassert>
 #include <cstring>
 #include <exception>
diff --git a/src/clinkaheadcli.c b/src/clinkaheadcli.c
index e3ce7de..fb2d198 100644
--- a/src/clinkaheadcli.c
+++ b/src/clinkaheadcli.c
@@ -1,5 +1,5 @@
-#include "caosdb/constants.h" // for LIBCAOSDB_VERSION_MAJOR, LIBCAOSDB_VER...
-#include "ccaosdb.h"          // for caosdb_info_version_info, caosdb_conne...
+#include "linkahead/constants.h" // for LIBCAOSDB_VERSION_MAJOR, LIBCAOSDB_VER...
+#include "clinkahead.h"          // for caosdb_info_version_info, caosdb_conne...
 #include <stdio.h>            // for printf
 
 int main(void) {
diff --git a/src/cxxlinkaheadcli.cpp b/src/cxxlinkaheadcli.cpp
index e6e5cee..6c83d54 100644
--- a/src/cxxlinkaheadcli.cpp
+++ b/src/cxxlinkaheadcli.cpp
@@ -21,14 +21,14 @@
  */
 
 // A simple caosdb client
-#include "caosdb/connection.h"         // for Connection, ConnectionManager
-#include "caosdb/constants.h"          // for LIBCAOSDB_VERSION_MINOR, LIBCAOSDB_V...
-#include "caosdb/entity.h"             // for Entity
-#include "caosdb/exceptions.h"         // for ConfigurationError
-#include "caosdb/info.h"               // for VersionInfo
-#include "caosdb/logging.h"            // for CAOSDB_LOG_TRACE
-#include "caosdb/transaction.h"        // for Transaction, ResultSet
-#include "caosdb/transaction_status.h" // for TransactionSt...
+#include "linkahead/connection.h"         // for Connection, ConnectionManager
+#include "linkahead/constants.h"          // for LIBCAOSDB_VERSION_MINOR, LIBCAOSDB_V...
+#include "linkahead/entity.h"             // for Entity
+#include "linkahead/exceptions.h"         // for ConfigurationError
+#include "linkahead/info.h"               // for VersionInfo
+#include "linkahead/logging.h"            // for CAOSDB_LOG_TRACE
+#include "linkahead/transaction.h"        // for Transaction, ResultSet
+#include "linkahead/transaction_status.h" // for TransactionSt...
 #include <boost/log/core/record.hpp>   // for record
 #include <boost/log/detail/attachable_sstream_buf.hpp> // for basic_ostring...
 #include <boost/log/sources/record_ostream.hpp>        // for operator<<
diff --git a/src/linkahead/acm/user.cpp b/src/linkahead/acm/user.cpp
index 2988287..bdf4790 100644
--- a/src/linkahead/acm/user.cpp
+++ b/src/linkahead/acm/user.cpp
@@ -18,10 +18,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/acm/user.h"
-#include "caosdb/acm/user_impl.h"        // for UserImpl
+#include "linkahead/acm/user.h"
+#include "linkahead/acm/user_impl.h"        // for UserImpl
 #include "caosdb/acm/v1alpha1/main.pb.h" // for ProtoUser
-#include "caosdb/protobuf_helper.h"      // for ProtoMessageWrapper
+#include "linkahead/protobuf_helper.h"      // for ProtoMessageWrapper
 #include <utility>                       // for move
 
 namespace caosdb::acm {
diff --git a/src/linkahead/acm/user_impl.h b/src/linkahead/acm/user_impl.h
index ea2e0da..08e6b1e 100644
--- a/src/linkahead/acm/user_impl.h
+++ b/src/linkahead/acm/user_impl.h
@@ -18,9 +18,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/acm/user.h"
+#include "linkahead/acm/user.h"
 #include "caosdb/acm/v1alpha1/main.pb.h" // for ProtoUser
-#include "caosdb/protobuf_helper.h"      // for ProtoMessageWrapper
+#include "linkahead/protobuf_helper.h"      // for ProtoMessageWrapper
 #include <memory>                        // for unique_ptr
 #include <utility>                       // for move
 
diff --git a/src/linkahead/authentication.cpp b/src/linkahead/authentication.cpp
index 919f9bc..a0e3d2e 100644
--- a/src/linkahead/authentication.cpp
+++ b/src/linkahead/authentication.cpp
@@ -18,8 +18,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/authentication.h"
-#include "caosdb/utility.h"               // for base64_encode
+#include "linkahead/authentication.h"
+#include "linkahead/utility.h"               // for base64_encode
 #include <grpcpp/security/credentials.h>  // for MetadataCredentialsPlugin
 #include <grpcpp/security/auth_context.h> // for AuthContext
 #include <map>                            // for multimap
diff --git a/src/linkahead/configuration.cpp b/src/linkahead/configuration.cpp
index 507f11e..9844baa 100644
--- a/src/linkahead/configuration.cpp
+++ b/src/linkahead/configuration.cpp
@@ -18,15 +18,15 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/configuration.h"
-#include "caosdb/authentication.h"    // for Authenticator
-#include "caosdb/connection.h"        // for ConnectionManager
-#include "caosdb/constants.h"         // for LIBCAOSDB_CONF...
-#include "caosdb/exceptions.h"        // for ConfigurationE...
-#include "caosdb/log_level.h"         // for CAOSDB_DEFAULT...
-#include "caosdb/logging.h"           // for SinkConfiguration, Loggin...
-#include "caosdb/status_code.h"       // for StatusCode
-#include "caosdb/utility.h"           // for get_home_direc...
+#include "linkahead/configuration.h"
+#include "linkahead/authentication.h"    // for Authenticator
+#include "linkahead/connection.h"        // for ConnectionManager
+#include "linkahead/constants.h"         // for LIBCAOSDB_CONF...
+#include "linkahead/exceptions.h"        // for ConfigurationE...
+#include "linkahead/log_level.h"         // for CAOSDB_DEFAULT...
+#include "linkahead/logging.h"           // for SinkConfiguration, Loggin...
+#include "linkahead/status_code.h"       // for StatusCode
+#include "linkahead/utility.h"           // for get_home_direc...
 #include <boost/json/impl/object.hpp> // for object::at
 #include <boost/json/object.hpp>      // for object, objec...
 #include <boost/json/string.hpp>      // for string
diff --git a/src/linkahead/connection.cpp b/src/linkahead/connection.cpp
index ebd5563..510c7ff 100644
--- a/src/linkahead/connection.cpp
+++ b/src/linkahead/connection.cpp
@@ -19,19 +19,19 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/connection.h"
+#include "linkahead/connection.h"
 #ifdef BUILD_ACM
-#include "caosdb/acm/user_impl.h"             // for UserImpl
+#include "linkahead/acm/user_impl.h"             // for UserImpl
 #include "caosdb/acm/v1alpha1/main.grpc.pb.h" // for AccessControlMan...
 #include "caosdb/acm/v1alpha1/main.pb.h"      // for CreateSingleUser...
 #endif
-#include "caosdb/configuration.h"        // for ConnectionConfigur...
-#include "caosdb/exceptions.h"           // for ConfigurationError
-#include "caosdb/info.h"                 // for VersionInfo
+#include "linkahead/configuration.h"        // for ConnectionConfigur...
+#include "linkahead/exceptions.h"           // for ConfigurationError
+#include "linkahead/info.h"                 // for VersionInfo
 #include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService
 #include "caosdb/info/v1/main.pb.h"      // for GetVersionInfoRequest
-#include "caosdb/transaction.h"          // for Transaction
-#include "caosdb/transaction_status.h"   // for TransactionStatus
+#include "linkahead/transaction.h"          // for Transaction
+#include "linkahead/transaction_status.h"   // for TransactionStatus
 #include <grpcpp/client_context.h>       // for ClientContext
 #include <grpcpp/create_channel.h>       // for CreateChannel
 #include <grpcpp/support/status.h>       // for Status
diff --git a/src/linkahead/entity.cpp b/src/linkahead/entity.cpp
index 1567488..1f2716a 100644
--- a/src/linkahead/entity.cpp
+++ b/src/linkahead/entity.cpp
@@ -19,11 +19,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/entity.h"
-#include "caosdb/data_type.h"         // for DataType
+#include "linkahead/entity.h"
+#include "linkahead/data_type.h"         // for DataType
 #include "caosdb/entity/v1/main.pb.h" // for Messages
-#include "caosdb/protobuf_helper.h"   // for get_arena
-#include "caosdb/status_code.h"       // for StatusCode
+#include "linkahead/protobuf_helper.h"   // for get_arena
+#include "linkahead/status_code.h"       // for StatusCode
 #include <google/protobuf/arena.h>    // for Arena
 #include <string>                     // for string
 #include <vector>                     // for vector
diff --git a/src/linkahead/file_transmission/download_request_handler.cpp b/src/linkahead/file_transmission/download_request_handler.cpp
index 1b0764f..8c90dcd 100644
--- a/src/linkahead/file_transmission/download_request_handler.cpp
+++ b/src/linkahead/file_transmission/download_request_handler.cpp
@@ -46,11 +46,11 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/file_transmission/download_request_handler.h"
-#include "caosdb/logging.h"              // for CAOSDB_LOG_TRACE
-#include "caosdb/protobuf_helper.h"      // for get_arena
-#include "caosdb/status_code.h"          // for GENERIC_RPC_E...
-#include "caosdb/transaction_status.h"   // for TransactionStatus
+#include "linkahead/file_transmission/download_request_handler.h"
+#include "linkahead/logging.h"              // for CAOSDB_LOG_TRACE
+#include "linkahead/protobuf_helper.h"      // for get_arena
+#include "linkahead/status_code.h"          // for GENERIC_RPC_E...
+#include "linkahead/transaction_status.h"   // for TransactionStatus
 #include <exception>                     // IWYU pragma: keep
 #include <filesystem>                    // for operator<<, path
 #include <google/protobuf/arena.h>       // for Arena
diff --git a/src/linkahead/file_transmission/file_reader.cpp b/src/linkahead/file_transmission/file_reader.cpp
index 3f82b8c..a75c5d6 100644
--- a/src/linkahead/file_transmission/file_reader.cpp
+++ b/src/linkahead/file_transmission/file_reader.cpp
@@ -46,8 +46,8 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/file_transmission/file_reader.h"
-#include "caosdb/file_transmission/file_error.h" // for FileIOError
+#include "linkahead/file_transmission/file_reader.h"
+#include "linkahead/file_transmission/file_error.h" // for FileIOError
 #include <filesystem>                            // for path
 #include <utility>                               // for move
 
diff --git a/src/linkahead/file_transmission/file_writer.cpp b/src/linkahead/file_transmission/file_writer.cpp
index 0f0161f..ddb0605 100644
--- a/src/linkahead/file_transmission/file_writer.cpp
+++ b/src/linkahead/file_transmission/file_writer.cpp
@@ -46,8 +46,8 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/file_transmission/file_writer.h"
-#include "caosdb/file_transmission/file_error.h" // for FileIOError
+#include "linkahead/file_transmission/file_writer.h"
+#include "linkahead/file_transmission/file_error.h" // for FileIOError
 #include <filesystem>                            // for path
 #include <utility>                               // for move
 
diff --git a/src/linkahead/file_transmission/register_file_upload_handler.cpp b/src/linkahead/file_transmission/register_file_upload_handler.cpp
index 3a47715..198ee40 100644
--- a/src/linkahead/file_transmission/register_file_upload_handler.cpp
+++ b/src/linkahead/file_transmission/register_file_upload_handler.cpp
@@ -46,8 +46,8 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/file_transmission/register_file_upload_handler.h"
-#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
+#include "linkahead/file_transmission/register_file_upload_handler.h"
+#include "linkahead/logging.h" // for CAOSDB_LOG_TRACE
 
 namespace caosdb::transaction {
 
diff --git a/src/linkahead/file_transmission/upload_request_handler.cpp b/src/linkahead/file_transmission/upload_request_handler.cpp
index 57bd224..af96edf 100644
--- a/src/linkahead/file_transmission/upload_request_handler.cpp
+++ b/src/linkahead/file_transmission/upload_request_handler.cpp
@@ -46,11 +46,11 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/file_transmission/upload_request_handler.h"
-#include "caosdb/logging.h"                  // for CAOSDB_LOG_ERROR
-#include "caosdb/protobuf_helper.h"          // for get_arena
-#include "caosdb/status_code.h"              // for GENERIC_RPC_E...
-#include "caosdb/transaction_status.h"       // for TransactionStatus
+#include "linkahead/file_transmission/upload_request_handler.h"
+#include "linkahead/logging.h"                  // for CAOSDB_LOG_ERROR
+#include "linkahead/protobuf_helper.h"          // for get_arena
+#include "linkahead/status_code.h"              // for GENERIC_RPC_E...
+#include "linkahead/transaction_status.h"       // for TransactionStatus
 #include <algorithm>                         // for min
 #include <cstdint>                           // for uint64_t
 #include <exception>                         // IWYU pragma: keep
diff --git a/src/linkahead/logging.cpp b/src/linkahead/logging.cpp
index 65b59c9..e8a3d00 100644
--- a/src/linkahead/logging.cpp
+++ b/src/linkahead/logging.cpp
@@ -18,8 +18,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/logging.h"
-#include "caosdb/log_level.h"
+#include "linkahead/logging.h"
+#include "linkahead/log_level.h"
 #include <boost/log/attributes/clock.hpp>
 #include <boost/log/core/core.hpp> // for core
 #include <boost/log/core/record.hpp>
diff --git a/src/linkahead/protobuf_helper.cpp b/src/linkahead/protobuf_helper.cpp
index 2b58476..52de545 100644
--- a/src/linkahead/protobuf_helper.cpp
+++ b/src/linkahead/protobuf_helper.cpp
@@ -18,8 +18,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/protobuf_helper.h"
-#include "caosdb/configuration.h"
+#include "linkahead/protobuf_helper.h"
+#include "linkahead/configuration.h"
 #include <google/protobuf/arena.h> // for Arena
 
 namespace caosdb::utility {
diff --git a/src/linkahead/result_set.cpp b/src/linkahead/result_set.cpp
index f4f4efd..8f84e85 100644
--- a/src/linkahead/result_set.cpp
+++ b/src/linkahead/result_set.cpp
@@ -17,7 +17,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/result_set.h" // for ResultSet
+#include "linkahead/result_set.h" // for ResultSet
 #include <memory>              // for unique_ptr
 #include <utility>             // for move, pair
 #include <vector>
diff --git a/src/linkahead/result_table.cpp b/src/linkahead/result_table.cpp
index f7d5c3e..6f0fb6f 100644
--- a/src/linkahead/result_table.cpp
+++ b/src/linkahead/result_table.cpp
@@ -18,11 +18,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/result_table.h"            // for ResultTable, ResultTab...
+#include "linkahead/result_table.h"            // for ResultTable, ResultTab...
 #include "caosdb/entity/v1/main.pb.h"       // for SelectQueryResult, Sel...
-#include "caosdb/protobuf_helper.h"         // for ScalarProtoMessageWrapper
-#include "caosdb/result_table_impl.h"       // for ResultTableImpl, Resul...
-#include "caosdb/value.h"                   // for Value
+#include "linkahead/protobuf_helper.h"         // for ScalarProtoMessageWrapper
+#include "linkahead/result_table_impl.h"       // for ResultTableImpl, Resul...
+#include "linkahead/value.h"                   // for Value
 #include <algorithm>                        // for max
 #include <google/protobuf/repeated_field.h> // IWYU pragma: keep for RepeatedPtrField
 #include <memory>                           // for unique_ptr
diff --git a/src/linkahead/result_table_impl.h b/src/linkahead/result_table_impl.h
index 6570e7a..8cd5117 100644
--- a/src/linkahead/result_table_impl.h
+++ b/src/linkahead/result_table_impl.h
@@ -20,17 +20,17 @@
 #ifndef CAOSDB_RESULT_TABLE_IMPL_H
 #define CAOSDB_RESULT_TABLE_IMPL_H
 
-#include "caosdb/transaction.h"
-#include "caosdb/entity/v1/main.grpc.pb.h"                         // for EntityTransac...
+#include "linkahead/transaction.h"
+#include "caosdb/entity/v1/main.pb.h"                         // for EntityTransac...
 #include "caosdb/entity/v1/main.pb.h"                              // for TransactionRe...
-#include "caosdb/file_transmission/download_request_handler.h"     // Download...
-#include "caosdb/file_transmission/file_reader.h"                  // for path
-#include "caosdb/file_transmission/register_file_upload_handler.h" // for RegisterFileUploadHandler
-#include "caosdb/file_transmission/upload_request_handler.h"       // Upload...
-#include "caosdb/logging.h"                                        // for CAOSDB_LOG_FATAL
-#include "caosdb/protobuf_helper.h"                                // for ProtoMessageWrapper
-#include "caosdb/status_code.h"                                    // for StatusCode
-#include "caosdb/transaction_handler.h"                            // for EntityTransactionHandler
+#include "linkahead/file_transmission/download_request_handler.h"     // Download...
+#include "linkahead/file_transmission/file_reader.h"                  // for path
+#include "linkahead/file_transmission/register_file_upload_handler.h" // for RegisterFileUploadHandler
+#include "linkahead/file_transmission/upload_request_handler.h"       // Upload...
+#include "linkahead/logging.h"                                        // for CAOSDB_LOG_FATAL
+#include "linkahead/protobuf_helper.h"                                // for ProtoMessageWrapper
+#include "linkahead/status_code.h"                                    // for StatusCode
+#include "linkahead/transaction_handler.h"                            // for EntityTransactionHandler
 #include <algorithm>                                               // for max
 #include <filesystem>                                              // for operator<<, path
 #include <future>                                                  // for async, future
diff --git a/src/linkahead/status_code_description.cpp b/src/linkahead/status_code_description.cpp
index d1f6512..4bdf29d 100644
--- a/src/linkahead/status_code_description.cpp
+++ b/src/linkahead/status_code_description.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "caosdb/status_code.h" // for StatusCode, ABORTED, ALREADY_EXISTS
+#include "linkahead/status_code.h" // for StatusCode, ABORTED, ALREADY_EXISTS
 #include <map>                  // for allocator, map
 #include <stdexcept>            // for out_of_range
 #include <string>               // for string, basic_string
diff --git a/src/linkahead/transaction.cpp b/src/linkahead/transaction.cpp
index c67cae1..8bedf61 100644
--- a/src/linkahead/transaction.cpp
+++ b/src/linkahead/transaction.cpp
@@ -17,20 +17,20 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/transaction.h"
-#include "caosdb/entity/v1/main.grpc.pb.h"                         // for EntityTransac...
+#include "linkahead/transaction.h"
+#include "caosdb/entity/v1/main.pb.h"                         // for EntityTransac...
 #include "caosdb/entity/v1/main.pb.h"                              // for TransactionRe...
-#include "caosdb/file_transmission/download_request_handler.h"     // Download...
-#include "caosdb/file_transmission/file_reader.h"                  // for path
-#include "caosdb/file_transmission/register_file_upload_handler.h" // for RegisterFileUploadHandler
-#include "caosdb/file_transmission/upload_request_handler.h"       // Upload...
-#include "caosdb/logging.h"                                        // for CAOSDB_LOG_FATAL
-#include "caosdb/protobuf_helper.h"                                // for ProtoMessageWrapper
-#include "caosdb/result_set.h"                                     // for ResultSet
-#include "caosdb/result_table.h"                                   // for ResultTable
-#include "caosdb/result_table_impl.h"                              // for ResultTableImpl
-#include "caosdb/status_code.h"                                    // for StatusCode
-#include "caosdb/transaction_handler.h"                            // for EntityTransactionHandler
+#include "linkahead/file_transmission/download_request_handler.h"     // Download...
+#include "linkahead/file_transmission/file_reader.h"                  // for path
+#include "linkahead/file_transmission/register_file_upload_handler.h" // for RegisterFileUploadHandler
+#include "linkahead/file_transmission/upload_request_handler.h"       // Upload...
+#include "linkahead/logging.h"                                        // for CAOSDB_LOG_FATAL
+#include "linkahead/protobuf_helper.h"                                // for ProtoMessageWrapper
+#include "linkahead/result_set.h"                                     // for ResultSet
+#include "linkahead/result_table.h"                                   // for ResultTable
+#include "linkahead/result_table_impl.h"                              // for ResultTableImpl
+#include "linkahead/status_code.h"                                    // for StatusCode
+#include "linkahead/transaction_handler.h"                            // for EntityTransactionHandler
 #include <algorithm>                                               // for max
 #include <exception>                                               // IWYU pragma: keep
 #include <filesystem>                                              // for operator<<, path
diff --git a/src/linkahead/transaction_handler.cpp b/src/linkahead/transaction_handler.cpp
index ef4897d..d5c168e 100644
--- a/src/linkahead/transaction_handler.cpp
+++ b/src/linkahead/transaction_handler.cpp
@@ -1,5 +1,5 @@
-#include "caosdb/transaction_handler.h"
-#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
+#include "linkahead/transaction_handler.h"
+#include "linkahead/logging.h" // for CAOSDB_LOG_TRACE
 #include <exception>        // IWYU pragma: keep
 // IWYU pragma: no_include <bits/exception.h>
 
diff --git a/src/linkahead/unary_rpc_handler.cpp b/src/linkahead/unary_rpc_handler.cpp
index 6d116ea..d36c369 100644
--- a/src/linkahead/unary_rpc_handler.cpp
+++ b/src/linkahead/unary_rpc_handler.cpp
@@ -46,9 +46,9 @@
  * > FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * > DEALINGS IN THE SOFTWARE.
  */
-#include "caosdb/unary_rpc_handler.h"
-#include "caosdb/logging.h"     // for CAOSDB_LOG_TRACE
-#include "caosdb/status_code.h" // for GENERIC_RPC_E...
+#include "linkahead/unary_rpc_handler.h"
+#include "linkahead/logging.h"     // for CAOSDB_LOG_TRACE
+#include "linkahead/status_code.h" // for GENERIC_RPC_E...
 #include <exception>            // IWYU pragma: keep
 #include <string>               // for string, opera...
 // IWYU pragma: no_include <bits/exception.h>
diff --git a/src/linkahead/utility.cpp b/src/linkahead/utility.cpp
index 1cefe34..1d8b32e 100644
--- a/src/linkahead/utility.cpp
+++ b/src/linkahead/utility.cpp
@@ -18,9 +18,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/utility.h"
-#include "caosdb/data_type.h"                 // for AtomicDataType, atomicdatatype_names
-#include "caosdb/entity.h"                    // for Importance, Role, importance_names
+#include "linkahead/utility.h"
+#include "linkahead/data_type.h"                 // for AtomicDataType, atomicdatatype_names
+#include "linkahead/entity.h"                    // for Importance, Role, importance_names
 #include <boost/beast/core/detail/base64.hpp> // for encoded_size
 #include <boost/beast/core/detail/base64.ipp> // for encode
 #include <boost/filesystem/string_file.hpp>   // for load_string_file
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index c097753..d5ff80f 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "caosdb/configuration.h"
-#include "caosdb/status_code.h"  // for StatusCode
+#include "linkahead/configuration.h"
+#include "linkahead/status_code.h"  // for StatusCode
 #include "caosdb_test_utility.h" // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
-#include "ccaosdb.h"             // for caosdb_utility_get_env_fallback
+#include "clinkahead.h"             // for caosdb_utility_get_env_fallback
 #include <cstdint>               // for int64_t
 #include <cstring>               // for strcmp
 #include <gtest/gtest.h>
diff --git a/test/test_configuration.cpp b/test/test_configuration.cpp
index 2f5e754..99f57c0 100644
--- a/test/test_configuration.cpp
+++ b/test/test_configuration.cpp
@@ -19,10 +19,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/configuration.h" // for ConfigurationError, Configuration...
-#include "caosdb/exceptions.h"    // for ConfigurationError
-#include "caosdb/log_level.h"     // for CAOSDB_DEFAULT_LOG_LEVEL, CAOSDB_...
-#include "caosdb/logging.h"       // for ConsoleSinkConfiguration, Logging...
+#include "linkahead/configuration.h" // for ConfigurationError, Configuration...
+#include "linkahead/exceptions.h"    // for ConfigurationError
+#include "linkahead/log_level.h"     // for CAOSDB_DEFAULT_LOG_LEVEL, CAOSDB_...
+#include "linkahead/logging.h"       // for ConsoleSinkConfiguration, Logging...
 #include "caosdb_test_utility.h"  // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index 29339b5..0ffd619 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -20,12 +20,12 @@
  *
  */
 #ifdef BUILD_ACM
-#include "caosdb/acm/user.h" // for User
+#include "linkahead/acm/user.h" // for User
 #endif
-#include "caosdb/certificate_provider.h" // for PemCertificateProvider
-#include "caosdb/configuration.h"        // for InsecureConnectionConfigura...
-#include "caosdb/connection.h"           // for ConnectionManager
-#include "caosdb/exceptions.h"           // for ConnectionConfigurationError
+#include "linkahead/certificate_provider.h" // for PemCertificateProvider
+#include "linkahead/configuration.h"        // for InsecureConnectionConfigura...
+#include "linkahead/connection.h"           // for ConnectionManager
+#include "linkahead/exceptions.h"           // for ConnectionConfigurationError
 #include "caosdb_test_utility.h"         // for EXPECT_THROW_MESSAGE, TEST_...
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
diff --git a/test/test_data_type.cpp b/test/test_data_type.cpp
index 540b06d..a5b0c61 100644
--- a/test/test_data_type.cpp
+++ b/test/test_data_type.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "caosdb/data_type.h"         // for DataType, AtomicDataType
-#include "caosdb/entity.h"            // for Entity
+#include "linkahead/data_type.h"         // for DataType, AtomicDataType
+#include "linkahead/entity.h"            // for Entity
 #include "caosdb/entity/v1/main.pb.h" // for DataType, Ato...
-#include "caosdb/logging.h"           // for CAOSDB_LOG_DEBUG
-#include "caosdb/protobuf_helper.h"   // for CAOSDB_DEBUG_...
+#include "linkahead/logging.h"           // for CAOSDB_LOG_DEBUG
+#include "linkahead/protobuf_helper.h"   // for CAOSDB_DEBUG_...
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApi...
diff --git a/test/test_entity.cpp b/test/test_entity.cpp
index 5122e68..3cafd1c 100644
--- a/test/test_entity.cpp
+++ b/test/test_entity.cpp
@@ -20,15 +20,15 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/data_type.h"              // for DataType, AtomicDat...
-#include "caosdb/entity.h"                 // for Entity, Property
-#include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransactionSe...
+#include "linkahead/data_type.h"              // for DataType, AtomicDat...
+#include "linkahead/entity.h"                 // for Entity, Property
+#include "caosdb/entity/v1/main.pb.h" // for EntityTransactionSe...
 #include "caosdb/entity/v1/main.pb.h"      // for IdResponse, Message
-#include "caosdb/message_code.h"           // for MessageCode, ENTITY...
-#include "caosdb/protobuf_helper.h"        // for get_arena
-#include "caosdb/status_code.h"            // for StatusCode, FILE_DO...
-#include "caosdb/transaction.h"            // for Transaction
-#include "caosdb/value.h"                  // for Value
+#include "linkahead/message_code.h"           // for MessageCode, ENTITY...
+#include "linkahead/protobuf_helper.h"        // for get_arena
+#include "linkahead/status_code.h"            // for StatusCode, FILE_DO...
+#include "linkahead/transaction.h"            // for Transaction
+#include "linkahead/value.h"                  // for Value
 #include "caosdb_test_utility.h"           // for TEST_DATA_DIR
 #include <google/protobuf/arena.h>         // for Arena
 #include <gtest/gtest.h>
diff --git a/test/test_file_transmission.cpp b/test/test_file_transmission.cpp
index 4a48a99..97a62a2 100644
--- a/test/test_file_transmission.cpp
+++ b/test/test_file_transmission.cpp
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#include "caosdb/file_transmission/file_writer.h"
-#include "caosdb/file_transmission/file_reader.h"
+#include "linkahead/file_transmission/file_writer.h"
+#include "linkahead/file_transmission/file_reader.h"
 #include <chrono>     // for filesystem
 #include <filesystem> // for path
 #include <gtest/gtest.h>
diff --git a/test/test_info.cpp b/test/test_info.cpp
index bc1e417..cc7f784 100644
--- a/test/test_info.cpp
+++ b/test/test_info.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "caosdb/info.h"            // for VersionInfo
+#include "linkahead/info.h"            // for VersionInfo
 #include "caosdb/info/v1/main.pb.h" // for VersionInfo
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
diff --git a/test/test_issues.cpp b/test/test_issues.cpp
index bedb2bc..3fb4fe8 100644
--- a/test/test_issues.cpp
+++ b/test/test_issues.cpp
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#include "caosdb/configuration.h"      // for InsecureConnectionConfig...
-#include "caosdb/connection.h"         // for Connection
-#include "caosdb/result_set.h"         // for ResultSet
-#include "caosdb/status_code.h"        // for StatusCode, EXECUTING
-#include "caosdb/transaction.h"        // for Transaction
-#include "caosdb/transaction_status.h" // for StatusCode
+#include "linkahead/configuration.h"      // for InsecureConnectionConfig...
+#include "linkahead/connection.h"         // for Connection
+#include "linkahead/result_set.h"         // for ResultSet
+#include "linkahead/status_code.h"        // for StatusCode, EXECUTING
+#include "linkahead/transaction.h"        // for Transaction
+#include "linkahead/transaction_status.h" // for StatusCode
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa...
diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index f2ef401..b212e49 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include "caosdb/data_type.h"         // for DataType, AtomicDataType
-#include "caosdb/entity.h"            // for Entity
+#include "linkahead/data_type.h"         // for DataType, AtomicDataType
+#include "linkahead/entity.h"            // for Entity
 #include "caosdb/entity/v1/main.pb.h" // for AtomicDataType, DataType
-#include "caosdb/value.h"             // for Value
+#include "linkahead/value.h"             // for Value
 #include <cstdint>                    // for int64_t
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
diff --git a/test/test_protobuf.cpp b/test/test_protobuf.cpp
index 2abb0bf..2e482dd 100644
--- a/test/test_protobuf.cpp
+++ b/test/test_protobuf.cpp
@@ -19,8 +19,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/data_type.h"         // for DataType, ReferenceDataType
-#include "caosdb/entity.h"            // for Entity
+#include "linkahead/data_type.h"         // for DataType, ReferenceDataType
+#include "linkahead/entity.h"            // for Entity
 #include "caosdb/entity/v1/main.pb.h" // for RepeatedPtrField, Message
 #include <google/protobuf/arena.h>    // for Arena
 #include <gtest/gtest.h>
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 47b2cb0..2557afc 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#include "caosdb/configuration.h"       // for InsecureConnectionConfig...
-#include "caosdb/connection.h"          // for Connection
-#include "caosdb/entity.h"              // for Entity
+#include "linkahead/configuration.h"       // for InsecureConnectionConfig...
+#include "linkahead/connection.h"          // for Connection
+#include "linkahead/entity.h"              // for Entity
 #include "caosdb/entity/v1/main.pb.h"   // for Entity
-#include "caosdb/exceptions.h"          // for ConnectionError
-#include "caosdb/result_set.h"          // for MultiResultSet, Entity, Resu...
-#include "caosdb/status_code.h"         // for StatusCode
-#include "caosdb/transaction.h"         // for Transaction
-#include "caosdb/transaction_handler.h" // for MultiTransactionResponse
-#include "caosdb/transaction_status.h"  // for ConnectionError
+#include "linkahead/exceptions.h"          // for ConnectionError
+#include "linkahead/result_set.h"          // for MultiResultSet, Entity, Resu...
+#include "linkahead/status_code.h"         // for StatusCode
+#include "linkahead/transaction.h"         // for Transaction
+#include "linkahead/transaction_handler.h" // for MultiTransactionResponse
+#include "linkahead/transaction_status.h"  // for ConnectionError
 #include "caosdb_test_utility.h"        // for EXPECT_THROW_MESSAGE
 #include <algorithm>                    // for max
 #include <google/protobuf/arena.h>      // for Arena
diff --git a/test/test_user.cpp b/test/test_user.cpp
index 8dcef60..8db6119 100644
--- a/test/test_user.cpp
+++ b/test/test_user.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "caosdb/acm/user.h" // for User
+#include "linkahead/acm/user.h" // for User
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRe...
diff --git a/test/test_utility.cpp b/test/test_utility.cpp
index 8db42b4..52bcc1c 100644
--- a/test/test_utility.cpp
+++ b/test/test_utility.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "boost/beast/core/detail/base64.hpp" // for encoded_size
-#include "caosdb/data_type.h"                 // for atomicdatatype_names
-#include "caosdb/entity.h"                    // for importance_names, role...
-#include "caosdb/status_code.h"               // for get_status_description
-#include "caosdb/utility.h"                   // for base64_encode, load_js...
+#include "linkahead/data_type.h"                 // for atomicdatatype_names
+#include "linkahead/entity.h"                    // for importance_names, role...
+#include "linkahead/status_code.h"               // for get_status_description
+#include "linkahead/utility.h"                   // for base64_encode, load_js...
 #include "caosdb_test_utility.h"              // for TEST_DATA_DIR
 #include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
diff --git a/test/test_value.cpp b/test/test_value.cpp
index 767965d..d1a2a99 100644
--- a/test/test_value.cpp
+++ b/test/test_value.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "caosdb/value.h"             // for Value
+#include "linkahead/value.h"             // for Value
 #include "caosdb/entity/v1/main.pb.h" // for AtomicDataType, DataType
-#include "caosdb/protobuf_helper.h"   // for ProtoMessageWrapper
+#include "linkahead/protobuf_helper.h"   // for ProtoMessageWrapper
 #include <algorithm>                  // for max
 #include <cmath>                      // for isnan
 #include <gtest/gtest.h>
-- 
GitLab