diff --git a/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
index a2238b5c1..6b44c21df 100644
--- a/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
+++ b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
@@ -3,7 +3,7 @@
 		"title": "Proxy DNS Over HTTPS",
 		"order": 20,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "https-dns-proxy"
 		},
 		"depends": {
diff --git a/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
index fa4f87669..dd6151ee0 100644
--- a/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
+++ b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
@@ -3,8 +3,8 @@
 		"title": "iPerf",
 		"order": 10,
 		"action": {
-			"type": "uci",
-			"path": "iperf"
+			"type": "template",
+			"path": "iperf/test"
 		},
 		"depends": {
 			"acl": [ "luci-app-iperf" ]
diff --git a/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
index 089af244c..6098e0a26 100644
--- a/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
+++ b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
@@ -3,7 +3,7 @@
 		"title": "E-Mail",
 		"order": 90,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "mail"
 		},
 		"depends": {
diff --git a/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
index db602b6ff..bd3fe3960 100644
--- a/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
+++ b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
@@ -3,8 +3,8 @@
 		"title": "OMR-DSCP",
 		"order": 80,
 		"action": {
-			"type": "uci",
-			"path": "omr-dscp"
+			"type": "cbi",
+			"path": "dscp"
 		},
 		"depends": {
 			"acl": [ "luci-app-omr-dscp" ]
diff --git a/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json b/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
similarity index 83%
rename from luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json
rename to luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
index 4cb8a0bb1..ec318e6ee 100644
--- a/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json
+++ b/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
@@ -1,5 +1,5 @@
 {
-    "luci-app-dscp": {
+    "luci-app-omr-dscp": {
 	"description": "Grant UCI access for luci-app-dscp",
 	"read": {
 	    "uci": [ "dscp" ]
diff --git a/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
index 5b7149b3f..73ac0e6f4 100644
--- a/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
+++ b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
@@ -3,8 +3,8 @@
 		"title": "Quota",
 		"order": 90,
 		"action": {
-			"type": "uci",
-			"path": "quota"
+			"type": "cbi",
+			"path": "quota/quota"
 		},
 		"depends": {
 			"acl": [ "luci-app-omr-quota" ]
diff --git a/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
index 102c65c16..ed1c7a074 100644
--- a/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
+++ b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
@@ -3,7 +3,7 @@
 		"title": "OMR-Tracker",
 		"order": 10,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "omr-tracker"
 		},
 		"depends": {
diff --git a/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
index 08c5b6f32..eea51e8f9 100644
--- a/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
+++ b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
@@ -3,7 +3,7 @@
 		"title": "OpenMPTCProuter",
 		"order": 1,
 		"action": {
-			"type": "uci",
+			"type": "template",
 			"path": "openmptcprouter/wizard"
 		},
 		"depends": {
diff --git a/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
index 5df5fa97a..771c4021a 100644
--- a/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
+++ b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
@@ -3,7 +3,7 @@
 		"title": "SNMPd",
 		"order": 91,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "snmpd"
 		},
 		"depends": {