diff --git a/platformio/commands/boards.py b/platformio/commands/boards.py
index b51103ca..2fe047e5 100644
--- a/platformio/commands/boards.py
+++ b/platformio/commands/boards.py
@@ -22,7 +22,7 @@ from platformio import fs
 from platformio.package.manager.platform import PlatformPackageManager
 
 
-@click.command("boards", short_help="Embedded board explorer")
+@click.command("boards", short_help="Board Explorer")
 @click.argument("query", required=False)
 @click.option("--installed", is_flag=True)
 @click.option("--json-output", is_flag=True)
diff --git a/platformio/commands/check/command.py b/platformio/commands/check/command.py
index 82ab7566..3b6a294b 100644
--- a/platformio/commands/check/command.py
+++ b/platformio/commands/check/command.py
@@ -32,7 +32,7 @@ from platformio.project.config import ProjectConfig
 from platformio.project.helpers import find_project_dir_above, get_project_dir
 
 
-@click.command("check", short_help="Static code analysis")
+@click.command("check", short_help="Static Code Analysis")
 @click.option("-e", "--environment", multiple=True)
 @click.option(
     "-d",
diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py
index 050baa65..d1a554ae 100644
--- a/platformio/commands/ci.py
+++ b/platformio/commands/ci.py
@@ -44,7 +44,7 @@ def validate_path(ctx, param, value):  # pylint: disable=unused-argument
         raise click.BadParameter("Found invalid path: %s" % invalid_path)
 
 
-@click.command("ci", short_help="Continuous integration")
+@click.command("ci", short_help="Continuous Integration")
 @click.argument("src", nargs=-1, callback=validate_path)
 @click.option("-l", "--lib", multiple=True, callback=validate_path, metavar="DIRECTORY")
 @click.option("--exclude", multiple=True)
diff --git a/platformio/commands/debug.py b/platformio/commands/debug.py
index 48d86891..dd9e228c 100644
--- a/platformio/commands/debug.py
+++ b/platformio/commands/debug.py
@@ -38,7 +38,7 @@ from platformio.project.options import ProjectOptions
 @click.command(
     "debug",
     context_settings=dict(ignore_unknown_options=True),
-    short_help="Unified debugger",
+    short_help="Unified Debugger",
 )
 @click.option(
     "-d",
diff --git a/platformio/commands/project.py b/platformio/commands/project.py
index 22b06ee2..b1056410 100644
--- a/platformio/commands/project.py
+++ b/platformio/commands/project.py
@@ -30,7 +30,7 @@ from platformio.project.generator import ProjectGenerator
 from platformio.project.helpers import is_platformio_project, load_project_ide_data
 
 
-@click.group(short_help="Project manager")
+@click.group(short_help="Project Manager")
 def cli():
     pass
 
diff --git a/platformio/commands/remote/command.py b/platformio/commands/remote/command.py
index 248d66d2..2b8ac61d 100644
--- a/platformio/commands/remote/command.py
+++ b/platformio/commands/remote/command.py
@@ -32,7 +32,7 @@ from platformio.package.manager.core import inject_contrib_pysite
 from platformio.project.exception import NotPlatformIOProjectError
 
 
-@click.group("remote", short_help="Remote development")
+@click.group("remote", short_help="Remote Development")
 @click.option("-a", "--agent", multiple=True)
 @click.pass_context
 def cli(ctx, agent):
diff --git a/platformio/commands/test/command.py b/platformio/commands/test/command.py
index c4b90499..39f509d4 100644
--- a/platformio/commands/test/command.py
+++ b/platformio/commands/test/command.py
@@ -30,7 +30,7 @@ from platformio.commands.test.native import NativeTestProcessor
 from platformio.project.config import ProjectConfig
 
 
-@click.command("test", short_help="Unit testing")
+@click.command("test", short_help="Unit Testing")
 @click.option("--environment", "-e", multiple=True, metavar="<environment>")
 @click.option(
     "--filter",