diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index dfbd0bdc..7e1199cb 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -200,7 +200,7 @@ Build Script
 
 Platform's build script is based on a next-generation build tool named
 `SCons <http://www.scons.org>`_. PlatformIO has own built-in firmware builder
-``env.BuildFirmware`` with the nested libraries search. Please look into a
+``env.BuildProgram`` with the nested libraries search. Please look into a
 base template of ``test-builder.py``.
 
 .. code-block:: python
@@ -260,7 +260,7 @@ base template of ``test-builder.py``.
     #
     # Target: Build executable and linkable firmware
     #
-    target_elf = env.BuildFirmware()
+    target_elf = env.BuildProgram()
 
     #
     # Target: Build the .bin file
@@ -383,7 +383,7 @@ and copy there two files:
     # Target: Build executable and linkable firmware
     #
 
-    target_elf = env.BuildFirmware()
+    target_elf = env.BuildProgram()
 
     #
     # Target: Build the .bin file
diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index 1027b6a4..6bdc2b62 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -95,7 +95,7 @@ else:
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Extract EEPROM data (from EEMEM directive) to .eep file
diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py
index 083f4136..00d0fa78 100644
--- a/platformio/builder/scripts/atmelsam.py
+++ b/platformio/builder/scripts/atmelsam.py
@@ -77,7 +77,7 @@ env.Append(
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index fa035f6d..09c7196b 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -132,7 +132,7 @@ if "FRAMEWORK" not in env:
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .hex
diff --git a/platformio/builder/scripts/freescalekinetis.py b/platformio/builder/scripts/freescalekinetis.py
index c80d7134..0f23c8f6 100644
--- a/platformio/builder/scripts/freescalekinetis.py
+++ b/platformio/builder/scripts/freescalekinetis.py
@@ -18,7 +18,7 @@ SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py
index 15e67cc2..caed2f55 100644
--- a/platformio/builder/scripts/nordicnrf51.py
+++ b/platformio/builder/scripts/nordicnrf51.py
@@ -18,7 +18,7 @@ SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/nxplpc.py b/platformio/builder/scripts/nxplpc.py
index 39b9dfd9..9585eb5a 100644
--- a/platformio/builder/scripts/nxplpc.py
+++ b/platformio/builder/scripts/nxplpc.py
@@ -27,7 +27,7 @@ SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/siliconlabsefm32.py b/platformio/builder/scripts/siliconlabsefm32.py
index 29692f6f..1fd710b9 100644
--- a/platformio/builder/scripts/siliconlabsefm32.py
+++ b/platformio/builder/scripts/siliconlabsefm32.py
@@ -18,7 +18,7 @@ SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/ststm32.py b/platformio/builder/scripts/ststm32.py
index c1622028..aeff2818 100644
--- a/platformio/builder/scripts/ststm32.py
+++ b/platformio/builder/scripts/ststm32.py
@@ -65,7 +65,7 @@ env.Append(
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index fc4f4f91..e7a5643f 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -61,7 +61,7 @@ else:
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the firmware file
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index c928b357..b38d4c12 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -83,7 +83,7 @@ env.Append(
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .hex
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index db14ecdf..a94a64e7 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/platformio/builder/scripts/titiva.py
@@ -31,7 +31,7 @@ env.Append(
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware()
+target_elf = env.BuildProgram()
 
 #
 # Target: Build the .bin file
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 4721884e..fb3f3fca 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -159,7 +159,7 @@ def DumpIDEData(env):
     return data
 
 
-def getCompilerType(env):
+def GetCompilerType(env):
     try:
         sysenv = environ.copy()
         sysenv['PATH'] = str(env['ENV']['PATH'])
@@ -182,5 +182,5 @@ def exists(_):
 def generate(env):
     env.AddMethod(ConvertInoToCpp)
     env.AddMethod(DumpIDEData)
-    env.AddMethod(getCompilerType)
+    env.AddMethod(GetCompilerType)
     return env
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index be537d7d..1f1d145e 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -20,7 +20,7 @@ SRC_DEFAULT_FILTER = " ".join([
 ])
 
 
-def BuildFirmware(env):
+def BuildProgram(env):
 
     # fix ASM handling under non-casitive OS
     if not case_sensitive_suffixes(".s", ".S"):
@@ -43,7 +43,7 @@ def BuildFirmware(env):
         )
 
     # enable "cyclic reference" for linker
-    if env.get("LIBS", deplibs) and env.getCompilerType() == "gcc":
+    if env.get("LIBS", deplibs) and env.GetCompilerType() == "gcc":
         env.Prepend(
             _LIBFLAGS="-Wl,--start-group "
         )
@@ -330,7 +330,7 @@ def exists(_):
 
 
 def generate(env):
-    env.AddMethod(BuildFirmware)
+    env.AddMethod(BuildProgram)
     env.AddMethod(ProcessFlags)
     env.AddMethod(IsFileWithExt)
     env.AddMethod(VariantDirWrap)