diff --git a/.github/workflows/smoke-tests-1_8_0.yml b/.github/workflows/smoke-tests-1_8_0.yml
index 5af7e3256..3da436393 100644
--- a/.github/workflows/smoke-tests-1_8_0.yml
+++ b/.github/workflows/smoke-tests-1_8_0.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_1.8.0Test'
+          arguments: ':acceptance-tests:functional:kgp_1.8.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -74,7 +74,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_1.8.0Test'
+          arguments: ':acceptance-tests:type-mapping:kgp_1.8.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -95,7 +95,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_1.8.0Test'
+          arguments: ':acceptance-tests:libraries:kgp_1.8.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
diff --git a/.github/workflows/smoke-tests-1_8_20.yml b/.github/workflows/smoke-tests-1_8_20.yml
index 424befe07..26fc0e61f 100644
--- a/.github/workflows/smoke-tests-1_8_20.yml
+++ b/.github/workflows/smoke-tests-1_8_20.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_1.8.20Test'
+          arguments: ':acceptance-tests:functional:kgp_1.8.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -74,7 +74,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_1.8.20Test'
+          arguments: ':acceptance-tests:type-mapping:kgp_1.8.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -95,7 +95,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_1.8.20Test'
+          arguments: ':acceptance-tests:libraries:kgp_1.8.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
diff --git a/.github/workflows/smoke-tests-1_9_0.yml b/.github/workflows/smoke-tests-1_9_0.yml
index 97119d561..975deca16 100644
--- a/.github/workflows/smoke-tests-1_9_0.yml
+++ b/.github/workflows/smoke-tests-1_9_0.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_1.9.0Test'
+          arguments: ':acceptance-tests:functional:kgp_1.9.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -74,7 +74,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_1.9.0Test'
+          arguments: ':acceptance-tests:type-mapping:kgp_1.9.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -95,7 +95,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_1.9.0Test'
+          arguments: ':acceptance-tests:libraries:kgp_1.9.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
diff --git a/.github/workflows/smoke-tests-1_9_20.yml b/.github/workflows/smoke-tests-1_9_20.yml
index de56b4a6a..93baa28b4 100644
--- a/.github/workflows/smoke-tests-1_9_20.yml
+++ b/.github/workflows/smoke-tests-1_9_20.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_1.9.20Test'
+          arguments: ':acceptance-tests:functional:kgp_1.9.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -74,7 +74,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_1.9.20Test'
+          arguments: ':acceptance-tests:type-mapping:kgp_1.9.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -95,7 +95,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_1.9.20Test'
+          arguments: ':acceptance-tests:libraries:kgp_1.9.20Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
diff --git a/.github/workflows/smoke-tests-2_0_0.yml b/.github/workflows/smoke-tests-2_0_0.yml
index 6334fe667..3e17efa6c 100644
--- a/.github/workflows/smoke-tests-2_0_0.yml
+++ b/.github/workflows/smoke-tests-2_0_0.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_2.0.0Test'
+          arguments: ':acceptance-tests:functional:kgp_2.0.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -74,7 +74,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_2.0.0Test'
+          arguments: ':acceptance-tests:type-mapping:kgp_2.0.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -95,7 +95,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_2.0.0Test'
+          arguments: ':acceptance-tests:libraries:kgp_2.0.0Test'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 43e624e74..af080918a 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Run Acceptance Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:functional__kgp_latestTest'
+          arguments: ':acceptance-tests:functional:kgp_latestTest'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -91,7 +91,7 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         id: run-tests
         with:
-          arguments: ':acceptance-tests:type-mapping__kgp_latestTest'
+          arguments: ':acceptance-tests:type-mapping:kgp_latestTest'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}
@@ -121,7 +121,7 @@ jobs:
       - name: Run External Libraries Tests
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: ':acceptance-tests:libraries__kgp_latestTest'
+          arguments: ':acceptance-tests:libraries:kgp_latestTest'
           build-root-directory: SKIE
         env:
           KOTLIN_LINK_MODE: ${{ inputs.linkage }}