diff --git a/applications/luci-app-cifsd/Makefile b/applications/luci-app-ksmbd/Makefile
similarity index 92%
rename from applications/luci-app-cifsd/Makefile
rename to applications/luci-app-ksmbd/Makefile
index a82842c8..dcb69ed7 100644
--- a/applications/luci-app-cifsd/Makefile
+++ b/applications/luci-app-ksmbd/Makefile
@@ -6,7 +6,7 @@ LUCI_TITLE:=Network Shares - CIFSD CIFS/SMB kernel fileserver
 LUCI_DEPENDS:=+ksmbd-server
 LUCI_PKGARCH:=all
 
-PKG_NAME:=luci-app-cifsd
+PKG_NAME:=luci-app-ksmbd
 PKG_VERSION:=1
 PKG_RELEASE:=12
 
diff --git a/applications/luci-app-cifsd/luasrc/controller/cifsd.lua b/applications/luci-app-ksmbd/luasrc/controller/cifsd.lua
similarity index 100%
rename from applications/luci-app-cifsd/luasrc/controller/cifsd.lua
rename to applications/luci-app-ksmbd/luasrc/controller/cifsd.lua
diff --git a/applications/luci-app-cifsd/luasrc/model/cbi/cifsd.lua b/applications/luci-app-ksmbd/luasrc/model/cbi/cifsd.lua
similarity index 100%
rename from applications/luci-app-cifsd/luasrc/model/cbi/cifsd.lua
rename to applications/luci-app-ksmbd/luasrc/model/cbi/cifsd.lua
diff --git a/applications/luci-app-cifsd/po/ca/cifsd.po b/applications/luci-app-ksmbd/po/ca/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ca/cifsd.po
rename to applications/luci-app-ksmbd/po/ca/cifsd.po
diff --git a/applications/luci-app-cifsd/po/cs/cifsd.po b/applications/luci-app-ksmbd/po/cs/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/cs/cifsd.po
rename to applications/luci-app-ksmbd/po/cs/cifsd.po
diff --git a/applications/luci-app-cifsd/po/de/cifsd.po b/applications/luci-app-ksmbd/po/de/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/de/cifsd.po
rename to applications/luci-app-ksmbd/po/de/cifsd.po
diff --git a/applications/luci-app-cifsd/po/el/cifsd.po b/applications/luci-app-ksmbd/po/el/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/el/cifsd.po
rename to applications/luci-app-ksmbd/po/el/cifsd.po
diff --git a/applications/luci-app-cifsd/po/en/cifsd.po b/applications/luci-app-ksmbd/po/en/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/en/cifsd.po
rename to applications/luci-app-ksmbd/po/en/cifsd.po
diff --git a/applications/luci-app-cifsd/po/es/cifsd.po b/applications/luci-app-ksmbd/po/es/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/es/cifsd.po
rename to applications/luci-app-ksmbd/po/es/cifsd.po
diff --git a/applications/luci-app-cifsd/po/fr/cifsd.po b/applications/luci-app-ksmbd/po/fr/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/fr/cifsd.po
rename to applications/luci-app-ksmbd/po/fr/cifsd.po
diff --git a/applications/luci-app-cifsd/po/he/cifsd.po b/applications/luci-app-ksmbd/po/he/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/he/cifsd.po
rename to applications/luci-app-ksmbd/po/he/cifsd.po
diff --git a/applications/luci-app-cifsd/po/hi/cifsd.po b/applications/luci-app-ksmbd/po/hi/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/hi/cifsd.po
rename to applications/luci-app-ksmbd/po/hi/cifsd.po
diff --git a/applications/luci-app-cifsd/po/hu/cifsd.po b/applications/luci-app-ksmbd/po/hu/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/hu/cifsd.po
rename to applications/luci-app-ksmbd/po/hu/cifsd.po
diff --git a/applications/luci-app-cifsd/po/it/cifsd.po b/applications/luci-app-ksmbd/po/it/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/it/cifsd.po
rename to applications/luci-app-ksmbd/po/it/cifsd.po
diff --git a/applications/luci-app-cifsd/po/ja/cifsd.po b/applications/luci-app-ksmbd/po/ja/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ja/cifsd.po
rename to applications/luci-app-ksmbd/po/ja/cifsd.po
diff --git a/applications/luci-app-cifsd/po/ko/cifsd.po b/applications/luci-app-ksmbd/po/ko/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ko/cifsd.po
rename to applications/luci-app-ksmbd/po/ko/cifsd.po
diff --git a/applications/luci-app-cifsd/po/ms/cifsd.po b/applications/luci-app-ksmbd/po/ms/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ms/cifsd.po
rename to applications/luci-app-ksmbd/po/ms/cifsd.po
diff --git a/applications/luci-app-cifsd/po/nb_NO/cifsd.po b/applications/luci-app-ksmbd/po/nb_NO/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/nb_NO/cifsd.po
rename to applications/luci-app-ksmbd/po/nb_NO/cifsd.po
diff --git a/applications/luci-app-cifsd/po/pl/cifsd.po b/applications/luci-app-ksmbd/po/pl/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/pl/cifsd.po
rename to applications/luci-app-ksmbd/po/pl/cifsd.po
diff --git a/applications/luci-app-cifsd/po/pt/cifsd.po b/applications/luci-app-ksmbd/po/pt/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/pt/cifsd.po
rename to applications/luci-app-ksmbd/po/pt/cifsd.po
diff --git a/applications/luci-app-cifsd/po/pt_BR/cifsd.po b/applications/luci-app-ksmbd/po/pt_BR/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/pt_BR/cifsd.po
rename to applications/luci-app-ksmbd/po/pt_BR/cifsd.po
diff --git a/applications/luci-app-cifsd/po/ro/cifsd.po b/applications/luci-app-ksmbd/po/ro/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ro/cifsd.po
rename to applications/luci-app-ksmbd/po/ro/cifsd.po
diff --git a/applications/luci-app-cifsd/po/ru/cifsd.po b/applications/luci-app-ksmbd/po/ru/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/ru/cifsd.po
rename to applications/luci-app-ksmbd/po/ru/cifsd.po
diff --git a/applications/luci-app-cifsd/po/sk/cifsd.po b/applications/luci-app-ksmbd/po/sk/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/sk/cifsd.po
rename to applications/luci-app-ksmbd/po/sk/cifsd.po
diff --git a/applications/luci-app-cifsd/po/sv/cifsd.po b/applications/luci-app-ksmbd/po/sv/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/sv/cifsd.po
rename to applications/luci-app-ksmbd/po/sv/cifsd.po
diff --git a/applications/luci-app-cifsd/po/templates/cifsd.pot b/applications/luci-app-ksmbd/po/templates/cifsd.pot
similarity index 100%
rename from applications/luci-app-cifsd/po/templates/cifsd.pot
rename to applications/luci-app-ksmbd/po/templates/cifsd.pot
diff --git a/applications/luci-app-cifsd/po/tr/cifsd.po b/applications/luci-app-ksmbd/po/tr/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/tr/cifsd.po
rename to applications/luci-app-ksmbd/po/tr/cifsd.po
diff --git a/applications/luci-app-cifsd/po/uk/cifsd.po b/applications/luci-app-ksmbd/po/uk/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/uk/cifsd.po
rename to applications/luci-app-ksmbd/po/uk/cifsd.po
diff --git a/applications/luci-app-cifsd/po/vi/cifsd.po b/applications/luci-app-ksmbd/po/vi/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/vi/cifsd.po
rename to applications/luci-app-ksmbd/po/vi/cifsd.po
diff --git a/applications/luci-app-cifsd/po/zh-cn/cifsd.po b/applications/luci-app-ksmbd/po/zh-cn/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/zh-cn/cifsd.po
rename to applications/luci-app-ksmbd/po/zh-cn/cifsd.po
diff --git a/applications/luci-app-cifsd/po/zh_Hant/cifsd.po b/applications/luci-app-ksmbd/po/zh_Hant/cifsd.po
similarity index 100%
rename from applications/luci-app-cifsd/po/zh_Hant/cifsd.po
rename to applications/luci-app-ksmbd/po/zh_Hant/cifsd.po
diff --git a/applications/luci-app-cifsd/root/etc/modules.d/ksmbd b/applications/luci-app-ksmbd/root/etc/modules.d/ksmbd
similarity index 100%
rename from applications/luci-app-cifsd/root/etc/modules.d/ksmbd
rename to applications/luci-app-ksmbd/root/etc/modules.d/ksmbd
diff --git a/applications/luci-app-cifsd/root/etc/uci-defaults/luci-cifsd b/applications/luci-app-ksmbd/root/etc/uci-defaults/luci-cifsd
similarity index 100%
rename from applications/luci-app-cifsd/root/etc/uci-defaults/luci-cifsd
rename to applications/luci-app-ksmbd/root/etc/uci-defaults/luci-cifsd