From 2ee8bae82efafa6db5ffd50815543600d896a7b6 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Thu, 6 Jun 2024 12:16:44 +0200
Subject: [PATCH] Rename httpd-client to http-client

---
 ...i-unit-test.yml => check-http-client-unit-test.yml} |  6 +++---
 flake.nix                                              |  2 +-
 {httpd-client => http-client}/index.ts                 |  0
 {httpd-client => http-client}/lib/fetcher.ts           |  0
 {httpd-client => http-client}/lib/profile.ts           |  0
 {httpd-client => http-client}/lib/project.ts           |  0
 {httpd-client => http-client}/lib/project/comment.ts   |  0
 {httpd-client => http-client}/lib/project/commit.ts    |  0
 {httpd-client => http-client}/lib/project/issue.ts     |  0
 {httpd-client => http-client}/lib/project/patch.ts     |  0
 {httpd-client => http-client}/lib/session.ts           |  0
 {httpd-client => http-client}/lib/shared.ts            |  0
 {httpd-client => http-client}/tests/client.test.ts     |  2 +-
 {httpd-client => http-client}/tests/project.test.ts    |  8 ++++----
 {httpd-client => http-client}/tests/session.test.ts    |  4 ++--
 .../tests/support/fixtures.ts                          |  2 +-
 {httpd-client => http-client}/tests/support/httpd.ts   |  2 +-
 {httpd-client => http-client}/tests/support/support.ts |  2 +-
 {httpd-client => http-client}/vite.config.ts           |  4 ++--
 package.json                                           |  2 +-
 src/App/Header/Breadcrumbs/NodeSegment.svelte          |  2 +-
 src/components/Comment.svelte                          |  2 +-
 src/components/CommentToggleInput.svelte               |  2 +-
 src/components/CompactCommitAuthorship.svelte          |  2 +-
 src/components/ExtendedTextarea.svelte                 |  2 +-
 src/components/Markdown.svelte                         |  2 +-
 src/components/ProjectCard.ts                          |  4 ++--
 src/components/ReactionSelector.svelte                 |  2 +-
 src/components/Reactions.svelte                        |  2 +-
 src/components/ScopePolicyExplainer.svelte             |  2 +-
 src/components/Thread.svelte                           |  4 ++--
 src/lib/commit.ts                                      |  4 ++--
 src/lib/file.ts                                        |  2 +-
 src/lib/httpd.ts                                       |  4 ++--
 src/lib/projects.ts                                    |  4 ++--
 src/lib/router.ts                                      |  2 +-
 src/lib/router/definitions.ts                          |  2 +-
 src/lib/seeds.ts                                       |  2 +-
 src/lib/utils.ts                                       |  2 +-
 src/views/home/Index.svelte                            |  2 +-
 src/views/home/components/PreferredSeedDropdown.svelte |  2 +-
 src/views/home/error.ts                                |  2 +-
 src/views/home/router.ts                               |  2 +-
 src/views/nodes/ScopePolicyPopover.svelte              |  2 +-
 src/views/nodes/View.svelte                            |  2 +-
 src/views/nodes/error.ts                               |  2 +-
 src/views/nodes/router.ts                              |  6 +++---
 src/views/projects/Changeset.svelte                    |  2 +-
 src/views/projects/Changeset/FileDiff.svelte           |  2 +-
 src/views/projects/Changeset/FileLocationChange.svelte |  2 +-
 src/views/projects/Cob/AssigneeInput.svelte            |  2 +-
 src/views/projects/Cob/CobCommitTeaser.svelte          |  2 +-
 src/views/projects/Cob/Embeds.svelte                   |  2 +-
 src/views/projects/Cob/Revision.svelte                 |  4 ++--
 src/views/projects/Commit.svelte                       |  2 +-
 src/views/projects/Commit/CommitAuthorship.svelte      |  2 +-
 src/views/projects/Commit/CommitTeaser.svelte          |  2 +-
 src/views/projects/DiffStatBadgeLoader.svelte          |  4 ++--
 src/views/projects/Header.svelte                       |  2 +-
 src/views/projects/Header/CloneButton.svelte           |  2 +-
 src/views/projects/History.svelte                      |  4 ++--
 src/views/projects/Issue.svelte                        |  6 +++---
 src/views/projects/Issue/IssueTeaser.svelte            |  2 +-
 src/views/projects/Issue/New.svelte                    |  4 ++--
 src/views/projects/Issues.svelte                       | 10 ++--------
 src/views/projects/Layout.svelte                       |  2 +-
 src/views/projects/Patch.svelte                        |  6 +++---
 src/views/projects/Patch/PatchTeaser.svelte            |  4 ++--
 src/views/projects/Patch/RevisionSelector.svelte       |  2 +-
 src/views/projects/Patches.svelte                      | 10 ++--------
 src/views/projects/Share.svelte                        |  2 +-
 src/views/projects/Sidebar.svelte                      |  2 +-
 src/views/projects/Sidebar/ContextHelp.svelte          |  2 +-
 src/views/projects/Sidebar/ContextRepo.svelte          |  2 +-
 src/views/projects/Source.svelte                       |  4 ++--
 src/views/projects/Source/Blob.svelte                  |  2 +-
 src/views/projects/Source/BranchSelector.svelte        |  2 +-
 src/views/projects/Source/Header.svelte                |  4 ++--
 src/views/projects/Source/PeerSelector.svelte          |  2 +-
 src/views/projects/Source/ProjectNameHeader.svelte     |  2 +-
 src/views/projects/Source/Tree.svelte                  |  2 +-
 src/views/projects/Source/Tree/Folder.svelte           |  2 +-
 src/views/projects/components/CommitButton.svelte      |  2 +-
 src/views/projects/components/CommitLink.svelte        |  2 +-
 src/views/projects/error.ts                            |  2 +-
 src/views/projects/router.ts                           |  6 +++---
 tests/support/peerManager.ts                           |  2 +-
 tsconfig.json                                          |  6 +++---
 vite.config.ts                                         |  2 +-
 89 files changed, 110 insertions(+), 122 deletions(-)
 rename .github/workflows/{check-httpd-api-unit-test.yml => check-http-client-unit-test.yml} (81%)
 rename {httpd-client => http-client}/index.ts (100%)
 rename {httpd-client => http-client}/lib/fetcher.ts (100%)
 rename {httpd-client => http-client}/lib/profile.ts (100%)
 rename {httpd-client => http-client}/lib/project.ts (100%)
 rename {httpd-client => http-client}/lib/project/comment.ts (100%)
 rename {httpd-client => http-client}/lib/project/commit.ts (100%)
 rename {httpd-client => http-client}/lib/project/issue.ts (100%)
 rename {httpd-client => http-client}/lib/project/patch.ts (100%)
 rename {httpd-client => http-client}/lib/session.ts (100%)
 rename {httpd-client => http-client}/lib/shared.ts (100%)
 rename {httpd-client => http-client}/tests/client.test.ts (90%)
 rename {httpd-client => http-client}/tests/project.test.ts (96%)
 rename {httpd-client => http-client}/tests/session.test.ts (90%)
 rename {httpd-client => http-client}/tests/support/fixtures.ts (95%)
 rename {httpd-client => http-client}/tests/support/httpd.ts (94%)
 rename {httpd-client => http-client}/tests/support/support.ts (96%)
 rename {httpd-client => http-client}/vite.config.ts (83%)

diff --git a/.github/workflows/check-httpd-api-unit-test.yml b/.github/workflows/check-http-client-unit-test.yml
similarity index 81%
rename from .github/workflows/check-httpd-api-unit-test.yml
rename to .github/workflows/check-http-client-unit-test.yml
index 50228a5d2..065c3ac27 100644
--- a/.github/workflows/check-httpd-api-unit-test.yml
+++ b/.github/workflows/check-http-client-unit-test.yml
@@ -1,8 +1,8 @@
-name: check-httpd-api-unit-test
+name: check-http-client-unit-test
 on: push
 
 jobs:
-  check-httpd-api-unit-test:
+  check-http-client-unit-test:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Node
@@ -18,4 +18,4 @@ jobs:
           ./scripts/install-binaries;
           ./scripts/install-binaries --show-path >> $GITHUB_PATH;
       - run: |
-          npm run test:httpd-api:unit
+          npm run test:http-client:unit
diff --git a/flake.nix b/flake.nix
index f87328a4e..a9e84f6ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,7 @@
             scripts/check
             {
               npm run test:unit
-              npm run test:httpd-api:unit
+              npm run test:http-client:unit
             } | tee /dev/null
             runHook postCheck
           '';
diff --git a/httpd-client/index.ts b/http-client/index.ts
similarity index 100%
rename from httpd-client/index.ts
rename to http-client/index.ts
diff --git a/httpd-client/lib/fetcher.ts b/http-client/lib/fetcher.ts
similarity index 100%
rename from httpd-client/lib/fetcher.ts
rename to http-client/lib/fetcher.ts
diff --git a/httpd-client/lib/profile.ts b/http-client/lib/profile.ts
similarity index 100%
rename from httpd-client/lib/profile.ts
rename to http-client/lib/profile.ts
diff --git a/httpd-client/lib/project.ts b/http-client/lib/project.ts
similarity index 100%
rename from httpd-client/lib/project.ts
rename to http-client/lib/project.ts
diff --git a/httpd-client/lib/project/comment.ts b/http-client/lib/project/comment.ts
similarity index 100%
rename from httpd-client/lib/project/comment.ts
rename to http-client/lib/project/comment.ts
diff --git a/httpd-client/lib/project/commit.ts b/http-client/lib/project/commit.ts
similarity index 100%
rename from httpd-client/lib/project/commit.ts
rename to http-client/lib/project/commit.ts
diff --git a/httpd-client/lib/project/issue.ts b/http-client/lib/project/issue.ts
similarity index 100%
rename from httpd-client/lib/project/issue.ts
rename to http-client/lib/project/issue.ts
diff --git a/httpd-client/lib/project/patch.ts b/http-client/lib/project/patch.ts
similarity index 100%
rename from httpd-client/lib/project/patch.ts
rename to http-client/lib/project/patch.ts
diff --git a/httpd-client/lib/session.ts b/http-client/lib/session.ts
similarity index 100%
rename from httpd-client/lib/session.ts
rename to http-client/lib/session.ts
diff --git a/httpd-client/lib/shared.ts b/http-client/lib/shared.ts
similarity index 100%
rename from httpd-client/lib/shared.ts
rename to http-client/lib/shared.ts
diff --git a/httpd-client/tests/client.test.ts b/http-client/tests/client.test.ts
similarity index 90%
rename from httpd-client/tests/client.test.ts
rename to http-client/tests/client.test.ts
index bf1c4a175..02ebd1614 100644
--- a/httpd-client/tests/client.test.ts
+++ b/http-client/tests/client.test.ts
@@ -1,6 +1,6 @@
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import { defaultHttpdPort } from "@tests/support/fixtures";
 
 const api = new HttpdClient({
diff --git a/httpd-client/tests/project.test.ts b/http-client/tests/project.test.ts
similarity index 96%
rename from httpd-client/tests/project.test.ts
rename to http-client/tests/project.test.ts
index 406b614f5..69f1d4977 100644
--- a/httpd-client/tests/project.test.ts
+++ b/http-client/tests/project.test.ts
@@ -1,6 +1,6 @@
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import {
   aliceMainHead,
   aliceRemote,
@@ -14,9 +14,9 @@ import {
   assertPatch,
   createIssueToBeModified,
   createPatchToBeModified,
-} from "@httpd-client/tests/support/support";
-import { authenticate } from "@httpd-client/tests/support/httpd.js";
-import { testFixture as testWithAPI } from "@httpd-client/tests/support/fixtures.js";
+} from "@http-client/tests/support/support";
+import { authenticate } from "@http-client/tests/support/httpd.js";
+import { testFixture as testWithAPI } from "@http-client/tests/support/fixtures.js";
 
 describe("project", () => {
   const api = new HttpdClient({
diff --git a/httpd-client/tests/session.test.ts b/http-client/tests/session.test.ts
similarity index 90%
rename from httpd-client/tests/session.test.ts
rename to http-client/tests/session.test.ts
index 744cd1ee9..31183a704 100644
--- a/httpd-client/tests/session.test.ts
+++ b/http-client/tests/session.test.ts
@@ -2,8 +2,8 @@ import * as FsSync from "node:fs";
 import * as Path from "node:path";
 import { describe, test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
-import { authenticate } from "@httpd-client/tests/support/httpd.js";
+import { HttpdClient } from "@http-client";
+import { authenticate } from "@http-client/tests/support/httpd.js";
 import { createPeerManager } from "@tests/support/peerManager.js";
 import { gitOptions } from "@tests/support/fixtures.js";
 import { tmpDir } from "@tests/support/support.js";
diff --git a/httpd-client/tests/support/fixtures.ts b/http-client/tests/support/fixtures.ts
similarity index 95%
rename from httpd-client/tests/support/fixtures.ts
rename to http-client/tests/support/fixtures.ts
index 6c4ed7b57..d6b86af74 100644
--- a/httpd-client/tests/support/fixtures.ts
+++ b/http-client/tests/support/fixtures.ts
@@ -2,7 +2,7 @@ import * as FsSync from "node:fs";
 import * as Path from "node:path";
 import { test } from "vitest";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import { RadiclePeer, createPeerManager } from "@tests/support/peerManager.js";
 import { gitOptions } from "@tests/support/fixtures.js";
 import { tmpDir } from "@tests/support/support.js";
diff --git a/httpd-client/tests/support/httpd.ts b/http-client/tests/support/httpd.ts
similarity index 94%
rename from httpd-client/tests/support/httpd.ts
rename to http-client/tests/support/httpd.ts
index 98d43853c..77fd4b56d 100644
--- a/httpd-client/tests/support/httpd.ts
+++ b/http-client/tests/support/httpd.ts
@@ -1,4 +1,4 @@
-import type { HttpdClient } from "@httpd-client";
+import type { HttpdClient } from "@http-client";
 import type { RadiclePeer } from "@tests/support/peerManager.js";
 
 import assert from "node:assert";
diff --git a/httpd-client/tests/support/support.ts b/http-client/tests/support/support.ts
similarity index 96%
rename from httpd-client/tests/support/support.ts
rename to http-client/tests/support/support.ts
index 857d3b902..b7f80ac8f 100644
--- a/httpd-client/tests/support/support.ts
+++ b/http-client/tests/support/support.ts
@@ -1,4 +1,4 @@
-import type { HttpdClient } from "@httpd-client";
+import type { HttpdClient } from "@http-client";
 
 import { expect } from "vitest";
 import isMatch from "lodash/isMatch";
diff --git a/httpd-client/vite.config.ts b/http-client/vite.config.ts
similarity index 83%
rename from httpd-client/vite.config.ts
rename to http-client/vite.config.ts
index d6ce12fe2..aeca19da4 100644
--- a/httpd-client/vite.config.ts
+++ b/http-client/vite.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
   ],
   test: {
     environment: "node",
-    include: ["httpd-client/tests/*.test.ts"],
+    include: ["http-client/tests/*.test.ts"],
     reporters: "verbose",
     globalSetup: "./tests/support/globalSetup",
   },
@@ -19,7 +19,7 @@ export default defineConfig({
     alias: {
       "@tests": path.resolve("./tests"),
       "@app": path.resolve("./src"),
-      "@httpd-client": path.resolve("./httpd-client"),
+      "@http-client": path.resolve("./http-client"),
     },
   },
 });
diff --git a/package.json b/package.json
index 679d47797..72ba964f2 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "format": "npx prettier '**/*.@(ts|js|svelte|json|css|html|yml)' --write",
     "test:unit": "TZ='UTC' vitest run",
     "test:e2e": "NODE_CONFIG_ENV='test' TZ='UTC' playwright test",
-    "test:httpd-api:unit": "NODE_CONFIG_ENV='test' TZ='UTC' vitest run --config httpd-client/vite.config.ts --reporter verbose"
+    "test:http-client:unit": "NODE_CONFIG_ENV='test' TZ='UTC' vitest run --config http-client/vite.config.ts --reporter verbose"
   },
   "type": "module",
   "engines": {
diff --git a/src/App/Header/Breadcrumbs/NodeSegment.svelte b/src/App/Header/Breadcrumbs/NodeSegment.svelte
index 624be7999..c3a095e36 100644
--- a/src/App/Header/Breadcrumbs/NodeSegment.svelte
+++ b/src/App/Header/Breadcrumbs/NodeSegment.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
 
   import { isLocal } from "@app/lib/utils";
 
diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 222e5f2e8..88f071dac 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { Comment, Embed } from "@httpd-client";
+  import type { Comment, Embed } from "@http-client";
 
   import { tick } from "svelte";
 
diff --git a/src/components/CommentToggleInput.svelte b/src/components/CommentToggleInput.svelte
index aef934034..58bd6a55a 100644
--- a/src/components/CommentToggleInput.svelte
+++ b/src/components/CommentToggleInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Embed } from "@httpd-client";
+  import type { Embed } from "@http-client";
 
   import ExtendedTextarea from "@app/components/ExtendedTextarea.svelte";
 
diff --git a/src/components/CompactCommitAuthorship.svelte b/src/components/CompactCommitAuthorship.svelte
index 0fe1bb4f3..46fe58770 100644
--- a/src/components/CompactCommitAuthorship.svelte
+++ b/src/components/CompactCommitAuthorship.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { CommitHeader } from "@httpd-client";
+  import type { CommitHeader } from "@http-client";
 
   import * as utils from "@app/lib/utils";
   import HoverPopover from "./HoverPopover.svelte";
diff --git a/src/components/ExtendedTextarea.svelte b/src/components/ExtendedTextarea.svelte
index 42eaeb131..3f0aba2f8 100644
--- a/src/components/ExtendedTextarea.svelte
+++ b/src/components/ExtendedTextarea.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { Embed } from "@httpd-client";
+  import type { Embed } from "@http-client";
 
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/components/Markdown.svelte b/src/components/Markdown.svelte
index ad834474f..c5d7612ff 100644
--- a/src/components/Markdown.svelte
+++ b/src/components/Markdown.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Embed } from "@httpd-client";
+  import type { Embed } from "@http-client";
 
   import dompurify from "dompurify";
   import matter from "@radicle/gray-matter";
diff --git a/src/components/ProjectCard.ts b/src/components/ProjectCard.ts
index 813ad7dd1..a1300e52b 100644
--- a/src/components/ProjectCard.ts
+++ b/src/components/ProjectCard.ts
@@ -1,4 +1,4 @@
-import type { ProjectListQuery } from "@httpd-client";
+import type { ProjectListQuery } from "@http-client";
 
 import { loadProjectActivity, type WeeklyActivity } from "@app/lib/commit";
 import {
@@ -6,7 +6,7 @@ import {
   type BaseUrl,
   type Commit,
   type Project,
-} from "@httpd-client";
+} from "@http-client";
 
 export interface ProjectInfo {
   project: Project;
diff --git a/src/components/ReactionSelector.svelte b/src/components/ReactionSelector.svelte
index 78a756499..5ad5ce4e3 100644
--- a/src/components/ReactionSelector.svelte
+++ b/src/components/ReactionSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Comment } from "@httpd-client";
+  import type { Comment } from "@http-client";
 
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/components/Reactions.svelte b/src/components/Reactions.svelte
index 09e6a3bd8..3e9f38085 100644
--- a/src/components/Reactions.svelte
+++ b/src/components/Reactions.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Comment } from "@httpd-client";
+  import type { Comment } from "@http-client";
 
   import IconButton from "./IconButton.svelte";
 
diff --git a/src/components/ScopePolicyExplainer.svelte b/src/components/ScopePolicyExplainer.svelte
index 5c217c1f0..6f150cc48 100644
--- a/src/components/ScopePolicyExplainer.svelte
+++ b/src/components/ScopePolicyExplainer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Scope, Policy } from "@httpd-client";
+  import type { Scope, Policy } from "@http-client";
 
   import { capitalize } from "lodash";
 
diff --git a/src/components/Thread.svelte b/src/components/Thread.svelte
index 77615bb3c..03a49a2e6 100644
--- a/src/components/Thread.svelte
+++ b/src/components/Thread.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" strictEvents>
-  import type { Embed } from "@httpd-client";
-  import type { Comment } from "@httpd-client";
+  import type { Embed } from "@http-client";
+  import type { Comment } from "@http-client";
 
   import * as utils from "@app/lib/utils";
   import partial from "lodash/partial";
diff --git a/src/lib/commit.ts b/src/lib/commit.ts
index e95b9a5ef..02c039f61 100644
--- a/src/lib/commit.ts
+++ b/src/lib/commit.ts
@@ -1,7 +1,7 @@
-import type { BaseUrl, CommitHeader } from "@httpd-client";
+import type { BaseUrl, CommitHeader } from "@http-client";
 
 import { getDaysPassed } from "@app/lib/utils";
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 
 // A set of commits grouped by time.
 interface CommitGroup {
diff --git a/src/lib/file.ts b/src/lib/file.ts
index b43af79bc..f1209228e 100644
--- a/src/lib/file.ts
+++ b/src/lib/file.ts
@@ -1,4 +1,4 @@
-import type { Embed } from "@httpd-client";
+import type { Embed } from "@http-client";
 
 async function parseGitOid(bytes: Uint8Array): Promise<string> {
   // Create the header
diff --git a/src/lib/httpd.ts b/src/lib/httpd.ts
index 29adef623..2ab4dbd8f 100644
--- a/src/lib/httpd.ts
+++ b/src/lib/httpd.ts
@@ -1,9 +1,9 @@
-import type { Node, Policy, Scope } from "@httpd-client";
+import type { Node, Policy, Scope } from "@http-client";
 
 import { get, writable } from "svelte/store";
 import { withTimeout, Mutex, E_CANCELED, E_TIMEOUT } from "async-mutex";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import config from "virtual:config";
 import { deduplicateStore } from "@app/lib/deduplicateStore";
 import { experimental } from "./appearance";
diff --git a/src/lib/projects.ts b/src/lib/projects.ts
index ad7adf724..1cc9580fe 100644
--- a/src/lib/projects.ts
+++ b/src/lib/projects.ts
@@ -1,6 +1,6 @@
-import type { BaseUrl, Project } from "@httpd-client";
+import type { BaseUrl, Project } from "@http-client";
 
-import { HttpdClient } from "@httpd-client";
+import { HttpdClient } from "@http-client";
 import { isFulfilled } from "@app/lib/utils";
 
 export interface ProjectBaseUrl {
diff --git a/src/lib/router.ts b/src/lib/router.ts
index 655cfdd61..bd7418f16 100644
--- a/src/lib/router.ts
+++ b/src/lib/router.ts
@@ -1,4 +1,4 @@
-import type { BaseUrl } from "@httpd-client";
+import type { BaseUrl } from "@http-client";
 import type { LoadedRoute, Route } from "@app/lib/router/definitions";
 
 import { get, writable } from "svelte/store";
diff --git a/src/lib/router/definitions.ts b/src/lib/router/definitions.ts
index 441befaa2..e22f7520c 100644
--- a/src/lib/router/definitions.ts
+++ b/src/lib/router/definitions.ts
@@ -1,7 +1,7 @@
 import type {
   ResponseError,
   ResponseParseError,
-} from "@httpd-client/lib/fetcher";
+} from "@http-client/lib/fetcher";
 import type { HomeRoute, HomeLoadedRoute } from "@app/views/home/router";
 import type {
   ProjectLoadedRoute,
diff --git a/src/lib/seeds.ts b/src/lib/seeds.ts
index 7160d5750..3d190fe3d 100644
--- a/src/lib/seeds.ts
+++ b/src/lib/seeds.ts
@@ -1,4 +1,4 @@
-import type { BaseUrl } from "@httpd-client";
+import type { BaseUrl } from "@http-client";
 
 import storedWritable from "@efstajas/svelte-stored-writable";
 import unionBy from "lodash/unionBy";
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 43eb65f6b..4555877a4 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,4 +1,4 @@
-import type { BaseUrl } from "@httpd-client";
+import type { BaseUrl } from "@http-client";
 
 import md5 from "md5";
 import bs58 from "bs58";
diff --git a/src/views/home/Index.svelte b/src/views/home/Index.svelte
index c4524c339..b1cfadb1a 100644
--- a/src/views/home/Index.svelte
+++ b/src/views/home/Index.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { ComponentProps } from "svelte";
   import type { ProjectInfo } from "@app/components/ProjectCard";
-  import type { BaseUrl, ProjectListQuery } from "@httpd-client";
+  import type { BaseUrl, ProjectListQuery } from "@http-client";
 
   import storedWritable from "@efstajas/svelte-stored-writable";
   import { derived } from "svelte/store";
diff --git a/src/views/home/components/PreferredSeedDropdown.svelte b/src/views/home/components/PreferredSeedDropdown.svelte
index b9a1911ef..0f4fa3e19 100644
--- a/src/views/home/components/PreferredSeedDropdown.svelte
+++ b/src/views/home/components/PreferredSeedDropdown.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { HttpdClient, type BaseUrl } from "@httpd-client";
+  import { HttpdClient, type BaseUrl } from "@http-client";
 
   import config from "virtual:config";
   import {
diff --git a/src/views/home/error.ts b/src/views/home/error.ts
index d14fd7899..f7ed7aa68 100644
--- a/src/views/home/error.ts
+++ b/src/views/home/error.ts
@@ -1,4 +1,4 @@
-import { ResponseParseError, ResponseError } from "@httpd-client/lib/fetcher";
+import { ResponseParseError, ResponseError } from "@http-client/lib/fetcher";
 
 export function handleError(
   error: Error | ResponseParseError | ResponseError,
diff --git a/src/views/home/router.ts b/src/views/home/router.ts
index 9319e94af..c30c65bd5 100644
--- a/src/views/home/router.ts
+++ b/src/views/home/router.ts
@@ -1,4 +1,4 @@
-import type { BaseUrl } from "@httpd-client";
+import type { BaseUrl } from "@http-client";
 import type { ErrorRoute } from "@app/lib/router/definitions";
 
 import * as seeds from "@app/lib/seeds";
diff --git a/src/views/nodes/ScopePolicyPopover.svelte b/src/views/nodes/ScopePolicyPopover.svelte
index ac035679f..581b656d5 100644
--- a/src/views/nodes/ScopePolicyPopover.svelte
+++ b/src/views/nodes/ScopePolicyPopover.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Policy, Scope } from "@httpd-client";
+  import type { Policy, Scope } from "@http-client";
 
   import capitalize from "lodash/capitalize";
 
diff --git a/src/views/nodes/View.svelte b/src/views/nodes/View.svelte
index 653f1ffe7..1198e2ca1 100644
--- a/src/views/nodes/View.svelte
+++ b/src/views/nodes/View.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, NodeStats, Policy, Scope } from "@httpd-client";
+  import type { BaseUrl, NodeStats, Policy, Scope } from "@http-client";
 
   import { capitalize } from "lodash";
 
diff --git a/src/views/nodes/error.ts b/src/views/nodes/error.ts
index 81b6ce789..b94216199 100644
--- a/src/views/nodes/error.ts
+++ b/src/views/nodes/error.ts
@@ -1,5 +1,5 @@
 import type { ErrorRoute, NotFoundRoute } from "@app/lib/router/definitions";
-import { ResponseParseError, ResponseError } from "@httpd-client/lib/fetcher";
+import { ResponseParseError, ResponseError } from "@http-client/lib/fetcher";
 
 export function handleError(
   error: Error | ResponseParseError | ResponseError,
diff --git a/src/views/nodes/router.ts b/src/views/nodes/router.ts
index 02ea4c595..fb39cf038 100644
--- a/src/views/nodes/router.ts
+++ b/src/views/nodes/router.ts
@@ -1,9 +1,9 @@
-import type { BaseUrl, NodeStats, Policy, Scope } from "@httpd-client";
+import type { BaseUrl, NodeStats, Policy, Scope } from "@http-client";
 import type { ErrorRoute, NotFoundRoute } from "@app/lib/router/definitions";
 
 import config from "virtual:config";
-import { HttpdClient } from "@httpd-client";
-import { ResponseError, ResponseParseError } from "@httpd-client/lib/fetcher";
+import { HttpdClient } from "@http-client";
+import { ResponseError, ResponseParseError } from "@http-client/lib/fetcher";
 import { baseUrlToString } from "@app/lib/utils";
 import { handleError } from "@app/views/nodes/error";
 import { unreachableError } from "@app/views/projects/error";
diff --git a/src/views/projects/Changeset.svelte b/src/views/projects/Changeset.svelte
index 57884f781..555154b3f 100644
--- a/src/views/projects/Changeset.svelte
+++ b/src/views/projects/Changeset.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, CommitBlob, Diff } from "@httpd-client";
+  import type { BaseUrl, CommitBlob, Diff } from "@http-client";
 
   import FileDiff from "@app/views/projects/Changeset/FileDiff.svelte";
   import FileLocationChange from "@app/views/projects/Changeset/FileLocationChange.svelte";
diff --git a/src/views/projects/Changeset/FileDiff.svelte b/src/views/projects/Changeset/FileDiff.svelte
index 714aaa642..bb46f456f 100644
--- a/src/views/projects/Changeset/FileDiff.svelte
+++ b/src/views/projects/Changeset/FileDiff.svelte
@@ -4,7 +4,7 @@
     ChangesetWithDiff,
     DiffContent,
     HunkLine,
-  } from "@httpd-client";
+  } from "@http-client";
 
   import { onDestroy, onMount } from "svelte";
   import { toHtml } from "hast-util-to-html";
diff --git a/src/views/projects/Changeset/FileLocationChange.svelte b/src/views/projects/Changeset/FileLocationChange.svelte
index 367c2c25e..721c7f9f8 100644
--- a/src/views/projects/Changeset/FileLocationChange.svelte
+++ b/src/views/projects/Changeset/FileLocationChange.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, ChangesetWithoutDiff } from "@httpd-client";
+  import type { BaseUrl, ChangesetWithoutDiff } from "@http-client";
 
   import Badge from "@app/components/Badge.svelte";
   import IconButton from "@app/components/IconButton.svelte";
diff --git a/src/views/projects/Cob/AssigneeInput.svelte b/src/views/projects/Cob/AssigneeInput.svelte
index bf72a789d..488eabeac 100644
--- a/src/views/projects/Cob/AssigneeInput.svelte
+++ b/src/views/projects/Cob/AssigneeInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { Reaction } from "@httpd-client";
+  import type { Reaction } from "@http-client";
 
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/views/projects/Cob/CobCommitTeaser.svelte b/src/views/projects/Cob/CobCommitTeaser.svelte
index 1879f9667..484bd789f 100644
--- a/src/views/projects/Cob/CobCommitTeaser.svelte
+++ b/src/views/projects/Cob/CobCommitTeaser.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, CommitHeader } from "@httpd-client";
+  import type { BaseUrl, CommitHeader } from "@http-client";
 
   import { twemoji } from "@app/lib/utils";
 
diff --git a/src/views/projects/Cob/Embeds.svelte b/src/views/projects/Cob/Embeds.svelte
index e5a007158..990d620d3 100644
--- a/src/views/projects/Cob/Embeds.svelte
+++ b/src/views/projects/Cob/Embeds.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { Embed } from "@httpd-client";
+  import type { Embed } from "@http-client";
 
   import Badge from "@app/components/Badge.svelte";
   import Clipboard from "@app/components/Clipboard.svelte";
diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte
index 2207f369c..1592b6d87 100644
--- a/src/views/projects/Cob/Revision.svelte
+++ b/src/views/projects/Cob/Revision.svelte
@@ -7,11 +7,11 @@
     PatchState,
     Revision,
     Verdict,
-  } from "@httpd-client";
+  } from "@http-client";
   import type { Timeline } from "@app/views/projects/Patch.svelte";
 
   import * as utils from "@app/lib/utils";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { closeFocused } from "@app/components/Popover.svelte";
   import { onMount } from "svelte";
   import { parseEmbedIntoMap } from "@app/lib/file";
diff --git a/src/views/projects/Commit.svelte b/src/views/projects/Commit.svelte
index 4e1d9f9f6..68d1cdf36 100644
--- a/src/views/projects/Commit.svelte
+++ b/src/views/projects/Commit.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Commit, Node, Project } from "@httpd-client";
+  import type { BaseUrl, Commit, Node, Project } from "@http-client";
 
   import { formatCommit } from "@app/lib/utils";
 
diff --git a/src/views/projects/Commit/CommitAuthorship.svelte b/src/views/projects/Commit/CommitAuthorship.svelte
index 9fb9644fc..8b2f6d896 100644
--- a/src/views/projects/Commit/CommitAuthorship.svelte
+++ b/src/views/projects/Commit/CommitAuthorship.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { CommitHeader } from "@httpd-client";
+  import type { CommitHeader } from "@http-client";
 
   import {
     absoluteTimestamp,
diff --git a/src/views/projects/Commit/CommitTeaser.svelte b/src/views/projects/Commit/CommitTeaser.svelte
index 4835c01fd..29209026a 100644
--- a/src/views/projects/Commit/CommitTeaser.svelte
+++ b/src/views/projects/Commit/CommitTeaser.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, CommitHeader } from "@httpd-client";
+  import type { BaseUrl, CommitHeader } from "@http-client";
 
   import { twemoji } from "@app/lib/utils";
 
diff --git a/src/views/projects/DiffStatBadgeLoader.svelte b/src/views/projects/DiffStatBadgeLoader.svelte
index 1af1dc2c9..6603a6f82 100644
--- a/src/views/projects/DiffStatBadgeLoader.svelte
+++ b/src/views/projects/DiffStatBadgeLoader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import type { BaseUrl, Patch, Revision } from "@httpd-client";
+  import type { BaseUrl, Patch, Revision } from "@http-client";
 
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { formatCommit } from "@app/lib/utils";
 
   import DiffStatBadge from "@app/components/DiffStatBadge.svelte";
diff --git a/src/views/projects/Header.svelte b/src/views/projects/Header.svelte
index 724e1c2a1..0aadcba24 100644
--- a/src/views/projects/Header.svelte
+++ b/src/views/projects/Header.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script lang="ts">
-  import type { BaseUrl, Project } from "@httpd-client";
+  import type { BaseUrl, Project } from "@http-client";
 
   import Link from "@app/components/Link.svelte";
   import Button from "@app/components/Button.svelte";
diff --git a/src/views/projects/Header/CloneButton.svelte b/src/views/projects/Header/CloneButton.svelte
index 0154d9e9e..d67977cf7 100644
--- a/src/views/projects/Header/CloneButton.svelte
+++ b/src/views/projects/Header/CloneButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
 
   import config from "virtual:config";
   import { parseRepositoryId } from "@app/lib/utils";
diff --git a/src/views/projects/History.svelte b/src/views/projects/History.svelte
index c177b5204..43981f70f 100644
--- a/src/views/projects/History.svelte
+++ b/src/views/projects/History.svelte
@@ -6,11 +6,11 @@
     Remote,
     Node,
     Tree,
-  } from "@httpd-client";
+  } from "@http-client";
   import type { Route } from "@app/lib/router";
 
   import { COMMITS_PER_PAGE } from "./router";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { baseUrlToString } from "@app/lib/utils";
   import { groupCommits } from "@app/lib/commit";
 
diff --git a/src/views/projects/Issue.svelte b/src/views/projects/Issue.svelte
index 33bfade73..b903a89b1 100644
--- a/src/views/projects/Issue.svelte
+++ b/src/views/projects/Issue.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Reaction } from "@httpd-client/lib/project/comment";
+  import type { Reaction } from "@http-client/lib/project/comment";
   import type {
     BaseUrl,
     Comment,
@@ -8,7 +8,7 @@
     IssueState,
     Project,
     Node,
-  } from "@httpd-client";
+  } from "@http-client";
   import type { Session } from "@app/lib/httpd";
 
   import capitalize from "lodash/capitalize";
@@ -21,7 +21,7 @@
   import * as router from "@app/lib/router";
   import * as utils from "@app/lib/utils";
   import { experimental } from "@app/lib/appearance";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { closeFocused } from "@app/components/Popover.svelte";
   import { httpdStore } from "@app/lib/httpd";
   import { parseEmbedIntoMap } from "@app/lib/file";
diff --git a/src/views/projects/Issue/IssueTeaser.svelte b/src/views/projects/Issue/IssueTeaser.svelte
index db4a2a559..8575060d0 100644
--- a/src/views/projects/Issue/IssueTeaser.svelte
+++ b/src/views/projects/Issue/IssueTeaser.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Issue } from "@httpd-client";
+  import type { BaseUrl, Issue } from "@http-client";
 
   import {
     absoluteTimestamp,
diff --git a/src/views/projects/Issue/New.svelte b/src/views/projects/Issue/New.svelte
index e596ec960..c9c4825be 100644
--- a/src/views/projects/Issue/New.svelte
+++ b/src/views/projects/Issue/New.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { BaseUrl, Embed, Node, Project, Reaction } from "@httpd-client";
+  import type { BaseUrl, Embed, Node, Project, Reaction } from "@http-client";
 
   import * as modal from "@app/lib/modal";
   import * as router from "@app/lib/router";
   import * as utils from "@app/lib/utils";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { httpdStore } from "@app/lib/httpd";
 
   import AssigneeInput from "@app/views/projects/Cob/AssigneeInput.svelte";
diff --git a/src/views/projects/Issues.svelte b/src/views/projects/Issues.svelte
index c6d7f81ae..e91e9cc70 100644
--- a/src/views/projects/Issues.svelte
+++ b/src/views/projects/Issues.svelte
@@ -1,14 +1,8 @@
 <script lang="ts">
-  import type {
-    BaseUrl,
-    Issue,
-    IssueState,
-    Node,
-    Project,
-  } from "@httpd-client";
+  import type { BaseUrl, Issue, IssueState, Node, Project } from "@http-client";
 
   import capitalize from "lodash/capitalize";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { ISSUES_PER_PAGE } from "./router";
   import { baseUrlToString, isLocal } from "@app/lib/utils";
   import { closeFocused } from "@app/components/Popover.svelte";
diff --git a/src/views/projects/Layout.svelte b/src/views/projects/Layout.svelte
index 9cb7b5d3d..16f3e32bb 100644
--- a/src/views/projects/Layout.svelte
+++ b/src/views/projects/Layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Node, Project } from "@httpd-client";
+  import type { BaseUrl, Node, Project } from "@http-client";
 
   import AppHeader from "@app/App/Header.svelte";
 
diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte
index 50d7d80a3..5c915684f 100644
--- a/src/views/projects/Patch.svelte
+++ b/src/views/projects/Patch.svelte
@@ -9,7 +9,7 @@
     Revision,
     Diff,
     Node,
-  } from "@httpd-client";
+  } from "@http-client";
 
   interface Thread {
     root: Comment;
@@ -42,7 +42,7 @@
 </script>
 
 <script lang="ts">
-  import type { BaseUrl, Embed, Patch } from "@httpd-client";
+  import type { BaseUrl, Embed, Patch } from "@http-client";
   import type { PatchView } from "./router";
   import type { Route } from "@app/lib/router";
   import type { ComponentProps } from "svelte";
@@ -57,7 +57,7 @@
   import isEqual from "lodash/isEqual";
   import partial from "lodash/partial";
   import uniqBy from "lodash/uniqBy";
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import { httpdStore } from "@app/lib/httpd";
   import { parseEmbedIntoMap } from "@app/lib/file";
 
diff --git a/src/views/projects/Patch/PatchTeaser.svelte b/src/views/projects/Patch/PatchTeaser.svelte
index c97468af2..a72cdc988 100644
--- a/src/views/projects/Patch/PatchTeaser.svelte
+++ b/src/views/projects/Patch/PatchTeaser.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
-  import type { Patch } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
+  import type { Patch } from "@http-client";
 
   import {
     absoluteTimestamp,
diff --git a/src/views/projects/Patch/RevisionSelector.svelte b/src/views/projects/Patch/RevisionSelector.svelte
index 8106720aa..1932a2182 100644
--- a/src/views/projects/Patch/RevisionSelector.svelte
+++ b/src/views/projects/Patch/RevisionSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { PatchView } from "../router";
-  import type { BaseUrl, Patch, Project } from "@httpd-client";
+  import type { BaseUrl, Patch, Project } from "@http-client";
   import * as utils from "@app/lib/utils";
 
   import Button from "@app/components/Button.svelte";
diff --git a/src/views/projects/Patches.svelte b/src/views/projects/Patches.svelte
index 6992e4497..551e815e5 100644
--- a/src/views/projects/Patches.svelte
+++ b/src/views/projects/Patches.svelte
@@ -1,13 +1,7 @@
 <script lang="ts">
-  import type {
-    BaseUrl,
-    Node,
-    Patch,
-    PatchState,
-    Project,
-  } from "@httpd-client";
+  import type { BaseUrl, Node, Patch, PatchState, Project } from "@http-client";
 
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
   import capitalize from "lodash/capitalize";
 
   import { PATCHES_PER_PAGE } from "./router";
diff --git a/src/views/projects/Share.svelte b/src/views/projects/Share.svelte
index b22272e2e..923e5931e 100644
--- a/src/views/projects/Share.svelte
+++ b/src/views/projects/Share.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
 
   import debounce from "lodash/debounce";
   import { api, httpdStore } from "@app/lib/httpd";
diff --git a/src/views/projects/Sidebar.svelte b/src/views/projects/Sidebar.svelte
index 7cc03d15e..8e56291cc 100644
--- a/src/views/projects/Sidebar.svelte
+++ b/src/views/projects/Sidebar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Node, Project } from "@httpd-client";
+  import type { BaseUrl, Node, Project } from "@http-client";
 
   import { onMount } from "svelte";
 
diff --git a/src/views/projects/Sidebar/ContextHelp.svelte b/src/views/projects/Sidebar/ContextHelp.svelte
index c056a5dac..9be7fb743 100644
--- a/src/views/projects/Sidebar/ContextHelp.svelte
+++ b/src/views/projects/Sidebar/ContextHelp.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
   import type { Route } from "@app/lib/router/definitions";
 
   import { activeUnloadedRouteStore } from "@app/lib/router";
diff --git a/src/views/projects/Sidebar/ContextRepo.svelte b/src/views/projects/Sidebar/ContextRepo.svelte
index 97fd71abe..736402bbd 100644
--- a/src/views/projects/Sidebar/ContextRepo.svelte
+++ b/src/views/projects/Sidebar/ContextRepo.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Node, Project } from "@httpd-client";
+  import type { BaseUrl, Node, Project } from "@http-client";
 
   import IconButton from "@app/components/IconButton.svelte";
   import IconSmall from "@app/components/IconSmall.svelte";
diff --git a/src/views/projects/Source.svelte b/src/views/projects/Source.svelte
index 75102443f..d2b425608 100644
--- a/src/views/projects/Source.svelte
+++ b/src/views/projects/Source.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import type { BaseUrl, Node, Project, Remote, Tree } from "@httpd-client";
+  import type { BaseUrl, Node, Project, Remote, Tree } from "@http-client";
   import type { BlobResult } from "./router";
   import type { Route } from "@app/lib/router";
 
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
   import Header from "./Source/Header.svelte";
diff --git a/src/views/projects/Source/Blob.svelte b/src/views/projects/Source/Blob.svelte
index 55af54332..eece01a11 100644
--- a/src/views/projects/Source/Blob.svelte
+++ b/src/views/projects/Source/Blob.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Blob } from "@httpd-client";
+  import type { BaseUrl, Blob } from "@http-client";
 
   import { afterUpdate, onDestroy, onMount } from "svelte";
   import { toHtml } from "hast-util-to-html";
diff --git a/src/views/projects/Source/BranchSelector.svelte b/src/views/projects/Source/BranchSelector.svelte
index 5db53f548..e9c9482cc 100644
--- a/src/views/projects/Source/BranchSelector.svelte
+++ b/src/views/projects/Source/BranchSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Commit, Project } from "@httpd-client";
+  import type { BaseUrl, Commit, Project } from "@http-client";
   import type { Route } from "@app/lib/router";
 
   import { activeUnloadedRouteStore } from "@app/lib/router";
diff --git a/src/views/projects/Source/Header.svelte b/src/views/projects/Source/Header.svelte
index 6e0c529f2..81e0d4e4d 100644
--- a/src/views/projects/Source/Header.svelte
+++ b/src/views/projects/Source/Header.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { BaseUrl, Project, Remote, Tree } from "@httpd-client";
+  import type { BaseUrl, Project, Remote, Tree } from "@http-client";
   import type { Route } from "@app/lib/router";
 
-  import { HttpdClient } from "@httpd-client";
+  import { HttpdClient } from "@http-client";
 
   import BranchSelector from "./BranchSelector.svelte";
   import PeerSelector from "./PeerSelector.svelte";
diff --git a/src/views/projects/Source/PeerSelector.svelte b/src/views/projects/Source/PeerSelector.svelte
index 6274d7606..fd9160ad2 100644
--- a/src/views/projects/Source/PeerSelector.svelte
+++ b/src/views/projects/Source/PeerSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Project, Remote } from "@httpd-client";
+  import type { BaseUrl, Project, Remote } from "@http-client";
   import type { Route } from "@app/lib/router";
 
   import { closeFocused } from "@app/components/Popover.svelte";
diff --git a/src/views/projects/Source/ProjectNameHeader.svelte b/src/views/projects/Source/ProjectNameHeader.svelte
index 2889a82bd..0d88bd3fe 100644
--- a/src/views/projects/Source/ProjectNameHeader.svelte
+++ b/src/views/projects/Source/ProjectNameHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Project } from "@httpd-client";
+  import type { BaseUrl, Project } from "@http-client";
 
   import { twemoji } from "@app/lib/utils";
 
diff --git a/src/views/projects/Source/Tree.svelte b/src/views/projects/Source/Tree.svelte
index 40f25243c..ccdd5c518 100644
--- a/src/views/projects/Source/Tree.svelte
+++ b/src/views/projects/Source/Tree.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { BaseUrl, Tree } from "@httpd-client";
+  import type { BaseUrl, Tree } from "@http-client";
 
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/views/projects/Source/Tree/Folder.svelte b/src/views/projects/Source/Tree/Folder.svelte
index e0d22a718..98131f077 100644
--- a/src/views/projects/Source/Tree/Folder.svelte
+++ b/src/views/projects/Source/Tree/Folder.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" strictEvents>
-  import type { BaseUrl, Tree } from "@httpd-client";
+  import type { BaseUrl, Tree } from "@http-client";
 
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/views/projects/components/CommitButton.svelte b/src/views/projects/components/CommitButton.svelte
index e80e42b9b..d6b851e3a 100644
--- a/src/views/projects/components/CommitButton.svelte
+++ b/src/views/projects/components/CommitButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Commit } from "@httpd-client";
+  import type { BaseUrl, Commit } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
   import Link from "@app/components/Link.svelte";
diff --git a/src/views/projects/components/CommitLink.svelte b/src/views/projects/components/CommitLink.svelte
index e7c3dd45d..51efdc829 100644
--- a/src/views/projects/components/CommitLink.svelte
+++ b/src/views/projects/components/CommitLink.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl } from "@httpd-client";
+  import type { BaseUrl } from "@http-client";
 
   import { formatCommit } from "@app/lib/utils";
   import Link from "@app/components/Link.svelte";
diff --git a/src/views/projects/error.ts b/src/views/projects/error.ts
index 849c15350..ad8604731 100644
--- a/src/views/projects/error.ts
+++ b/src/views/projects/error.ts
@@ -2,7 +2,7 @@ import type { ErrorRoute, NotFoundRoute } from "@app/lib/router/definitions";
 import type { ProjectRoute } from "@app/views/projects/router";
 
 import { baseUrlToString, isLocal } from "@app/lib/utils";
-import { ResponseParseError, ResponseError } from "@httpd-client/lib/fetcher";
+import { ResponseParseError, ResponseError } from "@http-client/lib/fetcher";
 import { httpdStore } from "@app/lib/httpd";
 import { get } from "svelte/store";
 
diff --git a/src/views/projects/router.ts b/src/views/projects/router.ts
index b0b96d91b..27cf29af9 100644
--- a/src/views/projects/router.ts
+++ b/src/views/projects/router.ts
@@ -19,12 +19,12 @@ import type {
   Project,
   Remote,
   Tree,
-} from "@httpd-client";
+} from "@http-client";
 
 import * as Syntax from "@app/lib/syntax";
 import * as httpd from "@app/lib/httpd";
-import { HttpdClient } from "@httpd-client";
-import { ResponseError, ResponseParseError } from "@httpd-client/lib/fetcher";
+import { HttpdClient } from "@http-client";
+import { ResponseError, ResponseParseError } from "@http-client/lib/fetcher";
 import { experimental } from "@app/lib/appearance";
 import { get } from "svelte/store";
 import { handleError, unreachableError } from "@app/views/projects/error";
diff --git a/tests/support/peerManager.ts b/tests/support/peerManager.ts
index 3bdf6eba2..d013db697 100644
--- a/tests/support/peerManager.ts
+++ b/tests/support/peerManager.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { BaseUrl } from "@httpd-client";
+import type { BaseUrl } from "@http-client";
 import type * as Execa from "execa";
 import { execa } from "execa";
 import * as Fs from "node:fs/promises";
diff --git a/tsconfig.json b/tsconfig.json
index 9b13ec0dd..5cbd887a6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@tsconfig/svelte/tsconfig.json",
-  "include": ["src", "tests", "httpd-client", "./*.js", "./*.ts"],
+  "include": ["src", "tests", "http-client", "./*.js", "./*.ts"],
   "exclude": ["node_modules/*"],
   "compilerOptions": {
     "noEmit": true,
@@ -20,8 +20,8 @@
     "skipLibCheck": true,
     "paths": {
       "@app/*": ["./src/*"],
-      "@httpd-client": ["./httpd-client/index.ts"],
-      "@httpd-client/*": ["./httpd-client/*"],
+      "@http-client": ["./http-client/index.ts"],
+      "@http-client/*": ["./http-client/*"],
       "@public/*": ["./public/*"],
       "@tests/*": ["./tests/*"]
     }
diff --git a/vite.config.ts b/vite.config.ts
index f385af244..e1f143c07 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
     alias: {
       "@app": path.resolve("./src"),
       "@public": path.resolve("./public"),
-      "@httpd-client": path.resolve("./httpd-client"),
+      "@http-client": path.resolve("./http-client"),
       "@tests": path.resolve("./tests"),
     },
   },