diff --git a/build-versioning.gradle b/build-versioning.gradle
index 732c7290ae..738648ef70 100644
--- a/build-versioning.gradle
+++ b/build-versioning.gradle
@@ -54,12 +54,12 @@ def buildVersionFiles(){
     // ------------------------
 
     // write version code for go client
-    String clientGoVersionTemplate = new File('./sechub-cli/src/daimler.com/sechub/cli/version.go.template').getText('UTF-8')
+    String clientGoVersionTemplate = new File('./sechub-cli/src/mercedes-benz.com/sechub/cli/version.go.template').getText('UTF-8')
     
     def clientVersionInfo = VersionData.defineVersion("Client",buildVersionString(clientVersionCommitTag, hasChanged,buildNumber))
     
     String clientGoVersionCode = clientGoVersionTemplate.replaceAll("__version__",clientVersionInfo.getFullVersion())
-    def clientVersionFile = new File('./sechub-cli/src/daimler.com/sechub/cli/version.go')
+    def clientVersionFile = new File('./sechub-cli/src/mercedes-benz.com/sechub/cli/version.go')
     clientVersionFile.write(clientGoVersionCode)
 
     /* write version info also as asciidoc file*/
diff --git a/sechub-cli/.gitignore b/sechub-cli/.gitignore
index 890af89caf..e56b4e6028 100644
--- a/sechub-cli/.gitignore
+++ b/sechub-cli/.gitignore
@@ -5,7 +5,7 @@ pkg
 .project
 
 # generated files:
-src/daimler.com/sechub/cli/version.go
+src/mercedes-benz.com/sechub/cli/version.go
 
 # vscode files:
 .vscode
diff --git a/sechub-cli/build.gradle b/sechub-cli/build.gradle
index d57e3a37a5..eb9f150b76 100644
--- a/sechub-cli/build.gradle
+++ b/sechub-cli/build.gradle
@@ -28,12 +28,12 @@ task buildGo(type: Exec, dependsOn: 'genGo') {
     // https://golang.org/cmd/go/
     //environment GOPATH: "${projectDir}"
 
-    workingDir "${projectDir}/src/daimler.com/sechub/"
+    workingDir "${projectDir}/src/mercedes-benz.com/sechub/"
 
     if (OSUtil.isWindows()){
-        commandLine 'cmd', '/c', 'bash', "${projectDir}/build_go.sh","${projectDir}", new MinGWConverter().convert("${projectDir}"),'daimler.com/sechub'
+        commandLine 'cmd', '/c', 'bash', "${projectDir}/build_go.sh","${projectDir}", new MinGWConverter().convert("${projectDir}"),'mercedes-benz.com/sechub'
     }else{
-        commandLine "${projectDir}/build_go.sh","${projectDir}", "${projectDir}",'daimler.com/sechub'
+        commandLine "${projectDir}/build_go.sh","${projectDir}", "${projectDir}",'mercedes-benz.com/sechub'
     }
 
 }
@@ -49,13 +49,13 @@ task testGo(type:Exec) {
   //https://stackoverflow.com/questions/48882691/force-retesting-or-disable-test-caching
   // but normally not necessary:  environment GOCACHE: "off"
 
-  workingDir "${projectDir}/src/daimler.com/sechub/cli"
+  workingDir "${projectDir}/src/mercedes-benz.com/sechub/cli"
 
   //on windows:
     if (OSUtil.isWindows()){
-        commandLine 'cmd', '/c', 'go', 'test', 'daimler.com/sechub/cli', 'daimler.com/sechub/util', '-v'
+        commandLine 'cmd', '/c', 'go', 'test', 'mercedes-benz.com/sechub/cli', 'mercedes-benz.com/sechub/util', '-v'
     }else{
-        commandLine 'go', 'test', 'daimler.com/sechub/cli', 'daimler.com/sechub/util', '-v'
+        commandLine 'go', 'test', 'mercedes-benz.com/sechub/cli', 'mercedes-benz.com/sechub/util', '-v'
     }
 
 }
@@ -67,9 +67,9 @@ task linterGo(type:Exec) {
 
   //on windows:
     if (OSUtil.isWindows()){
-        commandLine 'cmd', '/c', 'golint', 'daimler.com/sechub/cli', 'daimler.com/sechub/util', 'daimler.com/sechub/testutil'
+        commandLine 'cmd', '/c', 'golint', 'mercedes-benz.com/sechub/cli', 'mercedes-benz.com/sechub/util', 'mercedes-benz.com/sechub/testutil'
     }else{
-        commandLine 'golint', 'daimler.com/sechub/cli', 'daimler.com/sechub/util', 'daimler.com/sechub/testutil'
+        commandLine 'golint', 'mercedes-benz.com/sechub/cli', 'mercedes-benz.com/sechub/util', 'mercedes-benz.com/sechub/testutil'
     }
 
 }
diff --git a/sechub-cli/build_go.sh b/sechub-cli/build_go.sh
index 71302f6d4a..c48428a5ea 100755
--- a/sechub-cli/build_go.sh
+++ b/sechub-cli/build_go.sh
@@ -7,7 +7,7 @@ package="$3"
 platforms="$4"
 globalBuildDir="$5"
 
-MOD_BASENAME="daimler.com/sechub"
+MOD_BASENAME="mercedes-benz.com/sechub"
 SUBMODULES="cli testutil util"  # Space separated list
 SRC_PATH="$projectDirLinuxPath/src/$MOD_BASENAME"
 
diff --git a/sechub-cli/gen_go.sh b/sechub-cli/gen_go.sh
index 146ab4d706..26b49a8ef7 100755
--- a/sechub-cli/gen_go.sh
+++ b/sechub-cli/gen_go.sh
@@ -5,4 +5,4 @@
 cd script
 FILENAME_GEN_CONST_FP='constants_filepatterns_gen.go'
 echo "generate '$FILENAME_GEN_CONST_FP'"
-./go-gen-supported-source-extensions.sh > ./../../sechub-cli/src/daimler.com/sechub/cli/$FILENAME_GEN_CONST_FP
\ No newline at end of file
+./go-gen-supported-source-extensions.sh > ./../../sechub-cli/src/mercedes-benz.com/sechub/cli/$FILENAME_GEN_CONST_FP
\ No newline at end of file
diff --git a/sechub-cli/src/daimler.com/sechub/cli/config.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/config.go
similarity index 99%
rename from sechub-cli/src/daimler.com/sechub/cli/config.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/config.go
index e7029805cb..8da713fa92 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/config.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/config.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // Config for internal CLI calls
diff --git a/sechub-cli/src/daimler.com/sechub/cli/config_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/config_test.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/config_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/config_test.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/constants.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/constants.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/constants.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/constants.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/context-initializer.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer.go
similarity index 97%
rename from sechub-cli/src/daimler.com/sechub/cli/context-initializer.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer.go
index ee15b68955..ee757c41c9 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/context-initializer.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // InitializeContext - initialize and validate context.
diff --git a/sechub-cli/src/daimler.com/sechub/cli/context-initializer_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer_test.go
similarity index 97%
rename from sechub-cli/src/daimler.com/sechub/cli/context-initializer_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer_test.go
index bcf13db5cc..c7c787e6c9 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/context-initializer_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/context-initializer_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	. "daimler.com/sechub/testutil"
+	. "mercedes-benz.com/sechub/testutil"
 )
 
 func TestLoadConfigFile(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/cli/context.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/context.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/context.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/context.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/controller-uploadsourcezip.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/controller-uploadsourcezip.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/controller-uploadsourcezip.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/controller-uploadsourcezip.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/controller.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/controller.go
similarity index 99%
rename from sechub-cli/src/daimler.com/sechub/cli/controller.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/controller.go
index eb08cd874c..f430382628 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/controller.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/controller.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 type jobStatusResult struct {
diff --git a/sechub-cli/src/daimler.com/sechub/cli/errorHelper.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/errorHelper.go
similarity index 90%
rename from sechub-cli/src/daimler.com/sechub/cli/errorHelper.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/errorHelper.go
index 99de8f97a0..6a8afd2f3f 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/errorHelper.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/errorHelper.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // HandleHTTPErrorAndResponse does just handle error and repsonse
diff --git a/sechub-cli/src/daimler.com/sechub/cli/false-positives.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/false-positives.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives.go
index 9ab5d0a434..2ff96cd76e 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/false-positives.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // Keyword for false-posisitves json file
@@ -256,7 +256,7 @@ func printFinding(finding *SecHubReportFindings) {
 	// Example output:
 	// ---------------------------------------------------------------------------
 	// 1: Absolute Path Traversal, severity: MEDIUM
-	// java/com/daimler/sechub/docgen/AsciidocGenerator.java, line:28, column:35:
+	// java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java, line:28, column:35:
 	//       public static void main(String[] args) throws Exception {
 	// ---------------------------------------------------------------------------
 	sechubUtil.PrintDashedLine()
@@ -321,7 +321,7 @@ func printFalsePositiveDefinition(falsepositive *FalsePositiveDefinition) {
 	// ------------------------------------------------------------------
 	// Creation of Temp File in Dir with Incorrect Permissions, codeScan severity: LOW
 	//   Origin: Finding ID 3 in job f94d815c-7f69-48c3-8433-8f03d52ce32a
-	//   File: java/com/daimler/sechub/docgen/kubernetes/KubernetesTemplateFilesGenerator.java
+	//   File: java/com/mercedes-benz/sechub/docgen/kubernetes/KubernetesTemplateFilesGenerator.java
 	//   Code:                 File secHubServer = new File("./sechub-server");
 	// (Added by admin at 2020-07-10 13:41:06; comment: "Only temporary directory")
 	// ------------------------------------------------------------------
diff --git a/sechub-cli/src/daimler.com/sechub/cli/false-positives_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives_test.go
similarity index 95%
rename from sechub-cli/src/daimler.com/sechub/cli/false-positives_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives_test.go
index bc18c22634..b146b490cd 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/false-positives_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/false-positives_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	sechubTestUtil "daimler.com/sechub/testutil"
+	sechubTestUtil "mercedes-benz.com/sechub/testutil"
 )
 
 func TestFalsePositivesFilePathCorrectCreated(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/cli/help.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/help.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/help.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/help.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/job.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/job.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/job.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/job.go
index a41bd9604b..b14b498bcc 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/job.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/job.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 /* --------------------------------------------------
diff --git a/sechub-cli/src/daimler.com/sechub/cli/logo.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/logo.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/logo.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/logo.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/report.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/report.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/report.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/report.go
index 5ef6ad1363..c1666ef3ac 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/report.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/report.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // ReportDownload - struct for handling report downloads
diff --git a/sechub-cli/src/daimler.com/sechub/cli/report_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/report_test.go
similarity index 86%
rename from sechub-cli/src/daimler.com/sechub/cli/report_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/report_test.go
index b7f41974c2..4399cb006e 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/report_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/report_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	sechubTestUtil "daimler.com/sechub/testutil"
+	sechubTestUtil "mercedes-benz.com/sechub/testutil"
 )
 
 func TestReportFilePathCorrectCreated(t *testing.T) {
@@ -59,31 +59,31 @@ func TestNewSecHubReportFromFile(t *testing.T) {
 						 "name": "Absolute Path Traversal",
 						 "severity": "HIGH",
 						 "code": {
-								"location": "java/com/daimler/sechub/docgen/AsciidocGenerator.java",
+								"location": "java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java",
 								"line": 28,
 								"column": 35,
 								"source": "\tpublic static void main(String[] args) throws Exception {/*SECHUB mockdata*/",
 								"relevantPart": "args",
 								"calls": {
-									 "location": "java/com/daimler/sechub/docgen/AsciidocGenerator.java",
+									 "location": "java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java",
 									 "line": 33,
 									 "column": 17,
 									 "source": "\t\tString path = args[0];",
 									 "relevantPart": "args",
 									 "calls": {
-											"location": "java/com/daimler/sechub/docgen/AsciidocGenerator.java",
+											"location": "java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java",
 											"line": 33,
 											"column": 10,
 											"source": "\t\tString path = args[0];",
 											"relevantPart": "path",
 											"calls": {
-												 "location": "java/com/daimler/sechub/docgen/AsciidocGenerator.java",
+												 "location": "java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java",
 												 "line": 34,
 												 "column": 38,
 												 "source": "\t\tFile documentsGenFolder = new File(path);",
 												 "relevantPart": "path",
 												 "calls": {
-														"location": "java/com/daimler/sechub/docgen/AsciidocGenerator.java",
+														"location": "java/com/mercedes-benz/sechub/docgen/AsciidocGenerator.java",
 														"line": 34,
 														"column": 29,
 														"source": "\t\tFile documentsGenFolder = new File(path);",
@@ -101,7 +101,7 @@ func TestNewSecHubReportFromFile(t *testing.T) {
 						 "name": "Race Condition Format Flaw",
 						 "severity": "LOW",
 						 "code": {
-								"location": "java/com/daimler/sechub/docgen/kubernetes/KubernetesTemplateFilesGenerator.java",
+								"location": "java/com/mercedes-benz/sechub/docgen/kubernetes/KubernetesTemplateFilesGenerator.java",
 								"line": 228,
 								"column": 27,
 								"source": "\t\treturn dateFormat.format(new Date());",
diff --git a/sechub-cli/src/daimler.com/sechub/cli/resthelper.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/resthelper.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/resthelper.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/resthelper.go
index 0ed0838ee2..ec10f9d7ec 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/resthelper.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/resthelper.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"path/filepath"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 /**
diff --git a/sechub-cli/src/daimler.com/sechub/cli/sechubconfig.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/sechubconfig.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig.go
index 6dbfd1d2a1..4871b8572c 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/sechubconfig.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"strings"
 
-	sechubUtil "daimler.com/sechub/util"
+	sechubUtil "mercedes-benz.com/sechub/util"
 )
 
 // SecHubConfig is the sechub configuration JSON pendant in Go. But we do only necessary parts from JSON file!
diff --git a/sechub-cli/src/daimler.com/sechub/cli/sechubconfig_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig_test.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/sechubconfig_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig_test.go
index f28c103924..aa9751dd2a 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/sechubconfig_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/sechubconfig_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "daimler.com/sechub/testutil"
+	. "mercedes-benz.com/sechub/testutil"
 )
 
 func Test_fillTemplate_without_data_keeps_data_as_is(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/cli/testdata/README.md b/sechub-cli/src/mercedes-benz.com/sechub/cli/testdata/README.md
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/testdata/README.md
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/testdata/README.md
diff --git a/sechub-cli/src/daimler.com/sechub/cli/testdata/sechub-testfile1.json b/sechub-cli/src/mercedes-benz.com/sechub/cli/testdata/sechub-testfile1.json
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/testdata/sechub-testfile1.json
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/testdata/sechub-testfile1.json
diff --git a/sechub-cli/src/daimler.com/sechub/cli/urlbuilder.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/urlbuilder.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/urlbuilder.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/urlbuilder.go
diff --git a/sechub-cli/src/daimler.com/sechub/cli/urlbuilder_test.go b/sechub-cli/src/mercedes-benz.com/sechub/cli/urlbuilder_test.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/cli/urlbuilder_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/urlbuilder_test.go
index fb8dd745cc..84edf3623a 100644
--- a/sechub-cli/src/daimler.com/sechub/cli/urlbuilder_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/cli/urlbuilder_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	sechubTestUtil "daimler.com/sechub/testutil"
+	sechubTestUtil "mercedes-benz.com/sechub/testutil"
 )
 
 // https://localhost:8443/api/project/testproject/job/
diff --git a/sechub-cli/src/daimler.com/sechub/cli/version.go.template b/sechub-cli/src/mercedes-benz.com/sechub/cli/version.go.template
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/cli/version.go.template
rename to sechub-cli/src/mercedes-benz.com/sechub/cli/version.go.template
diff --git a/sechub-cli/src/daimler.com/sechub/main/sechub.go b/sechub-cli/src/mercedes-benz.com/sechub/main/sechub.go
similarity index 86%
rename from sechub-cli/src/daimler.com/sechub/main/sechub.go
rename to sechub-cli/src/mercedes-benz.com/sechub/main/sechub.go
index 1c270b7e7a..49f54e5594 100644
--- a/sechub-cli/src/daimler.com/sechub/main/sechub.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/main/sechub.go
@@ -6,7 +6,7 @@ package main
  * Main entry point for SECHUB CLI client.
  */
 import (
-	"daimler.com/sechub/cli"
+	"mercedes-benz.com/sechub/cli"
 )
 
 func main() {
diff --git a/sechub-cli/src/daimler.com/sechub/testutil/asserts.go b/sechub-cli/src/mercedes-benz.com/sechub/testutil/asserts.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/testutil/asserts.go
rename to sechub-cli/src/mercedes-benz.com/sechub/testutil/asserts.go
diff --git a/sechub-cli/src/daimler.com/sechub/testutil/fileTestHelpers.go b/sechub-cli/src/mercedes-benz.com/sechub/testutil/fileTestHelpers.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/testutil/fileTestHelpers.go
rename to sechub-cli/src/mercedes-benz.com/sechub/testutil/fileTestHelpers.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/checksumsha256.go b/sechub-cli/src/mercedes-benz.com/sechub/util/checksumsha256.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/checksumsha256.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/checksumsha256.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/checksumsha256_test.go b/sechub-cli/src/mercedes-benz.com/sechub/util/checksumsha256_test.go
similarity index 91%
rename from sechub-cli/src/daimler.com/sechub/util/checksumsha256_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/checksumsha256_test.go
index 3f0b8e5cd5..4da485e858 100644
--- a/sechub-cli/src/daimler.com/sechub/util/checksumsha256_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/util/checksumsha256_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	sechubTestUtil "daimler.com/sechub/testutil"
+	sechubTestUtil "mercedes-benz.com/sechub/testutil"
 )
 
 func TestCreateChecksum(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/util/consoleHelpers.go b/sechub-cli/src/mercedes-benz.com/sechub/util/consoleHelpers.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/consoleHelpers.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/consoleHelpers.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/consoleHelpers_test.go b/sechub-cli/src/mercedes-benz.com/sechub/util/consoleHelpers_test.go
similarity index 97%
rename from sechub-cli/src/daimler.com/sechub/util/consoleHelpers_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/consoleHelpers_test.go
index 154f87715f..8ad5cc5902 100644
--- a/sechub-cli/src/daimler.com/sechub/util/consoleHelpers_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/util/consoleHelpers_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	sechubTestUtil "daimler.com/sechub/testutil"
+	sechubTestUtil "mercedes-benz.com/sechub/testutil"
 )
 
 func Example_readFromConsole() {
diff --git a/sechub-cli/src/daimler.com/sechub/util/errorhandler.go b/sechub-cli/src/mercedes-benz.com/sechub/util/errorhandler.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/errorhandler.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/errorhandler.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/fileHelpers.go b/sechub-cli/src/mercedes-benz.com/sechub/util/fileHelpers.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/fileHelpers.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/fileHelpers.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/filepathmatcher.go b/sechub-cli/src/mercedes-benz.com/sechub/util/filepathmatcher.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/filepathmatcher.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/filepathmatcher.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/filepathmatcher_test.go b/sechub-cli/src/mercedes-benz.com/sechub/util/filepathmatcher_test.go
similarity index 98%
rename from sechub-cli/src/daimler.com/sechub/util/filepathmatcher_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/filepathmatcher_test.go
index 4722cc92cc..bf7d3ce1bc 100644
--- a/sechub-cli/src/daimler.com/sechub/util/filepathmatcher_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/util/filepathmatcher_test.go
@@ -5,7 +5,7 @@ package util
 import (
 	"testing"
 
-	. "daimler.com/sechub/testutil"
+	. "mercedes-benz.com/sechub/testutil"
 )
 
 func Test_Simple_filename_and_pattern_with_asterisk_at_start_and_prefix_matches(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/util/log.go b/sechub-cli/src/mercedes-benz.com/sechub/util/log.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/log.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/log.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/time.go b/sechub-cli/src/mercedes-benz.com/sechub/util/time.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/time.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/time.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/validator.go b/sechub-cli/src/mercedes-benz.com/sechub/util/validator.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/validator.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/validator.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/validator_test.go b/sechub-cli/src/mercedes-benz.com/sechub/util/validator_test.go
similarity index 96%
rename from sechub-cli/src/daimler.com/sechub/util/validator_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/validator_test.go
index bb86ade46b..5ce0cf0157 100644
--- a/sechub-cli/src/daimler.com/sechub/util/validator_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/util/validator_test.go
@@ -5,7 +5,7 @@ package util
 import (
 	"testing"
 
-	. "daimler.com/sechub/testutil"
+	. "mercedes-benz.com/sechub/testutil"
 )
 
 func Test_emptyJSON_is_json(t *testing.T) {
diff --git a/sechub-cli/src/daimler.com/sechub/util/zip.go b/sechub-cli/src/mercedes-benz.com/sechub/util/zip.go
similarity index 100%
rename from sechub-cli/src/daimler.com/sechub/util/zip.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/zip.go
diff --git a/sechub-cli/src/daimler.com/sechub/util/zip_test.go b/sechub-cli/src/mercedes-benz.com/sechub/util/zip_test.go
similarity index 99%
rename from sechub-cli/src/daimler.com/sechub/util/zip_test.go
rename to sechub-cli/src/mercedes-benz.com/sechub/util/zip_test.go
index 2a2e9f5935..b19ec3d0d5 100644
--- a/sechub-cli/src/daimler.com/sechub/util/zip_test.go
+++ b/sechub-cli/src/mercedes-benz.com/sechub/util/zip_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	sechubUtil "daimler.com/sechub/testutil"
+	sechubUtil "mercedes-benz.com/sechub/testutil"
 )
 
 func TestZipFileBeingPartOfScannedFoldersIsRejected(t *testing.T) {