diff --git a/src/packages/fff/fff-gateway/Makefile b/src/packages/fff/fff-layer3/Makefile
similarity index 79%
rename from src/packages/fff/fff-gateway/Makefile
rename to src/packages/fff/fff-layer3/Makefile
index 8ea76e0a..8bbff5e5 100644
--- a/src/packages/fff/fff-gateway/Makefile
+++ b/src/packages/fff/fff-layer3/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=fff-gateway
+PKG_NAME:=fff-layer3
 PKG_RELEASE:=7
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-layer3
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/fff-gateway
+define Package/fff-layer3
 	SECTION:=base
 	CATEGORY:=Freifunk
 	TITLE:=Freifunk-Franken gateway configuration
@@ -40,8 +40,8 @@ define Package/fff-gateway
 	         +vxlan
 endef
 
-define Package/fff-gateway/description
-	This package configures the gateway
+define Package/fff-layer3/description
+	This package provides the packages and settings for the layer 3 firmware
 endef
 
 define Build/Prepare
@@ -56,8 +56,8 @@ define Build/Compile
 	# nothing
 endef
 
-define Package/fff-gateway/install
+define Package/fff-layer3/install
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,fff-gateway))
+$(eval $(call BuildPackage,fff-layer3))
diff --git a/src/packages/fff/fff-gateway/files/etc/sysctl.d/60-fff-gateway.conf b/src/packages/fff/fff-layer3/files/etc/sysctl.d/60-fff-layer3.conf
similarity index 100%
rename from src/packages/fff/fff-gateway/files/etc/sysctl.d/60-fff-gateway.conf
rename to src/packages/fff/fff-layer3/files/etc/sysctl.d/60-fff-layer3.conf
diff --git a/src/packages/fff/fff-gateway/files/usr/lib/firewall.d/10-no-forward-wan b/src/packages/fff/fff-layer3/files/usr/lib/firewall.d/10-no-forward-wan
similarity index 100%
rename from src/packages/fff/fff-gateway/files/usr/lib/firewall.d/10-no-forward-wan
rename to src/packages/fff/fff-layer3/files/usr/lib/firewall.d/10-no-forward-wan
diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index 8af02361..e6648c09 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff
 
diff --git a/src/packages/fff/fff/variant-layer3.mk b/src/packages/fff/fff/variant-layer3.mk
index 57ce9c78..51b99923 100644
--- a/src/packages/fff/fff/variant-layer3.mk
+++ b/src/packages/fff/fff/variant-layer3.mk
@@ -4,7 +4,7 @@ define Package/fff-default
 	DEFAULT:=y
 	TITLE:=Freifunk-Franken Base default switcher
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+fff-base +fff-gateway
+	DEPENDS:=+fff-base +fff-layer3
 	VARIANT:=layer3
 endef