diff --git a/package/lcd4linux/lcd4linux.mk b/package/lcd4linux/lcd4linux.mk
index 7c4ad298..0ee2f34a 100644
--- a/package/lcd4linux/lcd4linux.mk
+++ b/package/lcd4linux/lcd4linux.mk
@@ -36,7 +36,7 @@ define LCD4LINUX_MAKE_VCS_VERSION
 	$(CHDIR)/$($(PKG)_DIR); \
 		$(MAKE) vcs_version
 endef
-LCD4LINUX_PRE_COMPILE_HOOKS += LCD4LINUX_MAKE_VCS_VERSION
+LCD4LINUX_PRE_BUILD_HOOKS += LCD4LINUX_MAKE_VCS_VERSION
 
 lcd4linux: | $(TARGET_DIR)
 	$(call autotools-package)
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 8b15ef18..0703e630 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -29,7 +29,7 @@ define LUA_MAKE_PC
 	$(CHDIR)/$($(PKG)_DIR); \
 		$($(PKG)_MAKE) pc INSTALL_TOP=$(TARGET_prefix) > $(TARGET_libdir)/pkgconfig/lua.pc
 endef
-LUA_POST_COMPILE_HOOKS += LUA_MAKE_PC
+LUA_POST_BUILD_HOOKS += LUA_MAKE_PC
 
 define LUA_TARGET_CLEANUP
 	$(TARGET_RM) $(TARGET_bindir)/luac
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 294f25c3..3bf123aa 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -58,7 +58,7 @@ define OPENSSL_MAKE_DEPEND
 	$(CHDIR)/$($(PKG)_DIR); \
 		$($(PKG)_MAKE) depend
 endef
-OPENSSL_PRE_COMPILE_HOOKS += OPENSSL_MAKE_DEPEND
+OPENSSL_PRE_BUILD_HOOKS += OPENSSL_MAKE_DEPEND
 
 OPENSSL_MAKE_INSTALL_ARGS = \
 	install_sw
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index fad749e7..edc73ecf 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -14,10 +14,10 @@ define TARGET_MAKE_CMDS
 endef
 
 define TARGET_MAKE
-	@$(call MESSAGE,"Compiling")
-	$(foreach hook,$($(PKG)_PRE_COMPILE_HOOKS),$(call $(hook))$(sep))
+	@$(call MESSAGE,"Building")
+	$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
 	$(Q)$(call $(PKG)_MAKE_CMDS)
-	$(foreach hook,$($(PKG)_POST_COMPILE_HOOKS),$(call $(hook))$(sep))
+	$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
 endef
 
 define TARGET_MAKE_INSTALL_CMDS
@@ -56,9 +56,9 @@ endef
 
 define HOST_MAKE
 	@$(call MESSAGE,"Compiling")
-	$(foreach hook,$($(PKG)_PRE_COMPILE_HOOKS),$(call $(hook))$(sep))
+	$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
 	$(Q)$(call $(PKG)_MAKE_CMDS)
-	$(foreach hook,$($(PKG)_POST_COMPILE_HOOKS),$(call $(hook))$(sep))
+	$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
 endef
 
 define HOST_MAKE_INSTALL_CMDS
diff --git a/package/u-boot/u-boot.mk b/package/u-boot/u-boot.mk
index 2cad2f4f..122c6175 100644
--- a/package/u-boot/u-boot.mk
+++ b/package/u-boot/u-boot.mk
@@ -22,7 +22,7 @@ define HOST_U_BOOT_MAKE_DEFCONFIG
 	$(CHDIR)/$($(PKG)_DIR); \
 		$($(PKG)_MAKE) defconfig
 endef
-HOST_U_BOOT_PRE_COMPILE_HOOKS += HOST_U_BOOT_MAKE_DEFCONFIG
+HOST_U_BOOT_PRE_BUILD_HOOKS += HOST_U_BOOT_MAKE_DEFCONFIG
 
 HOST_U_BOOT_MAKE_ARGS = \
 	tools-only
@@ -30,7 +30,7 @@ HOST_U_BOOT_MAKE_ARGS = \
 define HOST_U_BOOT_INSTALL_MKIMAGE
 	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/tools/mkimage $(HOST_MKIMAGE)
 endef
-HOST_U_BOOT_POST_COMPILE_HOOKS += HOST_U_BOOT_INSTALL_MKIMAGE
+HOST_U_BOOT_POST_BUILD_HOOKS += HOST_U_BOOT_INSTALL_MKIMAGE
 
 host-u-boot: | $(HOST_DIR)
 	$(call host-generic-package,$(PKG_NO_INSTALL))
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 3299ffa4..b7860dd9 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -26,7 +26,7 @@ VSFTPD_POST_PATCH_HOOKS += VSFTPD_PATCH_BUILDDEFS_H
 define VSFTPD_INSTALL_BINARY
 	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/vsftpd $(TARGET_sbindir)/vsftpd
 endef
-VSFTPD_POST_COMPILE_HOOKS += VSFTPD_INSTALL_BINARY
+VSFTPD_POST_BUILD_HOOKS += VSFTPD_INSTALL_BINARY
 
 define VSFTPD_INSTALL_FILES
 	$(INSTALL) -d $(TARGET_datadir)/empty