diff --git a/include/caosdb/configuration.h b/include/caosdb/configuration.h
index 5a4640078226de5181ab0adcc2ca6c273c7a072b..6a59880964f4cec402998e11529b60d459bdc338 100644
--- a/include/caosdb/configuration.h
+++ b/include/caosdb/configuration.h
@@ -55,7 +55,7 @@ using caosdb::utility::load_json_file;
  * the ConfigurationManager to construct Connection instances from the stored
  * configuration.
  */
-class ConnectionConfigurationurationHelper {
+class ConnectionConfigurationHelper {
 public:
   friend class ConfigurationManager;
 
@@ -75,10 +75,11 @@ private:
   /**
    * @param from - a single connection configuration.
    */
-  auto CreateConnectionConfigurationuration(
-    const bool tls, const std::string &host, const int port,
-    const CertificateProvider *certificate_provider,
-    const Authenticator *authenticator) const
+  auto
+  CreateConnectionConfiguration(const bool tls, const std::string &host,
+                                const int port,
+                                const CertificateProvider *certificate_provider,
+                                const Authenticator *authenticator) const
     -> std::unique_ptr<ConnectionConfiguration>;
 
   /**
@@ -89,7 +90,7 @@ private:
   /**
    * @param from - a single connection configuration.
    */
-  auto CreateConnectionConfigurationuration(const object &from) const
+  auto CreateConnectionConfiguration(const object &from) const
     -> std::unique_ptr<ConnectionConfiguration>;
 };
 
@@ -125,19 +126,19 @@ public:
   }
 
   /**
-   * See mGetConnectionConfigurationuration.
+   * See mGetConnectionConfiguration.
    */
-  inline static auto GetConnectionConfigurationuration(const std::string &name)
+  inline static auto GetConnectionConfiguration(const std::string &name)
     -> std::unique_ptr<ConnectionConfiguration> {
-    return GetInstance().mGetConnectionConfigurationuration(name);
+    return GetInstance().mGetConnectionConfiguration(name);
   }
 
   /**
    * Return the ConnectionConfiguration for the default connection.
    */
-  inline static auto GetDefaultConnectionConfigurationuration()
+  inline static auto GetDefaultConnectionConfiguration()
     -> std::unique_ptr<ConnectionConfiguration> {
-    return GetInstance().mGetConnectionConfigurationuration(
+    return GetInstance().mGetConnectionConfiguration(
       GetInstance().mGetDefaultConnectionName());
   }
 
@@ -153,7 +154,7 @@ public:
 
 private:
   value json_configuration;
-  ConnectionConfigurationurationHelper connection_configuration_helper;
+  ConnectionConfigurationHelper connection_configuration_helper;
   inline ConfigurationManager() { InitializeDefaults(); };
 
   /**
@@ -207,7 +208,7 @@ private:
   /**
    * Return the ConnectionConfiguration for the connection of the given name.
    */
-  auto mGetConnectionConfigurationuration(const std::string &name) const
+  auto mGetConnectionConfiguration(const std::string &name) const
     -> std::unique_ptr<ConnectionConfiguration>;
 
   /**
diff --git a/include/caosdb/connection.h b/include/caosdb/connection.h
index 2ae989538f3490505fe258971f6352d7d0fd75f8..2c58d57ce66375d1650834872d461464dd912be0 100644
--- a/include/caosdb/connection.h
+++ b/include/caosdb/connection.h
@@ -83,7 +83,7 @@ public:
   ConnectionConfiguration(const std::string &host, int port);
   virtual ~ConnectionConfiguration() = default;
   friend auto operator<<(std::ostream &out,
-                         const ConnectionConfiguration &config)
+                         const ConnectionConfiguration &configuration)
     -> std::ostream &;
 
   [[nodiscard]] auto virtual ToString() const -> std::string = 0;
@@ -132,7 +132,7 @@ class Connection {
   std::shared_ptr<EntityTransactionService::Stub> entity_transaction_service;
 
 public:
-  explicit Connection(const ConnectionConfiguration &config);
+  explicit Connection(const ConnectionConfiguration &configuration);
   friend auto operator<<(std::ostream &out, const Connection &connection)
     -> std::ostream &;
   [[nodiscard]] auto GetVersionInfo() const -> std::unique_ptr<VersionInfo>;
diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index c40340aa51148a525dad65fe66a158d70c417550..fd62e24865feab9b09f79248c4aaa70e2ec7ee13 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -47,7 +47,7 @@ using caosdb::exceptions::ConfigurationError;
 using caosdb::utility::get_home_directory;
 using caosdb::utility::load_json_file;
 
-auto ConnectionConfigurationurationHelper::CreateCertificateProvider(
+auto ConnectionConfigurationHelper::CreateCertificateProvider(
   const object &from) const -> std::unique_ptr<CertificateProvider> {
   std::unique_ptr<CertificateProvider> certificate_provider;
   if (from.contains("server_certificate_path")) {
@@ -59,7 +59,7 @@ auto ConnectionConfigurationurationHelper::CreateCertificateProvider(
   return certificate_provider;
 };
 
-auto ConnectionConfigurationurationHelper::CreateAuthenticator(
+auto ConnectionConfigurationHelper::CreateAuthenticator(
   const object &from) const -> std::unique_ptr<Authenticator> {
   std::unique_ptr<Authenticator> authenticator;
   if (from.contains("authentication")) {
@@ -89,7 +89,7 @@ auto ConnectionConfigurationurationHelper::CreateAuthenticator(
   return authenticator;
 };
 
-auto ConnectionConfigurationurationHelper::CreateConnectionConfigurationuration(
+auto ConnectionConfigurationHelper::CreateConnectionConfiguration(
   const bool tls, const std::string &host, const int port,
   const CertificateProvider *certificate_provider,
   const Authenticator *authenticator) const
@@ -115,8 +115,7 @@ auto ConnectionConfigurationurationHelper::CreateConnectionConfigurationuration(
   }
 };
 
-auto ConnectionConfigurationurationHelper::IsTls(const object &from) const
-  -> bool {
+auto ConnectionConfigurationHelper::IsTls(const object &from) const -> bool {
   bool tls = true;
   if (from.contains("tls")) {
     auto tls_switch = from.at("tls");
@@ -126,7 +125,7 @@ auto ConnectionConfigurationurationHelper::IsTls(const object &from) const
   return tls;
 };
 
-auto ConnectionConfigurationurationHelper::CreateConnectionConfigurationuration(
+auto ConnectionConfigurationHelper::CreateConnectionConfiguration(
   const object &from) const -> std::unique_ptr<ConnectionConfiguration> {
   assert(from.contains("host"));
   const auto &host = from.at("host");
@@ -142,7 +141,7 @@ auto ConnectionConfigurationurationHelper::CreateConnectionConfigurationuration(
 
   auto authenticator = CreateAuthenticator(from);
 
-  return CreateConnectionConfigurationuration(
+  return CreateConnectionConfiguration(
     tls, std::string(host.as_string().c_str()),
     static_cast<int>(port.as_int64()), certificate_provider.get(),
     authenticator.get());
@@ -171,10 +170,10 @@ auto ConfigurationManager::mLoadSingleJSONConfiguration(const path &json_file)
   // TODO(far future) validate against json-schema
 };
 
-auto ConfigurationManager::mGetConnectionConfigurationuration(
+auto ConfigurationManager::mGetConnectionConfiguration(
   const std::string &name) const -> std::unique_ptr<ConnectionConfiguration> {
   auto connection_json = GetConnection(name);
-  return connection_configuration_helper.CreateConnectionConfigurationuration(
+  return connection_configuration_helper.CreateConnectionConfiguration(
     connection_json);
 };
 
@@ -208,12 +207,12 @@ auto ConfigurationManager::GetConfiguration() const -> const object & {
 };
 
 auto ConfigurationManager::GetConnections() const -> const object & {
-  const auto &config = GetConfiguration();
-  if (!config.contains("connections")) {
+  const auto &configuration = GetConfiguration();
+  if (!configuration.contains("connections")) {
     throw ConfigurationError(
       "This CaosDB client hasn't any configured connections.");
   }
-  const auto &connections_value = config.at("connections");
+  const auto &connections_value = configuration.at("connections");
   if (connections_value.is_null()) {
     throw ConfigurationError(
       "This CaosDB client hasn't any configured connections.");
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index ed4fd2b0c929b20dd67c20672c4428065c29acf2..d2a2ae1fb2408362c18c5a7d5815ac75e3c91406 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -84,9 +84,9 @@ auto ConnectionConfiguration::GetHost() const -> std::string {
 
 auto ConnectionConfiguration::GetPort() const -> int { return this->port; }
 
-auto operator<<(std::ostream &out, const ConnectionConfiguration &config)
+auto operator<<(std::ostream &out, const ConnectionConfiguration &configuration)
   -> std::ostream & {
-  out << config.ToString();
+  out << configuration.ToString();
   return out;
 }
 
@@ -154,10 +154,11 @@ auto TlsConnectionConfiguration::ToString() const -> std::string {
          ")";
 }
 
-Connection::Connection(const ConnectionConfiguration &config) {
+Connection::Connection(const ConnectionConfiguration &configuration) {
   const std::string target =
-    config.GetHost() + ":" + std::to_string(config.GetPort());
-  this->channel = grpc::CreateChannel(target, config.GetChannelCredentials());
+    configuration.GetHost() + ":" + std::to_string(configuration.GetPort());
+  this->channel =
+    grpc::CreateChannel(target, configuration.GetChannelCredentials());
   this->general_info_service = GeneralInfoService::NewStub(this->channel);
   this->entity_transaction_service =
     std::make_shared<EntityTransactionService::Stub>(this->channel);
@@ -207,8 +208,7 @@ auto ConnectionManager::mGetConnection(const std::string &name) const
   -> const std::shared_ptr<Connection> & {
   if (!HasConnection(name)) {
     try {
-      auto connection =
-        ConfigurationManager::GetConnectionConfigurationuration(name);
+      auto connection = ConfigurationManager::GetConnectionConfiguration(name);
       connections[name] = std::make_shared<Connection>(*connection.release());
     } catch (const caosdb::exceptions::ConfigurationError &exc) {
       throw caosdb::exceptions::UnknownConnectionError("No connection named '" +
@@ -223,7 +223,7 @@ auto ConnectionManager::mGetDefaultConnection() const
   if (!HasConnection(default_connection_name)) {
     default_connection_name = ConfigurationManager::GetDefaultConnectionName();
     auto default_connection =
-      ConfigurationManager::GetDefaultConnectionConfigurationuration();
+      ConfigurationManager::GetDefaultConnectionConfiguration();
     connections[default_connection_name] =
       std::make_shared<Connection>(*default_connection.release());
   }
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index db3ff01a3e74a5a1991d3697261a19a93bf96472..556b49e3cb01cce82a91f10a4b20b6ae7e84ee82 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -44,21 +44,21 @@ protected:
 };
 
 TEST_F(test_connection, configure_insecure_localhost_8080) {
-  InsecureConnectionConfiguration config("localhost", 8000);
+  InsecureConnectionConfiguration configuration("localhost", 8000);
 
-  EXPECT_EQ("localhost", config.GetHost());
-  EXPECT_EQ(8000, config.GetPort());
-  auto icc = config.GetChannelCredentials();
+  EXPECT_EQ("localhost", configuration.GetHost());
+  EXPECT_EQ(8000, configuration.GetPort());
+  auto icc = configuration.GetChannelCredentials();
   EXPECT_TRUE(icc != nullptr);
 }
 
 TEST_F(test_connection, configure_ssl_localhost_8080) {
   auto cacert = PemCertificateProvider("ca chain");
-  TlsConnectionConfiguration config("localhost", 44300, cacert);
+  TlsConnectionConfiguration configuration("localhost", 44300, cacert);
 
-  EXPECT_EQ("localhost", config.GetHost());
-  EXPECT_EQ(44300, config.GetPort());
-  auto sslcc = config.GetChannelCredentials();
+  EXPECT_EQ("localhost", configuration.GetHost());
+  EXPECT_EQ(44300, configuration.GetPort());
+  auto sslcc = configuration.GetChannelCredentials();
   EXPECT_TRUE(sslcc != nullptr);
 }
 
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 5b0915f2d73739107b8c9ba065f97950dccc78ea..b528ae2ca01c53f2053002f7958a9a0cc466c50d 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -40,8 +40,8 @@ using ProtoEntity = caosdb::entity::v1alpha1::Entity;
 
 TEST(test_transaction, create_transaction) {
   const auto *host = "localhost";
-  auto config = InsecureConnectionConfiguration(host, 8000);
-  Connection connection(config);
+  auto configuration = InsecureConnectionConfiguration(host, 8000);
+  Connection connection(configuration);
   auto transaction = connection.CreateTransaction();
 
   transaction->RetrieveById("100");