diff --git a/make/environment-build.mk b/make/environment-build.mk
index 750c26ff..c6233dd0 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -250,7 +250,7 @@ MAKE_OPTS = \
 	STRIP="$(TARGET_STRIP)" \
 	ARCH=$(BOXARCH)
 
-BUILD_ENV = \
+MAKE_ENV = \
 	$(MAKE_OPTS) \
 	\
 	CFLAGS="$(TARGET_CFLAGS)" \
@@ -258,7 +258,7 @@ BUILD_ENV = \
 	CXXFLAGS="$(TARGET_CXXFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 
-BUILD_ENV += \
+MAKE_ENV += \
 	PKG_CONFIG=$(PKG_CONFIG) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 
@@ -268,7 +268,7 @@ CONFIGURE_OPTS = \
 
 CONFIGURE = \
 	test -f ./configure || ./autogen.sh && \
-	$(BUILD_ENV) \
+	$(MAKE_ENV) \
 	./configure $(CONFIGURE_OPTS)
 
 # -----------------------------------------------------------------------------
diff --git a/make/host-tools.mk b/make/host-tools.mk
index 7846f91b..bf4f9ee4 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -312,7 +312,7 @@ HOST_LUAROCKS_PATCH  = luarocks-0001-allow-libluajit-detection.patch
 
 HOST_LUAROCKS_CONFIG_FILE = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua
 
-HOST_LUAROCKS_BUILD_ENV = \
+HOST_LUAROCKS_MAKE_ENV = \
 	LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVER)/?.lua" \
 	TARGET_CC="$(TARGET_CC)" \
 	TARGET_LD="$(TARGET_LD)" \
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 032f33fc..d9a671f5 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -66,7 +66,7 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS)
 	test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR)
 	$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh
 	$(CD) $(NP_OBJ_DIR); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 3f0d96f7..d4f5a3b5 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -124,7 +124,7 @@ endif
 
 # -----------------------------------------------------------------------------
 
-N_BUILD_ENV = \
+N_MAKE_ENV = \
 	$(MAKE_OPTS) \
 	\
 	CFLAGS="$(N_CFLAGS)" \
@@ -132,7 +132,7 @@ N_BUILD_ENV = \
 	CXXFLAGS="$(N_CFLAGS) -std=c++11" \
 	LDFLAGS="$(N_LDFLAGS)"
 
-N_BUILD_ENV += \
+N_MAKE_ENV += \
 	PKG_CONFIG=$(PKG_CONFIG) \
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 
@@ -144,7 +144,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS)
 		git checkout $(NI-NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh
 	$(CD) $(N_OBJ_DIR); \
-		$(N_BUILD_ENV) \
+		$(N_MAKE_ENV) \
 		$(SOURCE_DIR)/$(NI-NEUTRINO)/configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
@@ -206,7 +206,7 @@ $(LH_OBJ_DIR)/config.status: $(LH_DEPS)
 	test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR)
 	$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh
 	$(CD) $(LH_OBJ_DIR); \
-		$(N_BUILD_ENV) \
+		$(N_MAKE_ENV) \
 		$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index 282b6af5..2a48d580 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -84,7 +84,7 @@ bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
 	$(CHDIR)/$(BZIP2_TMP); \
 		$(call apply_patches, $(BZIP2_PATCH)); \
 		mv Makefile-libbz2_so Makefile; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) all; \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
 	rm -f $(TARGET_DIR)/bin/bzip2
@@ -176,7 +176,7 @@ cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	$(UNTAR)/$(CAIRO_SOURCE)
 	$(CHDIR)/$(CAIRO_TMP); \
 		$(call apply_patches, $(CAIRO_PATCH)); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		ax_cv_c_float_words_bigendian="no" \
 		./configure $(CONFIGURE_OPTS) \
 			--prefix= \
diff --git a/make/target-libs.mk b/make/target-libs.mk
index 0cde98ce..c5c94d61 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -19,7 +19,7 @@ zlib: $(ARCHIVE)/$(ZLIB_SOURCE) | $(TARGET_DIR)
 	$(UNTAR)/$(ZLIB_SOURCE)
 	$(CHDIR)/$(ZLIB_TMP); \
 		$(call apply_patches, $(ZLIB_PATCH)); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		mandir=$(remove-mandir) \
 		./configure \
 			--prefix= \
@@ -134,7 +134,7 @@ giflib: $(ARCHIVE)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(GIFLIB_TMP)
 	$(UNTAR)/$(GIFLIB_SOURCE)
 	$(CHDIR)/$(GIFLIB_TMP); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE); \
 		make install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX=
 	$(REMOVE)/$(GIFLIB_TMP)
@@ -1385,7 +1385,7 @@ endif
 GRAPHLCD_BASE_DEPS   = freetype libiconv libusb
 
 GRAPHLCD_BASE_MAKE_OPTS = \
-	$(BUILD_ENV) \
+	$(MAKE_ENV) \
 	CXXFLAGS+="-fPIC" \
 	TARGET=$(TARGET_CROSS) \
 	PREFIX= \
diff --git a/make/target-lua.mk b/make/target-lua.mk
index 4ae55272..a0f7ebd6 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -57,7 +57,7 @@ luaexpat: $(LUAEXPAT_DEPS) $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 		sed -i 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_INCLUDE_DIR)|' makefile; \
 		sed -i 's|^CFLAGS =.*|& -L$(TARGET_LIB_DIR)|' makefile; \
 		sed -i 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) \
 			PREFIX=$(TARGET_DIR) \
 			LUA_SYS_VER=$(LUA_ABIVER); \
@@ -120,7 +120,7 @@ luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
 	$(GET-GIT-SOURCE) $(LUACURL_SITE) $(ARCHIVE)/$(LUACURL_SOURCE)
 	$(CPDIR)/$(LUACURL_SOURCE)
 	$(CHDIR)/$(LUACURL_TMP); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) \
 			LIBDIR=$(TARGET_LIB_DIR) \
 			LUA_INC=$(TARGET_INCLUDE_DIR); \
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index f28de6d4..297b813a 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -159,7 +159,7 @@ iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 	$(CHDIR)/$(IOZONE_TMP)/src/current; \
 		sed -i -e "s/= gcc/= $(TARGET_CC)/" makefile; \
 		sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) linux-arm; \
 		$(INSTALL_EXEC) iozone $(TARGET_BIN_DIR)/
 	$(REMOVE)/$(IOZONE_TMP)
diff --git a/make/target-tools.mk b/make/target-tools.mk
index ce7488e3..ebf48813 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -366,7 +366,7 @@ hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HDPARM_TMP)
 	$(UNTAR)/$(HDPARM_SOURCE)
 	$(CHDIR)/$(HDPARM_TMP); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE); \
 		$(INSTALL_EXEC) -D hdparm $(TARGET_DIR)/sbin/hdparm
 	$(REMOVE)/$(HDPARM_TMP)
@@ -386,7 +386,7 @@ hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(HD-IDLE_TMP)
 	$(UNTAR)/$(HD-IDLE_SOURCE)
 	$(CHDIR)/$(HD-IDLE_TMP); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE); \
 		$(INSTALL_EXEC) -D hd-idle $(TARGET_DIR)/sbin/hd-idle
 	$(REMOVE)/$(HD-IDLE_TMP)
@@ -555,7 +555,7 @@ ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
 	$(UNTAR)/$(USHARE_SOURCE)
 	$(CHDIR)/$(USHARE_TMP); \
 		$(call apply_patches, $(USHARE_PATCH)); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		./configure \
 			--prefix= \
 			--disable-dlna \
@@ -657,7 +657,7 @@ vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 		sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \
 		sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \
 		$(MAKE) clean; \
-		$(MAKE) $(BUILD_ENV) LIBS="-lcrypt -lcrypto -lssl"; \
+		$(MAKE) $(MAKE_ENV) LIBS="-lcrypt -lcrypto -lssl"; \
 		$(INSTALL_EXEC) -D vsftpd $(TARGET_DIR)/sbin/vsftpd
 	mkdir -p $(TARGET_SHARE_DIR)/empty
 	$(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
@@ -1277,7 +1277,7 @@ wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(T
 	$(UNTAR)/$(WPA_SUPPLICANT_SOURCE)
 	$(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \
 		$(INSTALL_DATA) $(CONFIGS)/wpa_supplicant.config .config; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh
@@ -1308,7 +1308,7 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 		git checkout 25d6d44; \
 		$(call apply_patches, $(XUPNPD_PATCH))
 	$(CHDIR)/$(XUPNPD_TMP)/src; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \
 		$(INSTALL_EXEC) -D xupnpd $(TARGET_BIN_DIR)/; \
 		mkdir -p $(TARGET_SHARE_DIR)/xupnpd/config; \
@@ -1652,7 +1652,7 @@ ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-OFGWRITE)
 	tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI-OFGWRITE); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE)
 	$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin
 	$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin
@@ -1756,7 +1756,7 @@ gptfdisk: $(GPTFDISK_DEPS) $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 		$(call apply_patches, $(GPTFDISK_PATCH)); \
 		sed -i 's|^CC=.*|CC=$(TARGET_CC)|' Makefile; \
 		sed -i 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) sgdisk; \
 		$(INSTALL_EXEC) -D sgdisk $(TARGET_DIR)/sbin/sgdisk
 	$(REMOVE)/$(GPTFDISK_TMP)
@@ -1819,7 +1819,7 @@ sysvinit: $(ARCHIVE)/$(SYSVINIT_SOURCE) | $(TARGET_DIR)
 	$(UNTAR)/$(SYSVINIT_SOURCE)
 	$(CHDIR)/$(SYSVINIT_TMP); \
 		$(call apply_patches, $(addprefix $(@F)/,$(SYSVINIT_PATCH))); \
-		$(BUILD_ENV) \
+		$(MAKE_ENV) \
 		$(MAKE) -C src SULOGINLIBS=-lcrypt
 	$(SYSVINIT_INSTALL)
 	$(REMOVE)/$(SYSVINIT_TMP)