diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index eedab2f2ce..4d4e28f54a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - uses: ./codeql/init
+    - uses: ./init
       with:
        config-file: ./.github/codeql/codeql-config.yml
-    - uses: ./codeql/finish
+    - uses: ./finish
diff --git a/README.md b/README.md
index 759dc2ebd6..1d3514d561 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ Identifying potential files for extraction:
 - If it finds a subfolder that's defined as `paths-ignore`, stop traversing.
 - If a file or folder is both in `paths` and `paths-ignore`, the `paths-ignore` is ignored.
 
-Use the config-file parameter of the codeql/init action to enable the configuration file. For example:
+Use the config-file parameter of the init action to enable the configuration file. For example:
 
 ```yaml
     - uses: github/codeql-action/init@master
diff --git a/lib/autobuild.js b/lib/autobuild.js
index 97efbfde8a..bce7f3a347 100644
--- a/lib/autobuild.js
+++ b/lib/autobuild.js
@@ -51,6 +51,6 @@ async function run() {
     await util.reportActionSucceeded('autobuild');
 }
 run().catch(e => {
-    core.setFailed("codeql/autobuild action failed: " + e);
+    core.setFailed("autobuild action failed: " + e);
     console.log(e);
 });
diff --git a/lib/finalize-db.js b/lib/finalize-db.js
index 7e9bcacedd..8679a7d0f6 100644
--- a/lib/finalize-db.js
+++ b/lib/finalize-db.js
@@ -133,6 +133,6 @@ async function run() {
     await util.reportActionSucceeded('finish');
 }
 run().catch(e => {
-    core.setFailed("codeql/finish action failed: " + e);
+    core.setFailed("analyze action failed: " + e);
     console.log(e);
 });
diff --git a/lib/setup-tracer.js b/lib/setup-tracer.js
index 55ff0b5e43..5265a10ff3 100644
--- a/lib/setup-tracer.js
+++ b/lib/setup-tracer.js
@@ -142,7 +142,7 @@ async function run() {
         const goFlags = process.env['GOFLAGS'];
         if (goFlags) {
             core.exportVariable('GOFLAGS', goFlags);
-            core.warning("Passing the GOFLAGS env parameter to the codeql/init action is deprecated. Please move this to the codeql/finish action.");
+            core.warning("Passing the GOFLAGS env parameter to the init action is deprecated. Please move this to the analyze action.");
         }
         // Setup CODEQL_RAM flag (todo improve this https://github.com/github/dsp-code-scanning/issues/935)
         const codeqlRam = process.env['CODEQL_RAM'] || '6500';
@@ -200,6 +200,6 @@ async function run() {
     await util.reportActionSucceeded('init');
 }
 run().catch(e => {
-    core.setFailed("codeql/init action failed: " + e);
+    core.setFailed("init action failed: " + e);
     console.log(e);
 });
diff --git a/lib/upload-sarif.js b/lib/upload-sarif.js
index 63b5c16577..5bd8e593d1 100644
--- a/lib/upload-sarif.js
+++ b/lib/upload-sarif.js
@@ -25,6 +25,6 @@ async function run() {
     await util.reportActionSucceeded('upload-sarif');
 }
 run().catch(e => {
-    core.setFailed("codeql/upload-sarif action failed: " + e);
+    core.setFailed("upload-sarif action failed: " + e);
     console.log(e);
 });
diff --git a/src/autobuild.ts b/src/autobuild.ts
index 05e0a2c907..bd7b37f255 100644
--- a/src/autobuild.ts
+++ b/src/autobuild.ts
@@ -53,6 +53,6 @@ async function run() {
 }
 
 run().catch(e => {
-  core.setFailed("codeql/autobuild action failed: " + e);
+  core.setFailed("autobuild action failed: " + e);
   console.log(e);
 });
diff --git a/src/finalize-db.ts b/src/finalize-db.ts
index 0002215912..a03e68a1b4 100644
--- a/src/finalize-db.ts
+++ b/src/finalize-db.ts
@@ -159,6 +159,6 @@ async function run() {
 }
 
 run().catch(e => {
-  core.setFailed("codeql/finish action failed: " + e);
+  core.setFailed("analyze action failed: " + e);
   console.log(e);
 });
diff --git a/src/setup-tracer.ts b/src/setup-tracer.ts
index 1e96c7cace..e926d3968b 100644
--- a/src/setup-tracer.ts
+++ b/src/setup-tracer.ts
@@ -166,7 +166,7 @@ async function run() {
         const goFlags = process.env['GOFLAGS'];
         if (goFlags) {
             core.exportVariable('GOFLAGS', goFlags);
-            core.warning("Passing the GOFLAGS env parameter to the codeql/init action is deprecated. Please move this to the codeql/finish action.");
+            core.warning("Passing the GOFLAGS env parameter to the init action is deprecated. Please move this to the analyze action.");
         }
 
         // Setup CODEQL_RAM flag (todo improve this https://github.com/github/dsp-code-scanning/issues/935)
@@ -235,6 +235,6 @@ async function run() {
 }
 
 run().catch(e => {
-    core.setFailed("codeql/init action failed: " + e);
+    core.setFailed("init action failed: " + e);
     console.log(e);
 });
diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts
index 3503337557..b0aedce5a3 100644
--- a/src/upload-sarif.ts
+++ b/src/upload-sarif.ts
@@ -20,6 +20,6 @@ async function run() {
 }
 
 run().catch(e => {
-    core.setFailed("codeql/upload-sarif action failed: " + e);
+    core.setFailed("upload-sarif action failed: " + e);
     console.log(e);
 });