diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index 84a5b107..aa6992df 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -26,6 +26,6 @@ define CONFD_INSTALL_EXTRA
 	mkdir -p $(TARGET_DIR)/lib/infix
 	cp $(CONFD_PKGDIR)/clean-etc     $(TARGET_DIR)/lib/infix/
 endef
-CONFD_TARGET_FINALIZE_HOOKS += CONFD_INSTALL_EXTRA
+CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
 
 $(eval $(autotools-package))
diff --git a/package/net/net.mk b/package/net/net.mk
index d353a71a..35f19549 100644
--- a/package/net/net.mk
+++ b/package/net/net.mk
@@ -14,6 +14,6 @@ NET_AUTORECONF = YES
 define NET_INSTALL_EXTRA
 	chmod +x $(TARGET_DIR)/usr/share/net/*.sh
 endef
-NET_TARGET_FINALIZE_HOOKS += NET_INSTALL_EXTRA
+NET_POST_INSTALL_TARGET_HOOKS += NET_INSTALL_EXTRA
 
 $(eval $(autotools-package))
diff --git a/package/skeleton-init-finit/skeleton-init-finit.mk b/package/skeleton-init-finit/skeleton-init-finit.mk
index 2a6fae90..f1229ca8 100644
--- a/package/skeleton-init-finit/skeleton-init-finit.mk
+++ b/package/skeleton-init-finit/skeleton-init-finit.mk
@@ -32,7 +32,7 @@ define SKELETON_INIT_FINIT_SET_GENERIC_GETTY
 	$(SKELETON_INIT_FINIT_GETTY) >> $(FINIT_D)/available/getty.conf
 	ln -sf ../available/getty.conf $(FINIT_D)/enabled/getty.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_GENERIC_GETTY
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_GENERIC_GETTY
 
 # Avahi mDNS-SD
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
@@ -41,7 +41,7 @@ define SKELETON_INIT_FINIT_SET_AVAHI
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/avahi-dnsconfd.conf $(FINIT_D)/available/
 	ln -sf ../available/avahi.conf $(FINIT_D)/enabled/avahi.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI
 endif
 
 ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)
@@ -49,21 +49,21 @@ define SKELETON_INIT_FINIT_SET_AVAHI_AUTOIPD
 	echo "service [2345789] name:zeroconf :%i avahi-autoipd --force-bind --syslog %i -- ZeroConf for %i" \
 		> $(FINIT_D)/available/zeroconf@.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI_AUTOIPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI_AUTOIPD
 endif
 
 ifeq ($(BR2_PACKAGE_CHRONY),y)
 define SKELETON_INIT_FINIT_SET_CHRONY
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/chronyd.conf $(FINIT_D)/available/
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_CHRONY
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_CHRONY
 endif
 
 ifeq ($(BR2_PACKAGE_CONNTRACKD),y)
 define SKELETON_INIT_FINIT_SET_CONNTRACKD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/conntrackd.conf $(FINIT_D)/available/
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_CONNTRACKD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_CONNTRACKD
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ),y)
@@ -71,7 +71,7 @@ define SKELETON_INIT_FINIT_SET_DNSMASQ
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/dnsmasq.conf $(FINIT_D)/available/
 	ln -sf ../available/dnsmasq.conf $(FINIT_D)/enabled/dnsmasq.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_DNSMASQ
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_DNSMASQ
 endif
 
 # Dropbear SSH
@@ -80,7 +80,7 @@ define SKELETON_INIT_FINIT_SET_DROPBEAR
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/dropbear.conf $(FINIT_D)/available/
 	ln -sf ../available/dropbear.conf $(FINIT_D)/enabled/dropbear.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_DROPBEAR
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_DROPBEAR
 endif
 
 ifeq ($(BR2_PACKAGE_FRR),y)
@@ -90,14 +90,14 @@ define SKELETON_INIT_FINIT_SET_FRR
 	done
 	ln -sf ../available/zebra.conf $(FINIT_D)/enabled/zebra.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_FRR
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_FRR
 endif # BR2_PACKAGE_FRR
 
 ifeq ($(BR2_PACKAGE_INADYN),y)
 define SKELETON_INIT_FINIT_SET_INADYN
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/inadyn.conf $(FINIT_D)/available/
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_INADYN
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_INADYN
 endif
 
 ifeq ($(BR2_PACKAGE_LLDPD),y)
@@ -105,14 +105,14 @@ define SKELETON_INIT_FINIT_SET_LLDPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/lldpd.conf $(FINIT_D)/available/
 	ln -sf ../available/lldpd.conf $(FINIT_D)/enabled/lldpd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_LLDPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_LLDPD
 endif
 
 ifeq ($(BR2_PACKAGE_MSTPD),y)
 define SKELETON_INIT_FINIT_SET_MSTPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/mstpd.conf $(FINIT_D)/available/
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_MSTPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_MSTPD
 endif
 
 ifeq ($(BR2_PACKAGE_NETSNMP),y)
@@ -120,7 +120,7 @@ define SKELETON_INIT_FINIT_SET_NETSNMP
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/snmpd.conf $(FINIT_D)/available/
 	ln -sf ../available/snmpd.conf $(FINIT_D)/enabled/snmpd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_NETSNMP
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_NETSNMP
 endif
 
 ifeq ($(BR2_PACKAGE_NGINX),y)
@@ -128,7 +128,7 @@ define SKELETON_INIT_FINIT_SET_NGINX
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/nginx.conf $(FINIT_D)/available/
 	ln -sf ../available/nginx.conf $(FINIT_D)/enabled/nginx.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_NGINX
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_NGINX
 endif
 
 ifeq ($(BR2_PACKAGE_NTPD),y)
@@ -136,7 +136,7 @@ define SKELETON_INIT_FINIT_SET_NTPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/ntpd.conf $(FINIT_D)/available/
 	ln -sf ../available/ntpd.conf $(FINIT_D)/enabled/ntpd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_NTPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_NTPD
 endif
 
 ifeq ($(BR2_PACKAGE_MINI_SNMPD),y)
@@ -144,7 +144,7 @@ define SKELETON_INIT_FINIT_SET_MINI_SNMPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/mini-snmpd.conf $(FINIT_D)/available/
 	ln -sf ../available/mini-snmpd.conf $(FINIT_D)/enabled/mini-snmpd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_MINI_SNMPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_MINI_SNMPD
 endif
 
 # OpenSSH
@@ -153,7 +153,7 @@ define SKELETON_INIT_FINIT_SET_OPENSSH
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/sshd.conf $(FINIT_D)/available/
 	ln -sf ../available/sshd.conf $(FINIT_D)/enabled/sshd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_OPENSSH
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_OPENSSH
 endif
 
 ifeq ($(BR2_PACKAGE_QUAGGA),y)
@@ -161,14 +161,14 @@ define SKELETON_INIT_FINIT_SET_QUAGGA
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/zebra.conf $(FINIT_D)/available/
 	ln -sf ../available/zebra.conf $(FINIT_D)/enabled/zebra.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA
 
 ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y)
 define SKELETON_INIT_FINIT_SET_QUAGGA_ISISD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/isisd.conf $(FINIT_D)/available/
 	ln -sf ../available/isisd.conf $(FINIT_D)/enabled/isisd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_ISISD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_ISISD
 endif
 
 ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y)
@@ -176,7 +176,7 @@ define SKELETON_INIT_FINIT_SET_QUAGGA_OSPFD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ospfd.conf $(FINIT_D)/available/
 	ln -sf ../available/ospfd.conf $(FINIT_D)/enabled/ospfd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSPFD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSPFD
 endif
 
 ifeq ($(BR2_PACKAGE_QUAGGA_OSP6D),y)
@@ -184,7 +184,7 @@ define SKELETON_INIT_FINIT_SET_QUAGGA_OSP6D
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ospf6d.conf $(FINIT_D)/available/
 	ln -sf ../available/ospf6d.conf $(FINIT_D)/enabled/ospf6d.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSP6D
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_OSP6D
 endif
 
 ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y)
@@ -192,7 +192,7 @@ define SKELETON_INIT_FINIT_SET_QUAGGA_RIPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ripd.conf $(FINIT_D)/available/
 	ln -sf ../available/ripd.conf $(FINIT_D)/enabled/ripd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPD
 endif
 
 ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y)
@@ -200,7 +200,7 @@ define SKELETON_INIT_FINIT_SET_QUAGGA_RIPNG
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/quagga/ripng.conf $(FINIT_D)/available/
 	ln -sf ../available/ripng.conf $(FINIT_D)/enabled/ripng.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPNG
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_QUAGGA_RIPNG
 endif
 
 endif # BR2_PACKAGE_QUAGGA
@@ -210,7 +210,7 @@ define SKELETON_INIT_FINIT_SET_SMCROUTE
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/smcroute.conf $(FINIT_D)/available/
 	ln -sf ../available/smcroute.conf $(FINIT_D)/enabled/smcroute.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_SMCROUTE
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_SMCROUTE
 endif
 
 # SSDP Responder
@@ -219,7 +219,7 @@ define SKELETON_INIT_FINIT_SET_SSDP_RESPONDER
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/ssdpd.conf $(FINIT_D)/available/
 	ln -sf ../available/ssdpd.conf $(FINIT_D)/enabled/ssdpd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_SSDP_RESPONDER
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_SSDP_RESPONDER
 endif
 
 # Enable Busybox syslogd unless sysklogd is enabled
@@ -236,13 +236,13 @@ define SKELETON_INIT_FINIT_SET_SYSLOGD
 	rm -f $(FINIT_D)/enabled/sysklogd.conf
 endef
 endif
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_SYSLOGD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_SYSLOGD
 
 ifeq ($(BR2_PACKAGE_ULOGD),y)
 define SKELETON_INIT_FINIT_SET_ULOGD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/ulogd.conf $(FINIT_D)/available/
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_ULOGD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_ULOGD
 endif
 
 ifeq ($(BR2_PACKAGE_WATCHDOGD),y)
@@ -250,7 +250,7 @@ define SKELETON_INIT_FINIT_SET_WATCHDOGD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/watchdogd.conf $(FINIT_D)/available/
 	ln -sf ../available/watchdogd.conf $(FINIT_D)/enabled/watchdogd.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_WATCHDOGD
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_WATCHDOGD
 endif
 
 # Enable gdbserver when running in Qemu mode
@@ -259,7 +259,7 @@ define SKELETON_INIT_FINIT_SET_GDBSERVER
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/gdbserver.conf $(FINIT_D)/available/
 	ln -sf ../available/gdbserver.conf $(FINIT_D)/enabled/gdbserver.conf
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_SET_GDBSERVER
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_GDBSERVER
 endif
 
 # Workaround, should be in ifupdown-scripts package
@@ -269,7 +269,7 @@ define SKELETON_INIT_FINIT_IFUPDOWN_WORKAROUND
 	$(IFUPDOWN_SCRIPTS_LOCALHOST)
         $(IFUPDOWN_SCRIPTS_DHCP)
 endef
-SKELETON_INIT_FINIT_TARGET_FINALIZE_HOOKS += SKELETON_INIT_FINIT_IFUPDOWN_WORKAROUND
+SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_IFUPDOWN_WORKAROUND
 endif