diff --git a/experimental/javascript-wc-indexeddb/scripts/build.js b/experimental/javascript-wc-indexeddb/scripts/build.js
index 46bc40f4c..64ef1ad34 100644
--- a/experimental/javascript-wc-indexeddb/scripts/build.js
+++ b/experimental/javascript-wc-indexeddb/scripts/build.js
@@ -97,7 +97,7 @@ const filesToMove = [
     { src: "node_modules/todomvc-css/dist/todo-list.constructable.js", dest: "./dist/styles/todo-list.constructable.js" },
     { src: "node_modules/todomvc-css/dist/todo-item.constructable.js", dest: "./dist/styles/todo-item.constructable.js" },
     { src: "node_modules/dexie/dist/modern/dexie.mjs", dest: "./dist/libs/dexie.mjs" },
-    { src: "node_modules/speedometer-utils/test-invoker.mjs", dest: "./dist/src/speedometer-utils/test-invoker.mjs" },
+    { src: "node_modules/speedometer-utils/step-scheduler.mjs", dest: "./dist/src/speedometer-utils/test-invoker.mjs" },
     { src: "node_modules/speedometer-utils/step-runner.mjs", dest: "./dist/src/speedometer-utils/step-runner.mjs" },
     { src: "node_modules/speedometer-utils/params.mjs", dest: "./dist/src/speedometer-utils/params.mjs" },
     { src: "src/speedometer-utils/benchmark.mjs", dest: "./dist/src/speedometer-utils/benchmark.mjs" },
diff --git a/resources/shared/step-runner.mjs b/resources/shared/step-runner.mjs
index 3be7ed806..46187a6ba 100644
--- a/resources/shared/step-runner.mjs
+++ b/resources/shared/step-runner.mjs
@@ -1,4 +1,4 @@
-import { TEST_INVOKER_LOOKUP } from "./test-invoker.mjs";
+import { STEP_SCHEDULER_LOOKUP } from "./step-scheduler.mjs";
 import { forceLayout } from "./helpers.mjs";
 
 export class StepRunner {
@@ -90,11 +90,11 @@ export class StepRunner {
         };
 
         const report = () => this.#callback(this.#step, syncTime, asyncTime);
-        const invokerType = this.#suite.type === "async" || this.#params.useAsyncSteps ? "async" : this.#params.measurementMethod;
-        const invokerClass = TEST_INVOKER_LOOKUP[invokerType];
-        const invoker = new invokerClass(runSync, measureAsync, report, this.#params);
+        const schedulerType = this.#suite.type === "async" || this.#params.useAsyncSteps ? "async" : this.#params.measurementMethod;
+        const schedulerClass = STEP_SCHEDULER_LOOKUP[schedulerType];
+        const scheduler = new schedulerClass(runSync, measureAsync, report, this.#params);
 
-        return invoker.start();
+        return scheduler.start();
     }
 }
 
diff --git a/resources/shared/test-invoker.mjs b/resources/shared/step-scheduler.mjs
similarity index 83%
rename from resources/shared/test-invoker.mjs
rename to resources/shared/step-scheduler.mjs
index cb63c3de3..df7d96a21 100644
--- a/resources/shared/test-invoker.mjs
+++ b/resources/shared/step-scheduler.mjs
@@ -1,4 +1,4 @@
-class TestInvoker {
+class StepScheduler {
     constructor(syncCallback, asyncCallback, reportCallback, params) {
         this._syncCallback = syncCallback;
         this._asyncCallback = asyncCallback;
@@ -16,7 +16,7 @@ class TestInvoker {
     }
 }
 
-class RAFTestInvoker extends TestInvoker {
+class RAFStepScheduler extends StepScheduler {
     _scheduleCallbacks(resolve) {
         requestAnimationFrame(() => this._syncCallback());
         requestAnimationFrame(() => {
@@ -31,7 +31,7 @@ class RAFTestInvoker extends TestInvoker {
     }
 }
 
-class AsyncRAFTestInvoker extends TestInvoker {
+class AsyncRAFStepScheduler extends StepScheduler {
     static mc = new MessageChannel();
     _scheduleCallbacks(resolve) {
         let gotTimer = false;
@@ -62,7 +62,7 @@ class AsyncRAFTestInvoker extends TestInvoker {
                 tryTriggerAsyncCallback();
             });
 
-            AsyncRAFTestInvoker.mc.port1.addEventListener(
+            AsyncRAFStepScheduler.mc.port1.addEventListener(
                 "message",
                 async function () {
                     await Promise.resolve();
@@ -71,14 +71,14 @@ class AsyncRAFTestInvoker extends TestInvoker {
                 },
                 { once: true }
             );
-            AsyncRAFTestInvoker.mc.port1.start();
-            AsyncRAFTestInvoker.mc.port2.postMessage("speedometer");
+            AsyncRAFStepScheduler.mc.port1.start();
+            AsyncRAFStepScheduler.mc.port2.postMessage("speedometer");
         });
     }
 }
 
-export const TEST_INVOKER_LOOKUP = {
+export const STEP_SCHEDULER_LOOKUP = {
     __proto__: null,
-    raf: RAFTestInvoker,
-    async: AsyncRAFTestInvoker,
+    raf: RAFStepScheduler,
+    async: AsyncRAFStepScheduler,
 };
diff --git a/resources/todomvc/vanilla-examples/javascript-web-components/scripts/build.js b/resources/todomvc/vanilla-examples/javascript-web-components/scripts/build.js
index d6cb7ab29..f8399da34 100644
--- a/resources/todomvc/vanilla-examples/javascript-web-components/scripts/build.js
+++ b/resources/todomvc/vanilla-examples/javascript-web-components/scripts/build.js
@@ -96,7 +96,7 @@ const filesToMove = [
     { src: "node_modules/todomvc-css/dist/bottombar.constructable.js", dest: "./dist/styles/bottombar.constructable.js" },
     { src: "node_modules/todomvc-css/dist/todo-list.constructable.js", dest: "./dist/styles/todo-list.constructable.js" },
     { src: "node_modules/todomvc-css/dist/todo-item.constructable.js", dest: "./dist/styles/todo-item.constructable.js" },
-    { src: "node_modules/speedometer-utils/test-invoker.mjs", dest: "./dist/src/speedometer-utils/test-invoker.mjs" },
+    { src: "node_modules/speedometer-utils/step-scheduler.mjs", dest: "./dist/src/speedometer-utils/test-invoker.mjs" },
     { src: "node_modules/speedometer-utils/step-runner.mjs", dest: "./dist/src/speedometer-utils/step-runner.mjs" },
     { src: "node_modules/speedometer-utils/params.mjs", dest: "./dist/src/speedometer-utils/params.mjs" },
     { src: "node_modules/speedometer-utils/benchmark.mjs", dest: "./dist/src/speedometer-utils/benchmark.mjs" },