From 7feb3e3b10e362331b9347b408cf4eaec73490f5 Mon Sep 17 00:00:00 2001
From: cloudhead <cloudhead@radicle.xyz>
Date: Fri, 19 Jan 2024 17:06:02 +0100
Subject: [PATCH] Use "repository" consistently over "project"

We were using the two pretty interchangeably. "Project" should only be
used to refer to the repository payload. "Repository" should be used
when referring to the resource that is fetched, synced, cloned, checked
out etc.
---
 rad.1.adoc                                    |  2 +-
 radicle-cli/examples/rad-auth.md              |  4 +-
 radicle-cli/examples/rad-clone-all.md         |  2 +-
 radicle-cli/examples/rad-clone-connect.md     |  2 +-
 radicle-cli/examples/rad-clone-directory.md   |  2 +-
 radicle-cli/examples/rad-clone.md             |  2 +-
 radicle-cli/examples/rad-fork.md              |  2 +-
 radicle-cli/examples/rad-id-collaboration.md  |  4 +-
 .../examples/rad-init-private-clone-seed.md   |  2 +-
 radicle-cli/examples/rad-init-private.md      |  6 +--
 .../examples/rad-init-sync-not-connected.md   | 10 ++---
 .../examples/rad-init-sync-preferred.md       | 12 +++---
 radicle-cli/examples/rad-init-sync-timeout.md | 12 +++---
 radicle-cli/examples/rad-init-sync.md         | 14 +++----
 .../examples/rad-init-with-existing-remote.md |  8 ++--
 radicle-cli/examples/rad-init.md              | 10 ++---
 radicle-cli/examples/rad-patch-pull-update.md | 16 ++++----
 radicle-cli/src/commands/auth.rs              |  4 +-
 radicle-cli/src/commands/checkout.rs          |  8 ++--
 radicle-cli/src/commands/clean.rs             |  2 +-
 radicle-cli/src/commands/clone.rs             |  8 ++--
 radicle-cli/src/commands/fork.rs              |  6 +--
 radicle-cli/src/commands/init.rs              | 38 +++++++++----------
 radicle-cli/src/commands/inspect.rs           |  4 +-
 radicle-cli/src/commands/ls.rs                |  2 +-
 radicle-cli/src/commands/patch.rs             |  2 +-
 radicle-cli/src/commands/patch/review.rs      |  2 +-
 radicle-cli/src/commands/publish.rs           |  2 +-
 radicle-cli/src/commands/remote.rs            |  4 +-
 radicle-cli/src/commands/sync.rs              |  2 +-
 radicle-cli/src/commands/watch.rs             |  2 +-
 radicle/src/rad.rs                            |  6 +--
 32 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/rad.1.adoc b/rad.1.adoc
index 5ade0d85c..651ba84c5 100644
--- a/rad.1.adoc
+++ b/rad.1.adoc
@@ -164,7 +164,7 @@ a working copy and run the *rad init* command:
     $ cd my-repo
     $ rad init
 
-You will be prompted to enter a project name and default branch. Once the
+You will be prompted to enter a repository name and default branch. Once the
 repository is created, the Repository Identifier (RID) will be printed.
 Share this with collaborators so that they can clone your repository.
 
diff --git a/radicle-cli/examples/rad-auth.md b/radicle-cli/examples/rad-auth.md
index 826a7fc2e..f3822b874 100644
--- a/radicle-cli/examples/rad-auth.md
+++ b/radicle-cli/examples/rad-auth.md
@@ -10,8 +10,8 @@ Initializing your radicle 👾 identity
 ✓ Your Radicle DID is did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi. This identifies your device. Run `rad self` to show it at all times.
 ✓ You're all set.
 
-To create a radicle project, run `rad init` from a Git repository with at least one commit.
-To clone a project, run `rad clone <rid>`. For example, `rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5` clones the Radicle 'heartwood' project.
+To create a Radicle repository, run `rad init` from a Git repository with at least one commit.
+To clone a repository, run `rad clone <rid>`. For example, `rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5` clones the Radicle 'heartwood' repository.
 To get a list of all commands, run `rad help`.
 ```
 
diff --git a/radicle-cli/examples/rad-clone-all.md b/radicle-cli/examples/rad-clone-all.md
index f6ee9b61b..8fa5c7381 100644
--- a/radicle-cli/examples/rad-clone-all.md
+++ b/radicle-cli/examples/rad-clone-all.md
@@ -11,7 +11,7 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope all
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 ```
 
 We can now have a look at the new working copy that was created from the cloned
diff --git a/radicle-cli/examples/rad-clone-connect.md b/radicle-cli/examples/rad-clone-connect.md
index 3b716561b..d453de5cb 100644
--- a/radicle-cli/examples/rad-clone-connect.md
+++ b/radicle-cli/examples/rad-clone-connect.md
@@ -17,5 +17,5 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 ```
diff --git a/radicle-cli/examples/rad-clone-directory.md b/radicle-cli/examples/rad-clone-directory.md
index 2202feecd..02f48cb24 100644
--- a/radicle-cli/examples/rad-clone-directory.md
+++ b/radicle-cli/examples/rad-clone-directory.md
@@ -14,7 +14,7 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed Developer/Radicle
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd [..]/Developer/Radicle` to go to the project directory.
+Run `cd [..]/Developer/Radicle` to go to the repository directory.
 ```
 
 Note that attempting to clone into a directory that already exists,
diff --git a/radicle-cli/examples/rad-clone.md b/radicle-cli/examples/rad-clone.md
index 48c547a58..e25d062e3 100644
--- a/radicle-cli/examples/rad-clone.md
+++ b/radicle-cli/examples/rad-clone.md
@@ -14,7 +14,7 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 ```
 
 We can now have a look at the new working copy that was created from the cloned
diff --git a/radicle-cli/examples/rad-fork.md b/radicle-cli/examples/rad-fork.md
index 3c64b1a52..bfedf69fc 100644
--- a/radicle-cli/examples/rad-fork.md
+++ b/radicle-cli/examples/rad-fork.md
@@ -22,7 +22,7 @@ wish to fork:
 
 ```
 $ rad fork rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Forked project rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
 ```
 
 Now, if we `rad inspect` the project's refs again we will see that we
diff --git a/radicle-cli/examples/rad-id-collaboration.md b/radicle-cli/examples/rad-id-collaboration.md
index cdcef3585..3d0a9b98e 100644
--- a/radicle-cli/examples/rad-id-collaboration.md
+++ b/radicle-cli/examples/rad-id-collaboration.md
@@ -20,7 +20,7 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 $ cd ./heartwood
 $ git push rad master
 ```
@@ -78,7 +78,7 @@ $ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
 │ Radicle Heartwood Protocol & Stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 $ cd ./heartwood
 $ git push rad master
 ```
diff --git a/radicle-cli/examples/rad-init-private-clone-seed.md b/radicle-cli/examples/rad-init-private-clone-seed.md
index 083dea077..946b511c5 100644
--- a/radicle-cli/examples/rad-init-private-clone-seed.md
+++ b/radicle-cli/examples/rad-init-private-clone-seed.md
@@ -41,5 +41,5 @@ $ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4J
 │ radicle heartwood protocol & stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 ```
diff --git a/radicle-cli/examples/rad-init-private.md b/radicle-cli/examples/rad-init-private.md
index 9f7b0cbab..ec115e08d 100644
--- a/radicle-cli/examples/rad-init-private.md
+++ b/radicle-cli/examples/rad-init-private.md
@@ -3,11 +3,11 @@ Alice can initialize a *private* repo using the `--private` flag.
 ```
 $ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --private
 
-Initializing private radicle 👾 project in .
+Initializing private radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu.
+Your Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu.
 You can show it any time by running `rad .` from this directory.
 
 You have created a private repository.
diff --git a/radicle-cli/examples/rad-init-sync-not-connected.md b/radicle-cli/examples/rad-init-sync-not-connected.md
index e5da18b18..f690719b8 100644
--- a/radicle-cli/examples/rad-init-sync-not-connected.md
+++ b/radicle-cli/examples/rad-init-sync-not-connected.md
@@ -1,18 +1,18 @@
-When initializing a project without any peer connections, we get this output:
+When initializing a repository without any peer connections, we get this output:
 
 ```
 $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
+Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
 You can show it any time by running `rad .` from this directory.
 
 ✗ Announcing.. <canceled>
 
-You are not connected to any peers. Your project will be announced as soon as your node establishes a connection with the network.
+You are not connected to any peers. Your repository will be announced as soon as your node establishes a connection with the network.
 Check for peer connections with `rad node status`.
 
 To push changes, run `git push`.
diff --git a/radicle-cli/examples/rad-init-sync-preferred.md b/radicle-cli/examples/rad-init-sync-preferred.md
index 29b81803a..552c91ac2 100644
--- a/radicle-cli/examples/rad-init-sync-preferred.md
+++ b/radicle-cli/examples/rad-init-sync-preferred.md
@@ -1,18 +1,18 @@
-Let's try initializing a new project with a preferred seed configured.
+Let's try initializing a new repository with a preferred seed configured.
 
 ```
 $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
+Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
 You can show it any time by running `rad .` from this directory.
 
-✓ Project successfully synced to 1 node(s).
+✓ Repository successfully synced to 1 node(s).
 
-Your project has been synced to the network and is now discoverable by peers.
+Your repository has been synced to the network and is now discoverable by peers.
 View it in your browser at:
 
     https://app.radicle.xyz/nodes/[...]/rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW
diff --git a/radicle-cli/examples/rad-init-sync-timeout.md b/radicle-cli/examples/rad-init-sync-timeout.md
index 836e1293b..324334985 100644
--- a/radicle-cli/examples/rad-init-sync-timeout.md
+++ b/radicle-cli/examples/rad-init-sync-timeout.md
@@ -4,17 +4,17 @@ as the node will keep attempting to sync in the background.
 ```
 $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
+Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
 You can show it any time by running `rad .` from this directory.
 
-✓ Project successfully announced to the network.
+✓ Repository successfully announced to the network.
 
-Your project has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your project by running `rad sync status`.
+Your repository has been announced to the network and is now discoverable by peers.
+You can check for any nodes that have replicated your repository by running `rad sync status`.
 
 To push changes, run `git push`.
 ```
diff --git a/radicle-cli/examples/rad-init-sync.md b/radicle-cli/examples/rad-init-sync.md
index 3a45fa67f..0b196b278 100644
--- a/radicle-cli/examples/rad-init-sync.md
+++ b/radicle-cli/examples/rad-init-sync.md
@@ -1,21 +1,21 @@
 
-To create your first radicle project, navigate to a git repository, and run
+To create your first radicle repository, navigate to a git repository, and run
 the `init` command:
 
 ```
 $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
+Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
 You can show it any time by running `rad .` from this directory.
 
-✓ Project successfully announced to the network.
+✓ Repository successfully announced to the network.
 
-Your project has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your project by running `rad sync status`.
+Your repository has been announced to the network and is now discoverable by peers.
+You can check for any nodes that have replicated your repository by running `rad sync status`.
 
 To push changes, run `git push`.
 ```
diff --git a/radicle-cli/examples/rad-init-with-existing-remote.md b/radicle-cli/examples/rad-init-with-existing-remote.md
index 8c40e2816..6e4152999 100644
--- a/radicle-cli/examples/rad-init-with-existing-remote.md
+++ b/radicle-cli/examples/rad-init-with-existing-remote.md
@@ -22,14 +22,14 @@ Then we initialize.
 ```
 $ rad init --name heartwood --description "Heartwood Protocol & Stack" --no-confirm --public
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:z2D6wQnKapY7dn5meBnbH2rUKNZbT.
+Your Repository ID (RID) is rad:z2D6wQnKapY7dn5meBnbH2rUKNZbT.
 You can show it any time by running `rad .` from this directory.
 
-Your project will be announced to the network when you start your node.
+Your repository will be announced to the network when you start your node.
 You can start your node with `rad node start`.
 To push changes, run `git push rad master`.
 ```
diff --git a/radicle-cli/examples/rad-init.md b/radicle-cli/examples/rad-init.md
index a6ff82709..0743e5084 100644
--- a/radicle-cli/examples/rad-init.md
+++ b/radicle-cli/examples/rad-init.md
@@ -1,23 +1,23 @@
 
-To create your first radicle project, navigate to a git repository, and run the
+To create your first radicle repository, navigate to a git repository, and run the
 `init` command.  Make sure you have [authenticated](../rad-auth.md) beforehand.
 
 ```
 $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public -v
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 {
   "name": "heartwood",
   "description": "Radicle Heartwood Protocol & Stack",
   "defaultBranch": "master"
 }
 
-Your project's Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
+Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
 You can show it any time by running `rad .` from this directory.
 
-Your project will be announced to the network when you start your node.
+Your repository will be announced to the network when you start your node.
 You can start your node with `rad node start`.
 To push changes, run `git push`.
 ```
diff --git a/radicle-cli/examples/rad-patch-pull-update.md b/radicle-cli/examples/rad-patch-pull-update.md
index aed3c520e..b33db60f7 100644
--- a/radicle-cli/examples/rad-patch-pull-update.md
+++ b/radicle-cli/examples/rad-patch-pull-update.md
@@ -1,21 +1,21 @@
 Let's look at how patch updates work.
 
-Alice creates a project and Bob clones it.
+Alice creates a repository and Bob clones it.
 
 ``` ~alice
 $ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --public
 
-Initializing public radicle 👾 project in .
+Initializing public radicle 👾 repository in .
 
-✓ Project heartwood created.
+✓ Repository heartwood created.
 
-Your project's Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK.
+Your Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK.
 You can show it any time by running `rad .` from this directory.
 
-✓ Project successfully announced to the network.
+✓ Repository successfully announced to the network.
 
-Your project has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your project by running `rad sync status`.
+Your repository has been announced to the network and is now discoverable by peers.
+You can check for any nodes that have replicated your repository by running `rad sync status`.
 
 To push changes, run `git push`.
 ```
@@ -33,7 +33,7 @@ $ rad clone rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
 │ radicle heartwood protocol & stack │
 │ 0 issues · 0 patches               │
 ╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the project directory.
+Run `cd ./heartwood` to go to the repository directory.
 ```
 
 We fork the repository by pushing to `master`, and wait for Alice to sync
diff --git a/radicle-cli/src/commands/auth.rs b/radicle-cli/src/commands/auth.rs
index 30da2dc5a..a15a9a90e 100644
--- a/radicle-cli/src/commands/auth.rs
+++ b/radicle-cli/src/commands/auth.rs
@@ -139,11 +139,11 @@ pub fn init(options: Options) -> anyhow::Result<()> {
     term::success!("You're all set.");
     term::blank();
     term::info!(
-        "To create a radicle project, run {} from a Git repository with at least one commit.",
+        "To create a Radicle repository, run {} from a Git repository with at least one commit.",
         term::format::command("rad init")
     );
     term::info!(
-        "To clone a project, run {}. For example, {} clones the Radicle 'heartwood' project.",
+        "To clone a repository, run {}. For example, {} clones the Radicle 'heartwood' repository.",
         term::format::command("rad clone <rid>"),
         term::format::command("rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5")
     );
diff --git a/radicle-cli/src/commands/checkout.rs b/radicle-cli/src/commands/checkout.rs
index 116893d81..c285dd087 100644
--- a/radicle-cli/src/commands/checkout.rs
+++ b/radicle-cli/src/commands/checkout.rs
@@ -16,13 +16,15 @@ use crate::terminal::args::{Args, Error, Help};
 
 pub const HELP: Help = Help {
     name: "checkout",
-    description: "Checkout a project into the local directory",
+    description: "Checkout a repository into the local directory",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
 
     rad checkout <rid> [--remote <did>] [<option>...]
 
+    Creates a working copy from a repository in local storage.
+
 Options
 
     --remote <did>  Remote peer to checkout
@@ -63,7 +65,7 @@ impl Args for Options {
 
         Ok((
             Options {
-                id: id.ok_or_else(|| anyhow!("a project to checkout must be provided"))?,
+                id: id.ok_or_else(|| anyhow!("a repository to checkout must be provided"))?,
                 remote,
             },
             vec![],
@@ -85,7 +87,7 @@ fn execute(options: Options, profile: &Profile) -> anyhow::Result<PathBuf> {
     let doc: Doc<_> = storage
         .repository(id)?
         .identity_doc()
-        .context("project could not be found in local storage")?
+        .context("repository could not be found in local storage")?
         .into();
     let payload = doc.project()?;
     let path = PathBuf::from(payload.name());
diff --git a/radicle-cli/src/commands/clean.rs b/radicle-cli/src/commands/clean.rs
index 747875836..3a694bf22 100644
--- a/radicle-cli/src/commands/clean.rs
+++ b/radicle-cli/src/commands/clean.rs
@@ -11,7 +11,7 @@ use crate::terminal::args::{Args, Error, Help};
 
 pub const HELP: Help = Help {
     name: "clean",
-    description: "Clean a project",
+    description: "Clean a repository",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
diff --git a/radicle-cli/src/commands/clone.rs b/radicle-cli/src/commands/clone.rs
index 6b2054843..118ed6507 100644
--- a/radicle-cli/src/commands/clone.rs
+++ b/radicle-cli/src/commands/clone.rs
@@ -29,7 +29,7 @@ use crate::terminal::Element as _;
 
 pub const HELP: Help = Help {
     name: "clone",
-    description: "Clone a project",
+    description: "Clone a Radicle repository",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
@@ -167,7 +167,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     let default_branch = proj.default_branch().clone();
     let path = working.workdir().unwrap(); // SAFETY: The working copy is not bare.
 
-    // Configure repository and setup tracking for project delegates.
+    // Configure repository and setup tracking for repository delegates.
     radicle::git::configure_repository(&working)?;
     checkout::setup_remotes(
         project::SetupRemote {
@@ -205,7 +205,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         .directory
         .map_or(proj.name().to_string(), |loc| loc.display().to_string());
     term::info!(
-        "Run {} to go to the project directory.",
+        "Run {} to go to the repository directory.",
         term::format::command(format!("cd ./{location}")),
     );
 
@@ -264,7 +264,7 @@ pub fn clone<G: Signer>(
 
     let results = sync::fetch(id, mode, timeout, node)?;
     let Ok(repository) = storage.repository(id) else {
-        // If we don't have the project locally, even after attempting to fetch,
+        // If we don't have the repository locally, even after attempting to fetch,
         // there's nothing we can do.
         if results.is_empty() {
             return Err(CloneError::NoSeeds(id));
diff --git a/radicle-cli/src/commands/fork.rs b/radicle-cli/src/commands/fork.rs
index aeb7ffca6..629ce180d 100644
--- a/radicle-cli/src/commands/fork.rs
+++ b/radicle-cli/src/commands/fork.rs
@@ -11,7 +11,7 @@ use crate::terminal::args::{Args, Error, Help};
 
 pub const HELP: Help = Help {
     name: "fork",
-    description: "Create a fork of a project",
+    description: "Create a fork of a repository",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
@@ -60,14 +60,14 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Some(rid) => rid,
         None => {
             let (_, rid) =
-                radicle::rad::cwd().context("Current directory is not a radicle project")?;
+                radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
 
             rid
         }
     };
 
     rad::fork(rid, &signer, &storage)?;
-    term::success!("Forked project {rid} for {}", profile.id());
+    term::success!("Forked repository {rid} for {}", profile.id());
 
     Ok(())
 }
diff --git a/radicle-cli/src/commands/init.rs b/radicle-cli/src/commands/init.rs
index cd9eec7d9..cda37d2c5 100644
--- a/radicle-cli/src/commands/init.rs
+++ b/radicle-cli/src/commands/init.rs
@@ -28,7 +28,7 @@ use crate::terminal::Interactive;
 
 pub const HELP: Help = Help {
     name: "init",
-    description: "Initialize a project from a git repository",
+    description: "Initialize Radicle repositories",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
@@ -37,9 +37,9 @@ Usage
 
 Options
 
-        --name <string>            Name of the project
-        --description <string>     Description of the project
-        --default-branch <name>    The default branch of the project
+        --name <string>            Name of the repository
+        --description <string>     Description of the repository
+        --default-branch <name>    The default branch of the repository
         --scope <scope>            Repository follow scope (default: all)
         --private                  Set repository visibility to *private*
         --public                   Set repository visibility to *public*
@@ -98,7 +98,7 @@ impl Args for Options {
                         .all(|c| c.is_alphanumeric() || allowed.contains(&c))
                     {
                         anyhow::bail!(
-                            "invalid project name specified with `--name`, \
+                            "invalid repository name specified with `--name`, \
                             only alphanumeric characters, '-', '_' and '.' are allowed"
                         );
                     }
@@ -109,7 +109,7 @@ impl Args for Options {
                         .value()?
                         .to_str()
                         .ok_or(anyhow::anyhow!(
-                            "invalid project description specified with `--description`"
+                            "invalid repository description specified with `--description`"
                         ))?
                         .to_owned();
 
@@ -213,7 +213,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
         .ok_or_else(|| anyhow!("repository head must point to a commit"))?;
 
     term::headline(format!(
-        "Initializing{}radicle 👾 project in {}",
+        "Initializing{}radicle 👾 repository in {}",
         if let Some(visibility) = &options.visibility {
             term::format::spaced(term::format::visibility(visibility))
         } else {
@@ -281,7 +281,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
             let proj = doc.project()?;
 
             spinner.message(format!(
-                "Project {} created.",
+                "Repository {} created.",
                 term::format::highlight(proj.name())
             ));
             spinner.finish();
@@ -315,7 +315,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
 
             term::blank();
             term::info!(
-                "Your project's Repository ID {} is {}.",
+                "Your Repository ID {} is {}.",
                 term::format::dim("(RID)"),
                 term::format::highlight(rid.urn())
             );
@@ -329,7 +329,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
             if let Err(e) = announce(rid, doc, &mut node, &profile.config) {
                 term::blank();
                 term::warning(format!(
-                    "There was an error announcing your project to the network: {e}"
+                    "There was an error announcing your repository to the network: {e}"
                 ));
                 term::warning("Try again with `rad sync --announce`, or check your logs with `rad node logs`.");
                 term::blank();
@@ -416,7 +416,7 @@ fn sync(
 
     if !replicas.is_empty() {
         spinner.message(format!(
-            "Project successfully synced to {} node(s).",
+            "Repository successfully synced to {} node(s).",
             replicas.len()
         ));
         spinner.finish();
@@ -430,7 +430,7 @@ fn sync(
         }
         Ok(SyncResult::Synced { result: None })
     } else {
-        spinner.message("Project successfully announced to the network.");
+        spinner.message("Repository successfully announced to the network.");
         spinner.finish();
 
         Ok(SyncResult::NotSynced)
@@ -450,7 +450,7 @@ pub fn announce(
             }) => {
                 term::blank();
                 term::info!(
-                    "Your project has been synced to the network and is \
+                    "Your repository has been synced to the network and is \
                     now discoverable by peers.",
                 );
                 term::info!("View it in your browser at:");
@@ -461,12 +461,12 @@ pub fn announce(
             Ok(SyncResult::Synced { result: None, .. }) => {
                 term::blank();
                 term::info!(
-                    "Your project has been synced to the network and is \
+                    "Your repository has been synced to the network and is \
                     now discoverable by peers.",
                 );
                 if !config.preferred_seeds.is_empty() {
                     term::info!(
-                        "Unfortunately, you were unable to replicate your project to \
+                        "Unfortunately, you were unable to replicate your repository to \
                         your preferred seeds."
                     );
                 }
@@ -474,11 +474,11 @@ pub fn announce(
             Ok(SyncResult::NotSynced) => {
                 term::blank();
                 term::info!(
-                    "Your project has been announced to the network and is \
+                    "Your repository has been announced to the network and is \
                     now discoverable by peers.",
                 );
                 term::info!(
-                    "You can check for any nodes that have replicated your project by running \
+                    "You can check for any nodes that have replicated your repository by running \
                     `rad sync status`."
                 );
                 term::blank();
@@ -486,14 +486,14 @@ pub fn announce(
             Ok(SyncResult::NoPeersConnected) => {
                 term::blank();
                 term::info!(
-                    "You are not connected to any peers. Your project will be announced as soon as \
+                    "You are not connected to any peers. Your repository will be announced as soon as \
                     your node establishes a connection with the network.");
                 term::info!("Check for peer connections with `rad node status`.");
                 term::blank();
             }
             Ok(SyncResult::NodeStopped) => {
                 term::info!(
-                    "Your project will be announced to the network when you start your node."
+                    "Your repository will be announced to the network when you start your node."
                 );
                 term::info!(
                     "You can start your node with {}.",
diff --git a/radicle-cli/src/commands/inspect.rs b/radicle-cli/src/commands/inspect.rs
index 3dfeb5eb1..558e534aa 100644
--- a/radicle-cli/src/commands/inspect.rs
+++ b/radicle-cli/src/commands/inspect.rs
@@ -134,7 +134,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Some(rid) => rid,
         None => radicle::rad::cwd()
             .map(|(_, rid)| rid)
-            .context("Current directory is not a radicle project")?,
+            .context("Current directory is not a Radicle repository")?,
     };
 
     if options.target == Target::RepoId {
@@ -146,7 +146,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     let storage = &profile.storage;
     let repo = storage
         .repository(rid)
-        .context("No project with the given RID exists")?;
+        .context("No repository with the given RID exists")?;
     let project = repo.identity_doc()?;
 
     match options.target {
diff --git a/radicle-cli/src/commands/ls.rs b/radicle-cli/src/commands/ls.rs
index 26374fbac..14f663694 100644
--- a/radicle-cli/src/commands/ls.rs
+++ b/radicle-cli/src/commands/ls.rs
@@ -9,7 +9,7 @@ use term::Element;
 
 pub const HELP: Help = Help {
     name: "ls",
-    description: "List projects",
+    description: "List repositories",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
diff --git a/radicle-cli/src/commands/patch.rs b/radicle-cli/src/commands/patch.rs
index ffed2b54c..863df98bd 100644
--- a/radicle-cli/src/commands/patch.rs
+++ b/radicle-cli/src/commands/patch.rs
@@ -655,7 +655,7 @@ impl Args for Options {
 
 pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     let (workdir, id) = radicle::rad::cwd()
-        .map_err(|_| anyhow!("this command must be run in the context of a project"))?;
+        .map_err(|_| anyhow!("this command must be run in the context of a repository"))?;
 
     let profile = ctx.profile()?;
     let repository = profile.storage.repository(id)?;
diff --git a/radicle-cli/src/commands/patch/review.rs b/radicle-cli/src/commands/patch/review.rs
index 48d18856c..00a201ea7 100644
--- a/radicle-cli/src/commands/patch/review.rs
+++ b/radicle-cli/src/commands/patch/review.rs
@@ -58,7 +58,7 @@ pub fn run(
 ) -> anyhow::Result<()> {
     let signer = term::signer(profile)?;
     let _project = repository.identity_doc().context(format!(
-        "couldn't load project {} from local state",
+        "couldn't load repository {} from local state",
         repository.id
     ))?;
     let mut patches = Patches::open(repository)?;
diff --git a/radicle-cli/src/commands/publish.rs b/radicle-cli/src/commands/publish.rs
index dcdc01f3d..85f02109b 100644
--- a/radicle-cli/src/commands/publish.rs
+++ b/radicle-cli/src/commands/publish.rs
@@ -72,7 +72,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Some(rid) => rid,
         None => radicle::rad::cwd()
             .map(|(_, rid)| rid)
-            .context("Current directory is not a radicle project")?,
+            .context("Current directory is not a Radicle repository")?,
     };
 
     let repo = profile.storage.repository_mut(rid)?;
diff --git a/radicle-cli/src/commands/remote.rs b/radicle-cli/src/commands/remote.rs
index 403bd9ba2..f66a33611 100644
--- a/radicle-cli/src/commands/remote.rs
+++ b/radicle-cli/src/commands/remote.rs
@@ -20,7 +20,7 @@ use crate::terminal::{Args, Context, Help};
 
 pub const HELP: Help = Help {
     name: "remote",
-    description: "Manage a project's remotes",
+    description: "Manage a repository's remotes",
     version: env!("CARGO_PKG_VERSION"),
     usage: r#"
 Usage
@@ -177,7 +177,7 @@ impl Args for Options {
 
 pub fn run(options: Options, ctx: impl Context) -> anyhow::Result<()> {
     let (working, rid) = radicle::rad::cwd()
-        .map_err(|_| anyhow!("this command must be run in the context of a project"))?;
+        .map_err(|_| anyhow!("this command must be run in the context of a repository"))?;
     let profile = ctx.profile()?;
 
     match options.op {
diff --git a/radicle-cli/src/commands/sync.rs b/radicle-cli/src/commands/sync.rs
index dca5755e8..d49d8f815 100644
--- a/radicle-cli/src/commands/sync.rs
+++ b/radicle-cli/src/commands/sync.rs
@@ -263,7 +263,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Some(rid) => rid,
         None => {
             let (_, rid) =
-                radicle::rad::cwd().context("Current directory is not a radicle project")?;
+                radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
 
             rid
         }
diff --git a/radicle-cli/src/commands/watch.rs b/radicle-cli/src/commands/watch.rs
index 2f3711aa1..8f6fded77 100644
--- a/radicle-cli/src/commands/watch.rs
+++ b/radicle-cli/src/commands/watch.rs
@@ -130,7 +130,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Some(rid) => rid,
         None => {
             let (_, rid) =
-                radicle::rad::cwd().context("Current directory is not a radicle project")?;
+                radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
             rid
         }
     };
diff --git a/radicle/src/rad.rs b/radicle/src/rad.rs
index d210d1819..d3633ce52 100644
--- a/radicle/src/rad.rs
+++ b/radicle/src/rad.rs
@@ -126,7 +126,7 @@ pub enum ForkError {
     Storage(#[from] storage::Error),
     #[error("payload: {0}")]
     Payload(#[from] doc::PayloadError),
-    #[error("project `{0}` was not found in storage")]
+    #[error("repository `{0}` was not found in storage")]
     NotFound(RepoId),
     #[error("repository: {0}")]
     Repository(#[from] RepositoryError),
@@ -197,7 +197,7 @@ pub enum CheckoutError {
     Git(#[from] git2::Error),
     #[error("payload: {0}")]
     Payload(#[from] doc::PayloadError),
-    #[error("project `{0}` was not found in storage")]
+    #[error("repository `{0}` was not found in storage")]
     NotFound(RepoId),
     #[error("repository: {0}")]
     Repository(#[from] RepositoryError),
@@ -295,7 +295,7 @@ pub fn remove_remote(repo: &git2::Repository) -> Result<(), RemoteError> {
     Ok(())
 }
 
-/// Get the Id of project in current working directory
+/// Get the RID of the repository in current working directory
 ///
 /// It will atempt to search parent directories if `path` did not find
 /// a git repository.