diff --git a/applications/luci-hd_idle/Makefile b/applications/luci-hd-idle/Makefile
similarity index 100%
rename from applications/luci-hd_idle/Makefile
rename to applications/luci-hd-idle/Makefile
diff --git a/applications/luci-hd_idle/ipkg/postinst b/applications/luci-hd-idle/ipkg/postinst
similarity index 100%
rename from applications/luci-hd_idle/ipkg/postinst
rename to applications/luci-hd-idle/ipkg/postinst
diff --git a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua b/applications/luci-hd-idle/luasrc/controller/hd_idle.lua
similarity index 100%
rename from applications/luci-hd_idle/luasrc/controller/hd_idle.lua
rename to applications/luci-hd-idle/luasrc/controller/hd_idle.lua
diff --git a/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua b/applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
similarity index 100%
rename from applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua
rename to applications/luci-hd-idle/luasrc/model/cbi/hd_idle.lua
diff --git a/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle b/applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
similarity index 100%
rename from applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle
rename to applications/luci-hd-idle/root/etc/uci-defaults/luci-hd_idle
diff --git a/applications/luci-mmc_over_gpio/Makefile b/applications/luci-mmc-over-gpio/Makefile
similarity index 100%
rename from applications/luci-mmc_over_gpio/Makefile
rename to applications/luci-mmc-over-gpio/Makefile
diff --git a/applications/luci-mmc_over_gpio/ipkg/postinst b/applications/luci-mmc-over-gpio/ipkg/postinst
similarity index 100%
rename from applications/luci-mmc_over_gpio/ipkg/postinst
rename to applications/luci-mmc-over-gpio/ipkg/postinst
diff --git a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
similarity index 100%
rename from applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
rename to applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua
diff --git a/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua b/applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
similarity index 100%
rename from applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua
rename to applications/luci-mmc-over-gpio/luasrc/model/cbi/mmc_over_gpio.lua
diff --git a/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio b/applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio
similarity index 100%
rename from applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio
rename to applications/luci-mmc-over-gpio/root/etc/uci-defaults/luci-mmc_over_gpio
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index ee2b94760f..a5ba53013b 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -646,14 +646,14 @@ define Package/luci-app-samba/install
 endef
 
 
-define Package/luci-app-mmc_over_gpio
+define Package/luci-app-mmc-over-gpio
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc_over_gpio:kmod-mmc-over-gpio
+  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio
   TITLE:=mmc_over_gpio
 endef
 
-define Package/luci-app-mmc_over_gpio/install
-        $(call Package/luci/install/template,$(1),applications/luci-mmc_over_gpio)
+define Package/luci-app-mmc-over-gpio/install
+        $(call Package/luci/install/template,$(1),applications/luci-mmc-over-gpio)
 endef
 
 
@@ -678,14 +678,14 @@ define Package/luci-app-ushare/install
         $(call Package/luci/install/template,$(1),applications/luci-ushare)
 endef
 
-define Package/luci-app-hd_idle
+define Package/luci-app-hd-idle
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd_idle:hd-idle
+  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd-idle:hd-idle
   TITLE:=hd-idle
 endef
 
-define Package/luci-app-hd_idle/install
-        $(call Package/luci/install/template,$(1),applications/luci-hd_idle)
+define Package/luci-app-hd-idle/install
+        $(call Package/luci/install/template,$(1),applications/luci-hd-idle)
 endef
 
 define Package/luci-app-tinyproxy
@@ -1112,8 +1112,8 @@ endif
 ifneq ($(CONFIG_PACKAGE_luci-app-samba),)
 	PKG_SELECTED_MODULES+=applications/luci-samba
 endif
-ifneq ($(CONFIG_PACKAGE_luci-app-mmc_over_gpio),)
-        PKG_SELECTED_MODULES+=applications/luci-mmc_over_gpio
+ifneq ($(CONFIG_PACKAGE_luci-app-mmc-over-gpio),)
+        PKG_SELECTED_MODULES+=applications/luci-mmc-over-gpio
 endif
 ifneq ($(CONFIG_PACKAGE_luci-app-p910nd),)
         PKG_SELECTED_MODULES+=applications/luci-p910nd
@@ -1121,8 +1121,8 @@ endif
 ifneq ($(CONFIG_PACKAGE_luci-app-ushare),)
         PKG_SELECTED_MODULES+=applications/luci-ushare
 endif
-ifneq ($(CONFIG_PACKAGE_luci-app-hd_idle),)
-       PKG_SELECTED_MODULES+=applications/luci-hd_idle
+ifneq ($(CONFIG_PACKAGE_luci-app-hd-idle),)
+       PKG_SELECTED_MODULES+=applications/luci-hd-idle
 endif
 ifneq ($(CONFIG_PACKAGE_luci-app-tinyproxy),)
        PKG_SELECTED_MODULES+=applications/luci-tinyproxy
@@ -1265,10 +1265,10 @@ $(eval $(call BuildPackage,luci-app-upnp))
 $(eval $(call BuildPackage,luci-app-ntpc))
 $(eval $(call BuildPackage,luci-app-ddns))
 $(eval $(call BuildPackage,luci-app-samba))
-$(eval $(call BuildPackage,luci-app-mmc_over_gpio))
+$(eval $(call BuildPackage,luci-app-mmc-over-gpio))
 $(eval $(call BuildPackage,luci-app-p910nd))
 $(eval $(call BuildPackage,luci-app-ushare))
-$(eval $(call BuildPackage,luci-app-hd_idle))
+$(eval $(call BuildPackage,luci-app-hd-idle))
 $(eval $(call BuildPackage,luci-app-tinyproxy))
 $(eval $(call BuildPackage,luci-app-initmgr))
 $(eval $(call BuildPackage,luci-app-livestats))