diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 6286bd57..8f7586e4 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -50,10 +50,10 @@ clivars.AddVariables(
 DEFAULT_ENV_OPTIONS = dict(
     tools=[
         "ar",
-        "gas",
-        "gcc",
-        "g++",
-        "gnulink",
+        "as",
+        "cc",
+        "c++",
+        "link",
         "platformio",
         "pioplatform",
         "pioproject",