diff --git a/demos/demo_working_copy.sh b/demos/demo_working_copy.sh
index dcf793212..b8f47ab8c 100755
--- a/demos/demo_working_copy.sh
+++ b/demos/demo_working_copy.sh
@@ -17,7 +17,7 @@ pause 2
 run_command "# Now make some changes in the working copy:"
 run_command "echo \"Goodbye World!\" > README"
 run_command "echo stuff > new-file"
-run_command "# Our working copy commit id changed because we made changes:"
+run_command "# Our working copy'\''s commit ID changed because we made changes:"
 run_command "jj status"
 pause 5
 run_command "# Add a branch so we can easily refer to this commit:"
diff --git a/docs/git-comparison.md b/docs/git-comparison.md
index 0b34f8868..b4bb50fbd 100644
--- a/docs/git-comparison.md
+++ b/docs/git-comparison.md
@@ -136,8 +136,8 @@ commit), but that's left out of the table to keep it simple. For example,
     </tr>
     <tr>
       <td>Reorder changes from A-B-C-D to A-C-B-D</td>
-      <td><code>jj rebase -r C -d A; rebase -s B -d C</code> (pass change ids,
-          not commit ids, to not have to look up commit id of rewritten C)</td>
+      <td><code>jj rebase -r C -d A; rebase -s B -d C</code> (pass change IDs,
+          not commit IDs, to not have to look up commit ID of rewritten C)</td>
       <td><code>git rebase -i A</code></td>
     </tr>
     <tr>
@@ -202,7 +202,7 @@ commit), but that's left out of the table to keep it simple. For example,
     </tr>
     <tr>
       <td>Undo an earlier operation</td>
-      <td><code>jj op undo -o &lt;operation id&gt;</code></td>
+      <td><code>jj op undo -o &lt;operation ID&gt;</code></td>
       <td>Not supported</td>
     </tr>
   </tbody>
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 77082ace3..1692ff490 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -27,7 +27,7 @@ Working copy : 265ecf5cab2d
 The working copy is clean
 ```
 
-We can see from the output above that our working copy has a commit id
+We can see from the output above that our working copy has a commit ID
 (`265ecf5cab2d` in the example).
 
 Let's check out a particular commit, so we get more predicable output:
@@ -96,7 +96,7 @@ Jujutsu's diff format currently only has inline coloring of the diff (like
 `git diff --color-words`), which makes the diff impossible to see in the
 un-colorized output above (the "not" in "not ready" is red).
 
-As you may have noticed, the working copy commit's id changed both when we
+As you may have noticed, the working copy commit's ID changed both when we
 edited the description and when we edited the README. However, the parent commit
 stayed the same. Each change to the working copy commit amends the previous
 version. So how do we tell Jujutsu that we are done amending the working copy
@@ -117,7 +117,7 @@ Working copy : 192b456b024b
 The working copy is clean
 ```
 
-Note that a commit id printed in green indicates an open commit and blue
+Note that a commit ID printed in green indicates an open commit and blue
 indicates a closed commit.
 
 If we later realize that we want to make further changes, we can make them
@@ -145,7 +145,7 @@ o dcfc888f50b3 7eddf8dfc70d martinvonz@google.com 2021-05-23 22:07:40.000 -07:00
 ```
 
 The `@` indicates the working copy commit. The first hash on a line is the
-commit id. The second hash is a "change id", which is an id that follows the
+commit ID. The second hash is a "change ID", which is an ID that follows the
 commit as it's rewritten (similar to Gerrit's Change-Id). You can give either
 hash to commands that take revisions as arguments. We will generally prefer
 change ids because they stay the same when the commit is rewritten.
diff --git a/src/commands.rs b/src/commands.rs
index 10a60b598..b0a8e0b48 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -518,14 +518,14 @@ fn resolve_single_op_from_store(
     }
     if matches.is_empty() {
         Err(CommandError::UserError(format!(
-            "No operation id matching \"{}\"",
+            "No operation ID matching \"{}\"",
             op_str
         )))
     } else if matches.len() == 1 {
         Ok(matches.pop().unwrap())
     } else {
         Err(CommandError::UserError(format!(
-            "Operation id prefix \"{}\" is ambiguous",
+            "Operation ID prefix \"{}\" is ambiguous",
             op_str
         )))
     }
@@ -1184,7 +1184,7 @@ By default, all branches are pushed. Use `--branch` if you want to push only one
         )
         .subcommand(
             SubCommand::with_name("resolveprefix")
-                .about("Resolve a commit id prefix")
+                .about("Resolve a commit ID prefix")
                 .arg(Arg::with_name("prefix").index(1).required(true)),
         );
     let debug_command = SubCommand::with_name("debug")
@@ -1272,7 +1272,7 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
                      ID> st` will show you what `jj st` would have shown you when the given \
                      operation had just finished.
 
-Use `jj op log` to find the operation ID you want. Any unambiguous prefix of the operation id is \
+Use `jj op log` to find the operation ID you want. Any unambiguous prefix of the operation ID is \
                      enough.
 
 When loading the repo at an earlier operation, the working copy will not be automatically \
@@ -3795,7 +3795,7 @@ When you use `--at-op`, the automatic snapshotting of the working copy will not
 
 As a top-level option, `--at-op`, it can be passed to any command. However, you will typically \
              only want to run read-only commands. For example, `jj log`, `jj st`, and `jj diff` \
-             all make sense. It's still possible to run e.g. `jj --at-op=<some operation id> \
+             all make sense. It's still possible to run e.g. `jj --at-op=<some operation ID> \
              describe`. That's equivalent to having started `jj describe` back when the specified \
              operation was the most recent operation and then let it run until now (which can be \
              done for that particular command by not closing the editor). There's practically no \
diff --git a/src/template_parser.rs b/src/template_parser.rs
index fb5d1d678..e06657303 100644
--- a/src/template_parser.rs
+++ b/src/template_parser.rs
@@ -172,7 +172,7 @@ fn parse_commit_id_method<'a>(method: Pair<Rule>) -> Property<'a, CommitId> {
 
     let this_function = match name.as_str() {
         "short" => Property::String(Box::new(CommitIdShortest)),
-        name => panic!("no such commit id method: {}", name),
+        name => panic!("no such commit ID method: {}", name),
     };
     let chain_method = inner.last().unwrap();
     parse_method_chain(chain_method, this_function)
@@ -193,7 +193,7 @@ fn parse_signature_method<'a>(method: Pair<Rule>) -> Property<'a, Signature> {
         "name" => Property::String(Box::new(SignatureName)),
         "email" => Property::String(Box::new(SignatureEmail)),
         "timestamp" => Property::String(Box::new(SignatureTimestamp)),
-        name => panic!("no such commit id method: {}", name),
+        name => panic!("no such commit ID method: {}", name),
     };
     let chain_method = inner.last().unwrap();
     parse_method_chain(chain_method, this_function)