diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/configuration/TestSuiteConfig.java b/sdccc/src/main/java/com/draeger/medical/sdccc/configuration/TestSuiteConfig.java
index d7f18a5b..476ea18a 100644
--- a/sdccc/src/main/java/com/draeger/medical/sdccc/configuration/TestSuiteConfig.java
+++ b/sdccc/src/main/java/com/draeger/medical/sdccc/configuration/TestSuiteConfig.java
@@ -25,7 +25,7 @@ public final class TestSuiteConfig {
     public static final String TEST_EXECUTION_LOGGING = SDCCC + "TestExecutionLogging";
     public static final String SUMMARIZE_MESSAGE_ENCODING_ERRORS = SDCCC + "SummarizeMessageEncodingErrors";
     public static final String ENABLE_MESSAGE_ENCODING_CHECK = SDCCC + "EnableMessageEncodingCheck";
-    public static final String OVER_RIDE = "Override";
+    public static final String CONFIGURATION_MODULE = "ConfigurationModule";
 
     /*
      * TLS configuration
diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java b/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java
index f6b1ce73..27dfa166 100644
--- a/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java
+++ b/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java
@@ -61,7 +61,7 @@ public class TestClientUtil {
      *                                       Values from 1 to 255 are valid.
      * @param enabledTlsProtocols            TLS protocol versions to be enabled
      * @param enabledCiphers                 ciphers to be enabled
-     * @param override                       overrides for AbstractConfigurationModule
+     * @param configurationModule            configuration for AbstractConfigurationModule
      */
     @Inject
     public TestClientUtil(
@@ -72,7 +72,7 @@ public TestClientUtil(
             @Named(TestSuiteConfig.NETWORK_MULTICAST_TTL) final Long multicastTTL,
             @Named(TestSuiteConfig.TLS_ENABLED_PROTOCOLS) final String[] enabledTlsProtocols,
             @Named(TestSuiteConfig.TLS_ENABLED_CIPHERS) final String[] enabledCiphers,
-            @Named(TestSuiteConfig.OVER_RIDE) final AbstractConfigurationModule override) {
+            @Named(TestSuiteConfig.CONFIGURATION_MODULE) final AbstractConfigurationModule configurationModule) {
 
         injector = createClientInjector(List.of(
                 new AbstractConfigurationModule() {
@@ -101,7 +101,7 @@ protected void configure() {
                         bind(LocalAddressResolver.class).toInstance(localAddressResolver);
                     }
                 },
-                override));
+                configurationModule));
     }
 
     /**
diff --git a/sdccc/src/test/java/it/com/draeger/medical/sdccc/TestSuiteIT.java b/sdccc/src/test/java/it/com/draeger/medical/sdccc/TestSuiteIT.java
index 86d1466d..2930f3f9 100644
--- a/sdccc/src/test/java/it/com/draeger/medical/sdccc/TestSuiteIT.java
+++ b/sdccc/src/test/java/it/com/draeger/medical/sdccc/TestSuiteIT.java
@@ -632,10 +632,13 @@ protected void defaultConfigure() {
 
             bind(Identifiers.DIRECT_TEST_IDENTIFIER_FAILING, Boolean.class, failingTests);
             bind(Identifiers.INVARIANT_TEST_IDENTIFIER_FAILING, Boolean.class, failingTests);
-            bind(TestSuiteConfig.OVER_RIDE, AbstractConfigurationModule.class, new AbstractConfigurationModule() {
-                @Override
-                protected void defaultConfigure() {}
-            });
+            bind(
+                    TestSuiteConfig.CONFIGURATION_MODULE,
+                    AbstractConfigurationModule.class,
+                    new AbstractConfigurationModule() {
+                        @Override
+                        protected void defaultConfigure() {}
+                    });
         }
     }
 }