diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 8bca73a4..4d46cbb0 100644
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -8,7 +8,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 endif
 
 PLAT_INCS  = $(TARGETLIB)/firmware
-PLAT_LIBS  = $(TARGETLIB) $(STATICLIB)
+PLAT_LIBS  = $(TARGETLIB) $(STATIC_LIB_DIR)
 
 bootstrap: $(BOOTSTRAP)
 	@echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXMODEL)$(TERM_NORMAL)"
@@ -48,7 +48,7 @@ $(HOST_DIR):
 $(HOST_DIR)/bin: $(HOST_DIR)
 	mkdir -p $@
 
-$(STATICLIB):
+$(STATIC_LIB_DIR):
 	mkdir -p $@
 
 $(TARGETLIB)/firmware: | $(TARGET_DIR)
diff --git a/make/environment.mk b/make/environment.mk
index 4d0adac4..e23c162b 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -153,7 +153,7 @@ PATCHES       = $(BASE_DIR)/archive-patches
 IMAGEFILES    = $(BASE_DIR)/archive-imagefiles
 SOURCES       = $(BASE_DIR)/archive-sources
 SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES)
-STATICLIB     = $(STATIC_DIR)/lib
+STATIC_LIB_DIR = $(STATIC_DIR)/lib
 TARGETLIB     = $(TARGET_DIR)/lib
 TARGETINCLUDE = $(TARGET_DIR)/include
 BUILD        ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess)
@@ -255,7 +255,7 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 
 # helper-"functions":
 REWRITE_LIBTOOL        = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
-REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATICLIB)
+REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATIC_LIB_DIR)
 REWRITE_LIBTOOLDEP     = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
 REWRITE_PKGCONF        = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"
 
diff --git a/make/static.mk b/make/static.mk
index 603eae0a..9e0aada5 100644
--- a/make/static.mk
+++ b/make/static.mk
@@ -7,8 +7,8 @@ ifneq ($(BOXSERIES), hd51)
 	CORTEX-STRINGS_CONF = --without-neon
 endif
 
-cortex-strings: $(STATICLIB)/libcortex-strings.la
-$(STATICLIB)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR)
+cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
+$(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR)
 	$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
 	pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \
 		./autogen.sh && \