From 315bafe1f8f8a8f62d48df35faee0e21376017de Mon Sep 17 00:00:00 2001
From: Grische <2787581+grische@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:18:40 +0200
Subject: [PATCH] replace hardcoded package names with $(PKG_NAME)

---
 ffda-gluon-unbound/Makefile                 |  6 +++---
 ffda-gluon-usteer/Makefile                  |  6 +++---
 ffda-mesh-vpn-fastd-sqm/Makefile            |  6 +++---
 ffda-network-setup-mode/Makefile            |  6 +++---
 ffda-node-whisperer/Makefile                | 10 +++++-----
 ffda-purge-contact-info/Makefile            |  6 +++---
 ffda-ssh-manager/Makefile                   |  6 +++---
 ffda-usb-wan-hotplug/Makefile               |  6 +++---
 ffgraz-blink/Makefile                       |  4 ++--
 ffgraz-config-mode-at-runtime/Makefile      | 10 +++++-----
 ffgraz-config-mode-theme-funkfeuer/Makefile |  4 ++--
 ffgraz-ddhcpd-batman-adv/Makefile           |  8 ++++----
 ffgraz-ddhcpd-nextnode/Makefile             |  6 +++---
 ffgraz-ddhcpd/Makefile                      |  8 ++++----
 ffgraz-mesh-olsr12-openvpn/Makefile         |  4 ++--
 ffgraz-mesh-vpn-openvpn/Makefile            |  4 ++--
 ffgraz-olsr-auto-restart/Makefile           |  4 ++--
 ffgraz-private-ap/Makefile                  |  4 ++--
 ffgraz-static-ip/Makefile                   |  4 ++--
 ffgraz-web-mesh-vpn-openvpn/Makefile        |  4 ++--
 ffgraz-web-model/Makefile                   |  4 ++--
 ffgraz-web-private-ap/Makefile              |  4 ++--
 ffgraz-web-static-ip/Makefile               |  4 ++--
 ffgraz-yggdrasil/Makefile                   |  4 ++--
 ffka-gluon-web-usb-wan-hotplug/Makefile     |  4 ++--
 ffmuc-mesh-vpn-wireguard-vxlan/Makefile     |  4 ++--
 26 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/ffda-gluon-unbound/Makefile b/ffda-gluon-unbound/Makefile
index 6429920a..83f6c461 100644
--- a/ffda-gluon-unbound/Makefile
+++ b/ffda-gluon-unbound/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-gluon-unbound
+define Package/$(PKG_NAME)
   TITLE:=Drop-in replacement for the local node resolver
   DEPENDS:=+gluon-core +unbound-daemon +ca-bundle
 endef
 
-define Package/ffda-gluon-unbound/description
+define Package/$(PKG_NAME)/description
   Drop-in replacement for the local node resolver
 endef
 
-$(eval $(call BuildPackageGluon,ffda-gluon-unbound))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-gluon-usteer/Makefile b/ffda-gluon-usteer/Makefile
index 2127e68a..e7666db1 100644
--- a/ffda-gluon-usteer/Makefile
+++ b/ffda-gluon-usteer/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-gluon-usteer
+define Package/$(PKG_NAME)
   TITLE:=Gluon integration for the usteer daemon
   DEPENDS:=+gluon-core +usteer
 endef
 
-define Package/ffda-gluon-usteer/description
+define Package/$(PKG_NAME)/description
   Gluon integration for the usteer daemon.
 endef
 
-$(eval $(call BuildPackageGluon,ffda-gluon-usteer))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-mesh-vpn-fastd-sqm/Makefile b/ffda-mesh-vpn-fastd-sqm/Makefile
index 9beb0032..5e0af06a 100644
--- a/ffda-mesh-vpn-fastd-sqm/Makefile
+++ b/ffda-mesh-vpn-fastd-sqm/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-mesh-vpn-fastd-sqm
+define Package/$(PKG_NAME)
   TITLE:=Enable SQM instead of simple-tc on fastd mesh vpn interface
   DEPENDS:=+gluon-mesh-vpn-fastd +sqm-scripts
 endef
 
-define Package/ffda-mesh-vpn-fastd-sqm/description
+define Package/$(PKG_NAME)/description
   Enable SQM instead of simple-tc on fastd mesh vpn interface
 endef
 
-$(eval $(call BuildPackageGluon,ffda-mesh-vpn-fastd-sqm))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-network-setup-mode/Makefile b/ffda-network-setup-mode/Makefile
index 5278bc2c..24ab3bf3 100644
--- a/ffda-network-setup-mode/Makefile
+++ b/ffda-network-setup-mode/Makefile
@@ -9,16 +9,16 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-network-setup-mode
+define Package/$(PKG_NAME)
   TITLE:=Activate setup-mode using a magic packet
   DEPENDS:=+gluon-core
 endef
 
-define Package/ffda-network-setup-mode/install
+define Package/$(PKG_NAME)/install
 	$(Gluon/Build/Install)
 
 	$(INSTALL_DIR) $(1)/lib/gluon/setup-mode
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wait-network-request $(1)/lib/gluon/setup-mode
 endef
 
-$(eval $(call BuildPackageGluon,ffda-network-setup-mode))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-node-whisperer/Makefile b/ffda-node-whisperer/Makefile
index b141c10d..da56be82 100644
--- a/ffda-node-whisperer/Makefile
+++ b/ffda-node-whisperer/Makefile
@@ -20,20 +20,20 @@ MAKE_VARS += \
 
 Build/Compile=$(call Build/Compile/Default)
 
-define Package/ffda-node-whisperer
+define Package/$(PKG_NAME)
   TITLE:=Package to provide diagnostic information using WiFi beacons
   DEPENDS:=+gluon-core +libubox +libubus +libblobmsg-json +libnl-tiny +libbatadv +libgluonutil
 endef
 
-define Package/ffda-node-whisperer/description
+define Package/$(PKG_NAME)/description
   Package to provide diagnostic information using WiFi beacons
 endef
 
-define Package/ffda-node-whisperer/conffiles
+define Package/$(PKG_NAME)/conffiles
 /etc/config/node-whisperer
 endef
 
-define Package/ffda-node-whisperer/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/lib/gluon/upgrade
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/node-whisperer $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/node-whisperer/files/node-whisperer.init $(1)/etc/init.d/node-whisperer
@@ -41,4 +41,4 @@ define Package/ffda-node-whisperer/install
 	$(INSTALL_BIN) ./files/node-whisperer.upgrade.lua $(1)/lib/gluon/upgrade/150-node-whisperer
 endef
 
-$(eval $(call BuildPackageGluon,ffda-node-whisperer))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-purge-contact-info/Makefile b/ffda-purge-contact-info/Makefile
index fbfacf2a..f199aaee 100644
--- a/ffda-purge-contact-info/Makefile
+++ b/ffda-purge-contact-info/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-purge-contact-info
+define Package/$(PKG_NAME)
   TITLE:=Purge contact-info on a Gluon node
   DEPENDS:=+gluon-core
 endef
 
-define Package/ffda-purge-contact-info/description
+define Package/$(PKG_NAME)/description
   Simple package to remove user-entered contact information.
 endef
 
-$(eval $(call BuildPackageGluon,ffda-purge-contact-info))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-ssh-manager/Makefile b/ffda-ssh-manager/Makefile
index 1d01eb6f..93b2aa4f 100644
--- a/ffda-ssh-manager/Makefile
+++ b/ffda-ssh-manager/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-ssh-manager
+define Package/$(PKG_NAME)
   TITLE:=Package to provide group-based SSH key management
   DEPENDS:=+gluon-core
 endef
 
-define Package/ffda-ssh-manager/description
+define Package/$(PKG_NAME)/description
   Package to provide group-based SSH key management
 endef
 
-$(eval $(call BuildPackageGluon,ffda-ssh-manager))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffda-usb-wan-hotplug/Makefile b/ffda-usb-wan-hotplug/Makefile
index 3b300a22..17388120 100644
--- a/ffda-usb-wan-hotplug/Makefile
+++ b/ffda-usb-wan-hotplug/Makefile
@@ -9,13 +9,13 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffda-usb-wan-hotplug
+define Package/$(PKG_NAME)
   TITLE:=Automatically adds USB ethernet devices to the WAN bridge
   DEPENDS:=+gluon-core +luaposix +libubus-lua +kmod-usb-net-rndis +kmod-usb-net-ipheth +usbmuxd
 endef
 
-define Package/ffda-usb-wan-hotplug/description
+define Package/$(PKG_NAME)/description
   Automatically adds USB ethernet devices to the WAN bridge.
 endef
 
-$(eval $(call BuildPackageGluon,ffda-usb-wan-hotplug))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-blink/Makefile b/ffgraz-blink/Makefile
index e412d3bc..9cafcedd 100644
--- a/ffgraz-blink/Makefile
+++ b/ffgraz-blink/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-blink
+define Package/$(PKG_NAME)
   TITLE:=Adds the gluon-blink command to make your current device blink
   DEPENDS:=+gluon-core
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-blink))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-config-mode-at-runtime/Makefile b/ffgraz-config-mode-at-runtime/Makefile
index 713999ce..2fbf1edc 100644
--- a/ffgraz-config-mode-at-runtime/Makefile
+++ b/ffgraz-config-mode-at-runtime/Makefile
@@ -8,18 +8,18 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-config-mode-at-runtime
+define Package/$(PKG_NAME)
 	SECTION:=admin
 	CATEGORY:=Administration
-	TITLE:=ffgraz-config-mode-at-runtime
+	TITLE:=$(PKG_NAME)
 	DEPENDS:= +ffgraz-web-model
 endef
 
-define Package/ffgraz-config-mode-at-runtime/description
+define Package/$(PKG_NAME)/description
 	Enable config mode server on port 81 during runtime
 endef
 
-define Package/ffgraz-config-mode-at-runtime/install
+define Package/$(PKG_NAME)/install
 	$(Gluon/Build/Install)
 
 	$(INSTALL_DIR) $(1)/lib/gluon/config-mode-runtime/view/ $(1)/lib/gluon/config-mode-runtime/www/static/
@@ -34,4 +34,4 @@ define Package/ffgraz-config-mode-at-runtime/install
 	$(LN) /lib/gluon/config-mode/www/static/gluon.css $(1)/lib/gluon/config-mode-runtime/www/static/
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-config-mode-at-runtime))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-config-mode-theme-funkfeuer/Makefile b/ffgraz-config-mode-theme-funkfeuer/Makefile
index 5540ccbc..8eaed84c 100644
--- a/ffgraz-config-mode-theme-funkfeuer/Makefile
+++ b/ffgraz-config-mode-theme-funkfeuer/Makefile
@@ -11,10 +11,10 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-config-mode-theme-funkfeuer
+define Package/$(PKG_NAME)
 	TITLE:=Gluon config mode theme for gluon-web customized for funkfeuer
 	DEPENDS:=+gluon-core +gluon-web
 	PROVIDES:=gluon-config-mode-theme
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-config-mode-theme-funkfeuer))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-ddhcpd-batman-adv/Makefile b/ffgraz-ddhcpd-batman-adv/Makefile
index 8b5f663b..3670f662 100644
--- a/ffgraz-ddhcpd-batman-adv/Makefile
+++ b/ffgraz-ddhcpd-batman-adv/Makefile
@@ -9,20 +9,20 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-ddhcpd-batman-adv
+define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	DEPENDS:=+micrond +ffgraz-ddhcpd
 	TITLE:=ddhcpd batman-adv integration
 endef
 
-define Package/ffgraz-ddhcpd-batman-adv/description
+define Package/$(PKG_NAME)/description
   batman-adv integration for ddhcpd
 endef
 
-define Package/ffgraz-ddhcpd-batman-adv/install
+define Package/$(PKG_NAME)/install
 	$(call Gluon/Build/Install,$(1))
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,ffgraz-ddhcpd-batman-adv))
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/ffgraz-ddhcpd-nextnode/Makefile b/ffgraz-ddhcpd-nextnode/Makefile
index 87c7ea24..f94e3ee2 100644
--- a/ffgraz-ddhcpd-nextnode/Makefile
+++ b/ffgraz-ddhcpd-nextnode/Makefile
@@ -8,16 +8,16 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-ddhcpd-nextnode
+define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	DEPENDS:=+ffgraz-ddhcpd
 	TITLE:=ddhcpd nextnode integration
 endef
 
-define Package/ffgraz-ddhcpd-nextnode/description
+define Package/$(PKG_NAME)/description
   nextnode integration for ddhcpd
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-ddhcpd-nextnode))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
 
diff --git a/ffgraz-ddhcpd/Makefile b/ffgraz-ddhcpd/Makefile
index f247f08f..fdc6956d 100644
--- a/ffgraz-ddhcpd/Makefile
+++ b/ffgraz-ddhcpd/Makefile
@@ -19,14 +19,14 @@ TARGET_CFLAGS += -DLOG_LEVEL_LIMIT=5
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-ddhcpd
+define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	DEPENDS:=+libnl-tiny
 	TITLE:=ddhcpd
 endef
 
-define Package/ffgraz-ddhcpd/description
+define Package/$(PKG_NAME)/description
 	distributed dhcp server
 endef
 
@@ -35,11 +35,11 @@ define Build/Compile
 	CFLAGS="$(TARGET_CFLAGS)" LIBNL_NAME=libnl-tiny BUILD_DIR="$(BUILD_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
 endef
 
-define Package/ffgraz-ddhcpd/install
+define Package/$(PKG_NAME)/install
 	$(call Gluon/Build/Install,$(1))
 	$(INSTALL_DIR) $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ddhcpd  $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ddhcpdctl $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,ffgraz-ddhcpd))
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/ffgraz-mesh-olsr12-openvpn/Makefile b/ffgraz-mesh-olsr12-openvpn/Makefile
index 7f4a1372..824d27bd 100644
--- a/ffgraz-mesh-olsr12-openvpn/Makefile
+++ b/ffgraz-mesh-olsr12-openvpn/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-mesh-olsr12-openvpn
+define Package/$(PKG_NAME)
   TITLE:=olsrd v1 to v2 migration fallback vpn
   DEPENDS:= +gluon-mesh-olsrd +openvpn
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-mesh-olsr12-openvpn))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-mesh-vpn-openvpn/Makefile b/ffgraz-mesh-vpn-openvpn/Makefile
index c8b359fe..712d8abc 100644
--- a/ffgraz-mesh-vpn-openvpn/Makefile
+++ b/ffgraz-mesh-vpn-openvpn/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-mesh-vpn-openvpn
+define Package/$(PKG_NAME)
   TITLE:=Support for connecting meshes via custom openvpn configuration
   DEPENDS:=+gluon-core +gluon-mesh-vpn-core +openvpn +lua-openssl
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-mesh-vpn-openvpn))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-olsr-auto-restart/Makefile b/ffgraz-olsr-auto-restart/Makefile
index 949c207d..bc0bcd92 100644
--- a/ffgraz-olsr-auto-restart/Makefile
+++ b/ffgraz-olsr-auto-restart/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-olsr-auto-restart
+define Package/$(PKG_NAME)
   TITLE:=Automatically restart olsr
   DEPENDS:= +gluon-mesh-olsrd +micrond
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-olsr-auto-restart))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-private-ap/Makefile b/ffgraz-private-ap/Makefile
index d76d8bb1..5b9a433e 100644
--- a/ffgraz-private-ap/Makefile
+++ b/ffgraz-private-ap/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-private-ap
+define Package/$(PKG_NAME)
   TITLE:=Provides a virtual access point for the nodes client network
   DEPENDS:=+gluon-core
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-private-ap))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-static-ip/Makefile b/ffgraz-static-ip/Makefile
index 29be131b..53d558cb 100644
--- a/ffgraz-static-ip/Makefile
+++ b/ffgraz-static-ip/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-static-ip
+define Package/$(PKG_NAME)
   TITLE:=Static IP assignment and configuration for gluon
   DEPENDS:=+gluon-core +luci-lib-ip
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-static-ip))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-web-mesh-vpn-openvpn/Makefile b/ffgraz-web-mesh-vpn-openvpn/Makefile
index 2a5b910a..8ae3daf1 100644
--- a/ffgraz-web-mesh-vpn-openvpn/Makefile
+++ b/ffgraz-web-mesh-vpn-openvpn/Makefile
@@ -7,9 +7,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-web-mesh-vpn-openvpn
+define Package/$(PKG_NAME)
   TITLE:=gluon-web module to upload keys for openvpn mesh-vpn
   DEPENDS:=+gluon-web-admin +ffgraz-web-model +ffgraz-mesh-vpn-openvpn +lua-openssl
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-web-mesh-vpn-openvpn))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-web-model/Makefile b/ffgraz-web-model/Makefile
index aaa041f4..4c227ad9 100644
--- a/ffgraz-web-model/Makefile
+++ b/ffgraz-web-model/Makefile
@@ -7,9 +7,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-web-model
+define Package/$(PKG_NAME)
   TITLE:=Module that adds custom web-model elements to gluon-web-model
   DEPENDS:=+gluon-web-model
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-web-model))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-web-private-ap/Makefile b/ffgraz-web-private-ap/Makefile
index a39d8cd3..fb4116f4 100644
--- a/ffgraz-web-private-ap/Makefile
+++ b/ffgraz-web-private-ap/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-web-private-ap
+define Package/$(PKG_NAME)
   DEPENDS:=+gluon-web-admin +ffgraz-private-ap
   TITLE:=UI for activating a private AP
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-web-private-ap))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-web-static-ip/Makefile b/ffgraz-web-static-ip/Makefile
index 35340040..561bd91c 100644
--- a/ffgraz-web-static-ip/Makefile
+++ b/ffgraz-web-static-ip/Makefile
@@ -4,9 +4,9 @@ PKG_NAME:=ffgraz-web-static-ip
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-web-static-ip
+define Package/$(PKG_NAME)
   DEPENDS:=+gluon-web-admin +ffgraz-web-model +ffgraz-static-ip
   TITLE:=UI for managing static IPs
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-web-static-ip))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffgraz-yggdrasil/Makefile b/ffgraz-yggdrasil/Makefile
index b9e224fa..ce177360 100644
--- a/ffgraz-yggdrasil/Makefile
+++ b/ffgraz-yggdrasil/Makefile
@@ -7,9 +7,9 @@ PKG_LICENSE:=MIT
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffgraz-yggdrasil
+define Package/$(PKG_NAME)
   TITLE:=yggdrasil integration
   DEPENDS:=+gluon-core +yggdrasil
 endef
 
-$(eval $(call BuildPackageGluon,ffgraz-yggdrasil))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffka-gluon-web-usb-wan-hotplug/Makefile b/ffka-gluon-web-usb-wan-hotplug/Makefile
index f2463b23..cee9ee38 100644
--- a/ffka-gluon-web-usb-wan-hotplug/Makefile
+++ b/ffka-gluon-web-usb-wan-hotplug/Makefile
@@ -6,9 +6,9 @@ PKG_RELEASE:=1
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffka-gluon-web-usb-wan-hotplug
+define Package/$(PKG_NAME)
   TITLE:=gluon-web module to enable and disable ffda-usb-wan-hotplug
   DEPENDS:=+gluon-web-admin +ffda-usb-wan-hotplug
 endef
 
-$(eval $(call BuildPackageGluon,ffka-gluon-web-usb-wan-hotplug))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))
diff --git a/ffmuc-mesh-vpn-wireguard-vxlan/Makefile b/ffmuc-mesh-vpn-wireguard-vxlan/Makefile
index d74463ee..fca2a0c0 100644
--- a/ffmuc-mesh-vpn-wireguard-vxlan/Makefile
+++ b/ffmuc-mesh-vpn-wireguard-vxlan/Makefile
@@ -9,9 +9,9 @@ PKG_LICENSE:=GPL-2.0-or-later
 
 include $(TOPDIR)/../package/gluon.mk
 
-define Package/ffmuc-mesh-vpn-wireguard-vxlan
+define Package/$(PKG_NAME)
   TITLE:=Support for connecting meshes via wireguard
   DEPENDS:=+gluon-mesh-vpn-core +micrond +kmod-wireguard +wireguard-tools +ip-full +lua-jsonc
 endef
 
-$(eval $(call BuildPackageGluon,ffmuc-mesh-vpn-wireguard-vxlan))
+$(eval $(call BuildPackageGluon,$(PKG_NAME)))