diff --git a/web/src/components/queue/ProcessingQueue.svelte b/web/src/components/queue/ProcessingQueue.svelte
index 1aeed81c..97dc0b44 100644
--- a/web/src/components/queue/ProcessingQueue.svelte
+++ b/web/src/components/queue/ProcessingQueue.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
+    import { onMount } from "svelte";
     import { t } from "$lib/i18n/translations";
     import { onNavigate } from "$app/navigation";
-    import { onMount, type SvelteComponent } from "svelte";
 
     import { formatFileSize } from "$lib/util";
     import { clearFileStorage, getStorageQuota } from "$lib/storage";
 
     import { queueVisible } from "$lib/state/queue-visibility";
-    import { currentTasks } from "$lib/state/queen-bee/current-tasks";
-    import { clearQueue, queue as readableQueue } from "$lib/state/queen-bee/queue";
+    import { currentTasks } from "$lib/state/task-manager/current-tasks";
+    import { clearQueue, queue as readableQueue } from "$lib/state/task-manager/queue";
 
     import SectionHeading from "$components/misc/SectionHeading.svelte";
     import PopoverContainer from "$components/misc/PopoverContainer.svelte";
diff --git a/web/src/components/queue/ProcessingQueueItem.svelte b/web/src/components/queue/ProcessingQueueItem.svelte
index 4030ef5a..e5afe74f 100644
--- a/web/src/components/queue/ProcessingQueueItem.svelte
+++ b/web/src/components/queue/ProcessingQueueItem.svelte
@@ -2,12 +2,12 @@
     import { t } from "$lib/i18n/translations";
     import { formatFileSize } from "$lib/util";
     import { downloadFile } from "$lib/download";
-    import { removeItem } from "$lib/state/queen-bee/queue";
+    import { removeItem } from "$lib/state/task-manager/queue";
     import { savingHandler } from "$lib/api/saving-handler";
 
     import type { CobaltQueueItem } from "$lib/types/queue";
     import type { CobaltWorkerProgress } from "$lib/types/workers";
-    import type { CobaltCurrentTaskItem } from "$lib/types/queen-bee";
+    import type { CobaltCurrentTaskItem } from "$lib/types/task-manager";
 
     import ProgressBar from "$components/queue/ProgressBar.svelte";
 
diff --git a/web/src/components/settings/ClearStorageButton.svelte b/web/src/components/settings/ClearStorageButton.svelte
index 04e6d852..725013aa 100644
--- a/web/src/components/settings/ClearStorageButton.svelte
+++ b/web/src/components/settings/ClearStorageButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { t } from "$lib/i18n/translations";
     import { createDialog } from "$lib/state/dialogs";
-    import { clearQueue } from "$lib/state/queen-bee/queue";
+    import { clearQueue } from "$lib/state/task-manager/queue";
     import { clearCacheStorage, clearFileStorage } from "$lib/storage";
 
     import IconFileShredder from "@tabler/icons-svelte/IconFileShredder.svelte";
diff --git a/web/src/lib/api/saving-handler.ts b/web/src/lib/api/saving-handler.ts
index 1e03b465..f6497d35 100644
--- a/web/src/lib/api/saving-handler.ts
+++ b/web/src/lib/api/saving-handler.ts
@@ -7,7 +7,7 @@ import { t } from "$lib/i18n/translations";
 import { downloadFile } from "$lib/download";
 import { createDialog } from "$lib/state/dialogs";
 import { downloadButtonState } from "$lib/state/omnibox";
-import { createSavePipeline } from "$lib/queen-bee/queue";
+import { createSavePipeline } from "$lib/task-manager/queue";
 
 import type { DialogInfo } from "$lib/types/dialog";
 import type { CobaltSaveRequestBody } from "$lib/types/api";
diff --git a/web/src/lib/state/queen-bee/current-tasks.ts b/web/src/lib/state/task-manager/current-tasks.ts
similarity index 97%
rename from web/src/lib/state/queen-bee/current-tasks.ts
rename to web/src/lib/state/task-manager/current-tasks.ts
index dd398b12..9d720bf2 100644
--- a/web/src/lib/state/queen-bee/current-tasks.ts
+++ b/web/src/lib/state/task-manager/current-tasks.ts
@@ -1,7 +1,7 @@
 import { readable, type Updater } from "svelte/store";
 
 import type { CobaltWorkerProgress } from "$lib/types/workers";
-import type { CobaltCurrentTasks, CobaltCurrentTaskItem } from "$lib/types/queen-bee";
+import type { CobaltCurrentTasks, CobaltCurrentTaskItem } from "$lib/types/task-manager";
 
 let update: (_: Updater<CobaltCurrentTasks>) => void;
 
diff --git a/web/src/lib/state/queen-bee/queue.ts b/web/src/lib/state/task-manager/queue.ts
similarity index 97%
rename from web/src/lib/state/queen-bee/queue.ts
rename to web/src/lib/state/task-manager/queue.ts
index 75f79c11..3482879d 100644
--- a/web/src/lib/state/queen-bee/queue.ts
+++ b/web/src/lib/state/task-manager/queue.ts
@@ -1,8 +1,8 @@
 import { readable, type Updater } from "svelte/store";
 
-import { schedule } from "$lib/queen-bee/scheduler";
+import { schedule } from "$lib/task-manager/scheduler";
 import { clearFileStorage, removeFromFileStorage } from "$lib/storage";
-import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/queen-bee/current-tasks";
+import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/task-manager/current-tasks";
 
 import type { CobaltFileReference } from "$lib/types/storage";
 import type { CobaltQueue, CobaltQueueItem, CobaltQueueItemRunning } from "$lib/types/queue";
diff --git a/web/src/lib/queen-bee/queue.ts b/web/src/lib/task-manager/queue.ts
similarity index 98%
rename from web/src/lib/queen-bee/queue.ts
rename to web/src/lib/task-manager/queue.ts
index f7550348..3584dae6 100644
--- a/web/src/lib/queen-bee/queue.ts
+++ b/web/src/lib/task-manager/queue.ts
@@ -1,6 +1,6 @@
 import { get } from "svelte/store";
 import { t } from "$lib/i18n/translations";
-import { addItem } from "$lib/state/queen-bee/queue";
+import { addItem } from "$lib/state/task-manager/queue";
 import { createDialog } from "$lib/state/dialogs";
 import { openQueuePopover } from "$lib/state/queue-visibility";
 import { ffmpegMetadataArgs } from "$lib/util";
diff --git a/web/src/lib/queen-bee/run-worker.ts b/web/src/lib/task-manager/run-worker.ts
similarity index 88%
rename from web/src/lib/queen-bee/run-worker.ts
rename to web/src/lib/task-manager/run-worker.ts
index ef20e618..16d6059b 100644
--- a/web/src/lib/queen-bee/run-worker.ts
+++ b/web/src/lib/task-manager/run-worker.ts
@@ -1,8 +1,8 @@
 import { get } from "svelte/store";
-import { queue } from "$lib/state/queen-bee/queue";
+import { queue } from "$lib/state/task-manager/queue";
 
-import { runRemuxWorker } from "$lib/queen-bee/runners/remux";
-import { runFetchWorker } from "$lib/queen-bee/runners/fetch";
+import { runRemuxWorker } from "$lib/task-manager/runners/remux";
+import { runFetchWorker } from "$lib/task-manager/runners/fetch";
 
 import type { CobaltPipelineItem } from "$lib/types/workers";
 import type { CobaltFileReference } from "$lib/types/storage";
diff --git a/web/src/lib/queen-bee/runners/fetch.ts b/web/src/lib/task-manager/runners/fetch.ts
similarity index 85%
rename from web/src/lib/queen-bee/runners/fetch.ts
rename to web/src/lib/task-manager/runners/fetch.ts
index 8cba7b29..3693ef61 100644
--- a/web/src/lib/queen-bee/runners/fetch.ts
+++ b/web/src/lib/task-manager/runners/fetch.ts
@@ -1,8 +1,8 @@
 import FetchWorker from "$lib/workers/fetch?worker";
 
-import { killWorker } from "$lib/queen-bee/run-worker";
-import { updateWorkerProgress } from "$lib/state/queen-bee/current-tasks";
-import { pipelineTaskDone, itemError, queue } from "$lib/state/queen-bee/queue";
+import { killWorker } from "$lib/task-manager/run-worker";
+import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks";
+import { pipelineTaskDone, itemError, queue } from "$lib/state/task-manager/queue";
 
 import type { CobaltQueue } from "$lib/types/queue";
 
diff --git a/web/src/lib/queen-bee/runners/remux.ts b/web/src/lib/task-manager/runners/remux.ts
similarity index 93%
rename from web/src/lib/queen-bee/runners/remux.ts
rename to web/src/lib/task-manager/runners/remux.ts
index 60784759..41384599 100644
--- a/web/src/lib/queen-bee/runners/remux.ts
+++ b/web/src/lib/task-manager/runners/remux.ts
@@ -1,8 +1,8 @@
 import RemuxWorker from "$lib/workers/remux?worker";
 
-import { killWorker } from "$lib/queen-bee/run-worker";
-import { updateWorkerProgress } from "$lib/state/queen-bee/current-tasks";
-import { pipelineTaskDone, itemError, queue } from "$lib/state/queen-bee/queue";
+import { killWorker } from "$lib/task-manager/run-worker";
+import { updateWorkerProgress } from "$lib/state/task-manager/current-tasks";
+import { pipelineTaskDone, itemError, queue } from "$lib/state/task-manager/queue";
 
 import type { FileInfo } from "$lib/types/libav";
 import type { CobaltQueue } from "$lib/types/queue";
diff --git a/web/src/lib/queen-bee/scheduler.ts b/web/src/lib/task-manager/scheduler.ts
similarity index 93%
rename from web/src/lib/queen-bee/scheduler.ts
rename to web/src/lib/task-manager/scheduler.ts
index 925eed98..41ed31d0 100644
--- a/web/src/lib/queen-bee/scheduler.ts
+++ b/web/src/lib/task-manager/scheduler.ts
@@ -1,7 +1,7 @@
 import { get } from "svelte/store";
-import { startWorker } from "$lib/queen-bee/run-worker";
-import { addWorkerToQueue, currentTasks } from "$lib/state/queen-bee/current-tasks";
-import { itemDone, itemError, itemRunning, queue } from "$lib/state/queen-bee/queue";
+import { startWorker } from "$lib/task-manager/run-worker";
+import { addWorkerToQueue, currentTasks } from "$lib/state/task-manager/current-tasks";
+import { itemDone, itemError, itemRunning, queue } from "$lib/state/task-manager/queue";
 
 import type { CobaltPipelineItem } from "$lib/types/workers";
 
diff --git a/web/src/lib/types/queen-bee.ts b/web/src/lib/types/task-manager.ts
similarity index 100%
rename from web/src/lib/types/queen-bee.ts
rename to web/src/lib/types/task-manager.ts
diff --git a/web/src/routes/remux/+page.svelte b/web/src/routes/remux/+page.svelte
index 0c5d17aa..827bab11 100644
--- a/web/src/routes/remux/+page.svelte
+++ b/web/src/routes/remux/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { t } from "$lib/i18n/translations";
-    import { createRemuxPipeline } from "$lib/queen-bee/queue";
+    import { createRemuxPipeline } from "$lib/task-manager/queue";
 
     import DropReceiver from "$components/misc/DropReceiver.svelte";
     import FileReceiver from "$components/misc/FileReceiver.svelte";