diff --git a/ffhh-config-mode/Makefile b/gluon-config-mode-ffhh/Makefile
similarity index 74%
rename from ffhh-config-mode/Makefile
rename to gluon-config-mode-ffhh/Makefile
index 98ae3d1..398b708 100644
--- a/ffhh-config-mode/Makefile
+++ b/gluon-config-mode-ffhh/Makefile
@@ -3,21 +3,21 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=ffhh-config-mode
+PKG_NAME:=gluon-config-mode-ffhh
 PKG_VERSION:=2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ffhh-config-mode
+define Package/gluon-config-mode-ffhh
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Luci based config mode for user friendly setup of new meshnodes
   DEPENDS:=+gluon-luci-core +gluon-lock-password +gluon-node-info +gluon-simple-tc +uhttpd +dnsmasq +ip
 endef
 
-define Package/ffhh-config-mode/description
+define Package/gluon-config-mode-ffhh/description
 	Luci based config mode
 endef
 
@@ -31,8 +31,8 @@ endef
 define Build/Compile
 endef
 
-define Package/ffhh-config-mode/install
+define Package/gluon-config-mode-ffhh/install
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,ffhh-config-mode))
+$(eval $(call BuildPackage,gluon-config-mode-ffhh))
diff --git a/ffhh-config-mode/files/etc/config/gluon-config-mode b/gluon-config-mode-ffhh/files/etc/config/gluon-config-mode
similarity index 100%
rename from ffhh-config-mode/files/etc/config/gluon-config-mode
rename to gluon-config-mode-ffhh/files/etc/config/gluon-config-mode
diff --git a/ffhh-config-mode/files/etc/hotplug.d/button/50-gluon-config-mode b/gluon-config-mode-ffhh/files/etc/hotplug.d/button/50-gluon-config-mode
similarity index 100%
rename from ffhh-config-mode/files/etc/hotplug.d/button/50-gluon-config-mode
rename to gluon-config-mode-ffhh/files/etc/hotplug.d/button/50-gluon-config-mode
diff --git a/ffhh-config-mode/files/etc/init.d/gluon-config-mode b/gluon-config-mode-ffhh/files/etc/init.d/gluon-config-mode
similarity index 100%
rename from ffhh-config-mode/files/etc/init.d/gluon-config-mode
rename to gluon-config-mode-ffhh/files/etc/init.d/gluon-config-mode
diff --git a/ffhh-config-mode/files/lib/gluon/config-mode/ash-login b/gluon-config-mode-ffhh/files/lib/gluon/config-mode/ash-login
similarity index 100%
rename from ffhh-config-mode/files/lib/gluon/config-mode/ash-login
rename to gluon-config-mode-ffhh/files/lib/gluon/config-mode/ash-login
diff --git a/ffhh-config-mode/files/lib/gluon/config-mode/www/cgi-bin/luci b/gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/cgi-bin/luci
similarity index 100%
rename from ffhh-config-mode/files/lib/gluon/config-mode/www/cgi-bin/luci
rename to gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/cgi-bin/luci
diff --git a/ffhh-config-mode/files/lib/gluon/config-mode/www/index.html b/gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/index.html
similarity index 100%
rename from ffhh-config-mode/files/lib/gluon/config-mode/www/index.html
rename to gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/index.html
diff --git a/ffhh-config-mode/files/lib/gluon/config-mode/www/luci-static b/gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/luci-static
similarity index 100%
rename from ffhh-config-mode/files/lib/gluon/config-mode/www/luci-static
rename to gluon-config-mode-ffhh/files/lib/gluon/config-mode/www/luci-static
diff --git a/ffhh-config-mode/files/lib/gluon/upgrade/config-mode/invariant/010-config-ifname b/gluon-config-mode-ffhh/files/lib/gluon/upgrade/config-mode-ffhh/invariant/010-config-ifname
similarity index 100%
rename from ffhh-config-mode/files/lib/gluon/upgrade/config-mode/invariant/010-config-ifname
rename to gluon-config-mode-ffhh/files/lib/gluon/upgrade/config-mode-ffhh/invariant/010-config-ifname
diff --git a/ffhh-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua b/gluon-config-mode-ffhh/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
similarity index 100%
rename from ffhh-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
rename to gluon-config-mode-ffhh/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
diff --git a/ffhh-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua b/gluon-config-mode-ffhh/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
similarity index 100%
rename from ffhh-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
rename to gluon-config-mode-ffhh/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
diff --git a/ffhh-config-mode/files/usr/lib/lua/luci/tools/gluon-config-mode.lua b/gluon-config-mode-ffhh/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
similarity index 100%
rename from ffhh-config-mode/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
rename to gluon-config-mode-ffhh/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
diff --git a/ffhh-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm b/gluon-config-mode-ffhh/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
similarity index 100%
rename from ffhh-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
rename to gluon-config-mode-ffhh/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
diff --git a/ffhh-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm b/gluon-config-mode-ffhh/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
similarity index 100%
rename from ffhh-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
rename to gluon-config-mode-ffhh/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm