diff --git a/README.md b/README.md
index 6b46d1e9..4922829b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 
 Keeping your system up to date usually involves invoking multiple package managers.
 This results in big, non-portable shell one-liners saved in your shell.
-To remedy this, **topgrade** detects which tools you use and runs the appropriate commands to update them.
+To remedy this, **Topgrade** detects which tools you use and runs the appropriate commands to update them.
 
 ## Installation
 
@@ -72,7 +72,7 @@ Just fork the repository and start coding.
 ## Remote execution
 
 You can specify a key called `remote_topgrades` in the configuration file.
-This key should contain a list of hostnames that have topgrade installed on them.
+This key should contain a list of hostnames that have Topgrade installed on them.
 Topgrade will use `ssh` to run `topgrade` on remote hosts before acting locally.
 To limit the execution only to specific hosts use the `--remote-host-limit` parameter.
 
diff --git a/src/self_renamer.rs b/src/self_renamer.rs
index ef556390..16186bac 100644
--- a/src/self_renamer.rs
+++ b/src/self_renamer.rs
@@ -31,7 +31,7 @@ impl Drop for SelfRenamer {
         }
 
         match fs::rename(&self.temp_path, &self.exe_path) {
-            Ok(_) => debug!("Moved topgrade back from {:?} to {:?}", self.temp_path, self.exe_path),
+            Ok(_) => debug!("Moved Topgrade back from {:?} to {:?}", self.temp_path, self.exe_path),
             Err(e) => error!(
                 "Could not move Topgrade from {} back to {}: {}",
                 self.temp_path.display(),
diff --git a/src/steps/tmux.rs b/src/steps/tmux.rs
index 14a726d8..3c54363e 100644
--- a/src/steps/tmux.rs
+++ b/src/steps/tmux.rs
@@ -92,7 +92,7 @@ pub fn run_in_tmux(args: &Option<String>) -> ! {
         tmux.new_session("topgrade").expect("Error creating a tmux session");
     }
 
-    tmux.run_in_session(&command).expect("Error running topgrade in tmux");
+    tmux.run_in_session(&command).expect("Error running Topgrade in tmux");
     tmux.build()
         .args(["kill-window", "-t", "topgrade:dummy"])
         .output()
diff --git a/src/steps/toolbx.rs b/src/steps/toolbx.rs
index e94c7bfe..fcf6b247 100644
--- a/src/steps/toolbx.rs
+++ b/src/steps/toolbx.rs
@@ -33,7 +33,7 @@ pub fn run_toolbx(ctx: &ExecutionContext) -> Result<()> {
     debug!("Toolboxes to inspect: {:?}", toolboxes);
 
     let mut topgrade_path = PathBuf::from("/run/host");
-    // Path of the running topgrade executable
+    // Path of the running Topgrade executable
     // Skip 1 to eliminate the path root, otherwise push overwrites the path
     topgrade_path.push(std::env::current_exe()?.components().skip(1).collect::<PathBuf>());
     let topgrade_path = topgrade_path.to_str().unwrap();
diff --git a/topgrade.8 b/topgrade.8
index aa9fd1be..7dad0565 100644
--- a/topgrade.8
+++ b/topgrade.8
@@ -2,7 +2,7 @@
 .TH "topgrade" "8"
 .SH NAME
 .PP
-topgrade \- upgrade everything
+Topgrade \- Upgrade everything
 .SH SYNOPSIS
 .PP
 topgrade [\fIoptions\f[]]
@@ -10,7 +10,7 @@ topgrade [\fIoptions\f[]]
 .PP
 Keeping your system up to date usually involves invoking multiple package managers.
 This results in big, non-portable shell one-liners saved in your shell.
-To remedy this, \fBtopgrade\fR detects which tools you use and runs the appropriate commands to update them.
+To remedy this, \fBTopgrade\fR detects which tools you use and runs the appropriate commands to update them.
 .SH OPTIONS
 .TP
 .B \-\-only <only>
@@ -75,6 +75,6 @@ A list of steps must be provided as a list of separate arguments, i.e. 'topgrade
 .SH BUGS
 For a list of bugs see <\fIhttps://github.com/r-darwish/topgrade/issues\fR>.
 .SH AUTHOR
-\fBtopgrade\fR is maintained by Roey Dror (\[aq]r\-darwish\[aq]) and many other contributors.
+\fBTopgrade\fR is maintained by Roey Dror (\[aq]r\-darwish\[aq]) and many other contributors.
 You can view the full list at
 <\fIhttps://github.com/r-darwish/topgrade/graphs/contributors\fR>