diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index f7635c4c..6f9c7e25 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -613,8 +613,8 @@ def GetLibBuilders(env):  # pylint: disable=too-many-branches
 
     items = []
     compat_mode = int(env.get("LIB_COMPAT_MODE", 1))
-    verbose = (int(ARGUMENTS.get("PIOVERBOSE", 0))
-               and not env.GetOption('clean'))
+    verbose = int(ARGUMENTS.get("PIOVERBOSE",
+                                0)) and not env.GetOption('clean')
 
     def _check_lib_builder(lb):
         if lb.name in env.get("LIB_IGNORE", []):
diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index ab679a68..1b7cf377 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -61,6 +61,9 @@ def LoadPioPlatform(env, variables):
     p = env.PioPlatform()
     installed_packages = p.get_installed_packages()
 
+    # Ensure real platform name
+    env['PIOPLATFORM'] = p.name
+
     # Add toolchains and uploaders to $PATH
     for name in installed_packages:
         type_ = p.get_package_type(name)
@@ -80,9 +83,8 @@ def LoadPioPlatform(env, variables):
 
     board_config = env.BoardConfig()
     for k in variables.keys():
-        if (k in env
-                or not any([k.startswith("BOARD_"),
-                            k.startswith("UPLOAD_")])):
+        if k in env or \
+                not any([k.startswith("BOARD_"), k.startswith("UPLOAD_")]):
             continue
         _opt, _val = k.lower().split("_", 1)
         if _opt == "board":