diff --git a/src/packages/fff/fff-babeld/Makefile b/src/packages/fff/fff-babeld/Makefile
index ab44e47a..a4ebe913 100644
--- a/src/packages/fff/fff-babeld/Makefile
+++ b/src/packages/fff/fff-babeld/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babeld
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,6 +24,9 @@ endef
 
 define Package/fff-babeld/install
 	$(CP) ./files/* $(1)/
+ifneq ($(FFF_VARIANT),)
+	mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
+endif
 endef
 
 $(eval $(call BuildPackage,fff-babeld))
diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute b/src/packages/fff/fff-babeld/files/etc/fff-defaults/01-iproute
similarity index 100%
rename from src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute
rename to src/packages/fff/fff-babeld/files/etc/fff-defaults/01-iproute
diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules b/src/packages/fff/fff-babeld/files/etc/fff-defaults/02-network-rules
similarity index 100%
rename from src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules
rename to src/packages/fff/fff-babeld/files/etc/fff-defaults/02-network-rules
diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile
index 94d1563c..d41788d3 100644
--- a/src/packages/fff/fff-dhcp/Makefile
+++ b/src/packages/fff/fff-dhcp/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-dhcp
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,6 +24,9 @@ endef
 
 define Package/fff-dhcp/install
 	$(CP) ./files/* $(1)/
+ifneq ($(FFF_VARIANT),)
+	mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
+endif
 endef
 
 $(eval $(call BuildPackage,fff-dhcp))
diff --git a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp b/src/packages/fff/fff-dhcp/files/etc/fff-defaults/90-fff-dhcp
similarity index 100%
rename from src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
rename to src/packages/fff/fff-dhcp/files/etc/fff-defaults/90-fff-dhcp
diff --git a/src/packages/fff/fff-ra/Makefile b/src/packages/fff/fff-ra/Makefile
index 78cdefeb..31e498f9 100644
--- a/src/packages/fff/fff-ra/Makefile
+++ b/src/packages/fff/fff-ra/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-ra
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,6 +24,9 @@ endef
 
 define Package/fff-ra/install
 	$(CP) ./files/* $(1)/
+ifneq ($(FFF_VARIANT),)
+	mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
+endif
 endef
 
 $(eval $(call BuildPackage,fff-ra))
diff --git a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra b/src/packages/fff/fff-ra/files/etc/fff-defaults/90-fff-ra
similarity index 100%
rename from src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
rename to src/packages/fff/fff-ra/files/etc/fff-defaults/90-fff-ra
diff --git a/src/packages/fff/fff-wireguard/Makefile b/src/packages/fff/fff-wireguard/Makefile
index c39e68ef..2d6ad5b4 100644
--- a/src/packages/fff/fff-wireguard/Makefile
+++ b/src/packages/fff/fff-wireguard/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireguard
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,6 +28,9 @@ endef
 
 define Package/fff-wireguard/install
 	$(CP) ./files/* $(1)/
+ifneq ($(FFF_VARIANT),)
+	mv $(1)/etc/fff-defaults $(1)/etc/uci-defaults
+endif
 endef
 
 $(eval $(call BuildPackage,fff-wireguard))
diff --git a/src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules b/src/packages/fff/fff-wireguard/files/etc/fff-defaults/05-wireguard-rules
similarity index 100%
rename from src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules
rename to src/packages/fff/fff-wireguard/files/etc/fff-defaults/05-wireguard-rules