diff --git a/HISTORY.rst b/HISTORY.rst
index fd73bec5..a4deb1d9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -11,6 +11,7 @@ PlatformIO Core 5
 5.0.4 (2020-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+- Added "Core" suffix when showing PlatformIO Core version using ``pio --verison`` command
 - Do not provide "intelliSenseMode" option when generating configuration for VSCode C/C++ extension
 
 5.0.3 (2020-11-12)
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 7bd11be1..09941f0a 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -31,11 +31,11 @@ __description__ = (
 )
 __url__ = "https://platformio.org"
 
-__author__ = "PlatformIO"
-__email__ = "contact@platformio.org"
+__author__ = "PlatformIO Labs"
+__email__ = "contact@piolabs.com"
 
 __license__ = "Apache Software License"
-__copyright__ = "Copyright 2014-present PlatformIO"
+__copyright__ = "Copyright 2014-present PlatformIO Labs"
 
 __accounts_api__ = "https://api.accounts.platformio.org"
 __registry_api__ = [
diff --git a/platformio/__main__.py b/platformio/__main__.py
index 8420544b..537b1d0a 100644
--- a/platformio/__main__.py
+++ b/platformio/__main__.py
@@ -33,7 +33,7 @@ except:  # pylint: disable=bare-except
 @click.command(
     cls=PlatformioCLI, context_settings=dict(help_option_names=["-h", "--help"])
 )
-@click.version_option(__version__, prog_name="PlatformIO")
+@click.version_option(__version__, prog_name="PlatformIO Core")
 @click.option("--force", "-f", is_flag=True, help="DEPRECATE")
 @click.option("--caller", "-c", help="Caller ID (service)")
 @click.option("--no-ansi", is_flag=True, help="Do not print ANSI control characters")