diff --git a/http-client/index.ts b/http-client/index.ts
index ee05168a15..74979764f5 100644
--- a/http-client/index.ts
+++ b/http-client/index.ts
@@ -2,18 +2,19 @@ import type { BaseUrl } from "./lib/fetcher.js";
 import type {
   Blob,
   DiffResponse,
-  Project,
-  ProjectListQuery,
   Remote,
+  Repo,
+  RepoListQuery,
   Tree,
   TreeStats,
-} from "./lib/project.js";
+} from "./lib/repo.js";
 import type {
+  Author,
   Config,
   SeedingPolicy,
   DefaultSeedingPolicy,
 } from "./lib/shared.js";
-import type { Comment, Embed, Reaction } from "./lib/project/comment.js";
+import type { Comment, Embed, Reaction } from "./lib/repo/comment.js";
 import type {
   Commit,
   CommitBlob,
@@ -25,8 +26,8 @@ import type {
   DiffContent,
   DiffFile,
   HunkLine,
-} from "./lib/project/commit.js";
-import type { Issue, IssueState } from "./lib/project/issue.js";
+} from "./lib/repo/commit.js";
+import type { Issue, IssueState } from "./lib/repo/issue.js";
 import type {
   LifecycleState,
   Merge,
@@ -35,13 +36,13 @@ import type {
   Review,
   Revision,
   Verdict,
-} from "./lib/project/patch.js";
+} from "./lib/repo/patch.js";
 import type { RequestOptions } from "./lib/fetcher.js";
 import type { ZodSchema } from "zod";
 
 import { z, array, literal, number, object, string, union } from "zod";
 
-import * as project from "./lib/project.js";
+import * as repo from "./lib/repo.js";
 import { Fetcher } from "./lib/fetcher.js";
 import {
   nodeConfigSchema,
@@ -50,6 +51,7 @@ import {
 } from "./lib/shared.js";
 
 export type {
+  Author,
   BaseUrl,
   Blob,
   ChangesetWithDiff,
@@ -73,15 +75,15 @@ export type {
   Merge,
   Patch,
   PatchState,
-  Project,
-  ProjectListQuery,
   Reaction,
   Remote,
+  Repo,
+  RepoListQuery,
   Review,
   Revision,
   SeedingPolicy,
-  TreeStats,
   Tree,
+  TreeStats,
   Verdict,
 };
 
@@ -156,13 +158,13 @@ export class HttpdClient {
   #fetcher: Fetcher;
 
   public baseUrl: BaseUrl;
-  public project: project.Client;
+  public repo: repo.Client;
 
   public constructor(baseUrl: BaseUrl) {
     this.baseUrl = baseUrl;
     this.#fetcher = new Fetcher(this.baseUrl);
 
-    this.project = new project.Client(this.#fetcher);
+    this.repo = new repo.Client(this.#fetcher);
   }
 
   public changePort(port: number): void {
@@ -214,13 +216,13 @@ export class HttpdClient {
   }
 
   public async getPolicyById(
-    id: string,
+    rid: string,
     options?: RequestOptions,
   ): Promise<SeedingPolicy> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `node/policies/repos/${id}`,
+        path: `node/policies/repos/${rid}`,
         options,
       },
       seedingPolicySchema,
@@ -239,13 +241,13 @@ export class HttpdClient {
   }
 
   public async getNodeIdentity(
-    id: string,
+    nid: string,
     options?: RequestOptions,
   ): Promise<NodeIdentity> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `nodes/${id}`,
+        path: `nodes/${nid}`,
         options,
       },
       nodeIdentitySchema,
@@ -253,13 +255,13 @@ export class HttpdClient {
   }
 
   public async getNodeInventory(
-    id: string,
+    nid: string,
     options?: RequestOptions,
   ): Promise<string[]> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `nodes/${id}/inventory`,
+        path: `nodes/${nid}/inventory`,
         options,
       },
       array(string()),
diff --git a/http-client/lib/project.ts b/http-client/lib/repo.ts
similarity index 76%
rename from http-client/lib/project.ts
rename to http-client/lib/repo.ts
index 2124b93b68..241c8f696e 100644
--- a/http-client/lib/project.ts
+++ b/http-client/lib/repo.ts
@@ -1,8 +1,8 @@
 import type { ZodSchema } from "zod";
 import type { Fetcher, RequestOptions } from "./fetcher.js";
-import type { Commit, Commits } from "./project/commit.js";
-import type { Issue } from "./project/issue.js";
-import type { Patch } from "./project/patch.js";
+import type { Commit, Commits } from "./repo/commit.js";
+import type { Issue } from "./repo/issue.js";
+import type { Patch } from "./repo/patch.js";
 
 import {
   array,
@@ -23,22 +23,25 @@ import {
   commitsSchema,
   diffBlobSchema,
   diffSchema,
-} from "./project/commit.js";
-import { issueSchema, issuesSchema } from "./project/issue.js";
-import { patchSchema, patchesSchema } from "./project/patch.js";
-
-const projectSchema = object({
-  id: string(),
-  name: string(),
-  description: string(),
-  defaultBranch: string(),
-  delegates: array(object({ id: string(), alias: optional(string()) })),
+} from "./repo/commit.js";
+import { issueSchema, issuesSchema } from "./repo/issue.js";
+import { patchSchema, patchesSchema } from "./repo/patch.js";
+import { authorSchema } from "./shared.js";
+
+const repoSchema = object({
+  rid: string(),
+  "xyz.radicle.project": object({
+    name: string(),
+    description: string(),
+    defaultBranch: string(),
+  }),
+  delegates: array(authorSchema),
   head: string(),
   threshold: number(),
   visibility: union([
     object({ type: literal("public") }),
     object({ type: literal("private"), allow: optional(array(string())) }),
-  ]).optional(),
+  ]),
   patches: object({
     open: number(),
     draft: number(),
@@ -51,9 +54,9 @@ const projectSchema = object({
   }),
   seeding: number(),
 });
-const projectsSchema = array(projectSchema);
+const reposSchema = array(repoSchema);
 
-export type Project = z.infer<typeof projectSchema>;
+export type Repo = z.infer<typeof repoSchema>;
 
 const activitySchema = object({
   activity: array(number()),
@@ -100,7 +103,7 @@ const treeSchema = object({
 export type Remote = z.infer<typeof remoteSchema>;
 
 export const remoteSchema = object({
-  id: string(),
+  nid: string(),
   alias: string().optional(),
   heads: record(string(), string()),
   delegate: boolean(),
@@ -116,7 +119,7 @@ const diffResponseSchema = object({
   files: record(string(), diffBlobSchema),
 });
 
-export type ProjectListQuery = {
+export type RepoListQuery = {
   page?: number;
   perPage?: number;
   show?: "pinned" | "all";
@@ -130,54 +133,54 @@ export class Client {
 
   public async getByDelegate(
     delegateId: string,
-    query?: ProjectListQuery,
+    query?: RepoListQuery,
     options?: RequestOptions,
-  ): Promise<Project[]> {
+  ): Promise<Repo[]> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `delegates/${delegateId}/projects`,
+        path: `delegates/${delegateId}/repos`,
         query,
         options,
       },
-      projectsSchema,
+      reposSchema,
     );
   }
 
-  public async getById(id: string, options?: RequestOptions): Promise<Project> {
+  public async getByRid(rid: string, options?: RequestOptions): Promise<Repo> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}`,
+        path: `repos/${rid}`,
         options,
       },
-      projectSchema,
+      repoSchema,
     );
   }
 
   public async getAll(
-    query?: ProjectListQuery,
+    query?: RepoListQuery,
     options?: RequestOptions,
-  ): Promise<Project[]> {
+  ): Promise<Repo[]> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: "projects",
+        path: "repos",
         query,
         options,
       },
-      projectsSchema,
+      reposSchema,
     );
   }
 
   public async getActivity(
-    id: string,
+    rid: string,
     options?: RequestOptions,
   ): Promise<Activity> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/activity`,
+        path: `repos/${rid}/activity`,
         options,
       },
       activitySchema,
@@ -185,14 +188,14 @@ export class Client {
   }
 
   public async getReadme(
-    id: string,
+    rid: string,
     sha: string,
     options?: RequestOptions,
   ): Promise<Blob> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/readme/${sha}`,
+        path: `repos/${rid}/readme/${sha}`,
         options,
       },
       blobSchema,
@@ -200,7 +203,7 @@ export class Client {
   }
 
   public async getBlob(
-    id: string,
+    rid: string,
     sha: string,
     path: string,
     options?: RequestOptions,
@@ -208,7 +211,7 @@ export class Client {
     const blob = await this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/blob/${sha}/${path}`,
+        path: `repos/${rid}/blob/${sha}/${path}`,
         options,
       },
       blobSchema,
@@ -217,7 +220,7 @@ export class Client {
   }
 
   public async getTree(
-    id: string,
+    rid: string,
     sha: string,
     path?: string,
     options?: RequestOptions,
@@ -225,7 +228,7 @@ export class Client {
     const tree = await this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/tree/${sha}/${path ?? ""}`,
+        path: `repos/${rid}/tree/${sha}/${path ?? ""}`,
         options,
       },
       treeSchema,
@@ -234,14 +237,14 @@ export class Client {
   }
 
   public async getTreeStatsBySha(
-    id: string,
+    rid: string,
     sha: string,
     options?: RequestOptions,
   ): Promise<TreeStats> {
     const tree = await this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/stats/tree/${sha}`,
+        path: `repos/${rid}/stats/tree/${sha}`,
         options,
       },
       treeStatsSchema,
@@ -250,13 +253,13 @@ export class Client {
   }
 
   public async getAllRemotes(
-    id: string,
+    rid: string,
     options?: RequestOptions,
   ): Promise<Remote[]> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/remotes`,
+        path: `repos/${rid}/remotes`,
         options,
       },
       remotesSchema,
@@ -264,14 +267,14 @@ export class Client {
   }
 
   public async getRemoteByPeer(
-    id: string,
+    rid: string,
     peer: string,
     options?: RequestOptions,
   ): Promise<Remote> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/remotes/${peer}`,
+        path: `repos/${rid}/remotes/${peer}`,
         options,
       },
       remoteSchema,
@@ -279,7 +282,7 @@ export class Client {
   }
 
   public async getAllCommits(
-    id: string,
+    rid: string,
     query?: {
       parent?: string;
       since?: number;
@@ -292,7 +295,7 @@ export class Client {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/commits`,
+        path: `repos/${rid}/commits`,
         query,
         options,
       },
@@ -301,14 +304,14 @@ export class Client {
   }
 
   public async getCommitBySha(
-    id: string,
+    rid: string,
     sha: string,
     options?: RequestOptions,
   ): Promise<Commit> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/commits/${sha}`,
+        path: `repos/${rid}/commits/${sha}`,
         options,
       },
       commitSchema,
@@ -316,7 +319,7 @@ export class Client {
   }
 
   public async getDiff(
-    id: string,
+    rid: string,
     revisionBase: string,
     revisionOid: string,
     options?: RequestOptions,
@@ -324,7 +327,7 @@ export class Client {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/diff/${revisionBase}/${revisionOid}`,
+        path: `repos/${rid}/diff/${revisionBase}/${revisionOid}`,
         options,
       },
       diffResponseSchema,
@@ -332,14 +335,14 @@ export class Client {
   }
 
   public async getIssueById(
-    id: string,
+    rid: string,
     issueId: string,
     options?: RequestOptions,
   ): Promise<Issue> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/issues/${issueId}`,
+        path: `repos/${rid}/issues/${issueId}`,
         options,
       },
       issueSchema,
@@ -347,7 +350,7 @@ export class Client {
   }
 
   public async getAllIssues(
-    id: string,
+    rid: string,
     query?: {
       page?: number;
       perPage?: number;
@@ -358,7 +361,7 @@ export class Client {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/issues`,
+        path: `repos/${rid}/issues`,
         query,
         options,
       },
@@ -367,14 +370,14 @@ export class Client {
   }
 
   public async getPatchById(
-    id: string,
+    rid: string,
     patchId: string,
     options?: RequestOptions,
   ): Promise<Patch> {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/patches/${patchId}`,
+        path: `repos/${rid}/patches/${patchId}`,
         options,
       },
       patchSchema,
@@ -382,7 +385,7 @@ export class Client {
   }
 
   public async getAllPatches(
-    id: string,
+    rid: string,
     query?: {
       page?: number;
       perPage?: number;
@@ -393,7 +396,7 @@ export class Client {
     return this.#fetcher.fetchOk(
       {
         method: "GET",
-        path: `projects/${id}/patches`,
+        path: `repos/${rid}/patches`,
         query,
         options,
       },
diff --git a/http-client/lib/project/comment.ts b/http-client/lib/repo/comment.ts
similarity index 100%
rename from http-client/lib/project/comment.ts
rename to http-client/lib/repo/comment.ts
diff --git a/http-client/lib/project/commit.ts b/http-client/lib/repo/commit.ts
similarity index 100%
rename from http-client/lib/project/commit.ts
rename to http-client/lib/repo/commit.ts
diff --git a/http-client/lib/project/issue.ts b/http-client/lib/repo/issue.ts
similarity index 100%
rename from http-client/lib/project/issue.ts
rename to http-client/lib/repo/issue.ts
diff --git a/http-client/lib/project/patch.ts b/http-client/lib/repo/patch.ts
similarity index 100%
rename from http-client/lib/project/patch.ts
rename to http-client/lib/repo/patch.ts
diff --git a/http-client/lib/shared.ts b/http-client/lib/shared.ts
index b9e96dbd25..5ce0d53d6d 100644
--- a/http-client/lib/shared.ts
+++ b/http-client/lib/shared.ts
@@ -117,7 +117,9 @@ export const codeLocationSchema = object({
   new: rangeSchema.nullable(),
 });
 
+export type Author = z.infer<typeof authorSchema>;
+
 export const authorSchema = object({
-  id: string(),
+  did: string(),
   alias: string().optional(),
 });
diff --git a/http-client/tests/project.test.ts b/http-client/tests/project.test.ts
index 8e8b05b6e0..c56a6987d0 100644
--- a/http-client/tests/project.test.ts
+++ b/http-client/tests/project.test.ts
@@ -9,7 +9,7 @@ import {
   sourceBrowsingRid,
 } from "@tests/support/fixtures.js";
 
-describe("project", () => {
+describe("repo", () => {
   const api = new HttpdClient({
     hostname: "127.0.0.1",
     port: defaultHttpdPort,
@@ -17,59 +17,56 @@ describe("project", () => {
   });
 
   test("#getByDelegate(delegateId)", async () => {
-    await api.project.getByDelegate(aliceRemote);
+    await api.repo.getByDelegate(aliceRemote);
   });
 
   test("#getAll()", async () => {
-    await api.project.getAll();
+    await api.repo.getAll();
   });
 
-  test("#getById(id)", async () => {
-    await api.project.getById(sourceBrowsingRid);
+  test("#getByRid(rid)", async () => {
+    await api.repo.getByRid(sourceBrowsingRid);
   });
 
-  test("#getActivity(id)", async () => {
-    await api.project.getActivity(sourceBrowsingRid);
+  test("#getActivity(rid)", async () => {
+    await api.repo.getActivity(sourceBrowsingRid);
   });
 
-  test("#getReadme(id, sha)", async () => {
-    await api.project.getReadme(sourceBrowsingRid, aliceMainHead);
+  test("#getReadme(rid, sha)", async () => {
+    await api.repo.getReadme(sourceBrowsingRid, aliceMainHead);
   });
 
-  test("#getBlob(id, sha, path)", async () => {
-    await api.project.getBlob(sourceBrowsingRid, aliceMainHead, "src/true.c");
+  test("#getBlob(rid, sha, path)", async () => {
+    await api.repo.getBlob(sourceBrowsingRid, aliceMainHead, "src/true.c");
   });
 
-  test("#getTree(id, sha)", async () => {
-    await api.project.getTree(sourceBrowsingRid, aliceMainHead);
+  test("#getTree(rid, sha)", async () => {
+    await api.repo.getTree(sourceBrowsingRid, aliceMainHead);
   });
 
-  test("#getTreeStats(id, sha)", async () => {
-    await api.project.getTreeStatsBySha(sourceBrowsingRid, aliceMainHead);
+  test("#getTreeStats(rid, sha)", async () => {
+    await api.repo.getTreeStatsBySha(sourceBrowsingRid, aliceMainHead);
   });
 
-  test("#getTree(id, sha, path)", async () => {
-    await api.project.getTree(sourceBrowsingRid, aliceMainHead, "src");
+  test("#getTree(rid, sha, path)", async () => {
+    await api.repo.getTree(sourceBrowsingRid, aliceMainHead, "src");
   });
 
-  test("#getAllRemotes(id)", async () => {
-    await api.project.getAllRemotes(sourceBrowsingRid);
+  test("#getAllRemotes(rid)", async () => {
+    await api.repo.getAllRemotes(sourceBrowsingRid);
   });
 
-  test("#getRemoteByPeer(id, peer)", async () => {
-    await api.project.getRemoteByPeer(
-      sourceBrowsingRid,
-      aliceRemote.substring(8),
-    );
+  test("#getRemoteByPeer(rid, peer)", async () => {
+    await api.repo.getRemoteByPeer(sourceBrowsingRid, aliceRemote.substring(8));
   });
 
-  test("#getAllCommits(id)", async () => {
-    await api.project.getAllCommits(sourceBrowsingRid);
+  test("#getAllCommits(rid)", async () => {
+    await api.repo.getAllCommits(sourceBrowsingRid);
   });
 
   // TODO: test since/until properly.
-  test("#getAllCommits(id, {parent, since, until, page, perPage})", async () => {
-    await api.project.getAllCommits(sourceBrowsingRid, {
+  test("#getAllCommits(rid, {parent, since, until, page, perPage})", async () => {
+    await api.repo.getAllCommits(sourceBrowsingRid, {
       parent: aliceMainHead,
       since: 1679065819581,
       until: 1679065819590,
@@ -78,41 +75,41 @@ describe("project", () => {
     });
   });
 
-  test("#getCommitBySha(id, sha)", async () => {
-    await api.project.getCommitBySha(sourceBrowsingRid, aliceMainHead);
+  test("#getCommitBySha(rid, sha)", async () => {
+    await api.repo.getCommitBySha(sourceBrowsingRid, aliceMainHead);
   });
 
-  test("#getDiff(id, revisionBase, revisionOid)", async () => {
-    await api.project.getDiff(
+  test("#getDiff(rid, revisionBase, revisionOid)", async () => {
+    await api.repo.getDiff(
       sourceBrowsingRid,
       "90f6d058ece12f75f349bc7bbe88142187fe0379",
       aliceMainHead,
     );
   });
 
-  test("#getIssueById(id, issueId)", async () => {
-    await api.project.getIssueById(
+  test("#getIssueById(rid, issueId)", async () => {
+    await api.repo.getIssueById(
       cobRid,
       "d481fe6e562dd78129589d4738f171a8380fcb19",
     );
   });
 
-  test("#getAllIssues(id)", async () => {
-    await api.project.getAllIssues(cobRid, {
+  test("#getAllIssues(rid)", async () => {
+    await api.repo.getAllIssues(cobRid, {
       page: 0,
       perPage: 5,
       status: "open",
     });
   });
 
-  test("#getPatchById(id, patchId)", async () => {
-    await api.project.getPatchById(
+  test("#getPatchByOid(rid, patchId)", async () => {
+    await api.repo.getPatchById(
       cobRid,
       "59a0821edc73630bce540596cffc7854da557365",
     );
   });
 
-  test("#getAllPatches(id)", async () => {
-    await api.project.getAllPatches(cobRid);
+  test("#getAllPatches(rid)", async () => {
+    await api.repo.getAllPatches(cobRid);
   });
 });
diff --git a/http-client/tests/support/support.ts b/http-client/tests/support/support.ts
index cd876b234c..1d08ce2557 100644
--- a/http-client/tests/support/support.ts
+++ b/http-client/tests/support/support.ts
@@ -12,7 +12,7 @@ export async function assertIssue(
 ) {
   expect(
     //@prettier-ignore looks more readable than what prettier suggests.
-    isMatch(await api.project.getIssueById(cobRid, oid), change),
+    isMatch(await api.repo.getIssueById(cobRid, oid), change),
   ).toBe(true);
 }
 
@@ -23,6 +23,6 @@ export async function assertPatch(
 ) {
   expect(
     //@prettier-ignore looks more readable than what prettier suggests.
-    isMatch(await api.project.getPatchById(cobRid, oid), change),
+    isMatch(await api.repo.getPatchById(cobRid, oid), change),
   ).toBe(true);
 }
diff --git a/playwright.config.ts b/playwright.config.ts
index c112919425..0aeac77748 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -87,7 +87,7 @@ const config: PlaywrightTestConfig = {
       command: "npm run start -- --strictPort --port 3001",
       port: 3001,
     },
-    // Required by test tests/e2e/project/commits.spec.ts "loading more commits, adds them to the commits list"
+    // Required by test tests/e2e/repo/commits.spec.ts "loading more commits, adds them to the commits list"
     {
       command: "npm run start -- --strictPort --port 3002",
       port: 3002,
diff --git a/radicle-httpd/src/api.rs b/radicle-httpd/src/api.rs
index 8dd2878af3..9992a52a6a 100644
--- a/radicle-httpd/src/api.rs
+++ b/radicle-httpd/src/api.rs
@@ -211,18 +211,19 @@ mod search {
     use std::collections::BTreeMap;
 
     use nonempty::NonEmpty;
-    use radicle::identity::doc::{Payload, PayloadId};
     use serde::{Deserialize, Serialize};
-    use serde_json::json;
 
+    use radicle::cob::Author;
     use radicle::crypto::Verified;
+    use radicle::identity::doc::{Payload, PayloadId};
     use radicle::identity::RepoId;
     use radicle::node::routing::Store;
-    use radicle::node::AliasStore;
-    use radicle::node::Database;
+    use radicle::node::{AliasStore, Database};
     use radicle::profile::Aliases;
     use radicle::storage::RepositoryInfo;
 
+    use super::json::author;
+
     #[derive(Serialize, Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SearchQueryString {
@@ -256,15 +257,10 @@ mod search {
                 return None;
             };
             let seeds = db.count(&info.rid).unwrap_or_default();
-            let delegates = info.doc.delegates.map(|did| match aliases.alias(&did) {
-                Some(alias) => json!({
-                    "id": did,
-                    "alias": alias,
-                }),
-                None => json!({
-                    "id": did,
-                }),
-            });
+            let delegates = info
+                .doc
+                .delegates
+                .map(|did| author(&Author::new(did), aliases.alias(&did)));
 
             Some(SearchResult {
                 rid: info.rid,
diff --git a/radicle-httpd/src/api/json.rs b/radicle-httpd/src/api/json.rs
index 9eab0277ac..6c4b45abcd 100644
--- a/radicle-httpd/src/api/json.rs
+++ b/radicle-httpd/src/api/json.rs
@@ -173,10 +173,10 @@ fn reactions(
 pub(crate) fn author(author: &Author, alias: Option<Alias>) -> Value {
     match alias {
         Some(alias) => json!({
-            "id": author.id,
+            "did": author.id,
             "alias": alias,
         }),
-        None => json!(author),
+        None => json!({ "did": author.id }),
     }
 }
 
diff --git a/radicle-httpd/src/api/v1/delegates.rs b/radicle-httpd/src/api/v1/delegates.rs
index 48e7fae583..df92a2021c 100644
--- a/radicle-httpd/src/api/v1/delegates.rs
+++ b/radicle-httpd/src/api/v1/delegates.rs
@@ -133,7 +133,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   }
                 ],
@@ -163,7 +163,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   },
                 ],
@@ -215,7 +215,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   }
                 ],
@@ -245,7 +245,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   },
                 ],
diff --git a/radicle-httpd/src/api/v1/repos.rs b/radicle-httpd/src/api/v1/repos.rs
index d748b452ec..9aa2398cc7 100644
--- a/radicle-httpd/src/api/v1/repos.rs
+++ b/radicle-httpd/src/api/v1/repos.rs
@@ -484,13 +484,13 @@ async fn remotes_handler(State(ctx): State<Context>, Path(rid): Path<RepoId>) ->
 
             match aliases.alias(&remote.id) {
                 Some(alias) => json!({
-                    "id": remote.id,
+                    "nid": remote.id,
                     "alias": alias,
                     "heads": refs,
                     "delegate": delegates.contains(&remote.id.into()),
                 }),
                 None => json!({
-                    "id": remote.id,
+                    "nid": remote.id,
                     "heads": refs,
                     "delegate": delegates.contains(&remote.id.into()),
                 }),
@@ -520,7 +520,7 @@ async fn remote_handler(
         })
         .collect::<BTreeMap<String, &Oid>>();
     let remote = json!({
-        "id": remote.id,
+        "nid": remote.id,
         "heads": refs,
         "delegate": delegates.contains(&remote.id.into()),
     });
@@ -736,7 +736,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   },
                 ],
@@ -766,7 +766,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   }
                 ],
@@ -809,7 +809,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   }
                 ],
@@ -839,7 +839,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   },
                 ],
@@ -882,7 +882,7 @@ mod routes {
                 },
                "delegates": [
                  {
-                   "id": DID,
+                   "did": DID,
                    "alias": CONTRIBUTOR_ALIAS,
                  }
                ],
@@ -926,7 +926,7 @@ mod routes {
                 "rid": "rad:z4FucBZHZMCsxTyQE1dfE2YR59Qbp",
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   }
                 ],
@@ -941,7 +941,7 @@ mod routes {
                 "rid": "rad:z4GypKmh1gkEfmkXtarcYnkvtFUfE",
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS
                   },
                 ],
@@ -970,7 +970,7 @@ mod routes {
                 },
                 "delegates": [
                   {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS,
                   }
                 ],
@@ -1362,7 +1362,7 @@ mod routes {
             response.json().await,
             json!([
               {
-                "id": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+                "nid": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
                 "alias": CONTRIBUTOR_ALIAS,
                 "heads": {
                   "master": HEAD
@@ -1387,7 +1387,7 @@ mod routes {
         assert_eq!(
             response.json().await,
             json!({
-                "id": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+                "nid": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
                 "heads": {
                     "master": HEAD
                 },
@@ -1601,7 +1601,7 @@ mod routes {
               {
                 "id": ISSUE_ID,
                 "author": {
-                  "id": DID,
+                  "did": DID,
                   "alias": CONTRIBUTOR_ALIAS
                 },
                 "title": "Issue #1",
@@ -1613,14 +1613,14 @@ mod routes {
                   {
                     "id": ISSUE_ID,
                     "author": {
-                      "id": DID,
+                      "did": DID,
                       "alias": CONTRIBUTOR_ALIAS
                     },
                     "body": "Change 'hello world' to 'hello everyone'",
                     "edits": [
                       {
                         "author": {
-                          "id": DID,
+                          "did": DID,
                           "alias": CONTRIBUTOR_ALIAS
                         },
                         "body": "Change 'hello world' to 'hello everyone'",
@@ -1653,7 +1653,7 @@ mod routes {
             json!({
                 "id": ISSUE_ID,
                 "author": {
-                  "id": DID,
+                  "did": DID,
                   "alias": CONTRIBUTOR_ALIAS
                 },
                 "title": "Issue #1",
@@ -1665,14 +1665,14 @@ mod routes {
                   {
                     "id": ISSUE_ID,
                     "author": {
-                      "id": DID,
+                      "did": DID,
                       "alias": CONTRIBUTOR_ALIAS
                     },
                     "body": "Change 'hello world' to 'hello everyone'",
                     "edits": [
                       {
                         "author": {
-                          "id": DID,
+                          "did": DID,
                           "alias": CONTRIBUTOR_ALIAS
                         },
                         "body": "Change 'hello world' to 'hello everyone'",
@@ -1705,7 +1705,7 @@ mod routes {
                 {
                     "id": PATCH_ID,
                     "author": {
-                        "id": DID,
+                        "did": DID,
                         "alias": CONTRIBUTOR_ALIAS,
                     },
                     "title": "A new `hello world`",
@@ -1720,14 +1720,14 @@ mod routes {
                         {
                             "id": PATCH_ID,
                             "author": {
-                                "id": DID,
+                                "did": DID,
                                 "alias": CONTRIBUTOR_ALIAS,
                             },
                             "description": "change `hello world` in README to something else",
                             "edits": [
                                 {
                                     "author": {
-                                        "id": DID,
+                                        "did": DID,
                                         "alias": CONTRIBUTOR_ALIAS,
                                     },
                                     "body": "change `hello world` in README to something else",
@@ -1764,7 +1764,7 @@ mod routes {
             json!({
                 "id": PATCH_ID,
                 "author": {
-                    "id": DID,
+                    "did": DID,
                     "alias": CONTRIBUTOR_ALIAS,
                 },
                 "title": "A new `hello world`",
@@ -1779,14 +1779,14 @@ mod routes {
                     {
                         "id": PATCH_ID,
                         "author": {
-                            "id": DID,
+                            "did": DID,
                             "alias": CONTRIBUTOR_ALIAS,
                         },
                         "description": "change `hello world` in README to something else",
                         "edits": [
                             {
                                 "author": {
-                                    "id": DID,
+                                    "did": DID,
                                     "alias": CONTRIBUTOR_ALIAS,
                                 },
                                 "body": "change `hello world` in README to something else",
diff --git a/src/App.svelte b/src/App.svelte
index 744dc270c2..8161c39059 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -10,15 +10,15 @@
   import Hotkeys from "./App/Hotkeys.svelte";
   import LoadingBar from "./App/LoadingBar.svelte";
 
-  import Commit from "@app/views/projects/Commit.svelte";
-  import History from "@app/views/projects/History.svelte";
-  import Issue from "@app/views/projects/Issue.svelte";
-  import Issues from "@app/views/projects/Issues.svelte";
+  import Commit from "@app/views/repos/Commit.svelte";
+  import History from "@app/views/repos/History.svelte";
+  import Issue from "@app/views/repos/Issue.svelte";
+  import Issues from "@app/views/repos/Issues.svelte";
   import Nodes from "@app/views/nodes/View.svelte";
   import NotFound from "@app/views/NotFound.svelte";
-  import Patch from "@app/views/projects/Patch.svelte";
-  import Patches from "@app/views/projects/Patches.svelte";
-  import Source from "@app/views/projects/Source.svelte";
+  import Patch from "@app/views/repos/Patch.svelte";
+  import Patches from "@app/views/repos/Patches.svelte";
+  import Source from "@app/views/repos/Source.svelte";
   import Users from "@app/views/users/View.svelte";
 
   import Error from "@app/views/error/View.svelte";
@@ -63,19 +63,19 @@
   <Nodes {...$activeRouteStore.params} />
 {:else if $activeRouteStore.resource === "users"}
   <Users {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.source"}
+{:else if $activeRouteStore.resource === "repo.source"}
   <Source {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.history"}
+{:else if $activeRouteStore.resource === "repo.history"}
   <History {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.commit"}
+{:else if $activeRouteStore.resource === "repo.commit"}
   <Commit {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.issues"}
+{:else if $activeRouteStore.resource === "repo.issues"}
   <Issues {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.issue"}
+{:else if $activeRouteStore.resource === "repo.issue"}
   <Issue {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.patches"}
+{:else if $activeRouteStore.resource === "repo.patches"}
   <Patches {...$activeRouteStore.params} />
-{:else if $activeRouteStore.resource === "project.patch"}
+{:else if $activeRouteStore.resource === "repo.patch"}
   <Patch {...$activeRouteStore.params} />
 {:else if $activeRouteStore.resource === "error"}
   <Error {...$activeRouteStore.params} />
diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index ac31cff3df..9ab2b04488 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -5,7 +5,6 @@
   export let variant: "small" | "large";
 
   function createContainer(source: string) {
-    source = source.replace("did:key:", "");
     const seed = source.toLowerCase();
     const avatar = createIcon({
       seed,
diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte
index 0c17988d08..79237d5589 100644
--- a/src/components/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -9,7 +9,7 @@
   import Reactions from "@app/components/Reactions.svelte";
 
   export let id: string;
-  export let authorId: string;
+  export let authorDid: string;
   export let authorAlias: string | undefined = undefined;
   export let baseUrl: BaseUrl;
   export let body: string;
@@ -108,7 +108,10 @@
     {/if}
     <div class="card-header" class:card-header-no-icon={isReply}>
       <slot class="icon" name="icon" />
-      <NodeId {baseUrl} nodeId={authorId} alias={authorAlias} />
+      <NodeId
+        {baseUrl}
+        nodeId={utils.stripDidKeyPrefix(authorDid)}
+        alias={authorAlias} />
       <slot name="caption">{caption}</slot>
       <Id {id} />
       <span class="timestamp" title={utils.absoluteTimestamp(timestamp)}>
diff --git a/src/components/Markdown.svelte b/src/components/Markdown.svelte
index e793e03de8..85ab8d3098 100644
--- a/src/components/Markdown.svelte
+++ b/src/components/Markdown.svelte
@@ -134,7 +134,7 @@
     }
 
     // Iterate over all images, and replace the source with a canonicalized URL
-    // pointing at the projects /raw endpoint.
+    // pointing at the repos /raw endpoint.
     for (const i of container.querySelectorAll("img")) {
       const imagePath = i.getAttribute("src");
 
diff --git a/src/components/ProjectCard.svelte b/src/components/ProjectCard.svelte
index 4f2891a44f..0a28e610c4 100644
--- a/src/components/ProjectCard.svelte
+++ b/src/components/ProjectCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { ProjectInfo } from "./ProjectCard";
+  import type { RepoInfo } from "./ProjectCard";
 
   import {
     absoluteTimestamp,
@@ -14,15 +14,16 @@
   import Link from "@app/components/Link.svelte";
 
   export let compact = false;
-  export let projectInfo: ProjectInfo;
+  export let repoInfo: RepoInfo;
 
-  $: project = projectInfo.project;
-  $: baseUrl = projectInfo.baseUrl;
-  $: isPrivate = project.visibility?.type === "private";
+  $: repo = repoInfo.repo;
+  $: project = repoInfo.repo["xyz.radicle.project"];
+  $: baseUrl = repoInfo.baseUrl;
+  $: isPrivate = repo.visibility?.type === "private";
 </script>
 
 <style>
-  .project-card {
+  .repo-card {
     height: 10rem;
     border: 1px solid var(--color-border-default);
     border-radius: var(--border-radius-small);
@@ -35,11 +36,11 @@
     overflow: hidden;
   }
 
-  .project-card.compact {
+  .repo-card.compact {
     height: 8rem;
   }
 
-  .project-card:hover {
+  .repo-card:hover {
     background-color: var(--color-fill-float-hover);
   }
 
@@ -64,7 +65,7 @@
     );
   }
 
-  .project-card:hover .fadeout-overlay {
+  .repo-card:hover .fadeout-overlay {
     background: linear-gradient(
       to right,
       var(--color-fill-float-hover) 20%,
@@ -129,18 +130,18 @@
 
 <Link
   route={{
-    resource: "project.source",
-    project: project.id,
+    resource: "repo.source",
+    repo: repo.rid,
     node: baseUrl,
   }}>
-  <div class="project-card" class:compact>
+  <div class="repo-card" class:compact>
     <div class="activity">
       <div class="fadeout-overlay" />
       <ActivityDiagram
-        id={project.id}
+        id={repo.rid}
         viewBoxHeight={200}
         styleColor="var(--color-foreground-primary"
-        activity={projectInfo.activity} />
+        activity={repoInfo.activity} />
     </div>
     <div class="title">
       <div class="headline-and-badges">
@@ -160,32 +161,32 @@
             size="tiny"
             style="padding: 0 0.372rem; gap: 0.125rem;">
             <Icon name="seedling" />
-            {projectInfo.project.seeding}
+            {repoInfo.repo.seeding}
           </Badge>
         </div>
       </div>
-      <p class="txt-small" use:twemoji>{project.description}</p>
+      <p class="txt-small" use:twemoji>
+        {project.description}
+      </p>
     </div>
     <div>
       <div class="stats-row txt-tiny" style:color="var(--color-foreground-dim)">
         <Icon name="issue" />
-        {project.issues.open} ·
+        {repo.issues.open} ·
         <Icon name="patch" />
         <span
           style:overflow="hidden"
           style:text-overflow="ellipsis"
-          title={absoluteTimestamp(
-            projectInfo.lastCommit.commit.committer.time,
-          )}>
-          {project.patches.open} · Updated {formatTimestamp(
-            projectInfo.lastCommit.commit.committer.time,
+          title={absoluteTimestamp(repoInfo.lastCommit.commit.committer.time)}>
+          {repo.patches.open} · Updated {formatTimestamp(
+            repoInfo.lastCommit.commit.committer.time,
           )}
         </span>
         <span
-          title={project.id}
+          title={repo.rid}
           style:color="var(--color-foreground-emphasized)"
           style:margin-left="auto">
-          {formatRepositoryId(project.id)}
+          {formatRepositoryId(repo.rid)}
         </span>
       </div>
     </div>
diff --git a/src/components/ProjectCard.ts b/src/components/ProjectCard.ts
index 407ecdea06..fb8f4f8cb7 100644
--- a/src/components/ProjectCard.ts
+++ b/src/components/ProjectCard.ts
@@ -1,40 +1,35 @@
-import type { ProjectListQuery } from "@http-client";
+import type { Repo, RepoListQuery } from "@http-client";
 
 import { loadProjectActivity, type WeeklyActivity } from "@app/lib/commit";
-import {
-  HttpdClient,
-  type BaseUrl,
-  type Commit,
-  type Project,
-} from "@http-client";
+import { HttpdClient, type BaseUrl, type Commit } from "@http-client";
 
-export interface ProjectInfo {
-  project: Project;
+export interface RepoInfo {
+  repo: Repo;
   baseUrl: BaseUrl;
   activity: WeeklyActivity[];
   lastCommit: Commit;
 }
 
-export async function fetchProjectInfos(
+export async function fetchRepoInfos(
   baseUrl: BaseUrl,
-  query?: ProjectListQuery,
+  query?: RepoListQuery,
   delegate?: string,
-): Promise<ProjectInfo[]> {
+): Promise<RepoInfo[]> {
   const api = new HttpdClient(baseUrl);
-  let projects: Project[];
+  let repos: Repo[];
 
   if (delegate) {
-    projects = await api.project.getByDelegate(delegate, query);
+    repos = await api.repo.getByDelegate(delegate, query);
   } else {
-    projects = await api.project.getAll(query);
+    repos = await api.repo.getAll(query);
   }
   const info = await Promise.all(
-    projects.map(async project => {
+    repos.map(async repo => {
       const [activity, lastCommit] = await Promise.all([
-        loadProjectActivity(project.id, baseUrl),
-        api.project.getCommitBySha(project.id, project.head),
+        loadProjectActivity(repo.rid, baseUrl),
+        api.repo.getCommitBySha(repo.rid, repo.head),
       ]);
-      return { project, activity, lastCommit, baseUrl };
+      return { repo, activity, lastCommit, baseUrl };
     }),
   );
 
diff --git a/src/components/Reactions.svelte b/src/components/Reactions.svelte
index e0066be4c0..f7e4631795 100644
--- a/src/components/Reactions.svelte
+++ b/src/components/Reactions.svelte
@@ -4,7 +4,7 @@
   export let reactions: Comment["reactions"];
 
   function authorsToTooltip(authors: Comment["reactions"][0]["authors"]) {
-    return authors.map(a => a.alias ?? a.id).join("\n");
+    return authors.map(a => a.alias ?? a.did).join("\n");
   }
 </script>
 
diff --git a/src/components/Thread.svelte b/src/components/Thread.svelte
index 2c368218d4..25230a3c86 100644
--- a/src/components/Thread.svelte
+++ b/src/components/Thread.svelte
@@ -48,7 +48,7 @@
       {rawPath}
       id={root.id}
       lastEdit={root.edits.length > 1 ? root.edits.pop() : undefined}
-      authorId={root.author.id}
+      authorDid={root.author.did}
       authorAlias={root.author.alias}
       reactions={root.reactions}
       timestamp={root.timestamp}
@@ -64,7 +64,7 @@
           {rawPath}
           lastEdit={reply.edits.length > 1 ? reply.edits.pop() : undefined}
           id={reply.id}
-          authorId={reply.author.id}
+          authorDid={reply.author.did}
           authorAlias={reply.author.alias}
           caption="replied"
           isReply
diff --git a/src/lib/commit.ts b/src/lib/commit.ts
index 02c039f61d..e6485a5600 100644
--- a/src/lib/commit.ts
+++ b/src/lib/commit.ts
@@ -112,7 +112,7 @@ function groupCommitsByWeek(commits: number[]): WeeklyActivity[] {
 
 export async function loadProjectActivity(id: string, baseUrl: BaseUrl) {
   const api = new HttpdClient(baseUrl);
-  const commits = await api.project.getActivity(id);
+  const commits = await api.repo.getActivity(id);
 
   return groupCommitsByWeek(commits.activity);
 }
diff --git a/src/lib/markdown.ts b/src/lib/markdown.ts
index ee6263e58a..bbeb922054 100644
--- a/src/lib/markdown.ts
+++ b/src/lib/markdown.ts
@@ -71,7 +71,7 @@ export class Renderer extends BaseRenderer {
       return `<a ${title ? `title="${title}"` : ""} href="${href.toLowerCase()}">${text}</a>`;
     }
 
-    if (this.#route.resource === "project.source" && !isUrl(href)) {
+    if (this.#route.resource === "repo.source" && !isUrl(href)) {
       href = routeToPath({
         ...this.#route,
         path: canonicalize(href, this.#route.path || "README.md"),
diff --git a/src/lib/router.ts b/src/lib/router.ts
index a982458750..76a1c09958 100644
--- a/src/lib/router.ts
+++ b/src/lib/router.ts
@@ -10,7 +10,7 @@ import {
   projectRouteToPath,
   projectTitle,
   resolveProjectRoute,
-} from "@app/views/projects/router";
+} from "@app/views/repos/router";
 import { loadRoute } from "@app/lib/router/definitions";
 import { nodePath } from "@app/views/nodes/router";
 import { userRouteToPath, userTitle } from "@app/views/users/router";
@@ -119,13 +119,13 @@ function setTitle(loadedRoute: LoadedRoute) {
     title.push("Page not found");
     title.push("Radicle");
   } else if (
-    loadedRoute.resource === "project.source" ||
-    loadedRoute.resource === "project.history" ||
-    loadedRoute.resource === "project.commit" ||
-    loadedRoute.resource === "project.issue" ||
-    loadedRoute.resource === "project.issues" ||
-    loadedRoute.resource === "project.patches" ||
-    loadedRoute.resource === "project.patch"
+    loadedRoute.resource === "repo.source" ||
+    loadedRoute.resource === "repo.history" ||
+    loadedRoute.resource === "repo.commit" ||
+    loadedRoute.resource === "repo.issue" ||
+    loadedRoute.resource === "repo.issues" ||
+    loadedRoute.resource === "repo.patches" ||
+    loadedRoute.resource === "repo.patch"
   ) {
     title.push(...projectTitle(loadedRoute));
   } else if (loadedRoute.resource === "nodes") {
@@ -229,13 +229,13 @@ export function routeToPath(route: Route): string {
   } else if (route.resource === "users") {
     return userRouteToPath(route);
   } else if (
-    route.resource === "project.source" ||
-    route.resource === "project.history" ||
-    route.resource === "project.commit" ||
-    route.resource === "project.issues" ||
-    route.resource === "project.issue" ||
-    route.resource === "project.patches" ||
-    route.resource === "project.patch"
+    route.resource === "repo.source" ||
+    route.resource === "repo.history" ||
+    route.resource === "repo.commit" ||
+    route.resource === "repo.issues" ||
+    route.resource === "repo.issue" ||
+    route.resource === "repo.patches" ||
+    route.resource === "repo.patch"
   ) {
     return projectRouteToPath(route);
   } else if (
diff --git a/src/lib/router/definitions.ts b/src/lib/router/definitions.ts
index 60813c1581..fe25eda9e3 100644
--- a/src/lib/router/definitions.ts
+++ b/src/lib/router/definitions.ts
@@ -2,16 +2,13 @@ import type {
   ResponseError,
   ResponseParseError,
 } from "@http-client/lib/fetcher";
-import type {
-  ProjectLoadedRoute,
-  ProjectRoute,
-} from "@app/views/projects/router";
+import type { ProjectLoadedRoute, ProjectRoute } from "@app/views/repos/router";
 import type { UserLoadedRoute, UserRoute } from "@app/views/users/router";
 import type { NodesRoute, NodesLoadedRoute } from "@app/views/nodes/router";
 import type { ComponentProps } from "svelte";
 import type IconLarge from "@app/components/IconLarge.svelte";
 
-import { loadProjectRoute } from "@app/views/projects/router";
+import { loadProjectRoute } from "@app/views/repos/router";
 import { loadUserRoute } from "@app/views/users/router";
 import { loadNodeRoute } from "@app/views/nodes/router";
 
@@ -61,13 +58,13 @@ export async function loadRoute(
   } else if (route.resource === "users") {
     return await loadUserRoute(route);
   } else if (
-    route.resource === "project.source" ||
-    route.resource === "project.history" ||
-    route.resource === "project.commit" ||
-    route.resource === "project.issues" ||
-    route.resource === "project.issue" ||
-    route.resource === "project.patches" ||
-    route.resource === "project.patch"
+    route.resource === "repo.source" ||
+    route.resource === "repo.history" ||
+    route.resource === "repo.commit" ||
+    route.resource === "repo.issues" ||
+    route.resource === "repo.issue" ||
+    route.resource === "repo.patches" ||
+    route.resource === "repo.patch"
   ) {
     return await loadProjectRoute(route, previousLoaded);
   } else {
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 6c130c02b6..92ca984d1d 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -72,6 +72,10 @@ export function formatRepositoryId(id: string): string {
   return id;
 }
 
+export function stripDidKeyPrefix(input: string): string {
+  return input.replace("did:key:", "");
+}
+
 export function truncateId(pubkey: string): string {
   return `${pubkey.substring(0, 6)}…${pubkey.slice(-6)}`;
 }
@@ -81,11 +85,11 @@ export function formatCommit(oid: string): string {
 }
 
 export function formatEditedCaption(
-  author: { id: string; alias?: string },
+  author: { did: string; alias?: string },
   timestamp: number,
 ) {
   return `${
-    author.alias ? author.alias : formatNodeId(author.id)
+    author.alias ? author.alias : stripDidKeyPrefix(author.did)
   } edited ${absoluteTimestamp(timestamp)}`;
 }
 
diff --git a/src/views/nodes/View.svelte b/src/views/nodes/View.svelte
index ccccf593d5..ccabd0ec0e 100644
--- a/src/views/nodes/View.svelte
+++ b/src/views/nodes/View.svelte
@@ -3,7 +3,7 @@
 
   import * as router from "@app/lib/router";
   import { baseUrlToString } from "@app/lib/utils";
-  import { fetchProjectInfos } from "@app/components/ProjectCard";
+  import { fetchRepoInfos } from "@app/components/ProjectCard";
   import { handleError } from "@app/views/nodes/error";
 
   import Settings from "@app/App/Settings.svelte";
@@ -135,10 +135,10 @@
     width: 100%;
     margin-top: 1rem;
   }
-  .projects {
+  .repos {
     margin-top: 0;
   }
-  .project-grid {
+  .repo-grid {
     display: grid;
     grid-template-columns: repeat(auto-fill, minmax(21rem, 1fr));
     gap: 1rem;
@@ -208,7 +208,7 @@
     .container {
       padding: 0;
     }
-    .projects {
+    .repos {
       margin-top: 3rem;
     }
     .mobile-footer {
@@ -406,21 +406,21 @@
             </div>
           {/if}
 
-          <div class="projects">
-            {#await fetchProjectInfos( baseUrl, { show: "pinned", perPage: stats.repos.total }, )}
+          <div class="repos">
+            {#await fetchRepoInfos( baseUrl, { show: "pinned", perPage: stats.repos.total }, )}
               <div style:height="35vh">
                 <Loading small center />
               </div>
-            {:then projectInfos}
-              {#if projectInfos.length > 0}
-                <div class="project-grid">
-                  {#each projectInfos as projectInfo}
-                    <ProjectCard {projectInfo} />
+            {:then repoInfos}
+              {#if repoInfos.length > 0}
+                <div class="repo-grid">
+                  {#each repoInfos as repoInfo}
+                    <ProjectCard {repoInfo} />
                   {/each}
                 </div>
                 <div class="subtitle">
-                  {projectInfos.length}
-                  pinned {projectInfos.length === 1
+                  {repoInfos.length}
+                  pinned {repoInfos.length === 1
                     ? "repository"
                     : "repositories"}
                 </div>
diff --git a/src/views/nodes/router.ts b/src/views/nodes/router.ts
index d15d0e0b0e..3a8f6d72c1 100644
--- a/src/views/nodes/router.ts
+++ b/src/views/nodes/router.ts
@@ -6,7 +6,7 @@ import { HttpdClient } from "@http-client";
 import { ResponseError, ResponseParseError } from "@http-client/lib/fetcher";
 import { baseUrlToString, isLocal } from "@app/lib/utils";
 import { handleError } from "@app/views/nodes/error";
-import { unreachableError } from "@app/views/projects/error";
+import { unreachableError } from "@app/views/repos/error";
 import { determineSeed } from "./SeedSelector";
 
 export type NodesRouteParams =
diff --git a/src/views/projects/Changeset.svelte b/src/views/repos/Changeset.svelte
similarity index 95%
rename from src/views/projects/Changeset.svelte
rename to src/views/repos/Changeset.svelte
index a4a57781d0..bf01561cf8 100644
--- a/src/views/projects/Changeset.svelte
+++ b/src/views/repos/Changeset.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   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";
+  import FileDiff from "@app/views/repos/Changeset/FileDiff.svelte";
+  import FileLocationChange from "@app/views/repos/Changeset/FileLocationChange.svelte";
   import IconButton from "@app/components/IconButton.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Observer, { intersection } from "@app/components/Observer.svelte";
diff --git a/src/views/projects/Changeset/FileDiff.svelte b/src/views/repos/Changeset/FileDiff.svelte
similarity index 99%
rename from src/views/projects/Changeset/FileDiff.svelte
rename to src/views/repos/Changeset/FileDiff.svelte
index a4728952d6..b1a46bb583 100644
--- a/src/views/projects/Changeset/FileDiff.svelte
+++ b/src/views/repos/Changeset/FileDiff.svelte
@@ -434,8 +434,8 @@
         {/if}
         <Link
           route={{
-            resource: "project.source",
-            project: projectId,
+            resource: "repo.source",
+            repo: projectId,
             node: baseUrl,
             path: filePath,
             revision,
diff --git a/src/views/projects/Changeset/FileLocationChange.svelte b/src/views/repos/Changeset/FileLocationChange.svelte
similarity index 96%
rename from src/views/projects/Changeset/FileLocationChange.svelte
rename to src/views/repos/Changeset/FileLocationChange.svelte
index 4825a69557..f57221757d 100644
--- a/src/views/projects/Changeset/FileLocationChange.svelte
+++ b/src/views/repos/Changeset/FileLocationChange.svelte
@@ -54,8 +54,8 @@
     <div style:margin-left="auto">
       <Link
         route={{
-          resource: "project.source",
-          project: projectId,
+          resource: "repo.source",
+          repo: projectId,
           node: baseUrl,
           path: newPath,
           revision,
diff --git a/src/views/projects/Cob/Assignees.svelte b/src/views/repos/Cob/Assignees.svelte
similarity index 86%
rename from src/views/projects/Cob/Assignees.svelte
rename to src/views/repos/Cob/Assignees.svelte
index 98e3a6ecef..51a26b84ea 100644
--- a/src/views/projects/Cob/Assignees.svelte
+++ b/src/views/repos/Cob/Assignees.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Reaction } from "@http-client";
 
-  import { formatNodeId } from "@app/lib/utils";
+  import { stripDidKeyPrefix } from "@app/lib/utils";
 
   import Avatar from "@app/components/Avatar.svelte";
   import Badge from "@app/components/Badge.svelte";
@@ -54,11 +54,11 @@
 <div class="wrapper">
   <div class="header">Assignees</div>
   <div class="body">
-    {#each assignees as { id }}
+    {#each assignees as { did }}
       <Badge variant="neutral" size="small">
         <div class="assignee">
-          <Avatar variant="small" nodeId={id} />
-          <span>{formatNodeId(id)}</span>
+          <Avatar variant="small" nodeId={stripDidKeyPrefix(did)} />
+          <span>{stripDidKeyPrefix(did)}</span>
         </div>
       </Badge>
     {:else}
diff --git a/src/views/projects/Cob/CobCommitTeaser.svelte b/src/views/repos/Cob/CobCommitTeaser.svelte
similarity index 92%
rename from src/views/projects/Cob/CobCommitTeaser.svelte
rename to src/views/repos/Cob/CobCommitTeaser.svelte
index 407701a3a5..02122ca811 100644
--- a/src/views/projects/Cob/CobCommitTeaser.svelte
+++ b/src/views/repos/Cob/CobCommitTeaser.svelte
@@ -8,7 +8,7 @@
   import IconButton from "@app/components/IconButton.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
   import Link from "@app/components/Link.svelte";
 
   export let baseUrl: BaseUrl;
@@ -62,8 +62,8 @@
     <div class="message">
       <Link
         route={{
-          resource: "project.commit",
-          project: projectId,
+          resource: "repo.commit",
+          repo: projectId,
           node: baseUrl,
           commit: commit.id,
         }}>
@@ -102,8 +102,8 @@
       <IconButton title="Browse repo at this commit">
         <Link
           route={{
-            resource: "project.source",
-            project: projectId,
+            resource: "repo.source",
+            repo: projectId,
             node: baseUrl,
             revision: commit.id,
           }}>
diff --git a/src/views/projects/Cob/CobHeader.svelte b/src/views/repos/Cob/CobHeader.svelte
similarity index 100%
rename from src/views/projects/Cob/CobHeader.svelte
rename to src/views/repos/Cob/CobHeader.svelte
diff --git a/src/views/projects/Cob/Embeds.svelte b/src/views/repos/Cob/Embeds.svelte
similarity index 100%
rename from src/views/projects/Cob/Embeds.svelte
rename to src/views/repos/Cob/Embeds.svelte
diff --git a/src/views/projects/Cob/InlineLabels.svelte b/src/views/repos/Cob/InlineLabels.svelte
similarity index 100%
rename from src/views/projects/Cob/InlineLabels.svelte
rename to src/views/repos/Cob/InlineLabels.svelte
diff --git a/src/views/projects/Cob/Labels.svelte b/src/views/repos/Cob/Labels.svelte
similarity index 100%
rename from src/views/projects/Cob/Labels.svelte
rename to src/views/repos/Cob/Labels.svelte
diff --git a/src/views/projects/Cob/Reviews.svelte b/src/views/repos/Cob/Reviews.svelte
similarity index 94%
rename from src/views/projects/Cob/Reviews.svelte
rename to src/views/repos/Cob/Reviews.svelte
index a1ef6547fd..a8721b1b73 100644
--- a/src/views/projects/Cob/Reviews.svelte
+++ b/src/views/repos/Cob/Reviews.svelte
@@ -4,6 +4,7 @@
 
   import Icon from "@app/components/Icon.svelte";
   import NodeId from "@app/components/NodeId.svelte";
+  import { stripDidKeyPrefix } from "@app/lib/utils";
 
   export let baseUrl: BaseUrl;
   export let reviews: PatchReviews;
@@ -73,7 +74,7 @@
         </span>
         <NodeId
           {baseUrl}
-          nodeId={review.author.id}
+          nodeId={stripDidKeyPrefix(review.author.did)}
           alias={review.author.alias} />
       </div>
     {:else}
diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/repos/Cob/Revision.svelte
similarity index 96%
rename from src/views/projects/Cob/Revision.svelte
rename to src/views/repos/Cob/Revision.svelte
index 68e432aa87..51c0fe5b9b 100644
--- a/src/views/projects/Cob/Revision.svelte
+++ b/src/views/repos/Cob/Revision.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import type {
+    Author,
     BaseUrl,
     Comment,
     DiffResponse,
@@ -7,14 +8,14 @@
     Revision,
     Verdict,
   } from "@http-client";
-  import type { Timeline } from "@app/views/projects/Patch.svelte";
+  import type { Timeline } from "@app/views/repos/Patch.svelte";
 
   import * as utils from "@app/lib/utils";
   import { HttpdClient } from "@http-client";
-  import { cachedGetDiff } from "@app/views/projects/router";
+  import { cachedGetDiff } from "@app/views/repos/router";
   import { onMount } from "svelte";
 
-  import CobCommitTeaser from "@app/views/projects/Cob/CobCommitTeaser.svelte";
+  import CobCommitTeaser from "@app/views/repos/Cob/CobCommitTeaser.svelte";
   import CommentComponent from "@app/components/Comment.svelte";
   import DiffStatBadge from "@app/components/DiffStatBadge.svelte";
   import DropdownList from "@app/components/DropdownList.svelte";
@@ -44,7 +45,7 @@
   export let revisionOid: string;
   export let revisionTimestamp: number;
   export let revisionReactions: Comment["reactions"];
-  export let revisionAuthor: { id: string; alias?: string | undefined };
+  export let revisionAuthor: Author;
   export let revisionDescription: string;
   export let timelines: Timeline[];
   export let previousRevBase: string | undefined = undefined;
@@ -293,8 +294,8 @@
               fromCommit,
             )}..{utils.formatCommit(revisionOid)}"
             route={{
-              resource: "project.patch",
-              project: projectId,
+              resource: "repo.patch",
+              repo: projectId,
               node: baseUrl,
               patch: patchId,
               view: { name: "diff", fromCommit, toCommit: revisionOid },
@@ -329,8 +330,8 @@
                 revisionOid,
               )}"
               route={{
-                resource: "project.patch",
-                project: projectId,
+                resource: "repo.patch",
+                repo: projectId,
                 node: baseUrl,
                 patch: patchId,
                 view: {
@@ -386,7 +387,7 @@
             </div>
             <NodeId
               {baseUrl}
-              nodeId={revisionAuthor.id}
+              nodeId={utils.stripDidKeyPrefix(revisionAuthor.did)}
               alias={revisionAuthor.alias} />
             {#if patchId === revisionId}
               opened this patch on base
@@ -478,7 +479,7 @@
 
               <NodeId
                 {baseUrl}
-                nodeId={element.inner.author.id}
+                nodeId={utils.stripDidKeyPrefix(element.inner.author.did)}
                 alias={element.inner.author.alias}>
               </NodeId>
 
@@ -494,7 +495,7 @@
             </div>
           </div>
         {:else if element.type === "review"}
-          {@const [author, review] = element.inner}
+          {@const [authorDid, review] = element.inner}
           <div class="connector" />
           <div
             class="action"
@@ -505,7 +506,7 @@
               {baseUrl}
               id={review.id}
               rawPath={rawPath(revisionBase)}
-              authorId={author}
+              {authorDid}
               authorAlias={review.author.alias}
               timestamp={review.timestamp}
               body={review.summary ?? ""}>
diff --git a/src/views/projects/CommentCounter.svelte b/src/views/repos/CommentCounter.svelte
similarity index 100%
rename from src/views/projects/CommentCounter.svelte
rename to src/views/repos/CommentCounter.svelte
diff --git a/src/views/projects/Commit.svelte b/src/views/repos/Commit.svelte
similarity index 81%
rename from src/views/projects/Commit.svelte
rename to src/views/repos/Commit.svelte
index 3cc64dd41c..c3d8de2505 100644
--- a/src/views/projects/Commit.svelte
+++ b/src/views/repos/Commit.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-  import type { BaseUrl, Commit, Project, SeedingPolicy } from "@http-client";
+  import type { BaseUrl, Commit, Repo, SeedingPolicy } from "@http-client";
 
   import { formatObjectId } from "@app/lib/utils";
 
   import Button from "@app/components/Button.svelte";
-  import Changeset from "@app/views/projects/Changeset.svelte";
-  import CommitAuthorship from "@app/views/projects/Commit/CommitAuthorship.svelte";
+  import Changeset from "@app/views/repos/Changeset.svelte";
+  import CommitAuthorship from "@app/views/repos/Commit/CommitAuthorship.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
   import Layout from "./Layout.svelte";
   import Link from "@app/components/Link.svelte";
   import Separator from "./Separator.svelte";
@@ -17,7 +17,7 @@
   export let baseUrl: BaseUrl;
   export let seedingPolicy: SeedingPolicy;
   export let commit: Commit;
-  export let project: Project;
+  export let repo: Repo;
   export let nodeAvatarUrl: string | undefined;
 
   $: header = commit.commit;
@@ -49,13 +49,13 @@
   }
 </style>
 
-<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {project}>
+<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {repo}>
   <svelte:fragment slot="breadcrumb">
     <Separator />
     <Link
       route={{
-        resource: "project.history",
-        project: project.id,
+        resource: "repo.history",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Commits
@@ -78,8 +78,8 @@
           <div class="button-container">
             <Link
               route={{
-                resource: "project.source",
-                project: project.id,
+                resource: "repo.source",
+                repo: repo.rid,
                 node: baseUrl,
                 path: "/",
                 revision: commit.commit.id,
@@ -101,7 +101,7 @@
     </div>
     <Changeset
       {baseUrl}
-      projectId={project.id}
+      projectId={repo.rid}
       files={commit.files}
       diff={commit.diff}
       revision={commit.commit.id} />
diff --git a/src/views/projects/Commit/CommitAuthorship.svelte b/src/views/repos/Commit/CommitAuthorship.svelte
similarity index 100%
rename from src/views/projects/Commit/CommitAuthorship.svelte
rename to src/views/repos/Commit/CommitAuthorship.svelte
diff --git a/src/views/projects/Commit/CommitTeaser.svelte b/src/views/repos/Commit/CommitTeaser.svelte
similarity index 92%
rename from src/views/projects/Commit/CommitTeaser.svelte
rename to src/views/repos/Commit/CommitTeaser.svelte
index fbae9cf18f..1f1130eaa2 100644
--- a/src/views/projects/Commit/CommitTeaser.svelte
+++ b/src/views/repos/Commit/CommitTeaser.svelte
@@ -7,7 +7,7 @@
   import ExpandButton from "@app/components/ExpandButton.svelte";
   import IconButton from "@app/components/IconButton.svelte";
   import Icon from "@app/components/Icon.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
   import Link from "@app/components/Link.svelte";
   import Id from "@app/components/Id.svelte";
 
@@ -79,8 +79,8 @@
     <div class="message">
       <Link
         route={{
-          resource: "project.commit",
-          project: projectId,
+          resource: "repo.commit",
+          repo: projectId,
           node: baseUrl,
           commit: commit.id,
         }}>
@@ -112,8 +112,8 @@
       <IconButton title="Browse repo at this commit">
         <Link
           route={{
-            resource: "project.source",
-            project: projectId,
+            resource: "repo.source",
+            repo: projectId,
             node: baseUrl,
             revision: commit.id,
           }}>
diff --git a/src/views/projects/DiffStatBadgeLoader.svelte b/src/views/repos/DiffStatBadgeLoader.svelte
similarity index 89%
rename from src/views/projects/DiffStatBadgeLoader.svelte
rename to src/views/repos/DiffStatBadgeLoader.svelte
index 3db848c466..cc4122e47b 100644
--- a/src/views/projects/DiffStatBadgeLoader.svelte
+++ b/src/views/repos/DiffStatBadgeLoader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { BaseUrl, Patch, Revision } from "@http-client";
 
-  import { cachedGetDiff } from "@app/views/projects/router";
+  import { cachedGetDiff } from "@app/views/repos/router";
   import { formatCommit } from "@app/lib/utils";
 
   import DiffStatBadge from "@app/components/DiffStatBadge.svelte";
@@ -22,8 +22,8 @@
       latestRevision.oid,
     )}"
     route={{
-      resource: "project.patch",
-      project: projectId,
+      resource: "repo.patch",
+      repo: projectId,
       node: baseUrl,
       patch: patch.id,
       view: {
diff --git a/src/views/projects/Header.svelte b/src/views/repos/Header.svelte
similarity index 87%
rename from src/views/projects/Header.svelte
rename to src/views/repos/Header.svelte
index 8d4202567c..00db3eb4e1 100644
--- a/src/views/projects/Header.svelte
+++ b/src/views/repos/Header.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <script lang="ts">
-  import type { BaseUrl, Project } from "@http-client";
+  import type { BaseUrl, Repo } from "@http-client";
 
   import Link from "@app/components/Link.svelte";
   import Button from "@app/components/Button.svelte";
@@ -11,7 +11,7 @@
 
   export let baseUrl: BaseUrl;
   export let activeTab: ActiveTab = undefined;
-  export let project: Project;
+  export let repo: Repo;
 </script>
 
 <style>
@@ -49,8 +49,8 @@
 <div class="container">
   <Link
     route={{
-      resource: "project.source",
-      project: project.id,
+      resource: "repo.source",
+      repo: repo.rid,
       node: baseUrl,
       path: "/",
     }}>
@@ -65,8 +65,8 @@
   </Link>
   <Link
     route={{
-      resource: "project.issues",
-      project: project.id,
+      resource: "repo.issues",
+      repo: repo.rid,
       node: baseUrl,
     }}>
     <Button
@@ -82,7 +82,7 @@
           class="counter"
           class:selected={activeTab === "issues"}
           class:hover={hover && activeTab !== "issues"}>
-          {project.issues.open}
+          {repo.issues.open}
         </span>
       </div>
     </Button>
@@ -90,8 +90,8 @@
 
   <Link
     route={{
-      resource: "project.patches",
-      project: project.id,
+      resource: "repo.patches",
+      repo: repo.rid,
       node: baseUrl,
     }}>
     <Button
@@ -107,7 +107,7 @@
           class="counter"
           class:hover={hover && activeTab !== "patches"}
           class:selected={activeTab === "patches"}>
-          {project.patches.open}
+          {repo.patches.open}
         </span>
       </div>
     </Button>
diff --git a/src/views/projects/Header/CloneButton.svelte b/src/views/repos/Header/CloneButton.svelte
similarity index 100%
rename from src/views/projects/Header/CloneButton.svelte
rename to src/views/repos/Header/CloneButton.svelte
diff --git a/src/views/projects/Header/SeedButton.svelte b/src/views/repos/Header/SeedButton.svelte
similarity index 100%
rename from src/views/projects/Header/SeedButton.svelte
rename to src/views/repos/Header/SeedButton.svelte
diff --git a/src/views/projects/History.svelte b/src/views/repos/History.svelte
similarity index 87%
rename from src/views/projects/History.svelte
rename to src/views/repos/History.svelte
index 3e92055b2d..eadf66c96f 100644
--- a/src/views/projects/History.svelte
+++ b/src/views/repos/History.svelte
@@ -2,7 +2,7 @@
   import type {
     BaseUrl,
     CommitHeader,
-    Project,
+    Repo,
     Remote,
     SeedingPolicy,
     Tree,
@@ -31,7 +31,7 @@
   export let commitHeaders: CommitHeader[];
   export let peer: string | undefined;
   export let peers: Remote[];
-  export let project: Project;
+  export let repo: Repo;
   export let revision: string | undefined;
   export let tree: Tree;
   export let nodeAvatarUrl: string | undefined;
@@ -45,10 +45,10 @@
   let allCommitHeaders: CommitHeader[];
 
   $: baseRoute = {
-    resource: "project.history",
+    resource: "repo.history",
     node: baseUrl,
-    project: project.id,
-  } as Extract<ProjectRoute, { resource: "project.history" }>;
+    repo: repo.rid,
+  } as Extract<ProjectRoute, { resource: "repo.history" }>;
   $: {
     allCommitHeaders = commitHeaders;
     page = 0;
@@ -58,7 +58,7 @@
     loading = true;
     page += 1;
     try {
-      const response = await api.project.getAllCommits(project.id, {
+      const response = await api.repo.getAllCommits(repo.rid, {
         parent: allCommitHeaders[0].id,
         page,
         perPage: config.source.commitsPerPage,
@@ -92,19 +92,19 @@
   }
 </style>
 
-<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {project} activeTab="source">
+<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {repo} activeTab="source">
   <svelte:fragment slot="breadcrumb">
     <Separator />
     <Link
       route={{
-        resource: "project.history",
-        project: project.id,
+        resource: "repo.history",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Commits
     </Link>
   </svelte:fragment>
-  <ProjectNameHeader {project} {baseUrl} slot="header" />
+  <ProjectNameHeader {repo} {baseUrl} slot="header" />
 
   <div style:margin="1rem" slot="subheader">
     <Header
@@ -112,7 +112,7 @@
       {commit}
       {peers}
       {peer}
-      {project}
+      {repo}
       {revision}
       {tree}
       node={baseUrl}
@@ -127,14 +127,14 @@
         <CommitTeaser
           slot="item"
           let:item
-          projectId={project.id}
+          projectId={repo.rid}
           {baseUrl}
           commit={item} />
       </List>
     {/each}
   </div>
 
-  {#await api.project.getTreeStatsBySha(project.id, commit)}
+  {#await api.repo.getTreeStatsBySha(repo.rid, commit)}
     <div class="more">
       <Loading small center />
     </div>
diff --git a/src/views/projects/Issue.svelte b/src/views/repos/Issue.svelte
similarity index 90%
rename from src/views/projects/Issue.svelte
rename to src/views/repos/Issue.svelte
index aa2460d159..719835e1e2 100644
--- a/src/views/projects/Issue.svelte
+++ b/src/views/repos/Issue.svelte
@@ -1,32 +1,32 @@
 <script lang="ts">
-  import type { BaseUrl, Issue, Project, SeedingPolicy } from "@http-client";
+  import type { BaseUrl, Issue, Repo, SeedingPolicy } from "@http-client";
 
   import capitalize from "lodash/capitalize";
   import uniqBy from "lodash/uniqBy";
 
   import * as utils from "@app/lib/utils";
 
-  import Assignees from "@app/views/projects/Cob/Assignees.svelte";
+  import Assignees from "@app/views/repos/Cob/Assignees.svelte";
   import Badge from "@app/components/Badge.svelte";
-  import CobHeader from "@app/views/projects/Cob/CobHeader.svelte";
-  import Embeds from "@app/views/projects/Cob/Embeds.svelte";
+  import CobHeader from "@app/views/repos/Cob/CobHeader.svelte";
+  import Embeds from "@app/views/repos/Cob/Embeds.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
-  import Labels from "@app/views/projects/Cob/Labels.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
+  import Labels from "@app/views/repos/Cob/Labels.svelte";
   import Layout from "./Layout.svelte";
   import Link from "@app/components/Link.svelte";
   import Markdown from "@app/components/Markdown.svelte";
   import NodeId from "@app/components/NodeId.svelte";
   import Reactions from "@app/components/Reactions.svelte";
   import Separator from "./Separator.svelte";
-  import Share from "@app/views/projects/Share.svelte";
+  import Share from "@app/views/repos/Share.svelte";
   import ThreadComponent from "@app/components/Thread.svelte";
 
   export let baseUrl: BaseUrl;
   export let seedingPolicy: SeedingPolicy;
   export let issue: Issue;
-  export let project: Project;
+  export let repo: Repo;
   export let rawPath: (commit?: string) => string;
   export let nodeAvatarUrl: string | undefined;
 
@@ -128,7 +128,7 @@
 <Layout
   {baseUrl}
   {nodeAvatarUrl}
-  {project}
+  {repo}
   {seedingPolicy}
   activeTab="issues"
   stylePaddingBottom="0">
@@ -136,8 +136,8 @@
     <Separator />
     <Link
       route={{
-        resource: "project.issues",
-        project: project.id,
+        resource: "repo.issues",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Issues
@@ -183,7 +183,7 @@
           {/if}
           <NodeId
             {baseUrl}
-            nodeId={issue.author.id}
+            nodeId={utils.stripDidKeyPrefix(issue.author.did)}
             alias={issue.author.alias} />
           opened
           <Id id={issue.id} />
@@ -215,7 +215,7 @@
             <Markdown
               breaks
               content={issue.discussion[0].body}
-              rawPath={rawPath(project.head)} />
+              rawPath={rawPath(repo.head)} />
           {:else}
             <span class="txt-missing">No description</span>
           {/if}
@@ -234,7 +234,7 @@
               <ThreadComponent
                 {baseUrl}
                 {thread}
-                rawPath={rawPath(project.head)} />
+                rawPath={rawPath(repo.head)} />
               {#if i < threads.length - 1}
                 <div class="connector" />
               {/if}
diff --git a/src/views/projects/Issue/IssueTeaser.svelte b/src/views/repos/Issue/IssueTeaser.svelte
similarity index 89%
rename from src/views/projects/Issue/IssueTeaser.svelte
rename to src/views/repos/Issue/IssueTeaser.svelte
index 9c423f191d..ae8c652ed9 100644
--- a/src/views/projects/Issue/IssueTeaser.svelte
+++ b/src/views/repos/Issue/IssueTeaser.svelte
@@ -1,13 +1,17 @@
 <script lang="ts">
   import type { BaseUrl, Issue } from "@http-client";
 
-  import { absoluteTimestamp, formatTimestamp } from "@app/lib/utils";
+  import {
+    absoluteTimestamp,
+    formatTimestamp,
+    stripDidKeyPrefix,
+  } from "@app/lib/utils";
 
   import CommentCounter from "../CommentCounter.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
   import InlineLabels from "../Cob/InlineLabels.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
   import Link from "@app/components/Link.svelte";
   import NodeId from "@app/components/NodeId.svelte";
 
@@ -84,8 +88,8 @@
         <Link
           styleHoverState
           route={{
-            resource: "project.issue",
-            project: projectId,
+            resource: "repo.issue",
+            repo: projectId,
             node: baseUrl,
             issue: issue.id,
           }}>
@@ -119,7 +123,10 @@
       {/if}
       <div
         style="display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap;">
-        <NodeId {baseUrl} nodeId={issue.author.id} alias={issue.author.alias} />
+        <NodeId
+          {baseUrl}
+          nodeId={stripDidKeyPrefix(issue.author.did)}
+          alias={issue.author.alias} />
         opened
         <Id id={issue.id} />
         <span title={absoluteTimestamp(issue.discussion[0].timestamp)}>
diff --git a/src/views/projects/Issues.svelte b/src/views/repos/Issues.svelte
similarity index 89%
rename from src/views/projects/Issues.svelte
rename to src/views/repos/Issues.svelte
index 2c5bb1b611..776220375c 100644
--- a/src/views/projects/Issues.svelte
+++ b/src/views/repos/Issues.svelte
@@ -3,7 +3,7 @@
     BaseUrl,
     Issue,
     IssueState,
-    Project,
+    Repo,
     SeedingPolicy,
   } from "@http-client";
 
@@ -18,7 +18,7 @@
   import DropdownListItem from "@app/components/DropdownList/DropdownListItem.svelte";
   import ErrorMessage from "@app/components/ErrorMessage.svelte";
   import Icon from "@app/components/Icon.svelte";
-  import IssueTeaser from "@app/views/projects/Issue/IssueTeaser.svelte";
+  import IssueTeaser from "@app/views/repos/Issue/IssueTeaser.svelte";
   import Layout from "./Layout.svelte";
   import Link from "@app/components/Link.svelte";
   import List from "@app/components/List.svelte";
@@ -31,7 +31,7 @@
   export let baseUrl: BaseUrl;
   export let seedingPolicy: SeedingPolicy;
   export let issues: Issue[];
-  export let project: Project;
+  export let repo: Repo;
   export let status: IssueState["status"];
   export let nodeAvatarUrl: string | undefined;
 
@@ -52,7 +52,7 @@
     loading = true;
     page += 1;
     try {
-      const response = await api.project.getAllIssues(project.id, {
+      const response = await api.repo.getAllIssues(repo.rid, {
         status,
         page,
         perPage: ISSUES_PER_PAGE,
@@ -72,7 +72,7 @@
   };
 
   $: showMoreButton =
-    !loading && !error && allIssues.length < project.issues[status];
+    !loading && !error && allIssues.length < repo.issues[status];
 </script>
 
 <style>
@@ -117,13 +117,13 @@
   }
 </style>
 
-<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {project} activeTab="issues">
+<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {repo} activeTab="issues">
   <svelte:fragment slot="breadcrumb">
     <Separator />
     <Link
       route={{
-        resource: "project.issues",
-        project: project.id,
+        resource: "repo.issues",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Issues
@@ -146,7 +146,7 @@
         </div>
         {capitalize(status)}
         <div class="dropdown-button-counter">
-          {project.issues[status]}
+          {repo.issues[status]}
         </div>
         <Icon name={expanded ? "chevron-up" : "chevron-down"} />
       </Button>
@@ -157,8 +157,8 @@
           slot="item"
           let:item
           route={{
-            resource: "project.issues",
-            project: project.id,
+            resource: "repo.issues",
+            repo: repo.rid,
             node: baseUrl,
             status: item,
           }}>
@@ -172,7 +172,7 @@
               <div
                 class="dropdown-list-counter"
                 class:selected={item === status}>
-                {project.issues[item]}
+                {repo.issues[item]}
               </div>
             </div>
           </DropdownListItem>
@@ -188,7 +188,7 @@
       slot="item"
       let:item
       {baseUrl}
-      projectId={project.id}
+      projectId={repo.rid}
       issue={item} />
   </List>
 
@@ -201,7 +201,7 @@
       {error} />
   {/if}
 
-  {#if project.issues[status] === 0}
+  {#if repo.issues[status] === 0}
     <div class="placeholder">
       <Placeholder iconName="no-issues" caption={`No ${status} issues`} />
     </div>
diff --git a/src/views/projects/Layout.svelte b/src/views/repos/Layout.svelte
similarity index 85%
rename from src/views/projects/Layout.svelte
rename to src/views/repos/Layout.svelte
index af4fd47d93..09238d46bb 100644
--- a/src/views/projects/Layout.svelte
+++ b/src/views/repos/Layout.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Project, SeedingPolicy } from "@http-client";
+  import type { BaseUrl, Repo, SeedingPolicy } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Link from "@app/components/Link.svelte";
   import MobileFooter from "@app/App/MobileFooter.svelte";
   import Separator from "./Separator.svelte";
-  import Sidebar from "@app/views/projects/Sidebar.svelte";
+  import Sidebar from "@app/views/repos/Sidebar.svelte";
 
   export let activeTab: ActiveTab | undefined = undefined;
   export let seedingPolicy: SeedingPolicy;
   export let baseUrl: BaseUrl;
-  export let project: Project;
+  export let repo: Repo;
   export let stylePaddingBottom: string = "2.5rem";
   export let nodeAvatarUrl: string | undefined;
 </script>
@@ -126,15 +126,15 @@
 
         <Separator />
 
-        <span class="breadcrumb" title={project.id}>
+        <span class="breadcrumb" title={repo.rid}>
           <Link
             route={{
-              resource: "project.source",
-              project: project.id,
+              resource: "repo.source",
+              repo: repo.rid,
               node: baseUrl,
             }}>
             <div class="breadcrumb">
-              {project.name}
+              {repo["xyz.radicle.project"].name}
             </div>
           </Link>
         </span>
@@ -157,11 +157,11 @@
   </div>
 
   <div class="sidebar global-hide-on-medium-desktop-down">
-    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {project} />
+    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {repo} />
   </div>
 
   <div class="sidebar global-hide-on-mobile-down global-hide-on-desktop-up">
-    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {project} collapsedOnly />
+    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {repo} collapsedOnly />
   </div>
 
   <div class="content" style:padding-bottom={stylePaddingBottom}>
@@ -176,8 +176,8 @@
         <Link
           title="Home"
           route={{
-            resource: "project.source",
-            project: project.id,
+            resource: "repo.source",
+            repo: repo.rid,
             node: baseUrl,
             path: "/",
           }}>
@@ -191,10 +191,10 @@
 
       <div style:width="100%">
         <Link
-          title={`${project.issues.open} Issues`}
+          title={`${repo.issues.open} Issues`}
           route={{
-            resource: "project.issues",
-            project: project.id,
+            resource: "repo.issues",
+            repo: repo.rid,
             node: baseUrl,
           }}>
           <Button
@@ -207,10 +207,10 @@
 
       <div style:width="100%">
         <Link
-          title={`${project.patches.open} Patches`}
+          title={`${repo.patches.open} Patches`}
           route={{
-            resource: "project.patches",
-            project: project.id,
+            resource: "repo.patches",
+            repo: repo.rid,
             node: baseUrl,
           }}>
           <Button
diff --git a/src/views/projects/Patch.svelte b/src/views/repos/Patch.svelte
similarity index 89%
rename from src/views/projects/Patch.svelte
rename to src/views/repos/Patch.svelte
index 6accee9a8b..33299e8dd8 100644
--- a/src/views/projects/Patch.svelte
+++ b/src/views/repos/Patch.svelte
@@ -1,9 +1,10 @@
 <script lang="ts" context="module">
   import type {
+    Author,
     Comment,
     Review,
     Merge,
-    Project,
+    Repo,
     Revision,
     Diff,
     SeedingPolicy,
@@ -51,35 +52,35 @@
 
   import Badge from "@app/components/Badge.svelte";
   import Button from "@app/components/Button.svelte";
-  import Changeset from "@app/views/projects/Changeset.svelte";
-  import CheckoutButton from "@app/views/projects/Patch/CheckoutButton.svelte";
-  import CobHeader from "@app/views/projects/Cob/CobHeader.svelte";
-  import CompareButton from "@app/views/projects/Patch/CompareButton.svelte";
+  import Changeset from "@app/views/repos/Changeset.svelte";
+  import CheckoutButton from "@app/views/repos/Patch/CheckoutButton.svelte";
+  import CobHeader from "@app/views/repos/Cob/CobHeader.svelte";
+  import CompareButton from "@app/views/repos/Patch/CompareButton.svelte";
   import DiffStatBadge from "@app/components/DiffStatBadge.svelte";
-  import Embeds from "@app/views/projects/Cob/Embeds.svelte";
+  import Embeds from "@app/views/repos/Cob/Embeds.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
-  import Labels from "@app/views/projects/Cob/Labels.svelte";
-  import Layout from "@app/views/projects/Layout.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
+  import Labels from "@app/views/repos/Cob/Labels.svelte";
+  import Layout from "@app/views/repos/Layout.svelte";
   import Link from "@app/components/Link.svelte";
   import Markdown from "@app/components/Markdown.svelte";
   import NodeId from "@app/components/NodeId.svelte";
   import Placeholder from "@app/components/Placeholder.svelte";
   import Radio from "@app/components/Radio.svelte";
   import Reactions from "@app/components/Reactions.svelte";
-  import Reviews from "@app/views/projects/Cob/Reviews.svelte";
-  import RevisionComponent from "@app/views/projects/Cob/Revision.svelte";
-  import RevisionSelector from "@app/views/projects/Patch/RevisionSelector.svelte";
+  import Reviews from "@app/views/repos/Cob/Reviews.svelte";
+  import RevisionComponent from "@app/views/repos/Cob/Revision.svelte";
+  import RevisionSelector from "@app/views/repos/Patch/RevisionSelector.svelte";
   import Separator from "./Separator.svelte";
-  import Share from "@app/views/projects/Share.svelte";
+  import Share from "@app/views/repos/Share.svelte";
 
   export let baseUrl: BaseUrl;
   export let seedingPolicy: SeedingPolicy;
   export let patch: Patch;
   export let stats: Diff["stats"];
   export let rawPath: (commit?: string) => string;
-  export let project: Project;
+  export let repo: Repo;
   export let view: PatchView;
   export let nodeAvatarUrl: string | undefined;
 
@@ -102,8 +103,8 @@
   let tabs: Record<Tab, { icon: ComponentProps<Icon>["name"]; route: Route }>;
   $: {
     const baseRoute = {
-      resource: "project.patch",
-      project: project.id,
+      resource: "repo.patch",
+      repo: repo.rid,
       node: baseUrl,
       patch: patch.id,
     } as const;
@@ -136,7 +137,7 @@
     patch.revisions.forEach((rev, i) => {
       const latest = i === patch.revisions.length - 1;
       for (const review of rev.reviews) {
-        patchReviews[review.author.id] = { latest, review };
+        patchReviews[review.author.did] = { latest, review };
       }
     });
 
@@ -168,7 +169,7 @@
         revisionOid: string;
         revisionEdits: Revision["edits"];
         revisionReactions: Revision["reactions"];
-        revisionAuthor: { id: string; alias?: string | undefined };
+        revisionAuthor: Author;
         revisionDescription: string;
       },
       Timeline[],
@@ -188,7 +189,7 @@
       ...rev.reviews.map<TimelineReview>(review => ({
         timestamp: review.timestamp,
         type: "review",
-        inner: [review.author.id, review],
+        inner: [review.author.did, review],
       })),
       ...patch.merges
         .filter(merge => merge.revision === rev.id)
@@ -294,7 +295,7 @@
 
 <Layout
   {baseUrl}
-  {project}
+  {repo}
   {nodeAvatarUrl}
   {seedingPolicy}
   activeTab="patches"
@@ -303,8 +304,8 @@
     <Separator />
     <Link
       route={{
-        resource: "project.patches",
-        project: project.id,
+        resource: "repo.patches",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Patches
@@ -344,8 +345,8 @@
           </Badge>
           <Link
             route={{
-              resource: "project.patch",
-              project: project.id,
+              resource: "repo.patch",
+              repo: repo.rid,
               node: baseUrl,
               patch: patch.id,
               view: { name: "changes", revision: latestRevision.id },
@@ -357,7 +358,7 @@
           </Link>
           <NodeId
             {baseUrl}
-            nodeId={patch.author.id}
+            nodeId={utils.stripDidKeyPrefix(patch.author.did)}
             alias={patch.author.alias} />
           opened
           <Id id={patch.id} />
@@ -423,7 +424,7 @@
           <div
             class="global-hide-on-mobile-down"
             style="margin-left: auto; margin-top: -0.5rem;">
-            <RevisionSelector {view} {baseUrl} {patch} {project} />
+            <RevisionSelector {view} {baseUrl} {patch} {repo} />
           </div>
         {/if}
         {#if view.name === "diff"}
@@ -446,7 +447,7 @@
             style:padding="0 1rem"
             style:display="flex"
             class="global-hide-on-small-desktop-up">
-            <RevisionSelector {view} {baseUrl} {patch} {project} />
+            <RevisionSelector {view} {baseUrl} {patch} {repo} />
           </div>
         {/if}
         {#if view.name === "diff"}
@@ -461,7 +462,7 @@
           </div>
           <Changeset
             {baseUrl}
-            projectId={project.id}
+            projectId={repo.rid}
             revision={view.toCommit}
             files={view.files}
             diff={view.diff} />
@@ -472,7 +473,7 @@
             <RevisionComponent
               {baseUrl}
               {rawPath}
-              projectId={project.id}
+              projectId={repo.rid}
               {timelines}
               {...revision}
               first={index === 0}
@@ -492,7 +493,7 @@
         {:else if view.name === "changes"}
           <Changeset
             {baseUrl}
-            projectId={project.id}
+            projectId={repo.rid}
             revision={view.oid}
             files={view.files}
             diff={view.diff} />
diff --git a/src/views/projects/Patch/CheckoutButton.svelte b/src/views/repos/Patch/CheckoutButton.svelte
similarity index 100%
rename from src/views/projects/Patch/CheckoutButton.svelte
rename to src/views/repos/Patch/CheckoutButton.svelte
diff --git a/src/views/projects/Patch/CompareButton.svelte b/src/views/repos/Patch/CompareButton.svelte
similarity index 100%
rename from src/views/projects/Patch/CompareButton.svelte
rename to src/views/repos/Patch/CompareButton.svelte
diff --git a/src/views/projects/Patch/PatchTeaser.svelte b/src/views/repos/Patch/PatchTeaser.svelte
similarity index 91%
rename from src/views/projects/Patch/PatchTeaser.svelte
rename to src/views/repos/Patch/PatchTeaser.svelte
index 344d668a72..92c9820f0a 100644
--- a/src/views/projects/Patch/PatchTeaser.svelte
+++ b/src/views/repos/Patch/PatchTeaser.svelte
@@ -2,14 +2,18 @@
   import type { BaseUrl } from "@http-client";
   import type { Patch } from "@http-client";
 
-  import { absoluteTimestamp, formatTimestamp } from "@app/lib/utils";
+  import {
+    absoluteTimestamp,
+    formatNodeId,
+    formatTimestamp,
+  } from "@app/lib/utils";
 
   import CommentCounter from "../CommentCounter.svelte";
   import DiffStatBadgeLoader from "../DiffStatBadgeLoader.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
-  import InlineLabels from "@app/views/projects/Cob/InlineLabels.svelte";
-  import InlineTitle from "@app/views/projects/components/InlineTitle.svelte";
+  import InlineLabels from "@app/views/repos/Cob/InlineLabels.svelte";
+  import InlineTitle from "@app/views/repos/components/InlineTitle.svelte";
   import Link from "@app/components/Link.svelte";
   import NodeId from "@app/components/NodeId.svelte";
 
@@ -99,8 +103,8 @@
       <Link
         styleHoverState
         route={{
-          resource: "project.patch",
-          project: projectId,
+          resource: "repo.patch",
+          repo: projectId,
           node: baseUrl,
           patch: patch.id,
         }}>
@@ -135,7 +139,7 @@
           style="display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap;">
           <NodeId
             {baseUrl}
-            nodeId={patch.author.id}
+            nodeId={formatNodeId(patch.author.did)}
             alias={patch.author.alias} />
           {patch.revisions.length > 1 ? "updated" : "opened"}
           <Id id={patch.id} />
diff --git a/src/views/projects/Patch/RevisionSelector.svelte b/src/views/repos/Patch/RevisionSelector.svelte
similarity index 93%
rename from src/views/projects/Patch/RevisionSelector.svelte
rename to src/views/repos/Patch/RevisionSelector.svelte
index b77cc55188..db0eb1ea97 100644
--- a/src/views/projects/Patch/RevisionSelector.svelte
+++ b/src/views/repos/Patch/RevisionSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { PatchView } from "../router";
-  import type { BaseUrl, Patch, Project } from "@http-client";
+  import type { BaseUrl, Patch, Repo } from "@http-client";
   import * as utils from "@app/lib/utils";
 
   import Button from "@app/components/Button.svelte";
@@ -14,7 +14,7 @@
   export let view: Extract<PatchView, { name: "changes" }>;
   export let baseUrl: BaseUrl;
   export let patch: Patch;
-  export let project: Project;
+  export let repo: Repo;
 </script>
 
 <Popover
@@ -48,8 +48,8 @@
       <Link
         on:afterNavigate={closeFocused}
         route={{
-          resource: "project.patch",
-          project: project.id,
+          resource: "repo.patch",
+          repo: repo.rid,
           node: baseUrl,
           patch: patch.id,
           view: {
diff --git a/src/views/projects/Patches.svelte b/src/views/repos/Patches.svelte
similarity index 91%
rename from src/views/projects/Patches.svelte
rename to src/views/repos/Patches.svelte
index d0b42bf612..c6a2c4abcc 100644
--- a/src/views/projects/Patches.svelte
+++ b/src/views/repos/Patches.svelte
@@ -3,7 +3,7 @@
     BaseUrl,
     Patch,
     PatchState,
-    Project,
+    Repo,
     SeedingPolicy,
   } from "@http-client";
 
@@ -31,7 +31,7 @@
   export let baseUrl: BaseUrl;
   export let seedingPolicy: SeedingPolicy;
   export let patches: Patch[];
-  export let project: Project;
+  export let repo: Repo;
   export let status: PatchState["status"];
   export let nodeAvatarUrl: string | undefined;
 
@@ -52,7 +52,7 @@
     loading = true;
     page += 1;
     try {
-      const response = await api.project.getAllPatches(project.id, {
+      const response = await api.repo.getAllPatches(repo.rid, {
         status,
         page,
         perPage: PATCHES_PER_PAGE,
@@ -80,7 +80,7 @@
   };
 
   $: showMoreButton =
-    !loading && !error && allPatches.length < project.patches[status];
+    !loading && !error && allPatches.length < repo.patches[status];
 </script>
 
 <style>
@@ -125,13 +125,13 @@
   }
 </style>
 
-<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {project} activeTab="patches">
+<Layout {nodeAvatarUrl} {seedingPolicy} {baseUrl} {repo} activeTab="patches">
   <svelte:fragment slot="breadcrumb">
     <Separator />
     <Link
       route={{
-        resource: "project.patches",
-        project: project.id,
+        resource: "repo.patches",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       Patches
@@ -154,7 +154,7 @@
         </div>
         {capitalize(status)}
         <div class="dropdown-button-counter">
-          {project.patches[status]}
+          {repo.patches[status]}
         </div>
         <Icon name={expanded ? "chevron-up" : "chevron-down"} />
       </Button>
@@ -164,8 +164,8 @@
           let:item
           on:afterNavigate={() => closeFocused()}
           route={{
-            resource: "project.patches",
-            project: project.id,
+            resource: "repo.patches",
+            repo: repo.rid,
             node: baseUrl,
             search: `status=${item}`,
           }}>
@@ -179,7 +179,7 @@
               <div
                 class="dropdown-list-counter"
                 class:selected={item === status}>
-                {project.patches[item]}
+                {repo.patches[item]}
               </div>
             </div>
           </DropdownListItem>
@@ -195,7 +195,7 @@
       slot="item"
       let:item
       {baseUrl}
-      projectId={project.id}
+      projectId={repo.rid}
       patch={item} />
   </List>
 
@@ -208,7 +208,7 @@
       {error} />
   {/if}
 
-  {#if project.patches[status] === 0}
+  {#if repo.patches[status] === 0}
     <div class="placeholder">
       <Placeholder iconName="no-patches" caption={`No ${status} patches`} />
     </div>
diff --git a/src/views/projects/Separator.svelte b/src/views/repos/Separator.svelte
similarity index 100%
rename from src/views/projects/Separator.svelte
rename to src/views/repos/Separator.svelte
diff --git a/src/views/projects/Share.svelte b/src/views/repos/Share.svelte
similarity index 100%
rename from src/views/projects/Share.svelte
rename to src/views/repos/Share.svelte
diff --git a/src/views/projects/Sidebar.svelte b/src/views/repos/Sidebar.svelte
similarity index 91%
rename from src/views/projects/Sidebar.svelte
rename to src/views/repos/Sidebar.svelte
index f05e753294..1afa773b16 100644
--- a/src/views/projects/Sidebar.svelte
+++ b/src/views/repos/Sidebar.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Project, SeedingPolicy } from "@http-client";
+  import type { BaseUrl, Repo, SeedingPolicy } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
-  import ContextRepo from "@app/views/projects/Sidebar/ContextRepo.svelte";
+  import ContextRepo from "@app/views/repos/Sidebar/ContextRepo.svelte";
   import Help from "@app/App/Help.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Link from "@app/components/Link.svelte";
@@ -15,7 +15,7 @@
   export let activeTab: ActiveTab | undefined = undefined;
   export let seedingPolicy: SeedingPolicy;
   export let baseUrl: BaseUrl;
-  export let project: Project;
+  export let repo: Repo;
   export let collapsedOnly = false;
 
   let expanded = collapsedOnly ? false : loadSidebarState();
@@ -64,7 +64,7 @@
   .sidebar.expanded {
     width: 22.5rem;
   }
-  .project-navigation {
+  .repo-navigation {
     display: flex;
     flex-direction: column;
     gap: 0.25rem;
@@ -163,12 +163,12 @@
 
 <div class="sidebar" class:expanded>
   <!-- Top Navigation Items -->
-  <div class="project-navigation">
+  <div class="repo-navigation">
     <Link
       title="Source"
       route={{
-        resource: "project.source",
-        project: project.id,
+        resource: "repo.source",
+        repo: repo.rid,
         node: baseUrl,
         path: "/",
       }}>
@@ -183,10 +183,10 @@
       </Button>
     </Link>
     <Link
-      title={`${project.issues.open} Issues`}
+      title={`${repo.issues.open} Issues`}
       route={{
-        resource: "project.issues",
-        project: project.id,
+        resource: "repo.issues",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       <Button
@@ -203,17 +203,17 @@
             class="counter"
             class:selected={activeTab === "issues"}
             class:hover={hover && activeTab !== "issues"}>
-            {project.issues.open}
+            {repo.issues.open}
           </span>
         </div>
       </Button>
     </Link>
 
     <Link
-      title={`${project.patches.open} Patches`}
+      title={`${repo.patches.open} Patches`}
       route={{
-        resource: "project.patches",
-        project: project.id,
+        resource: "repo.patches",
+        repo: repo.rid,
         node: baseUrl,
       }}>
       <Button
@@ -230,7 +230,7 @@
             class="counter"
             class:hover={hover && activeTab !== "patches"}
             class:selected={activeTab === "patches"}>
-            {project.patches.open}
+            {repo.patches.open}
           </span>
         </div>
       </Button>
@@ -241,8 +241,8 @@
     <div class="repo box" class:expanded>
       <ContextRepo
         {baseUrl}
-        projectThreshold={project.threshold}
-        projectDelegates={project.delegates}
+        projectThreshold={repo.threshold}
+        projectDelegates={repo.delegates}
         {seedingPolicy} />
     </div>
     <div class="vertical-buttons" class:expanded style:gap="0.5rem">
@@ -288,8 +288,8 @@
         <div slot="popover" class="txt-small" style:width="18rem">
           <ContextRepo
             {baseUrl}
-            projectThreshold={project.threshold}
-            projectDelegates={project.delegates}
+            projectThreshold={repo.threshold}
+            projectDelegates={repo.delegates}
             {seedingPolicy} />
         </div>
       </Popover>
diff --git a/src/views/projects/Sidebar/ContextRepo.svelte b/src/views/repos/Sidebar/ContextRepo.svelte
similarity index 89%
rename from src/views/projects/Sidebar/ContextRepo.svelte
rename to src/views/repos/Sidebar/ContextRepo.svelte
index 2f83e96186..2a3e4409e1 100644
--- a/src/views/projects/Sidebar/ContextRepo.svelte
+++ b/src/views/repos/Sidebar/ContextRepo.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
-  import type { BaseUrl, Project, SeedingPolicy } from "@http-client";
+  import type { BaseUrl, Repo, SeedingPolicy } from "@http-client";
 
   import capitalize from "lodash/capitalize";
 
   import IconButton from "@app/components/IconButton.svelte";
   import Icon from "@app/components/Icon.svelte";
   import NodeId from "@app/components/NodeId.svelte";
+  import { stripDidKeyPrefix } from "@app/lib/utils";
 
   export let baseUrl: BaseUrl;
   export let projectThreshold: number;
-  export let projectDelegates: Project["delegates"];
+  export let projectDelegates: Repo["delegates"];
   export let seedingPolicy: SeedingPolicy;
 
   let delegateExpanded = false;
@@ -60,7 +61,10 @@
   <div class="delegates">
     {#each projectDelegates as delegate}
       <div class="nid">
-        <NodeId {baseUrl} nodeId={delegate.id} alias={delegate.alias} />
+        <NodeId
+          {baseUrl}
+          nodeId={stripDidKeyPrefix(delegate.did)}
+          alias={delegate.alias} />
       </div>
     {/each}
   </div>
diff --git a/src/views/projects/Source.svelte b/src/views/repos/Source.svelte
similarity index 88%
rename from src/views/projects/Source.svelte
rename to src/views/repos/Source.svelte
index a245a68254..a0225b9162 100644
--- a/src/views/projects/Source.svelte
+++ b/src/views/repos/Source.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type {
     BaseUrl,
-    Project,
+    Repo,
     Remote,
     SeedingPolicy,
     Tree,
@@ -27,7 +27,7 @@
   export let path: string;
   export let peer: string | undefined;
   export let peers: Remote[];
-  export let project: Project;
+  export let repo: Repo;
   export let rawPath: (commit?: string) => string;
   export let revision: string | undefined;
   export let seedingPolicy: SeedingPolicy;
@@ -39,26 +39,24 @@
   const api = new HttpdClient(baseUrl);
 
   const fetchTree = async (path: string) => {
-    return api.project
-      .getTree(project.id, tree.lastCommit.id, path)
-      .catch(() => {
-        blobResult = {
-          ok: false,
-          error: {
-            message: "Not able to expand directory",
-            path,
-          },
-        };
-        return undefined;
-      });
+    return api.repo.getTree(repo.rid, tree.lastCommit.id, path).catch(() => {
+      blobResult = {
+        ok: false,
+        error: {
+          message: "Not able to expand directory",
+          path,
+        },
+      };
+      return undefined;
+    });
   };
 
   $: baseRoute = {
-    resource: "project.source",
+    resource: "repo.source",
     node: baseUrl,
-    project: project.id,
+    repo: repo.rid,
     path: "/",
-  } as Extract<ProjectRoute, { resource: "project.source" }>;
+  } as Extract<ProjectRoute, { resource: "repo.source" }>;
 </script>
 
 <style>
@@ -122,7 +120,7 @@
 <Layout
   {baseUrl}
   {nodeAvatarUrl}
-  {project}
+  {repo}
   {seedingPolicy}
   activeTab="source"
   stylePaddingBottom="0">
@@ -132,7 +130,7 @@
       <FilePath filenameWithPath={path} />
     {/if}
   </svelte:fragment>
-  <ProjectNameHeader {project} {baseUrl} slot="header" />
+  <ProjectNameHeader {repo} {baseUrl} slot="header" />
 
   <div style:margin="1rem" slot="subheader">
     <Header
@@ -143,7 +141,7 @@
       {baseRoute}
       {peers}
       {peer}
-      {project}
+      {repo}
       {revision}
       {tree} />
   </div>
@@ -164,7 +162,7 @@
       {#if mobileFileTree}
         <div class="layout-mobile" style:margin="1rem">
           <TreeComponent
-            projectId={project.id}
+            projectId={repo.rid}
             {revision}
             {baseUrl}
             {fetchTree}
@@ -184,7 +182,7 @@
       <div class="column-left global-hide-on-small-desktop-down">
         <div class="source-tree sticky">
           <TreeComponent
-            projectId={project.id}
+            projectId={repo.rid}
             {revision}
             {baseUrl}
             {fetchTree}
@@ -198,7 +196,7 @@
           <BlobComponent
             {path}
             {baseUrl}
-            projectId={project.id}
+            projectId={repo.rid}
             blob={blobResult.blob}
             highlighted={blobResult.highlighted}
             rawPath={rawPath(tree.lastCommit.id)} />
diff --git a/src/views/projects/Source/Blob.svelte b/src/views/repos/Source/Blob.svelte
similarity index 98%
rename from src/views/projects/Source/Blob.svelte
rename to src/views/repos/Source/Blob.svelte
index 0a01d0fc9a..56233b6f11 100644
--- a/src/views/projects/Source/Blob.svelte
+++ b/src/views/repos/Source/Blob.svelte
@@ -9,7 +9,7 @@
   import { lineNumbersGutter } from "@app/lib/syntax";
 
   import Button from "@app/components/Button.svelte";
-  import CommitButton from "@app/views/projects/components/CommitButton.svelte";
+  import CommitButton from "@app/views/repos/components/CommitButton.svelte";
   import File from "@app/components/File.svelte";
   import FilePath from "@app/components/FilePath.svelte";
   import Icon from "@app/components/Icon.svelte";
diff --git a/src/views/projects/Source/Header.svelte b/src/views/repos/Source/Header.svelte
similarity index 87%
rename from src/views/projects/Source/Header.svelte
rename to src/views/repos/Source/Header.svelte
index c941e50059..f5ca4df2ea 100644
--- a/src/views/projects/Source/Header.svelte
+++ b/src/views/repos/Source/Header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ProjectRoute } from "../router";
-  import type { BaseUrl, Project, Remote, Tree } from "@http-client";
+  import type { BaseUrl, Repo, Remote, Tree } from "@http-client";
   import type { ComponentProps } from "svelte";
 
   import { HttpdClient } from "@http-client";
@@ -18,10 +18,10 @@
   export let node: BaseUrl;
   export let peer: string | undefined;
   export let peers: Remote[];
-  export let project: Project;
+  export let repo: Repo;
   export let baseRoute: Extract<
     ProjectRoute,
-    { resource: "project.source" } | { resource: "project.history" }
+    { resource: "repo.source" } | { resource: "repo.history" }
   >;
   export let revision: string | undefined;
   export let tree: Tree;
@@ -36,11 +36,13 @@
   $: if (revision === lastCommit.id) {
     selectedBranch = undefined;
   } else {
-    selectedBranch = revision || project.defaultBranch;
+    selectedBranch = revision || repo["xyz.radicle.project"].defaultBranch;
   }
 
   $: lastCommit = tree.lastCommit;
-  $: onCanonical = Boolean(!peer && selectedBranch === project.defaultBranch);
+  $: onCanonical = Boolean(
+    !peer && selectedBranch === repo["xyz.radicle.project"].defaultBranch,
+  );
   $: if (onCanonical) {
     commitButtonVariant = "right";
   } else if (!selectedBranch) {
@@ -106,7 +108,7 @@
       {peer}
       {baseRoute}
       {onCanonical}
-      {project}
+      {repo}
       {selectedBranch} />
   {/if}
   <div class="global-flex-item txt-overflow" style:gap="1px">
@@ -115,7 +117,7 @@
       styleMinWidth="0"
       styleWidth="100%"
       hideSummaryOnMobile={false}
-      projectId={project.id}
+      projectId={repo.rid}
       commit={lastCommit}
       baseUrl={node} />
     {#if !onCanonical}
@@ -134,8 +136,8 @@
   <div style="display: flex; gap: 0.375rem;">
     <Link
       route={{
-        resource: "project.source",
-        project: project.id,
+        resource: "repo.source",
+        repo: repo.rid,
         node: node,
         peer,
         revision,
@@ -147,8 +149,8 @@
 
     <Link
       route={{
-        resource: "project.history",
-        project: project.id,
+        resource: "repo.history",
+        repo: repo.rid,
         node: node,
         peer,
         revision,
@@ -157,7 +159,7 @@
         <Icon name="commit" />
         <div class="title-counter">
           Commits
-          {#await api.project.getTreeStatsBySha(project.id, commit)}
+          {#await api.repo.getTreeStatsBySha(repo.rid, commit)}
             <Loading small center noDelay grayscale />
           {:then stats}
             <div class="counter" class:selected={historyLinkActive}>
diff --git a/src/views/projects/Source/PeerBranchSelector.svelte b/src/views/repos/Source/PeerBranchSelector.svelte
similarity index 89%
rename from src/views/projects/Source/PeerBranchSelector.svelte
rename to src/views/repos/Source/PeerBranchSelector.svelte
index fad4ba098f..8473fa1681 100644
--- a/src/views/projects/Source/PeerBranchSelector.svelte
+++ b/src/views/repos/Source/PeerBranchSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { ProjectRoute } from "@app/views/projects/router";
-  import type { Project, Remote } from "@http-client";
+  import type { ProjectRoute } from "@app/views/repos/router";
+  import type { Repo, Remote } from "@http-client";
 
   import fuzzysort from "fuzzysort";
   import orderBy from "lodash/orderBy";
@@ -18,12 +18,12 @@
 
   export let baseRoute: Extract<
     ProjectRoute,
-    { resource: "project.source" } | { resource: "project.history" }
+    { resource: "repo.source" } | { resource: "repo.history" }
   >;
   export let onCanonical: boolean;
   export let peer: string | undefined;
   export let peers: Remote[];
-  export let project: Project;
+  export let repo: Repo;
   export let selectedBranch: string | undefined;
 
   const subgridStyle =
@@ -37,19 +37,19 @@
   const searchElements = [
     {
       peer: undefined,
-      revision: project.defaultBranch,
-      head: project.head,
+      revision: repo["xyz.radicle.project"].defaultBranch,
+      head: repo.head,
     },
     ...peers.flatMap(peer =>
       Object.entries(peer.heads).map(([name, head]) => ({
-        peer: { id: peer.id, alias: peer.alias, delegate: peer.delegate },
+        peer: { nid: peer.nid, alias: peer.alias, delegate: peer.delegate },
         revision: name,
         head,
       })),
     ),
   ];
 
-  $: selectedPeer = peers.find(p => p.id === peer);
+  $: selectedPeer = peers.find(p => p.nid === peer);
   $: searchResults = fuzzysort.go(searchInput, searchElements, {
     keys: ["peer.alias", "revision"],
     scoreFn: r =>
@@ -126,8 +126,8 @@
       {#if selectedPeer}
         <div class="global-flex-item">
           <div class="node-id">
-            <Avatar nodeId={selectedPeer.id} variant="small" />
-            {selectedPeer.alias || formatNodeId(selectedPeer.id)}
+            <Avatar nodeId={selectedPeer.nid} variant="small" />
+            {selectedPeer.alias || selectedPeer.nid}
           </div>
 
           {#if selectedPeer.delegate}
@@ -171,7 +171,7 @@
               style={subgridStyle}
               route={{
                 ...baseRoute,
-                peer: peer?.id,
+                peer: peer?.nid,
                 revision: peer ? revision : undefined,
               }}
               on:afterNavigate={() => {
@@ -179,13 +179,13 @@
                 toggle();
               }}>
               <DropdownListItem
-                selected={selectedPeer?.id === peer?.id &&
+                selected={selectedPeer?.nid === peer?.nid &&
                   selectedBranch === revision}
                 style={`${subgridStyle} gap: inherit;`}>
                 <div class="global-flex-item">
                   <Icon name="branch" />
                   <span class="txt-overflow">
-                    {#if peer?.id}
+                    {#if peer?.nid}
                       <span class="global-flex-item">
                         {#if result[0].target}
                           <span>
@@ -194,7 +194,7 @@
                         {:else if peer.alias}
                           {peer.alias}
                         {:else}
-                          {formatNodeId(peer.id)}
+                          {formatNodeId(peer.nid)}
                         {/if}
                         {#if peer.delegate}
                           <Badge variant="delegate" round>
@@ -252,7 +252,7 @@
               style={`${subgridStyle} gap: inherit;`}>
               <div class="global-flex-item">
                 <Icon name="branch" />
-                {project.defaultBranch}
+                {repo["xyz.radicle.project"].defaultBranch}
                 <Badge title="Canonical branch" variant="foreground-emphasized">
                   Canonical
                 </Badge>
@@ -260,7 +260,7 @@
               <div
                 class="txt-monospace"
                 style="color: var(--color-foreground-dim);">
-                {formatCommit(project.head)}
+                {formatCommit(repo.head)}
               </div>
             </DropdownListItem>
           </Link>
@@ -268,7 +268,10 @@
             <Peer
               {baseRoute}
               revision={selectedBranch}
-              peer={{ remote: peer, selected: selectedPeer?.id === peer.id }} />
+              peer={{
+                remote: peer,
+                selected: selectedPeer?.nid === peer.nid,
+              }} />
           {/each}
         {/if}
       </div>
diff --git a/src/views/projects/Source/PeerBranchSelector/Peer.svelte b/src/views/repos/Source/PeerBranchSelector/Peer.svelte
similarity index 91%
rename from src/views/projects/Source/PeerBranchSelector/Peer.svelte
rename to src/views/repos/Source/PeerBranchSelector/Peer.svelte
index ba71a9abb3..baa8e8806d 100644
--- a/src/views/projects/Source/PeerBranchSelector/Peer.svelte
+++ b/src/views/repos/Source/PeerBranchSelector/Peer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { ProjectRoute } from "@app/views/projects/router";
+  import type { ProjectRoute } from "@app/views/repos/router";
   import type { Remote } from "@http-client";
 
   import { closeFocused } from "@app/components/Popover.svelte";
@@ -15,7 +15,7 @@
 
   export let baseRoute: Extract<
     ProjectRoute,
-    { resource: "project.source" } | { resource: "project.history" }
+    { resource: "repo.source" } | { resource: "repo.history" }
   >;
   export let peer: { remote: Remote; selected: boolean };
   export let revision: string | undefined = undefined;
@@ -40,7 +40,7 @@
     </IconButton>
     <NodeId
       baseUrl={baseRoute.node}
-      nodeId={peer.remote.id}
+      nodeId={peer.remote.nid}
       alias={peer.remote.alias} />
     {#if peer.remote.delegate}
       <Badge size="tiny" variant="delegate">
@@ -56,7 +56,7 @@
       style={subgridStyle}
       route={{
         ...baseRoute,
-        peer: peer.remote.id,
+        peer: peer.remote.nid,
         revision: name,
       }}
       on:afterNavigate={() => closeFocused()}>
@@ -65,7 +65,7 @@
         on:click={() =>
           replace({
             ...baseRoute,
-            peer: peer.remote.id,
+            peer: peer.remote.nid,
             revision: name,
           })}
         style={`${subgridStyle} padding-left: 2.3rem; gap: inherit;`}>
diff --git a/src/views/projects/Source/ProjectNameHeader.svelte b/src/views/repos/Source/ProjectNameHeader.svelte
similarity index 71%
rename from src/views/projects/Source/ProjectNameHeader.svelte
rename to src/views/repos/Source/ProjectNameHeader.svelte
index 68094eae5f..7b52f7f847 100644
--- a/src/views/projects/Source/ProjectNameHeader.svelte
+++ b/src/views/repos/Source/ProjectNameHeader.svelte
@@ -1,19 +1,19 @@
 <script lang="ts">
-  import type { BaseUrl, Project } from "@http-client";
+  import type { BaseUrl, Repo } from "@http-client";
 
   import dompurify from "dompurify";
   import { markdownWithExtensions } from "@app/lib/markdown";
   import { twemoji } from "@app/lib/utils";
 
   import Badge from "@app/components/Badge.svelte";
-  import CloneButton from "@app/views/projects/Header/CloneButton.svelte";
+  import CloneButton from "@app/views/repos/Header/CloneButton.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Id from "@app/components/Id.svelte";
   import Link from "@app/components/Link.svelte";
-  import SeedButton from "@app/views/projects/Header/SeedButton.svelte";
-  import Share from "@app/views/projects/Share.svelte";
+  import SeedButton from "@app/views/repos/Header/SeedButton.svelte";
+  import Share from "@app/views/repos/Share.svelte";
 
-  export let project: Project;
+  export let repo: Repo;
   export let baseUrl: BaseUrl;
 
   function render(content: string): string {
@@ -21,6 +21,8 @@
       markdownWithExtensions.parseInline(content) as string,
     );
   }
+
+  $: project = repo["xyz.radicle.project"];
 </script>
 
 <style>
@@ -38,10 +40,10 @@
   .description {
     padding: 0 1rem 1rem 1rem;
   }
-  .project-name {
+  .repo-name {
     font-weight: var(--font-weight-semibold);
   }
-  .project-name:hover {
+  .repo-name:hover {
     color: inherit;
   }
   .description :global(a) {
@@ -66,16 +68,16 @@
     <span class="txt-overflow">
       <Link
         route={{
-          resource: "project.source",
-          project: project.id,
+          resource: "repo.source",
+          repo: repo.rid,
           node: baseUrl,
         }}>
-        <span class="project-name">
+        <span class="repo-name">
           {project.name}
         </span>
       </Link>
     </span>
-    {#if project.visibility && project.visibility.type === "private"}
+    {#if repo.visibility && repo.visibility.type === "private"}
       <Badge variant="yellow" size="tiny">
         <Icon name="lock" />
         Private
@@ -87,22 +89,19 @@
         style:display="flex"
         style:gap="0.5rem"
         class="global-hide-on-mobile-down">
-        <CloneButton {baseUrl} id={project.id} name={project.name} />
-        <SeedButton seedCount={project.seeding} projectId={project.id} />
+        <CloneButton {baseUrl} id={repo.rid} name={project.name} />
+        <SeedButton seedCount={repo.seeding} projectId={repo.rid} />
       </div>
       <div
         style:display="flex"
         style:gap="0.5rem"
         class="global-hide-on-small-desktop-up">
-        <SeedButton
-          disabled
-          seedCount={project.seeding}
-          projectId={project.id} />
+        <SeedButton disabled seedCount={repo.seeding} projectId={repo.rid} />
       </div>
     </div>
   </div>
   <div class="id">
-    <Id shorten={false} id={project.id} ariaLabel="project-id" />
+    <Id shorten={false} id={repo.rid} ariaLabel="repo-id" />
   </div>
 </div>
 <div class="description" use:twemoji>
diff --git a/src/views/projects/Source/Tree.svelte b/src/views/repos/Source/Tree.svelte
similarity index 95%
rename from src/views/projects/Source/Tree.svelte
rename to src/views/repos/Source/Tree.svelte
index ccdd5c5180..6493d3033a 100644
--- a/src/views/projects/Source/Tree.svelte
+++ b/src/views/repos/Source/Tree.svelte
@@ -39,8 +39,8 @@
   {:else}
     <Link
       route={{
-        resource: "project.source",
-        project: projectId,
+        resource: "repo.source",
+        repo: projectId,
         node: baseUrl,
         path: entry.path,
         peer,
diff --git a/src/views/projects/Source/Tree/File.svelte b/src/views/repos/Source/Tree/File.svelte
similarity index 100%
rename from src/views/projects/Source/Tree/File.svelte
rename to src/views/repos/Source/Tree/File.svelte
diff --git a/src/views/projects/Source/Tree/Folder.svelte b/src/views/repos/Source/Tree/Folder.svelte
similarity index 97%
rename from src/views/projects/Source/Tree/Folder.svelte
rename to src/views/repos/Source/Tree/Folder.svelte
index fd8cce0be9..e8dca2e8ef 100644
--- a/src/views/projects/Source/Tree/Folder.svelte
+++ b/src/views/repos/Source/Tree/Folder.svelte
@@ -118,8 +118,8 @@
           {:else}
             <Link
               route={{
-                resource: "project.source",
-                project: projectId,
+                resource: "repo.source",
+                repo: projectId,
                 node: baseUrl,
                 path: entry.path,
                 peer,
diff --git a/src/views/projects/Source/Tree/Submodule.svelte b/src/views/repos/Source/Tree/Submodule.svelte
similarity index 100%
rename from src/views/projects/Source/Tree/Submodule.svelte
rename to src/views/repos/Source/Tree/Submodule.svelte
diff --git a/src/views/projects/components/CommitButton.svelte b/src/views/repos/components/CommitButton.svelte
similarity index 97%
rename from src/views/projects/components/CommitButton.svelte
rename to src/views/repos/components/CommitButton.svelte
index d9658b161c..f545242a1a 100644
--- a/src/views/projects/components/CommitButton.svelte
+++ b/src/views/repos/components/CommitButton.svelte
@@ -47,8 +47,8 @@
 <Link
   styleTextOverflow
   route={{
-    resource: "project.commit",
-    project: projectId,
+    resource: "repo.commit",
+    repo: projectId,
     node: baseUrl,
     commit: commit.id,
   }}>
diff --git a/src/views/projects/components/InlineTitle.svelte b/src/views/repos/components/InlineTitle.svelte
similarity index 100%
rename from src/views/projects/components/InlineTitle.svelte
rename to src/views/repos/components/InlineTitle.svelte
diff --git a/src/views/projects/error.ts b/src/views/repos/error.ts
similarity index 88%
rename from src/views/projects/error.ts
rename to src/views/repos/error.ts
index bd2453175c..083e99fa39 100644
--- a/src/views/projects/error.ts
+++ b/src/views/repos/error.ts
@@ -1,5 +1,5 @@
 import type { ErrorRoute, NotFoundRoute } from "@app/lib/router/definitions";
-import type { ProjectRoute } from "@app/views/projects/router";
+import type { ProjectRoute } from "@app/views/repos/router";
 
 import { baseUrlToString } from "@app/lib/utils";
 import { ResponseParseError, ResponseError } from "@http-client/lib/fetcher";
@@ -12,11 +12,11 @@ export function handleError(
   if (error instanceof ResponseError && error.status === 404) {
     let subject;
 
-    if (route.resource === "project.commit") {
+    if (route.resource === "repo.commit") {
       subject = "Commit";
-    } else if (route.resource === "project.issue") {
+    } else if (route.resource === "repo.issue") {
       subject = "Issue";
-    } else if (route.resource === "project.patch") {
+    } else if (route.resource === "repo.patch") {
       subject = "Patch";
     } else {
       subject = "Repository";
diff --git a/src/views/projects/router.ts b/src/views/repos/router.ts
similarity index 75%
rename from src/views/projects/router.ts
rename to src/views/repos/router.ts
index 979a4e5ce4..22798893b0 100644
--- a/src/views/projects/router.ts
+++ b/src/views/repos/router.ts
@@ -16,7 +16,7 @@ import type {
   Node,
   Patch,
   PatchState,
-  Project,
+  Repo,
   Remote,
   Revision,
   SeedingPolicy,
@@ -28,7 +28,7 @@ import config from "virtual:config";
 import { HttpdClient } from "@http-client";
 import { ResponseError, ResponseParseError } from "@http-client/lib/fetcher";
 import { cached } from "@app/lib/cache";
-import { handleError, unreachableError } from "@app/views/projects/error";
+import { handleError, unreachableError } from "@app/views/repos/error";
 import { isLocal, unreachable } from "@app/lib/utils";
 import { nodePath } from "@app/views/nodes/router";
 
@@ -39,9 +39,9 @@ export type ProjectRoute =
   | ProjectTreeRoute
   | ProjectHistoryRoute
   | {
-      resource: "project.commit";
+      resource: "repo.commit";
       node: BaseUrl;
-      project: string;
+      repo: string;
       commit: string;
     }
   | ProjectIssuesRoute
@@ -50,23 +50,23 @@ export type ProjectRoute =
   | ProjectPatchRoute;
 
 interface ProjectIssuesRoute {
-  resource: "project.issues";
+  resource: "repo.issues";
   node: BaseUrl;
-  project: string;
+  repo: string;
   status?: "open" | "closed";
 }
 
 interface ProjectIssueRoute {
-  resource: "project.issue";
+  resource: "repo.issue";
   node: BaseUrl;
-  project: string;
+  repo: string;
   issue: string;
 }
 
 interface ProjectTreeRoute {
-  resource: "project.source";
+  resource: "repo.source";
   node: BaseUrl;
-  project: string;
+  repo: string;
   path?: string;
   peer?: string;
   revision?: string;
@@ -74,17 +74,17 @@ interface ProjectTreeRoute {
 }
 
 interface ProjectHistoryRoute {
-  resource: "project.history";
+  resource: "repo.history";
   node: BaseUrl;
-  project: string;
+  repo: string;
   peer?: string;
   revision?: string;
 }
 
 interface ProjectPatchRoute {
-  resource: "project.patch";
+  resource: "repo.patch";
   node: BaseUrl;
-  project: string;
+  repo: string;
   patch: string;
   view?:
     | {
@@ -102,20 +102,20 @@ interface ProjectPatchRoute {
 }
 
 interface ProjectPatchesRoute {
-  resource: "project.patches";
+  resource: "repo.patches";
   node: BaseUrl;
-  project: string;
+  repo: string;
   search?: string;
 }
 
 export type ProjectLoadedRoute =
   | {
-      resource: "project.source";
+      resource: "repo.source";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
         commit: string;
-        project: Project;
+        repo: Repo;
         peers: Remote[];
         peer: string | undefined;
         revision: string | undefined;
@@ -127,12 +127,12 @@ export type ProjectLoadedRoute =
       };
     }
   | {
-      resource: "project.history";
+      resource: "repo.history";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
         commit: string;
-        project: Project;
+        repo: Repo;
         peers: Remote[];
         peer: string | undefined;
         revision: string | undefined;
@@ -142,54 +142,54 @@ export type ProjectLoadedRoute =
       };
     }
   | {
-      resource: "project.commit";
+      resource: "repo.commit";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
-        project: Project;
+        repo: Repo;
         commit: Commit;
         nodeAvatarUrl: string | undefined;
       };
     }
   | {
-      resource: "project.issue";
+      resource: "repo.issue";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
-        project: Project;
+        repo: Repo;
         rawPath: (commit?: string) => string;
         issue: Issue;
         nodeAvatarUrl: string | undefined;
       };
     }
   | {
-      resource: "project.issues";
+      resource: "repo.issues";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
-        project: Project;
+        repo: Repo;
         issues: Issue[];
         status: IssueState["status"];
         nodeAvatarUrl: string | undefined;
       };
     }
   | {
-      resource: "project.patches";
+      resource: "repo.patches";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
-        project: Project;
+        repo: Repo;
         patches: Patch[];
         status: PatchState["status"];
         nodeAvatarUrl: string | undefined;
       };
     }
   | {
-      resource: "project.patch";
+      resource: "repo.patch";
       params: {
         baseUrl: BaseUrl;
         seedingPolicy: SeedingPolicy;
-        project: Project;
+        repo: Repo;
         rawPath: (commit?: string) => string;
         patch: Patch;
         stats: Diff["stats"];
@@ -231,7 +231,7 @@ function isOid(input: string): boolean {
 export const cachedGetDiff = cached(
   async (baseUrl: BaseUrl, rid: string, base: string, oid: string) => {
     const api = new HttpdClient(baseUrl);
-    return await api.project.getDiff(rid, base, oid);
+    return await api.repo.getDiff(rid, base, oid);
   },
   (...args) => JSON.stringify(args),
   { max: 200 },
@@ -278,35 +278,35 @@ export async function loadProjectRoute(
   const api = new HttpdClient(route.node);
 
   try {
-    if (route.resource === "project.source") {
+    if (route.resource === "repo.source") {
       return await loadTreeView(route, previousLoaded);
-    } else if (route.resource === "project.history") {
+    } else if (route.resource === "repo.history") {
       return await loadHistoryView(route, previousLoaded);
-    } else if (route.resource === "project.commit") {
-      const [project, commit, seedingPolicy, node] = await Promise.all([
-        api.project.getById(route.project),
-        api.project.getCommitBySha(route.project, route.commit),
-        api.getPolicyById(route.project),
+    } else if (route.resource === "repo.commit") {
+      const [repo, commit, seedingPolicy, node] = await Promise.all([
+        api.repo.getByRid(route.repo),
+        api.repo.getCommitBySha(route.repo, route.commit),
+        api.getPolicyById(route.repo),
         api.getNode(),
       ]);
 
       return {
-        resource: "project.commit",
+        resource: "repo.commit",
         params: {
           baseUrl: route.node,
           seedingPolicy,
-          project,
+          repo,
           commit,
           nodeAvatarUrl: node.avatarUrl,
         },
       };
-    } else if (route.resource === "project.issue") {
+    } else if (route.resource === "repo.issue") {
       return await loadIssueView(route);
-    } else if (route.resource === "project.patch") {
+    } else if (route.resource === "repo.patch") {
       return await loadPatchView(route, previousLoaded);
-    } else if (route.resource === "project.issues") {
+    } else if (route.resource === "repo.issues") {
       return await loadIssuesView(route);
-    } else if (route.resource === "project.patches") {
+    } else if (route.resource === "repo.patches") {
       return await loadPatchesView(route);
     } else {
       return unreachable(route);
@@ -331,25 +331,25 @@ async function loadPatchesView(
   const searchParams = new URLSearchParams(route.search || "");
   const status = (searchParams.get("status") as PatchState["status"]) || "open";
 
-  const [project, patches, seedingPolicy, node] = await Promise.all([
-    api.project.getById(route.project),
-    api.project.getAllPatches(route.project, {
+  const [repo, patches, seedingPolicy, node] = await Promise.all([
+    api.repo.getByRid(route.repo),
+    api.repo.getAllPatches(route.repo, {
       status,
       page: 0,
       perPage: PATCHES_PER_PAGE,
     }),
-    api.getPolicyById(route.project),
+    api.getPolicyById(route.repo),
     api.getNode(),
   ]);
 
   return {
-    resource: "project.patches",
+    resource: "repo.patches",
     params: {
       baseUrl: route.node,
       seedingPolicy,
       patches,
       status,
-      project,
+      repo,
       nodeAvatarUrl: node.avatarUrl,
     },
   };
@@ -361,25 +361,25 @@ async function loadIssuesView(
   const api = new HttpdClient(route.node);
   const status = route.status || "open";
 
-  const [project, issues, seedingPolicy, node] = await Promise.all([
-    api.project.getById(route.project),
-    api.project.getAllIssues(route.project, {
+  const [repo, issues, seedingPolicy, node] = await Promise.all([
+    api.repo.getByRid(route.repo),
+    api.repo.getAllIssues(route.repo, {
       status,
       page: 0,
       perPage: ISSUES_PER_PAGE,
     }),
-    api.getPolicyById(route.project),
+    api.getPolicyById(route.repo),
     api.getNode(),
   ]);
 
   return {
-    resource: "project.issues",
+    resource: "repo.issues",
     params: {
       baseUrl: route.node,
       seedingPolicy,
       issues,
       status,
-      project,
+      repo,
       nodeAvatarUrl: node.avatarUrl,
     },
   };
@@ -392,33 +392,33 @@ async function loadTreeView(
   const api = new HttpdClient(route.node);
   const rawPath = (commit?: string) =>
     `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${
-      route.project
+      route.repo
     }${commit ? `/${commit}` : ""}`;
 
-  let projectPromise: Promise<Project>;
+  let projectPromise: Promise<Repo>;
   let seedingPolicyPromise: Promise<SeedingPolicy>;
   let peersPromise: Promise<Remote[]>;
   let nodePromise: Promise<Partial<Node>>;
   if (
-    (previousLoaded.resource === "project.source" ||
-      previousLoaded.resource === "project.history") &&
-    previousLoaded.params.project.id === route.project &&
+    (previousLoaded.resource === "repo.source" ||
+      previousLoaded.resource === "repo.history") &&
+    previousLoaded.params.repo.rid === route.repo &&
     previousLoaded.params.peer === route.peer
   ) {
-    projectPromise = Promise.resolve(previousLoaded.params.project);
+    projectPromise = Promise.resolve(previousLoaded.params.repo);
     peersPromise = Promise.resolve(previousLoaded.params.peers);
     seedingPolicyPromise = Promise.resolve(previousLoaded.params.seedingPolicy);
     nodePromise = Promise.resolve({
       avatarUrl: previousLoaded.params.nodeAvatarUrl,
     });
   } else {
-    projectPromise = api.project.getById(route.project);
-    peersPromise = api.project.getAllRemotes(route.project);
-    seedingPolicyPromise = api.getPolicyById(route.project);
+    projectPromise = api.repo.getByRid(route.repo);
+    peersPromise = api.repo.getAllRemotes(route.repo);
+    seedingPolicyPromise = api.getPolicyById(route.repo);
     nodePromise = api.getNode();
   }
 
-  const [project, peers, seedingPolicy, node] = await Promise.all([
+  const [repo, peers, seedingPolicy, node] = await Promise.all([
     projectPromise,
     peersPromise,
     seedingPolicyPromise,
@@ -426,10 +426,10 @@ async function loadTreeView(
   ]);
 
   let branchMap: Record<string, string> = {
-    [project.defaultBranch]: project.head,
+    [repo["xyz.radicle.project"].defaultBranch]: repo.head,
   };
   if (route.peer) {
-    const peer = peers.find(peer => peer.id === route.peer);
+    const peer = peers.find(peer => peer.nid === route.peer);
     if (!peer) {
       return {
         resource: "notFound",
@@ -448,21 +448,21 @@ async function loadTreeView(
 
   const commit = parseRevisionToOid(
     route.revision,
-    project.defaultBranch,
+    repo["xyz.radicle.project"].defaultBranch,
     branchMap,
   );
   const path = route.path || "/";
   const [tree, blobResult] = await Promise.all([
-    api.project.getTree(route.project, commit),
-    loadBlob(api, project.id, commit, path),
+    api.repo.getTree(route.repo, commit),
+    loadBlob(api, repo.rid, commit, path),
   ]);
   return {
-    resource: "project.source",
+    resource: "repo.source",
     params: {
       baseUrl: route.node,
       seedingPolicy,
       commit,
-      project,
+      repo,
       peers: peers.filter(remote => Object.keys(remote.heads).length > 0),
       peer: route.peer,
       rawPath,
@@ -477,16 +477,16 @@ async function loadTreeView(
 
 async function loadBlob(
   api: HttpdClient,
-  project: string,
+  repo: string,
   commit: string,
   path: string,
 ): Promise<BlobResult> {
   try {
     let blob: Blob;
     if (path === "" || path === "/") {
-      blob = await api.project.getReadme(project, commit);
+      blob = await api.repo.getReadme(repo, commit);
     } else {
-      blob = await api.project.getBlob(project, commit, path);
+      blob = await api.repo.getBlob(repo, commit, path);
     }
     return {
       ok: true,
@@ -530,34 +530,34 @@ async function loadHistoryView(
 ): Promise<ProjectLoadedRoute> {
   const api = new HttpdClient(route.node);
 
-  let projectPromise: Promise<Project>;
+  let projectPromise: Promise<Repo>;
   let seedingPolicyPromise: Promise<SeedingPolicy>;
   let peersPromise: Promise<Remote[]>;
   let nodePromise: Promise<Partial<Node>>;
   if (
-    (previousLoaded.resource === "project.source" ||
-      previousLoaded.resource === "project.history") &&
-    previousLoaded.params.project.id === route.project &&
+    (previousLoaded.resource === "repo.source" ||
+      previousLoaded.resource === "repo.history") &&
+    previousLoaded.params.repo.rid === route.repo &&
     previousLoaded.params.peer === route.peer
   ) {
-    projectPromise = Promise.resolve(previousLoaded.params.project);
+    projectPromise = Promise.resolve(previousLoaded.params.repo);
     peersPromise = Promise.resolve(previousLoaded.params.peers);
     seedingPolicyPromise = Promise.resolve(previousLoaded.params.seedingPolicy);
     nodePromise = Promise.resolve({
       avatarUrl: previousLoaded.params.nodeAvatarUrl,
     });
   } else {
-    projectPromise = api.project.getById(route.project);
-    peersPromise = api.project.getAllRemotes(route.project);
-    seedingPolicyPromise = api.getPolicyById(route.project);
+    projectPromise = api.repo.getByRid(route.repo);
+    peersPromise = api.repo.getAllRemotes(route.repo);
+    seedingPolicyPromise = api.getPolicyById(route.repo);
     nodePromise = api.getNode();
   }
 
-  const [project, peers, seedingPolicy, branchMap, node] = await Promise.all([
+  const [repo, peers, seedingPolicy, branchMap, node] = await Promise.all([
     projectPromise,
     peersPromise,
     seedingPolicyPromise,
-    getPeerBranches(api, route.project, route.peer),
+    getPeerBranches(api, route.repo, route.peer),
     nodePromise,
   ]);
 
@@ -565,33 +565,34 @@ async function loadHistoryView(
   if (route.revision && isOid(route.revision)) {
     commitId = route.revision;
   } else if (branchMap) {
-    commitId = branchMap[route.revision || project.defaultBranch];
+    commitId =
+      branchMap[route.revision || repo["xyz.radicle.project"].defaultBranch];
   } else if (!route.revision) {
-    commitId = project.head;
+    commitId = repo.head;
   }
 
   if (!commitId) {
     throw new Error(
-      `Revision ${route.revision} not found for project ${project.id}`,
+      `Revision ${route.revision} not found for repo ${repo.rid}`,
     );
   }
 
   let treePromise: Promise<Tree>;
 
   if (
-    (previousLoaded.resource === "project.source" ||
-      previousLoaded.resource === "project.history") &&
-    previousLoaded.params.project.id === route.project &&
+    (previousLoaded.resource === "repo.source" ||
+      previousLoaded.resource === "repo.history") &&
+    previousLoaded.params.repo.rid === route.repo &&
     previousLoaded.params.commit === commitId
   ) {
     treePromise = Promise.resolve(previousLoaded.params.tree);
   } else {
-    treePromise = api.project.getTree(route.project, commitId);
+    treePromise = api.repo.getTree(route.repo, commitId);
   }
 
   const [tree, commitHeaders] = await Promise.all([
     treePromise,
-    api.project.getAllCommits(project.id, {
+    api.repo.getAllCommits(repo.rid, {
       parent: commitId,
       page: 0,
       perPage: config.source.commitsPerPage,
@@ -599,12 +600,12 @@ async function loadHistoryView(
   ]);
 
   return {
-    resource: "project.history",
+    resource: "repo.history",
     params: {
       baseUrl: route.node,
       seedingPolicy,
       commit: commitId,
-      project,
+      repo,
       peers: peers.filter(remote => Object.keys(remote.heads).length > 0),
       peer: route.peer,
       revision: route.revision,
@@ -621,21 +622,21 @@ async function loadIssueView(
   const api = new HttpdClient(route.node);
   const rawPath = (commit?: string) =>
     `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${
-      route.project
+      route.repo
     }${commit ? `/${commit}` : ""}`;
 
-  const [project, issue, seedingPolicy, node] = await Promise.all([
-    api.project.getById(route.project),
-    api.project.getIssueById(route.project, route.issue),
-    api.getPolicyById(route.project),
+  const [repo, issue, seedingPolicy, node] = await Promise.all([
+    api.repo.getByRid(route.repo),
+    api.repo.getIssueById(route.repo, route.issue),
+    api.getPolicyById(route.repo),
     api.getNode(),
   ]);
   return {
-    resource: "project.issue",
+    resource: "repo.issue",
     params: {
       baseUrl: route.node,
       seedingPolicy,
-      project,
+      repo,
       rawPath,
       issue,
       nodeAvatarUrl: node.avatarUrl,
@@ -650,32 +651,32 @@ async function loadPatchView(
   const api = new HttpdClient(route.node);
   const rawPath = (commit?: string) =>
     `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${
-      route.project
+      route.repo
     }${commit ? `/${commit}` : ""}`;
 
-  let projectPromise: Promise<Project>;
+  let projectPromise: Promise<Repo>;
   let patchPromise: Promise<Patch>;
   let nodePromise: Promise<Partial<Node>>;
   let seedingPolicyPromise: Promise<SeedingPolicy>;
 
   if (
-    previousLoaded.resource === "project.patch" &&
-    previousLoaded.params.project.id === route.project &&
+    previousLoaded.resource === "repo.patch" &&
+    previousLoaded.params.repo.rid === route.repo &&
     previousLoaded.params.patch.id === route.patch
   ) {
-    projectPromise = Promise.resolve(previousLoaded.params.project);
+    projectPromise = Promise.resolve(previousLoaded.params.repo);
     patchPromise = Promise.resolve(previousLoaded.params.patch);
     seedingPolicyPromise = Promise.resolve(previousLoaded.params.seedingPolicy);
     nodePromise = Promise.resolve({
       avatarUrl: previousLoaded.params.nodeAvatarUrl,
     });
   } else {
-    projectPromise = api.project.getById(route.project);
-    patchPromise = api.project.getPatchById(route.project, route.patch);
-    seedingPolicyPromise = api.getPolicyById(route.project);
+    projectPromise = api.repo.getByRid(route.repo);
+    patchPromise = api.repo.getPatchById(route.repo, route.patch);
+    seedingPolicyPromise = api.getPolicyById(route.repo);
     nodePromise = api.getNode();
   }
-  const [project, patch, seedingPolicy, { avatarUrl }] = await Promise.all([
+  const [repo, patch, seedingPolicy, { avatarUrl }] = await Promise.all([
     projectPromise,
     patchPromise,
     seedingPolicyPromise,
@@ -687,7 +688,7 @@ async function loadPatchView(
     diff: { stats },
   } = await cachedGetDiff(
     api.baseUrl,
-    route.project,
+    route.repo,
     latestRevision.base,
     latestRevision.oid,
   );
@@ -710,7 +711,7 @@ async function loadPatchView(
       }
       const { diff, commits, files } = await cachedGetDiff(
         api.baseUrl,
-        route.project,
+        route.repo,
         revision.base,
         revision.oid,
       );
@@ -728,7 +729,7 @@ async function loadPatchView(
       const { fromCommit, toCommit } = route.view;
       const { diff, files } = await cachedGetDiff(
         api.baseUrl,
-        route.project,
+        route.repo,
         fromCommit,
         toCommit,
       );
@@ -738,11 +739,11 @@ async function loadPatchView(
     }
   }
   return {
-    resource: "project.patch",
+    resource: "repo.patch",
     params: {
       baseUrl: route.node,
       seedingPolicy,
-      project,
+      repo,
       rawPath,
       patch,
       stats,
@@ -752,13 +753,9 @@ async function loadPatchView(
   };
 }
 
-async function getPeerBranches(
-  api: HttpdClient,
-  project: string,
-  peer?: string,
-) {
+async function getPeerBranches(api: HttpdClient, repo: string, peer?: string) {
   if (peer) {
-    return (await api.project.getRemoteByPeer(project, peer)).heads;
+    return (await api.repo.getRemoteByPeer(repo, peer)).heads;
   } else {
     return undefined;
   }
@@ -799,7 +796,7 @@ function sanitizeQueryString(queryString: string): string {
 
 export function resolveProjectRoute(
   node: BaseUrl,
-  project: string,
+  repo: string,
   segments: string[],
   urlSearch: string,
 ): ProjectRoute | null {
@@ -812,9 +809,9 @@ export function resolveProjectRoute(
 
   if (!content || content === "tree") {
     return {
-      resource: "project.source",
+      resource: "repo.source",
       node,
-      project,
+      repo,
       peer,
       path: undefined,
       revision: undefined,
@@ -822,26 +819,26 @@ export function resolveProjectRoute(
     };
   } else if (content === "history") {
     return {
-      resource: "project.history",
+      resource: "repo.history",
       node,
-      project,
+      repo,
       peer,
       revision: segments.join("/"),
     };
   } else if (content === "commits") {
     return {
-      resource: "project.commit",
+      resource: "repo.commit",
       node,
-      project,
+      repo,
       commit: segments[0],
     };
   } else if (content === "issues") {
     const issueOrAction = segments.shift();
     if (issueOrAction) {
       return {
-        resource: "project.issue",
+        resource: "repo.issue",
         node,
-        project,
+        repo,
         issue: issueOrAction,
       };
     } else {
@@ -853,14 +850,14 @@ export function resolveProjectRoute(
         status = rawStatus;
       }
       return {
-        resource: "project.issues",
+        resource: "repo.issues",
         node,
-        project,
+        repo,
         status,
       };
     }
   } else if (content === "patches") {
-    return resolvePatchesRoute(node, project, segments, urlSearch);
+    return resolvePatchesRoute(node, repo, segments, urlSearch);
   } else {
     return null;
   }
@@ -868,7 +865,7 @@ export function resolveProjectRoute(
 
 function resolvePatchesRoute(
   node: BaseUrl,
-  project: string,
+  repo: string,
   segments: string[],
   urlSearch: string,
 ): ProjectPatchRoute | ProjectPatchesRoute {
@@ -878,9 +875,9 @@ function resolvePatchesRoute(
     const searchParams = new URLSearchParams(sanitizeQueryString(urlSearch));
     const tab = searchParams.get("tab");
     const base = {
-      resource: "project.patch",
+      resource: "repo.patch",
       node,
-      project,
+      repo,
       patch,
     } as const;
     const diff = searchParams.get("diff");
@@ -909,9 +906,9 @@ function resolvePatchesRoute(
     }
   } else {
     return {
-      resource: "project.patches",
+      resource: "repo.patches",
       node,
-      project,
+      repo,
       search: sanitizeQueryString(urlSearch),
     };
   }
@@ -920,9 +917,9 @@ function resolvePatchesRoute(
 export function projectRouteToPath(route: ProjectRoute): string {
   const node = nodePath(route.node);
 
-  const pathSegments = [node, route.project];
+  const pathSegments = [node, route.repo];
 
-  if (route.resource === "project.source") {
+  if (route.resource === "repo.source") {
     if (route.peer) {
       pathSegments.push("remotes", route.peer);
     }
@@ -949,7 +946,7 @@ export function projectRouteToPath(route: ProjectRoute): string {
     }
 
     return pathSegments.join("/");
-  } else if (route.resource === "project.history") {
+  } else if (route.resource === "repo.history") {
     if (route.peer) {
       pathSegments.push("remotes", route.peer);
     }
@@ -960,9 +957,9 @@ export function projectRouteToPath(route: ProjectRoute): string {
       pathSegments.push(route.revision);
     }
     return pathSegments.join("/");
-  } else if (route.resource === "project.commit") {
+  } else if (route.resource === "repo.commit") {
     return [...pathSegments, "commits", route.commit].join("/");
-  } else if (route.resource === "project.issues") {
+  } else if (route.resource === "repo.issues") {
     let url = [...pathSegments, "issues"].join("/");
     const searchParams = new URLSearchParams();
     if (route.status) {
@@ -972,15 +969,15 @@ export function projectRouteToPath(route: ProjectRoute): string {
       url += `?${searchParams}`;
     }
     return url;
-  } else if (route.resource === "project.issue") {
+  } else if (route.resource === "repo.issue") {
     return [...pathSegments, "issues", route.issue].join("/");
-  } else if (route.resource === "project.patches") {
+  } else if (route.resource === "repo.patches") {
     let url = [...pathSegments, "patches"].join("/");
     if (route.search) {
       url += `?${route.search}`;
     }
     return url;
-  } else if (route.resource === "project.patch") {
+  } else if (route.resource === "repo.patch") {
     return patchRouteToPath(route);
   } else {
     return unreachable(route);
@@ -990,7 +987,7 @@ export function projectRouteToPath(route: ProjectRoute): string {
 function patchRouteToPath(route: ProjectPatchRoute): string {
   const node = nodePath(route.node);
 
-  const pathSegments = [node, route.project];
+  const pathSegments = [node, route.repo];
 
   pathSegments.push("patches", route.patch);
   if (route.view?.name === "changes") {
@@ -1021,28 +1018,28 @@ function patchRouteToPath(route: ProjectPatchRoute): string {
 export function projectTitle(loadedRoute: ProjectLoadedRoute) {
   const title: string[] = [];
 
-  if (loadedRoute.resource === "project.source") {
-    title.push(loadedRoute.params.project.name);
-    if (loadedRoute.params.project.description.length > 0) {
-      title.push(loadedRoute.params.project.description);
+  if (loadedRoute.resource === "repo.source") {
+    title.push(loadedRoute.params.repo["xyz.radicle.project"].name);
+    if (loadedRoute.params.repo["xyz.radicle.project"].description.length > 0) {
+      title.push(loadedRoute.params.repo["xyz.radicle.project"].description);
     }
-  } else if (loadedRoute.resource === "project.commit") {
+  } else if (loadedRoute.resource === "repo.commit") {
     title.push(loadedRoute.params.commit.commit.summary);
     title.push("commit");
-  } else if (loadedRoute.resource === "project.history") {
-    title.push(loadedRoute.params.project.name);
+  } else if (loadedRoute.resource === "repo.history") {
+    title.push(loadedRoute.params.repo["xyz.radicle.project"].name);
     title.push("history");
-  } else if (loadedRoute.resource === "project.issue") {
+  } else if (loadedRoute.resource === "repo.issue") {
     title.push(loadedRoute.params.issue.title);
     title.push("issue");
-  } else if (loadedRoute.resource === "project.issues") {
-    title.push(loadedRoute.params.project.name);
+  } else if (loadedRoute.resource === "repo.issues") {
+    title.push(loadedRoute.params.repo["xyz.radicle.project"].name);
     title.push("issues");
-  } else if (loadedRoute.resource === "project.patch") {
+  } else if (loadedRoute.resource === "repo.patch") {
     title.push(loadedRoute.params.patch.title);
     title.push("patch");
-  } else if (loadedRoute.resource === "project.patches") {
-    title.push(loadedRoute.params.project.name);
+  } else if (loadedRoute.resource === "repo.patches") {
+    title.push(loadedRoute.params.repo["xyz.radicle.project"].name);
     title.push("patches");
   } else {
     return unreachable(loadedRoute);
diff --git a/src/views/users/View.svelte b/src/views/users/View.svelte
index dd7e9fc75a..e06ec6aa4e 100644
--- a/src/views/users/View.svelte
+++ b/src/views/users/View.svelte
@@ -3,7 +3,7 @@
 
   import * as router from "@app/lib/router";
   import * as utils from "@app/lib/utils";
-  import { fetchProjectInfos } from "@app/components/ProjectCard";
+  import { fetchRepoInfos } from "@app/components/ProjectCard";
   import { handleError } from "@app/views/nodes/error";
 
   import Avatar from "@app/components/Avatar.svelte";
@@ -20,7 +20,7 @@
   import Placeholder from "@app/components/Placeholder.svelte";
   import Popover from "@app/components/Popover.svelte";
   import ProjectCard from "@app/components/ProjectCard.svelte";
-  import Separator from "@app/views/projects/Separator.svelte";
+  import Separator from "@app/views/repos/Separator.svelte";
   import Settings from "@app/App/Settings.svelte";
   import UserAddress from "@app/views/users/UserAddress.svelte";
 
@@ -352,15 +352,15 @@
         </div>
       </div>
 
-      {#await fetchProjectInfos(baseUrl, { show: "all", perPage: stats.repos.total }, utils.formatDid(did))}
+      {#await fetchRepoInfos(baseUrl, { show: "all", perPage: stats.repos.total }, utils.formatDid(did))}
         <div class="loading">
           <Loading small center />
         </div>
       {:then repos}
         {#if repos.length > 0}
           <div class="repo-grid">
-            {#each repos as projectInfo}
-              <ProjectCard {projectInfo}>
+            {#each repos as repoInfo}
+              <ProjectCard {repoInfo}>
                 <svelte:fragment slot="delegate">
                   <Badge
                     title={`${node.alias || utils.formatNodeId(did.pubkey)} is a delegate of this repository`}
diff --git a/src/views/users/router.ts b/src/views/users/router.ts
index 01a760684c..3b725011ab 100644
--- a/src/views/users/router.ts
+++ b/src/views/users/router.ts
@@ -7,7 +7,7 @@ import { HttpdClient } from "@http-client";
 import { ResponseError, ResponseParseError } from "@http-client/lib/fetcher";
 import { handleError } from "@app/views/nodes/error";
 import { nodePath } from "@app/views/nodes/router";
-import { unreachableError } from "@app/views/projects/error";
+import { unreachableError } from "@app/views/repos/error";
 
 export interface UserRoute {
   resource: "users";
diff --git a/tests/e2e/clipboard.spec.ts b/tests/e2e/clipboard.spec.ts
index 71c40d7cff..1fe90b79fe 100644
--- a/tests/e2e/clipboard.spec.ts
+++ b/tests/e2e/clipboard.spec.ts
@@ -30,9 +30,9 @@ test("copy to clipboard", async ({ page, browserName, context }) => {
   // Reset system clipboard to a known state.
   await page.evaluate<string>("navigator.clipboard.writeText('')");
 
-  // Project ID.
+  // Repo ID.
   {
-    await page.getByLabel("project-id").click();
+    await page.getByLabel("repo-id").click();
     const clipboardContent = await page.evaluate<string>(
       "navigator.clipboard.readText()",
     );
diff --git a/tests/e2e/node.spec.ts b/tests/e2e/node.spec.ts
index 4a44929662..80b299c7b0 100644
--- a/tests/e2e/node.spec.ts
+++ b/tests/e2e/node.spec.ts
@@ -25,27 +25,27 @@ test("node metadata", async ({ page, peerManager }) => {
   await expect(page.getByText("/radicle:1.0.0-rc.13/")).toBeVisible();
 });
 
-test("node projects", async ({ page }) => {
+test("node repos", async ({ page }) => {
   await page.goto("/nodes/radicle.local");
-  const project = page
-    .locator(".project-card", { hasText: "source-browsing" })
+  const repo = page
+    .locator(".repo-card", { hasText: "source-browsing" })
     .nth(0);
 
-  // Project metadata.
+  // Repo metadata.
   {
-    await expect(project.getByText("source-browsing")).toBeVisible();
+    await expect(repo.getByText("source-browsing")).toBeVisible();
     await expect(
-      project.getByText("Git repository for source browsing tests"),
+      repo.getByText("Git repository for source browsing tests"),
     ).toBeVisible();
   }
 });
 
 test("show pinned repositories", async ({ page }) => {
   await page.goto("/");
-  // Shows pinned project name.
+  // Shows pinned repo name.
   await expect(page.getByText("source-browsing")).toBeVisible();
   //
-  // Shows pinned project description.
+  // Shows pinned repo description.
   await expect(
     page.getByText("Git repository for source browsing tests"),
   ).toBeVisible();
diff --git a/tests/e2e/project.spec.ts b/tests/e2e/repo.spec.ts
similarity index 96%
rename from tests/e2e/project.spec.ts
rename to tests/e2e/repo.spec.ts
index d1af45cf6e..c8bd0f1ef2 100644
--- a/tests/e2e/project.spec.ts
+++ b/tests/e2e/repo.spec.ts
@@ -12,10 +12,10 @@ import {
   sourceBrowsingUrl,
   test,
 } from "@tests/support/fixtures.js";
-import { changeBranch, createProject } from "@tests/support/project";
+import { changeBranch, createRepo } from "@tests/support/repo";
 import { expectUrlPersistsReload } from "@tests/support/router";
 
-test("navigate to project", async ({ page }) => {
+test("navigate to repo", async ({ page }) => {
   await page.goto(sourceBrowsingUrl);
 
   // Header.
@@ -31,7 +31,7 @@ test("navigate to project", async ({ page }) => {
     await expect(description).toBeVisible();
   }
 
-  // Project menu shows default selected branch and commit and contributor counts.
+  // Repo menu shows default selected branch and commit and contributor counts.
   {
     await expect(page.getByTitle("Change branch")).toBeVisible();
     await expect(
@@ -48,7 +48,7 @@ test("navigate to project", async ({ page }) => {
     ).toBeVisible();
   }
 
-  // Navigate to the project README.md by default.
+  // Navigate to the repo README.md by default.
   await expect(page.locator(".filename")).toContainText("README.md");
 
   // Show a commit teaser.
@@ -58,8 +58,8 @@ test("navigate to project", async ({ page }) => {
   await expect(page.getByText("Git test repository")).toBeVisible();
 });
 
-test("project description", async ({ page, peer }) => {
-  const { rid } = await createProject(peer, {
+test("repo description", async ({ page, peer }) => {
+  const { rid } = await createRepo(peer, {
     name: "heartwood",
     description: "Radicle Heartwood Protocol & Stack",
   });
@@ -356,7 +356,7 @@ test("peer and branch switching", async ({ page }) => {
     }
   }
 
-  // Reset the source browser by clicking the project title.
+  // Reset the source browser by clicking the repo title.
   {
     await page.getByRole("link", { name: "source-browsing" }).nth(1).click();
 
@@ -429,7 +429,7 @@ test.describe("browser error handling", () => {
     await page.route(
       ({ pathname }) =>
         pathname.startsWith(
-          `/api/v1/projects/${sourceBrowsingRid}/tree/${aliceMainHead}/src`,
+          `/api/v1/repos/${sourceBrowsingRid}/tree/${aliceMainHead}/src`,
         ),
       route => route.fulfill({ status: 500 }),
     );
@@ -445,7 +445,7 @@ test.describe("browser error handling", () => {
     await page.route(
       ({ pathname }) =>
         pathname ===
-        `/api/v1/projects/${sourceBrowsingRid}/blob/${aliceMainHead}/.hidden`,
+        `/api/v1/repos/${sourceBrowsingRid}/blob/${aliceMainHead}/.hidden`,
       route => route.fulfill({ status: 500 }),
     );
 
@@ -458,7 +458,7 @@ test.describe("browser error handling", () => {
     await page.route(
       ({ pathname }) =>
         pathname ===
-        `/api/v1/projects/${sourceBrowsingRid}/readme/${aliceMainHead}`,
+        `/api/v1/repos/${sourceBrowsingRid}/readme/${aliceMainHead}`,
       route => route.fulfill({ status: 500 }),
     );
 
@@ -469,7 +469,7 @@ test.describe("browser error handling", () => {
     await page.route(
       ({ pathname }) =>
         pathname ===
-        `/api/v1/projects/${sourceBrowsingRid}/blob/${aliceMainHead}/.hidden`,
+        `/api/v1/repos/${sourceBrowsingRid}/blob/${aliceMainHead}/.hidden`,
       route => route.fulfill({ status: 500 }),
     );
 
diff --git a/tests/e2e/project/commit.spec.ts b/tests/e2e/repo/commit.spec.ts
similarity index 98%
rename from tests/e2e/project/commit.spec.ts
rename to tests/e2e/repo/commit.spec.ts
index ed3f81085b..ecfe67d917 100644
--- a/tests/e2e/project/commit.spec.ts
+++ b/tests/e2e/repo/commit.spec.ts
@@ -6,7 +6,7 @@ import {
   sourceBrowsingUrl,
   test,
 } from "@tests/support/fixtures.js";
-import { changeBranch } from "@tests/support/project";
+import { changeBranch } from "@tests/support/repo";
 import sinon from "sinon";
 
 const commitUrl = `${sourceBrowsingUrl}/commits/${bobHead}`;
diff --git a/tests/e2e/project/commits.spec.ts b/tests/e2e/repo/commits.spec.ts
similarity index 93%
rename from tests/e2e/project/commits.spec.ts
rename to tests/e2e/repo/commits.spec.ts
index 1438ae0143..80570d3619 100644
--- a/tests/e2e/project/commits.spec.ts
+++ b/tests/e2e/repo/commits.spec.ts
@@ -9,7 +9,7 @@ import {
   sourceBrowsingUrl,
   test,
 } from "@tests/support/fixtures.js";
-import { changeBranch, createProject } from "@tests/support/project";
+import { changeBranch, createRepo } from "@tests/support/repo";
 import sinon from "sinon";
 
 test("peer and branch switching", async ({ page }) => {
@@ -183,18 +183,18 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => {
   });
   await alice.startNode();
   await alice.startHttpd();
-  const { rid, projectFolder } = await createProject(alice, {
-    name: "alice-project",
+  const { rid, repoFolder } = await createRepo(alice, {
+    name: "alice-repo",
   });
   await page.goto(`${alice.uiUrl()}/${rid}`);
   await page.getByRole("link", { name: "Commits 1" }).click();
   await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}/history`);
 
   await alice.git(["commit", "--allow-empty", "--message", "first change"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await alice.git(["push", "rad", "main"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await page.reload();
   await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}/history`);
@@ -206,24 +206,19 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => {
 
   await page
     .getByRole("banner")
-    .getByRole("link", { name: "alice-project" })
+    .getByRole("link", { name: "alice-repo" })
     .click();
   await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}`);
   await page.getByRole("link", { name: "Commits 2" }).click();
 
   await alice.git(
-    [
-      "commit",
-      "--allow-empty",
-      "--message",
-      "after clicking the project title",
-    ],
+    ["commit", "--allow-empty", "--message", "after clicking the repo title"],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
   await alice.git(["push", "rad", "main"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await page.reload();
   await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}/history`);
@@ -234,6 +229,6 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => {
     page.getByRole("button", { name: "main Canonical" }),
   ).toBeVisible();
   await expect(
-    page.getByRole("link", { name: "bb9089a after clicking the" }),
+    page.getByRole("link", { name: "2fc9228 after clicking the" }),
   ).toBeVisible();
 });
diff --git a/tests/e2e/project/issue.spec.ts b/tests/e2e/repo/issue.spec.ts
similarity index 100%
rename from tests/e2e/project/issue.spec.ts
rename to tests/e2e/repo/issue.spec.ts
diff --git a/tests/e2e/project/issues.spec.ts b/tests/e2e/repo/issues.spec.ts
similarity index 89%
rename from tests/e2e/project/issues.spec.ts
rename to tests/e2e/repo/issues.spec.ts
index a859a1940e..d6a5baece8 100644
--- a/tests/e2e/project/issues.spec.ts
+++ b/tests/e2e/repo/issues.spec.ts
@@ -1,5 +1,5 @@
 import { test, cobUrl, expect } from "@tests/support/fixtures.js";
-import { createProject } from "@tests/support/project";
+import { createRepo } from "@tests/support/repo";
 
 test("navigate issue listing", async ({ page }) => {
   await page.goto(cobUrl);
@@ -12,7 +12,7 @@ test("navigate issue listing", async ({ page }) => {
 });
 
 test("issue counters", async ({ page, peer }) => {
-  const { rid, projectFolder } = await createProject(peer, {
+  const { rid, repoFolder } = await createRepo(peer, {
     name: "issue-counters",
   });
   await peer.rad(
@@ -24,7 +24,7 @@ test("issue counters", async ({ page, peer }) => {
       "--description",
       "Let's see",
     ],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await page.goto(`${peer.uiUrl()}/${rid}/issues`);
   await peer.rad(
@@ -36,7 +36,7 @@ test("issue counters", async ({ page, peer }) => {
       "--description",
       "Let's see",
     ],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await page.getByRole("button", { name: "filter-dropdown" }).first().click();
   await page.locator(".dropdown-item").getByText("Open 1").click();
diff --git a/tests/e2e/project/patch.spec.ts b/tests/e2e/repo/patch.spec.ts
similarity index 100%
rename from tests/e2e/project/patch.spec.ts
rename to tests/e2e/repo/patch.spec.ts
diff --git a/tests/e2e/project/patches.spec.ts b/tests/e2e/repo/patches.spec.ts
similarity index 83%
rename from tests/e2e/project/patches.spec.ts
rename to tests/e2e/repo/patches.spec.ts
index d6b3f3f2f2..49239e3125 100644
--- a/tests/e2e/project/patches.spec.ts
+++ b/tests/e2e/repo/patches.spec.ts
@@ -1,5 +1,5 @@
 import { test, cobUrl, expect } from "@tests/support/fixtures.js";
-import { createProject } from "@tests/support/project";
+import { createRepo } from "@tests/support/repo";
 
 test("navigate patch listing", async ({ page }) => {
   await page.goto(cobUrl);
@@ -15,30 +15,30 @@ test("navigate patch listing", async ({ page }) => {
 });
 
 test("patches counters", async ({ page, peer }) => {
-  const { rid, projectFolder, defaultBranch } = await createProject(peer, {
+  const { rid, repoFolder, defaultBranch } = await createRepo(peer, {
     name: "patch-counters",
   });
   await peer.git(["switch", "-c", "feature-1"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.git(["commit", "--allow-empty", "-m", "1th"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.git(["push", "rad", "HEAD:refs/patches"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await page.goto(`${peer.uiUrl()}/${rid}/patches`);
   await peer.git(["switch", defaultBranch], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.git(["switch", "-c", "feature-2"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.git(["commit", "--allow-empty", "-m", "2nd"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.git(["push", "rad", "HEAD:refs/patches"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await page.getByRole("button", { name: "filter-dropdown" }).first().click();
   await page.locator(".dropdown-item").getByText("Open 1").click();
diff --git a/tests/e2e/router.ts b/tests/e2e/router.ts
index e58e0ccfcd..8428bf8453 100644
--- a/tests/e2e/router.ts
+++ b/tests/e2e/router.ts
@@ -6,13 +6,13 @@ import {
   sourceBrowsingUrl,
   test,
 } from "@tests/support/fixtures.js";
-import { createProject } from "@tests/support/project";
+import { createRepo } from "@tests/support/repo";
 import {
   expectBackAndForwardNavigationWorks,
   expectUrlPersistsReload,
 } from "@tests/support/router.js";
 
-test("navigate between landing and project page", async ({ page }) => {
+test("navigate between landing and repo page", async ({ page }) => {
   await page.goto("/");
   await expect(page).toHaveURL("/");
 
@@ -23,13 +23,13 @@ test("navigate between landing and project page", async ({ page }) => {
   await expectUrlPersistsReload(page);
 });
 
-test("navigation between node and project pages", async ({ page }) => {
+test("navigation between node and repo pages", async ({ page }) => {
   await page.goto("/nodes/radicle.local");
 
-  const project = page
-    .locator(".project-card", { hasText: "source-browsing" })
+  const repo = page
+    .locator(".repo-card", { hasText: "source-browsing" })
     .nth(0);
-  await project.click();
+  await repo.click();
   await expect(page).toHaveURL(sourceBrowsingUrl);
 
   await expectBackAndForwardNavigationWorks("/nodes/radicle.local", page);
@@ -39,7 +39,7 @@ test("navigation between node and project pages", async ({ page }) => {
   await expect(page).toHaveURL("/nodes/127.0.0.1");
 });
 
-test.describe("project page navigation", () => {
+test.describe("repo page navigation", () => {
   test("navigation between commit history and single commit", async ({
     page,
   }) => {
@@ -96,7 +96,7 @@ test.describe("project page navigation", () => {
     await expect(page).toHaveURL(`${sourceBrowsingUrl}/history`);
   });
 
-  test("navigate project paths", async ({ page }) => {
+  test("navigate repo paths", async ({ page }) => {
     const projectTreeURL = `${sourceBrowsingUrl}/tree/${aliceMainHead}`;
 
     await page.goto(projectTreeURL);
@@ -126,12 +126,9 @@ test.describe("project page navigation", () => {
     );
   });
 
-  test("page title on project with empty description", async ({
-    page,
-    peer,
-  }) => {
-    const { rid } = await createProject(peer, {
-      name: "ProjectWithNoDescription",
+  test("page title on repo with empty description", async ({ page, peer }) => {
+    const { rid } = await createRepo(peer, {
+      name: "RepoWithNoDescription",
     });
     await page.goto(peer.ridUrl(rid), {
       waitUntil: "networkidle",
@@ -140,10 +137,10 @@ test.describe("project page navigation", () => {
     expect(title).toBe("ProjectWithNoDescription");
   });
 
-  test("navigate project paths with an explicitly selected peer", async ({
+  test("navigate repo paths with an explicitly selected peer", async ({
     page,
   }) => {
-    // If a branch isn't explicitly specified, the code assumes the project
+    // If a branch isn't explicitly specified, the code assumes the repo
     // default branch is selected. We omit showing the default branch in the URL.
 
     const projectTreeURL = `${sourceBrowsingUrl}/remotes/${aliceRemote.substring(
@@ -167,7 +164,7 @@ test.describe("project page navigation", () => {
     await expectUrlPersistsReload(page);
   });
 
-  test("navigate project paths with an explicitly selected peer and branch", async ({
+  test("navigate repo paths with an explicitly selected peer and branch", async ({
     page,
   }) => {
     const projectTreeURL = `${sourceBrowsingUrl}/remotes/${aliceRemote.substring(
diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts
index 3a9ebf79ab..bbc843dd62 100644
--- a/tests/support/fixtures.ts
+++ b/tests/support/fixtures.ts
@@ -14,7 +14,7 @@ import * as logLabel from "@tests/support/logPrefix.js";
 import * as patch from "@tests/support/cobs/patch.js";
 import { createOptions, supportDir, tmpDir } from "@tests/support/support.js";
 import { createPeerManager } from "@tests/support/peerManager.js";
-import { createProject } from "@tests/support/project.js";
+import { createRepo } from "@tests/support/repo.js";
 import { formatCommit } from "@app/lib/utils.js";
 
 export { expect };
@@ -268,7 +268,7 @@ export async function createSourceBrowsingFixture(
 export async function createCobsFixture(peer: RadiclePeer) {
   await peer.rad(["follow", peer.nodeId, "--alias", "palm"]);
   await Fs.mkdir(Path.join(tmpDir, "repos", "cobs"));
-  const { projectFolder, defaultBranch } = await createProject(peer, {
+  const { repoFolder, defaultBranch } = await createRepo(peer, {
     name: "cobs",
   });
   const issueOne = await issue.create(
@@ -276,23 +276,23 @@ export async function createCobsFixture(peer: RadiclePeer) {
     "This `title` has **markdown**",
     "This is a description\nWith some multiline text.",
     ["bug", "feature-request"],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     ["issue", "react", issueOne, "--emoji", "👍", "--to", issueOne],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
   await peer.rad(
     ["issue", "react", issueOne, "--emoji", "🎉", "--to", issueOne],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
   await peer.rad(
     ["issue", "assign", issueOne, "--add", `did:key:${peer.nodeId}`],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
   const { stdout: commentIssueOne } = await peer.rad(
     [
@@ -303,12 +303,12 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "This is a multiline comment\n\nWith some more text.",
       "--quiet",
     ],
-    createOptions(projectFolder, 2),
+    createOptions(repoFolder, 2),
   );
   await peer.rad(
     ["issue", "react", issueOne, "--emoji", "🙏", "--to", commentIssueOne],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
   const { stdout: replyIssueOne } = await peer.rad(
@@ -322,12 +322,12 @@ export async function createCobsFixture(peer: RadiclePeer) {
       commentIssueOne,
       "--quiet",
     ],
-    createOptions(projectFolder, 3),
+    createOptions(repoFolder, 3),
   );
   await peer.rad(
     ["issue", "react", issueOne, "--emoji", "🚀", "--to", replyIssueOne],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
   await peer.rad(
@@ -339,7 +339,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "A root level comment after a reply, for margins sake.",
       "--quiet",
     ],
-    createOptions(projectFolder, 4),
+    createOptions(repoFolder, 4),
   );
 
   const issueTwo = await issue.create(
@@ -347,11 +347,11 @@ export async function createCobsFixture(peer: RadiclePeer) {
     "A closed issue",
     "This issue has been closed\n\nsource: [link](https://radicle.xyz)",
     [],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     ["issue", "state", issueTwo, "--closed"],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
 
   const issueThree = await issue.create(
@@ -359,20 +359,20 @@ export async function createCobsFixture(peer: RadiclePeer) {
     "A solved issue",
     "This issue has been solved\n\n```js\nconsole.log('hello world')\nconsole.log(\"\")\n```",
     [],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     ["issue", "state", issueThree, "--solved"],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
 
   const patchOne = await patch.create(
     peer,
     ["Add README", "This commit adds more information to the README"],
     "feature/add-readme",
-    () => Fs.writeFile(Path.join(projectFolder, "README.md"), "# Cobs Repo"),
+    () => Fs.writeFile(Path.join(repoFolder, "README.md"), "# Cobs Repo"),
     ["Let's add a README", "This repo needed a README"],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   const { stdout: commentPatchOne } = await peer.rad(
     [
@@ -384,7 +384,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "--quiet",
       "--no-announce",
     ],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
   await peer.rad(
     [
@@ -397,7 +397,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       commentPatchOne,
       "--quiet",
     ],
-    createOptions(projectFolder, 2),
+    createOptions(repoFolder, 2),
   );
   await peer.rad(
     [
@@ -410,7 +410,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       commentPatchOne,
       "--quiet",
     ],
-    createOptions(projectFolder, 3),
+    createOptions(repoFolder, 3),
   );
   const { stdout: commentTwo } = await peer.rad(
     [
@@ -422,7 +422,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "--quiet",
       "--no-announce",
     ],
-    createOptions(projectFolder, 4),
+    createOptions(repoFolder, 4),
   );
   await peer.rad(
     [
@@ -435,27 +435,26 @@ export async function createCobsFixture(peer: RadiclePeer) {
       commentTwo,
       "--quiet",
     ],
-    createOptions(projectFolder, 5),
+    createOptions(repoFolder, 5),
   );
   await peer.rad(
     ["patch", "review", patchOne, "-m", "LGTM", "--accept"],
-    createOptions(projectFolder, 6),
+    createOptions(repoFolder, 6),
   );
   await patch.merge(
     peer,
     defaultBranch,
     "feature/add-readme",
-    createOptions(projectFolder, 7),
+    createOptions(repoFolder, 7),
   );
 
   const patchTwo = await patch.create(
     peer,
     ["Add subtitle to README"],
     "feature/add-more-text",
-    () =>
-      Fs.appendFile(Path.join(projectFolder, "README.md"), "\n\n## Subtitle"),
+    () => Fs.appendFile(Path.join(repoFolder, "README.md"), "\n\n## Subtitle"),
     [],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     [
@@ -466,7 +465,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "Not the README we are looking for",
       "--reject",
     ],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
 
   const patchThree = await patch.create(
@@ -477,29 +476,28 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "Blazingly fast",
     ],
     "feature/better-subtitle",
-    () =>
-      Fs.appendFile(Path.join(projectFolder, "README.md"), "\n\n## Better?"),
+    () => Fs.appendFile(Path.join(repoFolder, "README.md"), "\n\n## Better?"),
     [
       "Taking another stab at the README",
       "This is a big improvement over the last one",
       "Hopefully **this** is the last time",
     ],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     ["patch", "label", patchThree, "--add", "documentation"],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
   await peer.rad(
     ["patch", "review", patchThree, "-m", "This looks better"],
-    createOptions(projectFolder, 2),
+    createOptions(repoFolder, 2),
   );
   await Fs.appendFile(
-    Path.join(projectFolder, "README.md"),
+    Path.join(repoFolder, "README.md"),
     "\n\nHad to push a new revision",
   );
-  await peer.git(["add", "."], { cwd: projectFolder });
-  await peer.git(["commit", "-m", "Add more text"], { cwd: projectFolder });
+  await peer.git(["add", "."], { cwd: repoFolder });
+  await peer.git(["commit", "-m", "Add more text"], { cwd: repoFolder });
   await peer.git(
     [
       "push",
@@ -510,7 +508,7 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "rad",
       "feature/better-subtitle",
     ],
-    createOptions(projectFolder, 3),
+    createOptions(repoFolder, 3),
   );
   await peer.rad(
     [
@@ -521,17 +519,16 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "No this doesn't look better",
       "--reject",
     ],
-    createOptions(projectFolder, 2),
+    createOptions(repoFolder, 2),
   );
 
   const patchFour = await patch.create(
     peer,
     ["This patch is going to be archived"],
     "feature/archived",
-    () =>
-      Fs.writeFile(Path.join(projectFolder, "CONTRIBUTING.md"), "# Archived"),
+    () => Fs.writeFile(Path.join(repoFolder, "CONTRIBUTING.md"), "# Archived"),
     [],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     [
@@ -541,24 +538,21 @@ export async function createCobsFixture(peer: RadiclePeer) {
       "-m",
       "No review due to patch being archived.",
     ],
-    createOptions(projectFolder, 1),
-  );
-  await peer.rad(
-    ["patch", "archive", patchFour],
-    createOptions(projectFolder, 2),
+    createOptions(repoFolder, 1),
   );
+  await peer.rad(["patch", "archive", patchFour], createOptions(repoFolder, 2));
 
   const patchFive = await patch.create(
     peer,
     ["This patch is going to be reverted to draft"],
     "feature/draft",
-    () => Fs.writeFile(Path.join(projectFolder, "LICENSE"), "Draft"),
+    () => Fs.writeFile(Path.join(repoFolder, "LICENSE"), "Draft"),
     [],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
   await peer.rad(
     ["patch", "ready", patchFive, "--undo"],
-    createOptions(projectFolder, 1),
+    createOptions(repoFolder, 1),
   );
 }
 
@@ -570,12 +564,12 @@ export async function createMarkdownFixture(peer: RadiclePeer) {
     "-C",
     Path.join(tmpDir, "repos", "markdown"),
   ]);
-  const { projectFolder } = await createProject(peer, { name: "markdown" });
-  await Fs.cp(Path.join(tmpDir, "repos", "markdown"), projectFolder, {
+  const { repoFolder } = await createRepo(peer, { name: "markdown" });
+  await Fs.cp(Path.join(tmpDir, "repos", "markdown"), repoFolder, {
     recursive: true,
   });
 
-  await peer.git(["add", "."], { cwd: projectFolder });
+  await peer.git(["add", "."], { cwd: repoFolder });
   const commitMessage = `Add Markdown cheat sheet
 
   Borrowed from [Adam Pritchard][ap].
@@ -583,15 +577,15 @@ export async function createMarkdownFixture(peer: RadiclePeer) {
 
   [ap]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet`;
   await peer.git(["commit", "-m", commitMessage], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
-  await peer.git(["push", "rad"], { cwd: projectFolder });
+  await peer.git(["push", "rad"], { cwd: repoFolder });
   await issue.create(
     peer,
     "This `title` has **markdown**",
     'This is a description\n\nWith some multiline text.\n\n```\n23-11-06 10:19 ➜  radicle-jetbrains-plugin git:(main) rad id update --title "Godify jchrist" --description "where jchrist ascends to a god of this project" --delegate did:key:z6MkpaATbhkGbSMysNomYTFVvKG5bnNKYZ2cCamfoHzX9SnL --threshold 1\n\n✓ Identity revision 029837dde8f5c49704e50a19cd709473ac66a456 created\n```',
     ["bug", "feature-request"],
-    { cwd: projectFolder },
+    { cwd: repoFolder },
   );
 }
 
@@ -613,7 +607,6 @@ export const markdownRid = "rad:z2tchH2Ti4LxRKdssPQYs6VHE5rsg";
 export const sourceBrowsingUrl = `/nodes/127.0.0.1/${sourceBrowsingRid}`;
 export const cobUrl = `/nodes/127.0.0.1/${cobRid}`;
 export const markdownUrl = `/nodes/127.0.0.1/${markdownRid}`;
-export const nodeRemote = "z6MktULudTtAsAhRegYPiZ6631RV3viv12qd4GQF8z1xB22S";
 export const shortNodeRemote = "z6MktU…1xB22S";
 export const defaultHttpdPort = 8081;
 export const gitOptions = {
diff --git a/tests/support/radicle-httpd-release b/tests/support/radicle-httpd-release
index 7092c7c46f..d183d4ace0 100644
--- a/tests/support/radicle-httpd-release
+++ b/tests/support/radicle-httpd-release
@@ -1 +1 @@
-0.15.0
\ No newline at end of file
+0.16.0
\ No newline at end of file
diff --git a/tests/support/project.ts b/tests/support/repo.ts
similarity index 80%
rename from tests/support/project.ts
rename to tests/support/repo.ts
index 307bfcff79..d5b2227ab4 100644
--- a/tests/support/project.ts
+++ b/tests/support/repo.ts
@@ -10,8 +10,8 @@ export async function changeBranch(peer: string, branch: string, page: Page) {
   await page.getByRole("button", { name: branch }).click();
 }
 
-// Create a project using the rad CLI.
-export async function createProject(
+// Create a repo using the rad CLI.
+export async function createRepo(
   peer: RadiclePeer,
   {
     name,
@@ -24,14 +24,14 @@ export async function createProject(
     defaultBranch?: string;
     visibility?: "public" | "private";
   },
-): Promise<{ rid: string; projectFolder: string; defaultBranch: string }> {
-  const projectFolder = Path.join(peer.checkoutPath, name);
+): Promise<{ rid: string; repoFolder: string; defaultBranch: string }> {
+  const repoFolder = Path.join(peer.checkoutPath, name);
 
   await peer.git(["init", name, "--initial-branch", defaultBranch], {
     cwd: peer.checkoutPath,
   });
   await peer.git(["commit", "--allow-empty", "--message", "initial commit"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
   await peer.rad(
     [
@@ -45,15 +45,15 @@ export async function createProject(
       `--${visibility}`,
     ],
     {
-      cwd: projectFolder,
+      cwd: repoFolder,
     },
   );
 
   const { stdout: rid } = await peer.rad(["inspect"], {
-    cwd: projectFolder,
+    cwd: repoFolder,
   });
 
-  return { rid, projectFolder, defaultBranch };
+  return { rid, repoFolder, defaultBranch };
 }
 
 export function extractPatchId(cmdOutput: { stderr: string }) {
diff --git a/tests/support/support.ts b/tests/support/support.ts
index de1ba1fa81..eae82fce4b 100644
--- a/tests/support/support.ts
+++ b/tests/support/support.ts
@@ -11,9 +11,9 @@ export function randomTag(): string {
   return Crypto.randomBytes(8).toString("hex");
 }
 
-export function createOptions(projectFolder: string, days: number): Options {
+export function createOptions(repoFolder: string, days: number): Options {
   return {
-    cwd: projectFolder,
+    cwd: repoFolder,
     // eslint-disable-next-line @typescript-eslint/naming-convention
     env: { RAD_LOCAL_TIME: (1671211684 + days * 86400).toString() },
   };
diff --git a/tests/unit/projectRouter.test.ts b/tests/unit/projectRouter.test.ts
index de6b24c9ae..dea9cccc07 100644
--- a/tests/unit/projectRouter.test.ts
+++ b/tests/unit/projectRouter.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { testExports } from "@app/views/projects/router";
+import { testExports } from "@app/views/repos/router";
 
 // Defining the window.origin value, since vitest doesn't provide one.
 window.origin = "http://localhost:3000";
diff --git a/tests/unit/router.test.ts b/tests/unit/router.test.ts
index dfe057c20b..11100a298e 100644
--- a/tests/unit/router.test.ts
+++ b/tests/unit/router.test.ts
@@ -24,30 +24,30 @@ describe("route invariant when parsed", () => {
       },
     });
   });
-  test("projects.tree", () => {
+  test("repos.tree", () => {
     expectParsingInvariant({
-      resource: "project.source",
+      resource: "repo.source",
       node,
-      project: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
+      repo: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
       route: "",
     });
   });
 
-  test("projects.tree with peer", () => {
+  test("repos.tree with peer", () => {
     expectParsingInvariant({
-      resource: "project.source",
+      resource: "repo.source",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       peer: "PEER",
       route: "",
     });
   });
 
-  test("projects.tree with peer and revision", () => {
+  test("repos.tree with peer and revision", () => {
     const route: Route = {
-      resource: "project.source",
+      resource: "repo.source",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       peer: "PEER",
       revision: "REVISION",
       route: "",
@@ -58,11 +58,11 @@ describe("route invariant when parsed", () => {
     expect(testExports.urlToRoute(new URL(path, origin))).toEqual(route);
   });
 
-  test("projects.tree with peer and revision and path", () => {
+  test("repos.tree with peer and revision and path", () => {
     const route: Route = {
-      resource: "project.source",
+      resource: "repo.source",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       peer: "PEER",
       path: "PATH",
       revision: "REVISION",
@@ -75,121 +75,112 @@ describe("route invariant when parsed", () => {
     expect(testExports.urlToRoute(new URL(path, origin))).toEqual(route);
   });
 
-  test("projects.history", () => {
+  test("repos.history", () => {
     expectParsingInvariant({
-      resource: "project.history",
+      resource: "repo.history",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       revision: "",
     });
   });
 
-  test("projects.history with revision", () => {
+  test("repos.history with revision", () => {
     expectParsingInvariant({
-      resource: "project.history",
+      resource: "repo.history",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       revision: "REVISION",
     });
   });
 
-  test("projects.commits", () => {
+  test("repos.commits", () => {
     expectParsingInvariant({
-      resource: "project.commit",
+      resource: "repo.commit",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       commit: "COMMIT",
     });
   });
 
-  test("projects.issues", () => {
+  test("repos.issues", () => {
     expectParsingInvariant({
-      resource: "project.issues",
+      resource: "repo.issues",
       node,
-      project: "PROJECT",
+      repo: "REPO",
     });
   });
 
-  test("projects.issues with status", () => {
+  test("repos.issues with status", () => {
     expectParsingInvariant({
-      resource: "project.issues",
+      resource: "repo.issues",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       status: "closed",
     });
   });
 
-  test("projects.issue", () => {
+  test("repos.issue", () => {
     expectParsingInvariant({
-      resource: "project.issue",
+      resource: "repo.issue",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       issue: "ISSUE",
     });
   });
 
   test("projects.patches", () => {
     expectParsingInvariant({
-      resource: "project.patches",
+      resource: "repo.patches",
       node,
-      project: "PROJECT",
+      repo: "PROJECT",
       search: "SEARCH",
     });
   });
 
-  test("projects.patches with search", () => {
+  test("repos.patch default view", () => {
     expectParsingInvariant({
-      resource: "project.patches",
+      resource: "repo.patch",
       node,
-      project: "PROJECT",
-      search: "SEARCH",
-    });
-  });
-
-  test("projects.patch default view", () => {
-    expectParsingInvariant({
-      resource: "project.patch",
-      node,
-      project: "PROJECT",
+      repo: "REPO",
       patch: "PATCH",
     });
   });
 
-  test("projects.patch activity", () => {
+  test("repos.patch activity", () => {
     expectParsingInvariant({
-      resource: "project.patch",
+      resource: "repo.patch",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       patch: "PATCH",
       view: { name: "activity" },
     });
   });
 
-  test("projects.patch changes", () => {
+  test("repos.patch changes", () => {
     expectParsingInvariant({
-      resource: "project.patch",
+      resource: "repo.patch",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       patch: "PATCH",
       view: { name: "changes" },
     });
   });
 
-  test("projects.patch changes with revision", () => {
+  test("repos.patch changes with revision", () => {
     expectParsingInvariant({
-      resource: "project.patch",
+      resource: "repo.patch",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       patch: "PATCH",
       view: { name: "changes", revision: "REVISION" },
     });
   });
 
-  test("projects.patch diff", () => {
+  test("repos.patch diff", () => {
     expectParsingInvariant({
-      resource: "project.patch",
+      resource: "repo.patch",
       node,
-      project: "PROJECT",
+      repo: "REPO",
       patch: "PATCH",
       view: {
         name: "diff",
@@ -224,39 +215,39 @@ describe("pathToRoute", () => {
     });
   });
 
-  test("project with trailing slash", () => {
+  test("repo with trailing slash", () => {
     expectPathToRoute(
       "/nodes/example.node.tld/rad:zKtT7DmF9H34KkvcKj9PHW19WzjT/",
       {
-        resource: "project.source",
+        resource: "repo.source",
         node: {
           hostname: "example.node.tld",
           scheme: "http",
           port: defaultHttpdPort,
         },
-        project: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
+        repo: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
         route: "",
       },
     );
   });
 
-  test("project without trailing slash", () => {
+  test("repo without trailing slash", () => {
     expectPathToRoute(
       "/nodes/example.node.tld/rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
       {
-        resource: "project.source",
+        resource: "repo.source",
         node: {
           hostname: "example.node.tld",
           scheme: "http",
           port: defaultHttpdPort,
         },
-        project: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
+        repo: "rad:zKtT7DmF9H34KkvcKj9PHW19WzjT",
         route: "",
       },
     );
   });
 
-  test("non-existent project route", () => {
+  test("non-existent repo route", () => {
     expectPathToRoute(
       "/nodes/example.node.tld/rad:zKtT7DmF9H34KkvcKj9PHW19WzjT/nope",
       null,
diff --git a/tests/visual/desktop/cob.spec.ts b/tests/visual/desktop/cob.spec.ts
index 8f30488fd0..cf5cfb214f 100644
--- a/tests/visual/desktop/cob.spec.ts
+++ b/tests/visual/desktop/cob.spec.ts
@@ -90,7 +90,7 @@ test("failed diff loading for a specific revision", async ({ page }) => {
   await page.route(
     ({ pathname }) =>
       pathname ===
-      "/api/v1/projects/rad:z3fpY7nttPPa6MBnAv2DccHzQJnqe/diff/38c225e2a0b47ba59def211f4e4825c31d9463ec/9898da6155467adad511f63bf0fb5aa4156b92ef",
+      "/api/v1/repos/rad:z3fpY7nttPPa6MBnAv2DccHzQJnqe/diff/38c225e2a0b47ba59def211f4e4825c31d9463ec/9898da6155467adad511f63bf0fb5aa4156b92ef",
     route => route.fulfill({ status: 500 }),
   );
 
diff --git a/tests/visual/desktop/landingPage.spec.ts b/tests/visual/desktop/landingPage.spec.ts
index cadc5fba1e..08363c7910 100644
--- a/tests/visual/desktop/landingPage.spec.ts
+++ b/tests/visual/desktop/landingPage.spec.ts
@@ -1,7 +1,7 @@
 import { test, expect } from "@tests/support/fixtures.js";
 import sinon from "sinon";
 
-test("pinned projects", async ({ page }) => {
+test("pinned repos", async ({ page }) => {
   await page.addInitScript(() => {
     localStorage.setItem(
       "configuredPreferredSeeds",
@@ -18,7 +18,7 @@ test("pinned projects", async ({ page }) => {
   await expect(page).toHaveScreenshot();
 });
 
-test("load projects error", async ({ page }) => {
+test("load repos error", async ({ page }) => {
   await page.addInitScript(() => {
     localStorage.setItem(
       "configuredPreferredSeeds",
@@ -32,7 +32,7 @@ test("load projects error", async ({ page }) => {
   });
 
   await page.route(
-    ({ pathname }) => pathname === "/api/v1/projects",
+    ({ pathname }) => pathname === "/api/v1/repos",
     route => route.fulfill({ status: 500 }),
   );
 
@@ -47,7 +47,7 @@ test("response parse error", async ({ page }) => {
       JSON.stringify([{ hostname: "127.0.0.1", port: 8081, scheme: "http" }]),
     );
   });
-  await page.route("*/**/v1/projects*", route => {
+  await page.route("*/**/v1/repos*", route => {
     return route.fulfill({
       json: [{ name: 1337 }],
     });
@@ -63,7 +63,7 @@ test("response error", async ({ page }) => {
       JSON.stringify([{ hostname: "127.0.0.1", port: 8081, scheme: "http" }]),
     );
   });
-  await page.route("*/**/v1/projects*", route => {
+  await page.route("*/**/v1/repos*", route => {
     return route.fulfill({
       status: 500,
       body: "There is an error in the response",
diff --git a/tests/visual/desktop/node.spec.ts b/tests/visual/desktop/node.spec.ts
index 1f9d95d041..dbd6a6aa3f 100644
--- a/tests/visual/desktop/node.spec.ts
+++ b/tests/visual/desktop/node.spec.ts
@@ -14,10 +14,10 @@ test("node page", async ({ page }) => {
   await expect(page).toHaveScreenshot();
 });
 
-test("empty pinned projects", async ({ page }) => {
+test("empty pinned repos", async ({ page }) => {
   await page.route(
     ({ hostname, pathname }) =>
-      pathname === "/api/v1/projects" && hostname === "127.0.0.1",
+      pathname === "/api/v1/repos" && hostname === "127.0.0.1",
     async route => {
       await route.fulfill({
         status: 200,
@@ -40,7 +40,7 @@ test("node not found", async ({ page }) => {
 });
 
 test("response parse error", async ({ page }) => {
-  await page.route("*/**/v1/projects*", route => {
+  await page.route("*/**/v1/repos*", route => {
     return route.fulfill({
       json: [{ name: 1337 }],
     });
@@ -53,7 +53,7 @@ test("response parse error", async ({ page }) => {
 });
 
 test("response error", async ({ page }) => {
-  await page.route("*/**/v1/projects*", route => {
+  await page.route("*/**/v1/repos*", route => {
     return route.fulfill({
       status: 500,
     });
diff --git a/tests/visual/desktop/project.spec.ts b/tests/visual/desktop/project.spec.ts
index 767a825766..a7263ef488 100644
--- a/tests/visual/desktop/project.spec.ts
+++ b/tests/visual/desktop/project.spec.ts
@@ -80,7 +80,7 @@ test("diff selection", async ({ page }) => {
   await expect(page).toHaveScreenshot({ fullPage: true });
 });
 
-test("project load error", async ({ page }) => {
+test("repo load error", async ({ page }) => {
   await page.goto(
     `${sourceBrowsingUrl}/remotes/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz`,
     { waitUntil: "networkidle" },
@@ -88,7 +88,7 @@ test("project load error", async ({ page }) => {
   await expect(page).toHaveScreenshot();
 });
 
-test("project not found", async ({ page }) => {
+test("repo not found", async ({ page }) => {
   await page.goto(`/nodes/127.0.0.1/rad:z4Vzzzzzzzzzzzzzzzzzzzzzzzzzz`, {
     waitUntil: "networkidle",
   });
@@ -97,7 +97,7 @@ test("project not found", async ({ page }) => {
 
 test("response parse error", async ({ page }) => {
   await page.route(
-    ({ pathname }) => pathname === `/api/v1/projects/${sourceBrowsingRid}`,
+    ({ pathname }) => pathname === `/api/v1/repos/${sourceBrowsingRid}`,
     route => {
       return route.fulfill({
         json: [{ name: 1337 }],
@@ -110,7 +110,7 @@ test("response parse error", async ({ page }) => {
 
 test("response error", async ({ page }) => {
   await page.route(
-    ({ pathname }) => pathname === `/api/v1/projects/${sourceBrowsingRid}`,
+    ({ pathname }) => pathname === `/api/v1/repos/${sourceBrowsingRid}`,
     route => {
       return route.fulfill({
         status: 500,
@@ -125,7 +125,7 @@ test("readme not found", async ({ page }) => {
   await page.route(
     ({ pathname }) =>
       pathname ===
-      `http://127.0.0.1:8081/api/v1/projects/${sourceBrowsingRid}/readme/f591f9c3d842fdfb9e170e0f467189c6d9e950a2`,
+      `http://127.0.0.1:8081/api/v1/repos/${sourceBrowsingRid}/readme/f591f9c3d842fdfb9e170e0f467189c6d9e950a2`,
     route => {
       return route.fulfill({
         status: 500,
diff --git a/tests/visual/desktop/user.spec.ts b/tests/visual/desktop/user.spec.ts
index 56c172b07f..d91d8e2437 100644
--- a/tests/visual/desktop/user.spec.ts
+++ b/tests/visual/desktop/user.spec.ts
@@ -21,7 +21,7 @@ test("user page", async ({ page }) => {
   await expect(page).toHaveScreenshot();
 });
 
-test("empty pinned projects", async ({ page }) => {
+test("empty pinned repos", async ({ page }) => {
   await page.goto(`/nodes/radicle.local/users/${bobRemote}`, {
     waitUntil: "networkidle",
   });
diff --git a/tests/visual/mobile/user.spec.ts b/tests/visual/mobile/user.spec.ts
index 56c172b07f..d91d8e2437 100644
--- a/tests/visual/mobile/user.spec.ts
+++ b/tests/visual/mobile/user.spec.ts
@@ -21,7 +21,7 @@ test("user page", async ({ page }) => {
   await expect(page).toHaveScreenshot();
 });
 
-test("empty pinned projects", async ({ page }) => {
+test("empty pinned repos", async ({ page }) => {
   await page.goto(`/nodes/radicle.local/users/${bobRemote}`, {
     waitUntil: "networkidle",
   });