diff --git a/sechub-commons-model/src/main/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidator.java b/sechub-commons-model/src/main/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidator.java
index 17cea34527..4a2570d1ea 100644
--- a/sechub-commons-model/src/main/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidator.java
+++ b/sechub-commons-model/src/main/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidator.java
@@ -72,12 +72,12 @@ public SecHubConfigurationModelValidator() {
      * @param model
      * @return validation result
      */
-    public SecHubConfigurationModelValidationResult validateRemoteData(SecHubConfigurationModel model) {
+    public SecHubConfigurationModelValidationResult validate(SecHubConfigurationModel model) {
         SecHubConfigurationModelValidationResult result = new SecHubConfigurationModelValidationResult();
         InternalValidationContext context = new InternalValidationContext();
         context.result = result;
         context.model = model;
-        validateRemoteData(context);
+        validate(context);
         return result;
     }
 
@@ -128,7 +128,7 @@ private void handleMetaDataLabels(Map<String, String> labels, SecHubConfiguratio
         }
     }
 
-    private void validateRemoteData(InternalValidationContext context) {
+    private void validate(InternalValidationContext context) {
         if (context.model == null) {
             context.result.addError(MODEL_NULL);
             return;
@@ -563,7 +563,7 @@ private void validateRemoteDataConfiguration(InternalValidationContext context,
 
         validateOnlyOneRemoteSourceOrBinary(sourcesAndBinaries, result);
         validateRemoteAndFileSystemAreNotMixed(sourcesAndBinaries, result);
-        validateRemoteData(sourcesAndBinaries, result);
+        validate(sourcesAndBinaries, result);
     }
 
     private void validateOnlyOneRemoteSourceOrBinary(Collection<? extends SecHubDataConfigurationObject> sourcesAndBinaries,
@@ -603,7 +603,7 @@ private void validateRemoteAndFileSystemAreNotMixed(Collection<? extends SecHubD
         }
     }
 
-    private void validateRemoteData(Collection<? extends SecHubDataConfigurationObject> sourcesAndBinaries, SecHubConfigurationModelValidationResult result) {
+    private void validate(Collection<? extends SecHubDataConfigurationObject> sourcesAndBinaries, SecHubConfigurationModelValidationResult result) {
         for (SecHubDataConfigurationObject sourceOrBinary : sourcesAndBinaries) {
             Optional<SecHubRemoteDataConfiguration> optRemoteData = sourceOrBinary.getRemote();
 
diff --git a/sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidatorTest.java b/sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidatorTest.java
index 2160181186..5d832bd13f 100644
--- a/sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidatorTest.java
+++ b/sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubConfigurationModelValidatorTest.java
@@ -56,7 +56,7 @@ void when_no_scan_type_is_set_validation_fails_with_CONTAINS_NO_SCAN_CONFIGURATI
         model.setApiVersion("1.0");
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -69,7 +69,7 @@ void when_scan_type_codescan_validation_fails_NOT_with_CONTAINS_NO_SCAN_CONFIGUR
         model.setCodeScan(new SecHubCodeScanConfiguration());
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -82,7 +82,7 @@ void when_scan_type_licensescan_validation_fails_NOT_with_CONTAINS_NO_SCAN_CONFI
         model.setLicenseScan(new SecHubLicenseScanConfiguration());
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -95,7 +95,7 @@ void when_scan_type_webscan_validation_fails_NOT_with_CONTAINS_NO_SCAN_CONFIGURA
         model.setWebScan(new SecHubWebScanConfiguration());
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -108,7 +108,7 @@ void when_scan_type_secretscan_validation_fails_NOT_with_CONTAINS_NO_SCAN_CONFIG
         model.setSecretScan(new SecHubSecretScanConfiguration());
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -121,7 +121,7 @@ void when_scan_type_infrascan_validation_fails_NOT_with_CONTAINS_NO_SCAN_CONFIGU
         model.setInfraScan(new SecHubInfrastructureScanConfiguration());
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, CONTAINS_NO_SCAN_CONFIGURATION);
@@ -136,7 +136,7 @@ void when_modelcollector_collects_no_scan_types_the_validation_fails_with_nonuni
         assertNull(ModuleGroup.resolveModuleGroupOrNull(modelSupportCollectedScanTypes));
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.NO_MODULE_GROUP_DETECTED);
@@ -155,7 +155,7 @@ void when_modelcollector_collects_two_scan_types_which_are_not_in_same_group_the
         assertNull(ModuleGroup.resolveModuleGroupOrNull(modelSupportCollectedScanTypes));
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.MULTIPLE_MODULE_GROUPS_DETECTED);
@@ -173,7 +173,7 @@ void when_modelcollector_collects_two_scan_types_which_are_in_same_group_the_val
         assertNotNull(ModuleGroup.resolveModuleGroupOrNull(modelSupportCollectedScanTypes));
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -205,7 +205,7 @@ void a_configuration_which_has_code_scan_and_license_scan_will_NOT_fail_because_
         model.getLicenseScan().get().getNamesOfUsedDataConfigurationObjects().add("config-object-name");
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -223,7 +223,7 @@ void empty_webscanconfig_results_in_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_HAS_NO_URL_DEFINED);
@@ -242,7 +242,7 @@ void license_scan__empty_config_results_in_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.NO_DATA_CONFIG_SPECIFIED_FOR_SCAN);
@@ -271,7 +271,7 @@ void license_scan__config_with_data() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -291,7 +291,7 @@ void webscanconfig_with_https_uri_set_has_no_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertFalse(result.hasErrors());
@@ -311,7 +311,7 @@ void webscanconfig_with_ftp_uri_set_has_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_URL_HAS_UNSUPPORTED_SCHEMA);
@@ -330,7 +330,7 @@ void empty_infrascanconfig_results_in_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.INFRA_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.INFRA_SCAN_HAS_NO_URIS_OR_IPS_DEFINED);
@@ -351,7 +351,7 @@ void infrascanconfig_with_one_uri_results_in_no_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.INFRA_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -371,7 +371,7 @@ void infrascanconfig_with_one_ip_results_in_no_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.INFRA_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertFalse(result.hasErrors());
@@ -381,7 +381,7 @@ void infrascanconfig_with_one_ip_results_in_no_error() throws Exception {
     @Test
     void null_model_results_in_one_error() {
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(null);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(null);
 
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
@@ -399,7 +399,7 @@ void api_version_set_but_no_scan_configuration_results_in_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.CONTAINS_NO_SCAN_CONFIGURATION);
@@ -415,7 +415,7 @@ void api_version_null_in_model_results_in_one_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.API_VERSION_NULL);
@@ -431,7 +431,7 @@ void api_version_unsupported_results_in_one_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.API_VERSION_NOT_SUPPORTED);
@@ -455,7 +455,7 @@ void model_having_a_data_configuration_with_valid_name_has_no_error(String name)
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -476,7 +476,7 @@ void model_having_a_data_configuration_with_invalid_name_has_error(String name)
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -498,7 +498,7 @@ void model_having_a_code_scan_configuration_which_references_a_wellknown_data_ob
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -513,7 +513,7 @@ void model_having_a_code_scan_configuration_which_references_an_unknown_data_obj
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, "config-object-not-existing1", SecHubConfigurationModelValidationError.REFERENCED_DATA_CONFIG_OBJECT_NAME_NOT_EXISTING);
@@ -536,7 +536,7 @@ void model_having_a_web_scan_configuration_with_open_api_which_references_an_unk
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, "unknown-configuration", SecHubConfigurationModelValidationError.REFERENCED_DATA_CONFIG_OBJECT_NAME_NOT_EXISTING);
@@ -566,7 +566,7 @@ void model_having_a_web_scan_configuration_with_open_api_which_references_a_well
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertFalse(result.hasErrors());
@@ -592,7 +592,7 @@ void model_having_two_elements_in_source_data_section_with_same_name_results_in_
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute + test */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.DATA_CONFIG_OBJECT_NAME_IS_NOT_UNIQUE);
@@ -614,7 +614,7 @@ void model_having_one_elements_with_name_with_length101_has_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.DATA_CONFIG_OBJECT_NAME_LENGTH_TOO_LONG);
@@ -636,7 +636,7 @@ void model_having_one_elements_with_name_with_length0_has_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.DATA_CONFIG_OBJECT_NAME_LENGTH_TOO_SHORT);
@@ -658,7 +658,7 @@ void model_having_one_elements_with_name_null_has_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.DATA_CONFIG_OBJECT_NAME_IS_NULL);
@@ -679,7 +679,7 @@ void model_having_one_element_with_name_not_set_has_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.DATA_CONFIG_OBJECT_NAME_IS_NULL);
@@ -707,7 +707,7 @@ void model_having_two_elements_in_binary_data_section_with_same_name_has_error()
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
 
@@ -735,7 +735,7 @@ void model_having_two_elements_in_binary_and_source_data_section_with_same_name_
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertEquals(1, result.getErrors().size());
@@ -766,7 +766,7 @@ void model_having_two_elements_in_binary_and_source_data_section_with_different_
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -784,7 +784,7 @@ void secret_scan__empty_config_results_in_error() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.SECRET_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.NO_DATA_CONFIG_SPECIFIED_FOR_SCAN);
@@ -813,7 +813,7 @@ void secret_scan__config_with_data() throws Exception {
         modelSupportCollectedScanTypes.add(ScanType.SECRET_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertFalse(result.hasErrors());
@@ -842,7 +842,7 @@ void model_with_given_amount_of__valid_metadata_labels_has_no_error(int amount)
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertFalse(result.hasErrors());
@@ -872,7 +872,7 @@ void model_with_given_amount_of__valid_metadata_labels_has_error(int amount) {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -900,7 +900,7 @@ void model_with_metadata_label_key_length31_has_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.METADATA_LABEL_KEY_TOO_LONG);
@@ -927,7 +927,7 @@ void model_with_metadata_label_key_length30_has_no_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -954,7 +954,7 @@ void model_with_metadata_label_value_length_has_error(int length) {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.METADATA_LABEL_VALUE_TOO_LONG);
@@ -982,7 +982,7 @@ void model_with_metadata_label_key_not_allowed_character_inside_has_error_code_s
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.METADATA_LABEL_KEY_CONTAINS_ILLEGAL_CHARACTERS);
@@ -1010,7 +1010,7 @@ void model_with_metadata_label_key_not_allowed_character_inside_has_error_licens
         modelSupportCollectedScanTypes.add(ScanType.LICENSE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.METADATA_LABEL_KEY_CONTAINS_ILLEGAL_CHARACTERS);
@@ -1039,7 +1039,7 @@ void model_with_metadata_label_key_allowed_character_inside_has_no_error_codeSca
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1067,7 +1067,7 @@ void model_with_metadata_label_key_allowed_character_inside_has_no_error_webScan
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1094,7 +1094,7 @@ void model_with_metadata_label_value_length_has_no_error(int length) {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN); // simulate correct module group found
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1114,7 +1114,7 @@ void model_has_valid_urls_for_headers_specified_has_no_error(String onlyForUrl)
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1143,7 +1143,7 @@ void model_has_valid_only_for_urls_and_multiple_headers_for_headers_specified_ha
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1170,7 +1170,7 @@ void model_has_valid_only_for_urls_and_one_header_for_headers_specified_has_no_e
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1189,7 +1189,7 @@ void model_has_valid_urls_for_headers_specified_but_different_target_url_has_err
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_HTTP_HEADER_ONLY_FOR_URL_DOES_NOT_CONTAIN_TARGET_URL);
@@ -1208,7 +1208,7 @@ void model_has_invalid_url_for_headers_specified_has_error(String onlyForUrl) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_HTTP_HEADER_ONLY_FOR_URL_IS_NOT_A_VALID_URL);
@@ -1234,7 +1234,7 @@ void model_has_multiple_only_for_urls_with_at_least_one_invalid_for_headers_spec
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_HTTP_HEADER_ONLY_FOR_URL_IS_NOT_A_VALID_URL);
@@ -1262,7 +1262,7 @@ void model_has_multiple_only_for_urls_in_multiple_headers_with_at_least_one_inva
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_HTTP_HEADER_ONLY_FOR_URL_IS_NOT_A_VALID_URL);
@@ -1286,7 +1286,7 @@ void model_has_no_header_names_specified_has_error(String missingHeaderName) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_NO_HEADER_NAME_DEFINED);
@@ -1310,7 +1310,7 @@ void model_has_no_header_values_specified_has_error(String missingHeaderValue) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_NO_HEADER_VALUE_DEFINED);
@@ -1336,7 +1336,7 @@ void model_has_header_value_only_from_file_ref_specified_has_no_error(String exp
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNoErrors(result);
@@ -1360,7 +1360,7 @@ void model_has_multiple_header_values_from_file_ref_and_direct_value_specified_h
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_MULTIPLE_HEADER_VALUES_DEFINED);
@@ -1376,7 +1376,7 @@ void explicit_definitions_for_the_same_header_for_certain_urls_but_list_of_urls_
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1394,7 +1394,7 @@ void explicit_definitions_for_the_same_header_for_certain_urls_but_list_of_urls_
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1410,7 +1410,7 @@ void default_for_a_header_with_explicit_definitions_for_the_same_header_for_cert
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1427,7 +1427,7 @@ void duplicated_default_for_the_same_header_has_error(String testFilePath) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_NON_UNIQUE_HEADER_CONFIGURATION);
@@ -1444,7 +1444,7 @@ void explicit_definitions_for_the_same_header_for_certain_urls_but_list_of_urls_
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_NON_UNIQUE_HEADER_CONFIGURATION);
@@ -1465,7 +1465,7 @@ void valid_include_and_exclude_has_no_errors(String includeExcludeEntry) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1483,7 +1483,7 @@ void double_slashes_include_exclude_has_errors(String includeExcludeEntry) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_EXCLUDE_INVALID);
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_INCLUDE_INVALID);
@@ -1501,7 +1501,7 @@ void spaces_in_include_exclude_has_errors(String includeExcludeEntry) {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_EXCLUDE_INVALID);
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_INCLUDE_INVALID);
@@ -1517,7 +1517,7 @@ void too_many_excludes_results_in_error() {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_EXCLUDE_INVALID);
@@ -1534,7 +1534,7 @@ void too_many_includes_results_in_error() {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_INCLUDE_INVALID);
@@ -1551,7 +1551,7 @@ void exclude_too_long_results_in_error() {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_EXCLUDE_INVALID);
@@ -1568,7 +1568,7 @@ void include_too_long_results_in_error() {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasError(result, SecHubConfigurationModelValidationError.WEB_SCAN_INCLUDE_INVALID);
@@ -1583,7 +1583,7 @@ void can_read_sechub_web_scan_config_with_wildcards() {
         modelSupportCollectedScanTypes.add(ScanType.WEB_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1595,7 +1595,7 @@ void when_sechub_config_too_large_validation_fails_with_SECHUB_CONFIGURATION_TOO
         SecHubConfigurationModel model = createSecHubConfigModelWithExactly8193Characters();
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasError(result, SECHUB_CONFIGURATION_TOO_LARGE);
@@ -1609,7 +1609,7 @@ void when_sechub_config_has_exactly_maximum_size_allowed_error_SECHUB_CONFIGURAT
         model.setApiVersion(model.getApiVersion().substring(1));
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(model);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(model);
 
         /* test */
         assertHasNotError(result, SECHUB_CONFIGURATION_TOO_LARGE);
@@ -1624,7 +1624,7 @@ void when_remote_sechub_configuration_is_valid_no_errors_are_reported(String fil
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertHasNoErrors(result);
@@ -1638,7 +1638,7 @@ void when_multiple_remote_configurations_are_configured_error_REMOTE_DATA_CONFIG
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1653,7 +1653,7 @@ void when_remote_configuration_location_is_not_defined_error_REMOTE_DATA_CONFIGU
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1668,7 +1668,7 @@ void when_remote_configuration_has_empty_credentials_error_REMOTE_DATA_CONFIGURA
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1683,7 +1683,7 @@ void when_remote_configuration_credential_user_has_no_username_error_REMOTE_DATA
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1698,7 +1698,7 @@ void when_remote_configuration_credential_user_has_no_password_error_REMOTE_DATA
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1713,7 +1713,7 @@ void when_remote_configuration_is_mixed_with_filesystem_REMOTE_REMOTE_DATA_MIXED
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
@@ -1728,7 +1728,7 @@ void when_remote_data_is_configured_for_binaries_and_sources_error() {
         modelSupportCollectedScanTypes.add(ScanType.CODE_SCAN);
 
         /* execute */
-        SecHubConfigurationModelValidationResult result = validatorToTest.validateRemoteData(sechubConfiguration);
+        SecHubConfigurationModelValidationResult result = validatorToTest.validate(sechubConfiguration);
 
         /* test */
         assertTrue(result.hasErrors());
diff --git a/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidator.java b/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidator.java
index 001b76bb4c..ecc4b99e2a 100644
--- a/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidator.java
+++ b/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidator.java
@@ -41,7 +41,7 @@ public void validate(Object target, Errors errors) {
         LOG.debug("Start validation for: {}", target);
 
         SecHubConfiguration configuration = (SecHubConfiguration) target;
-        SecHubConfigurationModelValidationResult modelValidationResult = modelValidator.validateRemoteData(configuration);
+        SecHubConfigurationModelValidationResult modelValidationResult = modelValidator.validate(configuration);
 
         handleExplicitErrorCodes(errors, modelValidationResult);
         addGenericErrorsWhenNecessary(errors, modelValidationResult);
diff --git a/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidatorTest.java b/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidatorTest.java
index 7f96ff312a..24226a4320 100644
--- a/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidatorTest.java
+++ b/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/configuration/SecHubConfigurationValidatorTest.java
@@ -46,7 +46,7 @@ public void before() throws Exception {
 
         configurationModelValidationResult = mock(SecHubConfigurationModelValidationResult.class);
         modelValidator = mock(SecHubConfigurationModelValidator.class);
-        when(modelValidator.validateRemoteData(any())).thenReturn(configurationModelValidationResult);
+        when(modelValidator.validate(any())).thenReturn(configurationModelValidationResult);
 
         validatorToTest.modelValidator = modelValidator;