diff --git a/src/renderer/app-paths/setup-app-paths.injectable.ts b/src/renderer/app-paths/setup-app-paths.injectable.ts
index 21bb1a0ed1..d69d8dcbab 100644
--- a/src/renderer/app-paths/setup-app-paths.injectable.ts
+++ b/src/renderer/app-paths/setup-app-paths.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import appPathsStateInjectable from "../../common/app-paths/app-paths-state.injectable";
-import { evenBeforeFrameStartsInjectionToken } from "../before-frame-starts/tokens";
+import { beforeFrameStartsFirstInjectionToken } from "../before-frame-starts/tokens";
 import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import { requestFromChannelInjectionToken } from "../../common/utils/channel/request-from-channel-injection-token";
 
@@ -22,7 +22,7 @@ const setupAppPathsInjectable = getInjectable({
     },
   }),
 
-  injectionToken: evenBeforeFrameStartsInjectionToken,
+  injectionToken: beforeFrameStartsFirstInjectionToken,
 });
 
 export default setupAppPathsInjectable;
diff --git a/src/renderer/before-frame-starts/runnables/configure-immer.injectable.ts b/src/renderer/before-frame-starts/runnables/configure-immer.injectable.ts
index 2159983f2b..73ec9f99bc 100644
--- a/src/renderer/before-frame-starts/runnables/configure-immer.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/configure-immer.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { setAutoFreeze, enableMapSet } from "immer";
-import { evenBeforeFrameStartsInjectionToken } from "../tokens";
+import { beforeFrameStartsFirstInjectionToken } from "../tokens";
 
 const configureImmerInjectable = getInjectable({
   id: "configure-immer",
@@ -17,7 +17,7 @@ const configureImmerInjectable = getInjectable({
       enableMapSet(); // allow to merge maps and sets
     },
   }),
-  injectionToken: evenBeforeFrameStartsInjectionToken,
+  injectionToken: beforeFrameStartsFirstInjectionToken,
 });
 
 export default configureImmerInjectable;
diff --git a/src/renderer/before-frame-starts/runnables/configure-mobx.injectable.ts b/src/renderer/before-frame-starts/runnables/configure-mobx.injectable.ts
index 51a7899801..20953b8a8a 100644
--- a/src/renderer/before-frame-starts/runnables/configure-mobx.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/configure-mobx.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { configure } from "mobx";
-import { evenBeforeFrameStartsInjectionToken } from "../tokens";
+import { beforeFrameStartsFirstInjectionToken } from "../tokens";
 
 const configureMobxInjectable = getInjectable({
   id: "configure-mobx",
@@ -22,7 +22,7 @@ const configureMobxInjectable = getInjectable({
       });
     },
   }),
-  injectionToken: evenBeforeFrameStartsInjectionToken,
+  injectionToken: beforeFrameStartsFirstInjectionToken,
 });
 
 export default configureMobxInjectable;
diff --git a/src/renderer/before-frame-starts/runnables/setup-auto-registration.injectable.ts b/src/renderer/before-frame-starts/runnables/setup-auto-registration.injectable.ts
index c6f2cb4b56..c2c58c22b0 100644
--- a/src/renderer/before-frame-starts/runnables/setup-auto-registration.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/setup-auto-registration.injectable.ts
@@ -9,7 +9,7 @@ import { CustomResourceStore } from "../../../common/k8s-api/api-manager/resourc
 import type { CustomResourceDefinition } from "../../../common/k8s-api/endpoints";
 import { KubeApi } from "../../../common/k8s-api/kube-api";
 import { KubeObject } from "../../../common/k8s-api/kube-object";
-import { evenBeforeClusterFrameStartsInjectionToken } from "../tokens";
+import { beforeClusterFrameStartsInjectionToken } from "../tokens";
 
 const setupAutoRegistrationInjectable = getInjectable({
   id: "setup-auto-registration",
@@ -73,7 +73,7 @@ const setupAutoRegistrationInjectable = getInjectable({
       initialized = true;
     },
   }),
-  injectionToken: evenBeforeClusterFrameStartsInjectionToken,
+  injectionToken: beforeClusterFrameStartsInjectionToken,
 });
 
 export default setupAutoRegistrationInjectable;
diff --git a/src/renderer/before-frame-starts/runnables/setup-current-cluster-broadcast.injectable.ts b/src/renderer/before-frame-starts/runnables/setup-current-cluster-broadcast.injectable.ts
index ab9e8ba81c..978eae3d95 100644
--- a/src/renderer/before-frame-starts/runnables/setup-current-cluster-broadcast.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/setup-current-cluster-broadcast.injectable.ts
@@ -7,7 +7,7 @@ import { reaction } from "mobx";
 import { currentClusterMessageChannel } from "../../../common/cluster/current-cluster-channel";
 import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import matchedClusterIdInjectable from "../../navigation/matched-cluster-id.injectable";
-import { evenBeforeMainFrameStartsInjectionToken } from "../tokens";
+import { beforeMainFrameStartsInjectionToken } from "../tokens";
 
 const setupCurrentClusterBroadcastInjectable = getInjectable({
   id: "setup-current-cluster-broadcast",
@@ -26,7 +26,7 @@ const setupCurrentClusterBroadcastInjectable = getInjectable({
       );
     },
   }),
-  injectionToken: evenBeforeMainFrameStartsInjectionToken,
+  injectionToken: beforeMainFrameStartsInjectionToken,
 });
 
 export default setupCurrentClusterBroadcastInjectable;
diff --git a/src/renderer/before-frame-starts/runnables/setup-sentry.injectable.ts b/src/renderer/before-frame-starts/runnables/setup-sentry.injectable.ts
index cb625d7841..401cec99d5 100644
--- a/src/renderer/before-frame-starts/runnables/setup-sentry.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/setup-sentry.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import initializeSentryReportingWithInjectable from "../../../common/error-reporting/initialize-sentry-reporting.injectable";
-import { evenBeforeMainFrameStartsInjectionToken } from "../tokens";
+import { beforeMainFrameStartsInjectionToken } from "../tokens";
 import { init } from "@sentry/electron/renderer";
 
 const setupSentryInjectable = getInjectable({
@@ -17,7 +17,7 @@ const setupSentryInjectable = getInjectable({
       initializeSentryReportingWith(init);
     },
   }),
-  injectionToken: evenBeforeMainFrameStartsInjectionToken,
+  injectionToken: beforeMainFrameStartsInjectionToken,
 });
 
 export default setupSentryInjectable;
diff --git a/src/renderer/before-frame-starts/tokens.ts b/src/renderer/before-frame-starts/tokens.ts
index 47307a26cb..77b0350315 100644
--- a/src/renderer/before-frame-starts/tokens.ts
+++ b/src/renderer/before-frame-starts/tokens.ts
@@ -5,17 +5,18 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { Runnable } from "../../common/runnable/run-many-for";
 
-export const evenBeforeFrameStartsInjectionToken = getInjectionToken<Runnable>({
+// NOTE: these are run before any other token, mostly to set up things that all other runnables need
+export const beforeFrameStartsFirstInjectionToken = getInjectionToken<Runnable>({
   id: "even-before-frame-starts",
 });
 
 // NOTE: these are only run when process.isMainFrame === true
-export const evenBeforeMainFrameStartsInjectionToken = getInjectionToken<Runnable>({
+export const beforeMainFrameStartsInjectionToken = getInjectionToken<Runnable>({
   id: "even-before-main-frame-starts",
 });
 
 // NOTE: these are only run when process.isMainFrame === false
-export const evenBeforeClusterFrameStartsInjectionToken = getInjectionToken<Runnable>({
+export const beforeClusterFrameStartsInjectionToken = getInjectionToken<Runnable>({
   id: "even-before-cluster-frame-starts",
 });
 
diff --git a/src/renderer/start-frame/start-frame.injectable.ts b/src/renderer/start-frame/start-frame.injectable.ts
index 17fcb0c094..60e8d590d0 100644
--- a/src/renderer/start-frame/start-frame.injectable.ts
+++ b/src/renderer/start-frame/start-frame.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { runManyFor } from "../../common/runnable/run-many-for";
-import { beforeFrameStartsInjectionToken, evenBeforeClusterFrameStartsInjectionToken, evenBeforeFrameStartsInjectionToken, evenBeforeMainFrameStartsInjectionToken } from "../before-frame-starts/tokens";
+import { beforeFrameStartsInjectionToken, beforeClusterFrameStartsInjectionToken, beforeFrameStartsFirstInjectionToken, beforeMainFrameStartsInjectionToken } from "../before-frame-starts/tokens";
 import currentlyInClusterFrameInjectable from "../routes/currently-in-cluster-frame.injectable";
 
 const startFrameInjectable = getInjectable({
@@ -13,19 +13,19 @@ const startFrameInjectable = getInjectable({
   // TODO: Consolidate contents of bootstrap.tsx here
   instantiate: (di) => {
     const runMany = runManyFor(di);
-    const evenBeforeFrameStarts = runMany(evenBeforeFrameStartsInjectionToken);
-    const evenBeforeMainFrameStarts = runMany(evenBeforeMainFrameStartsInjectionToken);
-    const evenBeforeClusterFrameStarts = runMany(evenBeforeClusterFrameStartsInjectionToken);
+    const beforeFrameStartsFirst = runMany(beforeFrameStartsFirstInjectionToken);
+    const beforeMainFrameStarts = runMany(beforeMainFrameStartsInjectionToken);
+    const beforeClusterFrameStarts = runMany(beforeClusterFrameStartsInjectionToken);
     const beforeFrameStarts = runMany(beforeFrameStartsInjectionToken);
     const currentlyInClusterFrame = di.inject(currentlyInClusterFrameInjectable);
 
     return async () => {
-      await evenBeforeFrameStarts();
+      await beforeFrameStartsFirst();
 
       if (currentlyInClusterFrame) {
-        await evenBeforeClusterFrameStarts();
+        await beforeClusterFrameStarts();
       } else {
-        await evenBeforeMainFrameStarts();
+        await beforeMainFrameStarts();
       }
 
       await beforeFrameStarts();