diff --git a/include/linkahead/authentication.h b/include/linkahead/authentication.h
index 0ea818cc9d95caab96eb45efad30bed6d1a13745..ecc20c61bc6fa93bc539116003c234a207177347 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 11b29f3e25097d3d383da9c12aecae08eef188d9..e6c1d48ed331a464f9113758dd986f869c7da444 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 d3f10480ca9dda9c9fab3bc196dffcd9117ea981..8ac22daf1e2636b845e6fc1aa70f5460414d1adc 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 11909c012e3105ed29185637b3f32801f1613ccf..8accd296246201e64d098c7b39b9d00938b45629 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 354f60f24872a24ff424d6211304d319dad2188b..ba5907d211d59a58cd5f986600323c764dd847c5 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 415d0722580e1199f014358f524caf75f9d68b32..f9bcdce10fcfc3d424a4a8d1718b55e8b4f2f24c 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 9c82b232bed9e0b702c38eeeeb762899a3071528..b13844dc1e8cb2eaef59176952ae0d62690e00c5 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 37cc6cf6ae83aa23781cc65924cefba83be22627..67e418124f400b6dac664ca358ed2dddf35eeeb6 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 f9d6aab9abf1800ab7e5ebece6f2f7011f86cca0..89dd16cba8f2e0b55ad9f57f87889b3bd4c7728d 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 f5d77f86c35fe60edbd088afd235ed7ba633c69c..2896bfb6c6d71c1521051e9405666dd03576213c 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 4b7c948376df77ee5d468a69218aca64b38c91e3..6bc5637e3cf445f1d32bf2ed734a279594e11751 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 a0afefb69a042eed13bd38f1cea8d698e0b19893..d9f90a48490101d9481f443f6b154d1d4c90a27d 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 2ce70e67e770a93e86512c564954ea57d10046eb..03d9874009e9558c53e49b82a22e3a109dae65b6 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 6795e27e5b60a680c1700d9fa98bcdd50b059474..547938374df72eebc06f529eb806f6da8341db27 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 3d994168d57a9882f8b41215e6c3229275cd02b8..9759477e4b5553eacffe0dff3cda86cd2ede1ad4 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 3f9fc811a2137d9b8c8d0205c15704179a1c3554..933deb75829b074d775a35efaf713982195646d7 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 020da73655b8bc104dc2c4827566f1d783a37d10..cac4c7761ead79f1725a34fca9345f0224be071d 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 06b9457ceae715b4319739f46d810d7a892612d7..b3cb8b087cbb3232daa7ec5758f8ec970345b584 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 2ae2d6d9089a08c2c604a4e37e032932f08a2f69..ab2ff236bcbe590e77e84a4689826c8d57c205c9 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 e17fc5517f8717bec8c8249e7ce6f07b0f7c0e35..0531a211a8c10fd1302f80fd5dbd24697c89b6c4 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 82bcbae2c6eaee34368a871c9a5b7f983e838a2a..bce000b93b4f47eeae4eb64f0ccc3fc9ef09efe8 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 e3ce7dea431441b5ef6f827f02f8741681f631c2..fb2d1980111874f2974e2a9eaec57cc2c59aa16d 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 e6e5cee66e6c90ab7719434d7667cd6ad20ccbb8..6c83d54bfd380cd04cb021b3aa2558fed8abf96b 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 2988287997c723c35bdd1f470572c4dc5797879f..bdf47906d84cdac261c05e49464c7115ce5ebf01 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 ea2e0da6738942f922d158f3adfa03d81c0c862a..08e6b1e10a340db9387760af6848a525dd7ed836 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 919f9bca3b18fc3aa5192ed10855d60925101bc1..a0e3d2e965c6173a243a14376d8908b1bf6c9622 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 507f11e3f8cd8f1fc87dbc04ca1375698e9439b6..9844baa0421d71f35607d5658dc57dfb36be8cac 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 ebd55631d9df2208d56a40385bcb4d8e4b9dad82..510c7ff5db49c77e66e41062a6ec3fec7b7cee7f 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 1567488144935c3281562af75f1476fdcbbb5603..1f2716affabd667201128e0e8c826c232de8dada 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 1b0764fa2039b7d4c37ba09fdc03cedf4959736a..8c90dcd5779ce58c7c5c853bb9f6656f3006eb7b 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 3f82b8c8c775d38f2a75e2a995ce7cfa8bb7cceb..a75c5d6085fac7150075a0802dc7e13dc3bf4e16 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 0f0161fbcafe1df7f6ffa271dcce8af9cc10fe82..ddb0605bb68dfd2c338aac85fd96bb5ccf9d89ec 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 3a47715c75eb797120e1a0116c37743ef6d2b92a..198ee40e70bd107c2b8d8248992ddb294010620d 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 57bd224dfe53a57ecb706d74dc1438e143dac641..af96edfb1a9b3e2580034645834775555e8bbe97 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 65b59c954e96a1a7a8d0b46f1183f949a07efa7b..e8a3d003b774bb1dcdd0a129c5a1da9953eb0ce9 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 2b5847687d4926324cbbd5d4f49caca4131dc951..52de5457a07fbc00e5d4fae61f9fd443877d0175 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 f4f4efddbd00edb9de9ce06a9a2225a8b73e0c16..8f84e858946f1f6d13626137a43ad89878ec4f84 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 f7d5c3e3564fdad9b7f9755c77c6ddce37d3c25f..6f0fb6f3e99dfca9dc346327e8e29e7395727d5b 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 6570e7a71144906128da0cbf9ff38be270790fc0..8cd511793f0df0ba525318f989e8f408e1c043cd 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 d1f651257bc1a682870ffb52650a42c4d16ec642..4bdf29deecf7d3caf2891668788b0a6cb9560950 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 c67cae1ac2e50d30b2cafbfc60b7e7c28795cd9d..8bedf613a51e5b66427ba424729cbf1e34cc9282 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 ef4897d1392f46b374fbdf5831c3a9e74ebf9d63..d5c168e2d96cee43f4e90cd8bf26716f9941604a 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 6d116eafae7203498ebf431a09d85c184b619191..d36c369c32d416b1e403ede179035b6b5c47a513 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 1cefe34c5a69477b5ebc8d5f457eaebc044f96aa..1d8b32e3ed4293ee2f3cec9b5e2e13d74a3afbb8 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 c09775311f5512269b852e4b5aaeb6df2578ccaa..d5ff80f8b12d34434ecbe2d052fd725beb745fb6 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 2f5e754b83ad5be6903deb6f521190f07911f9b6..99f57c08b6010050f9317a5554269a49e643e2b0 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 29339b5d6e6bec03052a62bf3e65fd5911946a23..0ffd619c9afdfafa3fafd198d6637b3798ff05e0 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 540b06d5d677eef0e90587ca76bc01bb14cb2ead..a5b0c61c730be61b012ccaf2e8de28bf7fc89dc3 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 5122e681152ea9c5cf51826b1169a6d7c41ac872..3cafd1cbd768dd4a0930651af24bf07ace69c4cb 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 4a48a99f071d8603f7efa8de5de284ccd60a15a0..97a62a28c6d5c1bd162093bc1dea7fc94b53b5de 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 bc1e41784148ae3d2a14ac1e77ad23b3cdccb5ee..cc7f78406e8de8667c5b0fa67c8b44dfea35c84d 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 bedb2bc2e83d88c3d352f8ab37466f19cd8f744c..3fb4fe89c004438014d04019215738153d2850f8 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 f2ef401b7b0433d627e4666ace115c363912a1cc..b212e49c39df4c3a9b7d58acad00f1cbb0671873 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 2abb0bf32137bf010c7ef7e2fbfba12ea2b73604..2e482ddc2b9113d8333fd99a0cdeca1d8179ce10 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 47b2cb0f8b3433e6229f03863dd00951ca244b17..2557afc498839c43600e899d1079d32a4b1cb23d 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 8dcef60623f69b0c89c1d14fc2f16d4c513abeeb..8db6119948ae8d017db0db8a0b83dba81e61eb1e 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 8db42b4991e0b643ecaf04b6e5fcf3d06d38e9bf..52bcc1ced5e6653f8439becef62e2e2fbf280084 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 767965df68e648a04ba64a4148dc58839ebcc08c..d1a2a997ddad1dd18f2265c9b082846b50eaa748 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>