diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile
index cb0d255f8e..e13b86a411 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile
@@ -13,7 +13,7 @@ PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_haproxy \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_privoxy \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs\
@@ -66,8 +66,8 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
 	bool "dnsforwarder"
 	default n
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns
-	bool "chiandns"
+config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS
+	bool "chinadns"
 	default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_haproxy
@@ -120,7 +120,7 @@ define Package/luci-app-ssr-plus-Jo
             +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Socks:shadowsocks-libev-ss-local \
             +PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy:dnscrypt-proxy-full \
             +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder \
-            +PACKAGE_$(PKG_NAME)_INCLUDE_Chinadns:openwrt_chinadns \
+            +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:openwrt_chinadns \
             +PACKAGE_$(PKG_NAME)_INCLUDE_haproxy:haproxy \
             +PACKAGE_$(PKG_NAME)_INCLUDE_privoxy:privoxy \
             +PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs:simple-obfs \
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua
index cb31ef0dc7..f17a2e3883 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/controller/shadowsocksr.lua
@@ -7,37 +7,37 @@ function index()
         return
     end
     if nixio.fs.access("/usr/bin/ssr-redir") then
-        entry({"admin", "service", "shadowsocksr"},alias("admin", "service", "shadowsocksr", "client"), _("ShadowSocksR Plus+"),10).dependent = true
-        entry({"admin", "service", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"),10).leaf = true
-        entry({"admin", "service", "shadowsocksr", "servers"}, cbi("shadowsocksr/servers"), _("Severs Nodes"), 11).leaf = true
-        entry({"admin", "service", "shadowsocksr", "servers"},arcombine(cbi("shadowsocksr/servers"), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 11).leaf = true
+        entry({"admin", "vpn", "shadowsocksr"},alias("admin", "vpn", "shadowsocksr", "client"), _("ShadowSocksR Plus+"),10).dependent = true
+        entry({"admin", "vpn", "shadowsocksr", "client"},cbi("shadowsocksr/client"),_("SSR Client"),10).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "servers"}, cbi("shadowsocksr/servers"), _("Severs Nodes"), 11).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "servers"},arcombine(cbi("shadowsocksr/servers"), cbi("shadowsocksr/client-config")),_("Severs Nodes"), 11).leaf = true
 
- entry({"admin", "service", "shadowsocksr", "subscription"},cbi("shadowsocksr/subscription"), _("Subscription Managenent"),12).leaf = true
-        entry({"admin", "service", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"),13).leaf = true
+ entry({"admin", "vpn", "shadowsocksr", "subscription"},cbi("shadowsocksr/subscription"), _("Subscription Managenent"),12).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "control"},cbi("shadowsocksr/control"),_("Access Control"),13).leaf = true
 
-        entry({"admin", "service", "shadowsocksr", "list"},cbi("shadowsocksr/list"),_("GFW List"),15).leaf = true
-entry({"admin", "service", "shadowsocksr", "appointlist"},form("shadowsocksr/appointlist"),_("Appointlist List"), 17).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "list"},cbi("shadowsocksr/list"),_("GFW List"),15).leaf = true
+entry({"admin", "vpn", "shadowsocksr", "appointlist"},form("shadowsocksr/appointlist"),_("Appointlist List"), 17).leaf = true
           
- entry({"admin", "service", "shadowsocksr", "automatic"},cbi("shadowsocksr/automatic"), _("Automatic Switching"),20).leaf = true
-        entry({"admin", "service", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"), _("Advanced Settings"),21).leaf = true
+ entry({"admin", "vpn", "shadowsocksr", "automatic"},cbi("shadowsocksr/automatic"), _("Automatic Switching"),20).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "advanced"},cbi("shadowsocksr/advanced"), _("Advanced Settings"),21).leaf = true
     elseif nixio.fs.access("/usr/bin/ssr-server") then
-        entry({"admin", "service", "shadowsocksr"},alias("admin", "service", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true
+        entry({"admin", "vpn", "shadowsocksr"},alias("admin", "vpn", "shadowsocksr", "server"), _("ShadowSocksR"),10).dependent = true
     else
         return
     end
     if nixio.fs.access("/usr/bin/ssr-server") then
-        entry({"admin", "service", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true
+        entry({"admin", "vpn", "shadowsocksr", "server"},arcombine(cbi("shadowsocksr/server"), cbi("shadowsocksr/server-config")),_("SSR Server"),22).leaf = true
     end
-    entry({"admin", "service", "shadowsocksr", "status"},form("shadowsocksr/status"),_("Status"), 23).leaf = true
-    entry({"admin", "service", "shadowsocksr", "log"}, cbi("shadowsocksr/log"), _("Log"), 30).leaf = true
+    entry({"admin", "vpn", "shadowsocksr", "status"},form("shadowsocksr/status"),_("Status"), 23).leaf = true
+    entry({"admin", "vpn", "shadowsocksr", "log"}, cbi("shadowsocksr/log"), _("Log"), 30).leaf = true
 
-    entry({"admin", "service", "shadowsocksr", "refresh"}, call("refresh_data"))
-    entry({"admin", "service", "shadowsocksr", "checkport"}, call("check_port"))
-    entry({"admin", "service", "shadowsocksr", "checkports"}, call("check_ports"))
-    entry({"admin", "service", "shadowsocksr", "run"}, call("act_status"))
-    entry({"admin", "service", "shadowsocksr", "change"}, call("change_node"))
-    entry({"admin", "service", "shadowsocksr", "allserver"}, call("get_servers"))
-    entry({"admin", "service", "shadowsocksr", "ping"}, call("act_ping")).leaf=true
+    entry({"admin", "vpn", "shadowsocksr", "refresh"}, call("refresh_data"))
+    entry({"admin", "vpn", "shadowsocksr", "checkport"}, call("check_port"))
+    entry({"admin", "vpn", "shadowsocksr", "checkports"}, call("check_ports"))
+    entry({"admin", "vpn", "shadowsocksr", "run"}, call("act_status"))
+    entry({"admin", "vpn", "shadowsocksr", "change"}, call("change_node"))
+    entry({"admin", "vpn", "shadowsocksr", "allserver"}, call("get_servers"))
+    entry({"admin", "vpn", "shadowsocksr", "ping"}, call("act_ping")).leaf=true
 end
 
 
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm
index ca749d6963..e747afa1fd 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/check.htm
@@ -6,7 +6,7 @@
 		btn.disabled = true;
 		btn.value    = '<%:Check...%>';
 		murl=urlname;
-		XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","check")%>',
+		XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","check")%>',
 			{ set:murl },
 			function(x,rv)
 			{
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm
index 3cd1a4d1ae..1db2c79c74 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/checkport.htm
@@ -5,7 +5,7 @@
 	{
 		btn.disabled = true;
 		btn.value    = '<%:Check...%>';
-		XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","checkports")%>',
+		XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","checkports")%>',
 			null,
 			function(x,rv)
 			{
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm
index a567f52206..370d4f6e79 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/ping.htm
@@ -7,7 +7,7 @@
 	//<![CDATA[
 	var pings = document.getElementsByClassName('pingtime');
 	for(var i = 0; i < pings.length; i++) {
-		XHR.get('/cgi-bin/luci/admin/service/shadowsocksr/ping', {
+		XHR.get('/cgi-bin/luci/admin/vpn/shadowsocksr/ping', {
 				index: i,
 				domain: pings[i].getAttribute("hint")
 			},
@@ -15,7 +15,7 @@
 				pings[result.index].innerHTML = (result.ping ? "<b><font color=green>"+result.ping+"</font></b> ms" : "<b><font color=red> 检测失败 </font></b>");
 			}
 		);
-		XHR.poll(10,'/cgi-bin/luci/admin/service/shadowsocksr/ping',{
+		XHR.poll(10,'/cgi-bin/luci/admin/vpn/shadowsocksr/ping',{
 				index: i,
 				domain: pings[i].getAttribute("hint")
 			},
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm
index d048d40531..7e260023d6 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/refresh.htm
@@ -7,7 +7,7 @@
 		btn.disabled = true;
 		btn.value    = '<%:Refresh...%> ';
 		murl=dataname;
-		XHR.get('<%=luci.dispatcher.build_url("admin", "service", "shadowsocksr","refresh")%>',
+		XHR.get('<%=luci.dispatcher.build_url("admin", "vpn", "shadowsocksr","refresh")%>',
 			{ set:murl },
 			function(x,rv)
 			{
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm
index 18b699de41..a5a4d9cb09 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/server_list.htm
@@ -11,7 +11,7 @@ local dsp = require "luci.dispatcher"
 	//<![CDATA[
 	var pings = document.getElementsByClassName('pingtime');
 	for(var i = 0; i < pings.length; i++) {
-		XHR.get('<%=dsp.build_url("admin/service/shadowsocksr/ping")%>', {
+		XHR.get('<%=dsp.build_url("admin/vpn/shadowsocksr/ping")%>', {
 				index: i,
 				domain: pings[i].getAttribute("hint")
 			},
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm
index f25cb30987..e5b8a9b4e6 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm
@@ -172,7 +172,7 @@
 </style>
 
 <script type="text/javascript">//<![CDATA[
-    XHR.poll(5, '<%=url([[admin]], [[service]], [[shadowsocksr]], [[run]])%>', null,
+    XHR.poll(5, '<%=url([[admin]], [[vpn]], [[shadowsocksr]], [[run]])%>', null,
             function (x, data) {
                 var tb = document.getElementById('shadowsocksr_status');
                 var tb1 = document.getElementById('google_status');
diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm
index b1820a38f3..6dbfd972f0 100644
--- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm
+++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm
@@ -164,7 +164,7 @@
 </div>
 </style>
 <script type="text/javascript">//<![CDATA[
-    XHR.poll(5, '<%=url([[admin]], [[service]], [[shadowsocksr]], [[run]])%>', null,
+    XHR.poll(5, '<%=url([[admin]], [[vpn]], [[shadowsocksr]], [[run]])%>', null,
             function (x, data) {
                 var tb = document.getElementById('shadowsocksr_status');
                 var tb1 = document.getElementById('google_status');