diff --git a/.github/workflows/check_diff_action.yaml b/.github/workflows/check_diff_action.yaml
index 0b9f47a91d..30cfeeb60b 100644
--- a/.github/workflows/check_diff_action.yaml
+++ b/.github/workflows/check_diff_action.yaml
@@ -23,7 +23,7 @@ jobs:
         echo "go_modcache=$(go env GOMODCACHE)" >> $GITHUB_ENV
 
     # This step will only reuse the go mod and build cache from main made during the Build,
-    # see push_ocm.yaml => "ocm-cli-latest" Job
+    # see lint_and_test.yaml => "test" Job
     # This means it never caches by itself and PRs cannot cause cache pollution / thrashing
     # This is because we have huge storage requirements for our cache because of the mass of dependencies
     - name: Restore / Reuse Cache from central build
diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml
index 98b71bfa0e..0ca4ecbe1c 100644
--- a/.github/workflows/lint_and_test.yaml
+++ b/.github/workflows/lint_and_test.yaml
@@ -32,7 +32,7 @@ jobs:
           echo "go_modcache=$(go env GOMODCACHE)" >> $GITHUB_ENV
 
       # This step will only reuse the go mod and build cache from main made during the Build,
-      # see push_ocm.yaml => "ocm-cli-latest" Job
+      # see lint_and_test.yaml => "test" Job
       # This means it never caches by itself and PRs cannot cause cache pollution / thrashing
       # This is because we have huge storage requirements for our cache because of the mass of dependencies
       - name: Restore / Reuse Cache from central build
@@ -46,7 +46,7 @@ jobs:
           restore-keys: |
             ${{ env.cache_name }}-${{ runner.os }}-go-
         env:
-          cache_name: ocm-cli-latest-go-cache # needs to be the same key in the end as in the build step
+          cache_name: run-tests-go-cache # needs to be the same key in the end as in the build step
 
       - name: Build
         run: make build -j
@@ -54,7 +54,7 @@ jobs:
         run: make install-requirements test
 
       # This step will only reuse the go mod and build cache from main made during the Build,
-      # see push_ocm.yaml => "ocm-cli-latest" Job
+      # see lint_and_test.yaml => "test" Job
       # This means it never caches by itself and PRs cannot cause cache pollution / thrashing
       # This is because we have huge storage requirements for our cache because of the mass of dependencies
       - name: Save Cache of Build (only on main)
@@ -68,7 +68,7 @@ jobs:
           key: ${{ env.cache_name }}-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-${{ hashFiles('**/go.mod') }}
           upload-chunk-size: 256000000 # default of 32MB is not really optimal for our large cache, choose 256MB instead
         env:
-          cache_name: ocm-cli-latest-go-cache # needs to be the same key in the end as in the build step
+          cache_name: run-tests-go-cache # needs to be the same key in the end as in the build step
 
   go-lint:
     name: Lint Golang