diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_NI_Plugin-control.yhtm
index 1b55a12a1..8f43317e0 100644
--- a/data/y-web/Y_NI_Plugin-control.yhtm
+++ b/data/y-web/Y_NI_Plugin-control.yhtm
@@ -72,9 +72,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.samba~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_smb_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_samba_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_smb_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_samba_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -91,9 +91,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxcald~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_txc_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_tuxcald_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_txc_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_tuxcald_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -110,9 +110,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxmaild~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_txm_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_tuxmaild_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_txm_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_tuxmaild_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -129,9 +129,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.inadyn~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_ina_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_inadyn_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_ina_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_inadyn_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -148,9 +148,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.dropbear~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_drop_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_dropbear_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_drop_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_dropbear_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -167,9 +167,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.ushare~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_ush_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_ushare_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_ush_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_ushare_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -209,9 +209,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.djmount~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_djm_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_djmount_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_djm_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_djmount_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -228,9 +228,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.xupnpd~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_xud_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_xupnpd_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_xud_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_xupnpd_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -251,9 +251,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.crond~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_cro_stop", 5000);'/>
+					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_crond_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_cro_start", 5000);'/>
+					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_crond_start", 5000);'/>
 					=}
 				</td>
 				<td>
diff --git a/data/y-web/scripts/Y_NI_Plugin-control.sh b/data/y-web/scripts/Y_NI_Plugin-control.sh
index 09ae32e9d..2d000942a 100644
--- a/data/y-web/scripts/Y_NI_Plugin-control.sh
+++ b/data/y-web/scripts/Y_NI_Plugin-control.sh
@@ -32,72 +32,72 @@ case "$1" in
 		service nfsd stop >/dev/console
 		rm -f /var/etc/.nfsd
 	;;
-	smb_start)
+	samba_start)
 		echo "[$BNAME] samba-server start"
 		touch /var/etc/.samba
 		service samba start >/dev/console
 	;;
-	smb_stop)
+	samba_stop)
 		echo "[$BNAME] samba-server stop"
 		service samba stop >/dev/console
 		rm -f /var/etc/.samba
 	;;
-	txc_start)
+	tuxcald_start)
 		echo "[$BNAME] tuxcal start"
 		touch /var/etc/.tuxcald
 		service tuxcald start >/dev/console
 	;;
-	txc_stop)
+	tuxcald_stop)
 		echo "[$BNAME] tuxcal stop"
 		service tuxcald stop >/dev/console
 		rm -f /var/etc/.tuxcald
 	;;
-	txm_start)
+	tuxmaild_start)
 		echo "[$BNAME] tuxmail start"
 		touch /var/etc/.tuxmaild
 		service tuxmaild start >/dev/console
 	;;
-	txm_stop)
+	tuxmaild_stop)
 		echo "[$BNAME] tuxmail stop"
 		service tuxmaild stop >/dev/console
 		rm -f /var/etc/.tuxmaild
 	;;
-	ina_start)
+	inadyn_start)
 		echo "[$BNAME] inadyn start"
 		touch /var/etc/.inadyn
 		service inadyn start >/dev/console
 	;;
-	ina_stop)
+	inadyn_stop)
 		echo "[$BNAME] inadyn stop"
 		service inadyn stop >/dev/console
 		rm -f /var/etc/.inadyn
 	;;
-	drop_start)
+	dropbear_start)
 		echo "[$BNAME] dropbear start"
 		touch /var/etc/.dropbear
 		service dropbear start >/dev/console
 	;;
-	drop_stop)
+	dropbear_stop)
 		echo "[$BNAME] dropbear stop"
 		service dropbear stop >/dev/console
 		rm -f /var/etc/.dropbear
 	;;
-	ush_start)
+	ushare_start)
 		echo "[$BNAME] ushare start"
 		touch /var/etc/.ushare
 		service ushare start >/dev/console
 	;;
-	ush_stop)
+	ushare_stop)
 		echo "[$BNAME] ushare stop"
 		service ushare stop >/dev/console
 		rm -f /var/etc/.ushare
 	;;
-	djm_start)
+	djmount_start)
 		echo "[$BNAME] djmount start"
 		touch /var/etc/.djmount
 		service djmount start >/dev/console
 	;;
-	djm_stop)
+	djmount_stop)
 		echo "[$BNAME] djmount stop"
 		service djmount stop >/dev/console
 		rm -f /var/etc/.djmount
@@ -112,22 +112,22 @@ case "$1" in
 		service minidlnad stop >/dev/console
 		rm -f /var/etc/.minidlnad
 	;;
-	xud_start)
+	xupnpd_start)
 		echo "[$BNAME] xupnpd start"
 		touch /var/etc/.xupnpd
 		service xupnpd start >/dev/console
 	;;
-	xud_stop)
+	xupnpd_stop)
 		echo "[$BNAME] xupnpd stop"
 		service xupnpd stop >/dev/console
 		rm -f /var/etc/.xupnpd
 	;;
-	cro_start)
+	crond_start)
 		echo "[$BNAME] crond start"
 		touch /var/etc/.crond
 		service crond start >/dev/console
 	;;
-	cro_stop)
+	crond_stop)
 		echo "[$BNAME] crond stop"
 		service crond stop >/dev/console
 		rm -f /var/etc/.crond
diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh
index 1e4a512ee..8d8d39537 100644
--- a/data/y-web/scripts/Y_NI_Tools.sh
+++ b/data/y-web/scripts/Y_NI_Tools.sh
@@ -485,30 +485,30 @@ case "$action" in
 		printf "%s" "$S"
 	;;
 	# plugin-control
-	p_fcm_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_start;;
-	p_fcm_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_stop;;
-	p_nfs_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_start;;
-	p_nfs_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_stop;;
-	p_smb_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh smb_start;;
-	p_smb_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh smb_stop;;
-	p_txc_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh txc_start;;
-	p_txc_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh txc_stop;;
-	p_txm_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh txm_start;;
-	p_txm_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh txm_stop;;
-	p_ina_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ina_start;;
-	p_ina_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ina_stop;;
-	p_drop_start)   %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh drop_start;;
-	p_drop_stop)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh drop_stop;;
-	p_ush_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ush_start;;
-	p_ush_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ush_stop;;
-	p_djm_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djm_start;;
-	p_djm_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djm_stop;;
+	p_fcm_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_start;;
+	p_fcm_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_stop;;
+	p_nfs_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_start;;
+	p_nfs_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_stop;;
+	p_samba_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh samba_start;;
+	p_samba_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh samba_stop;;
+	p_tuxcald_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxcald_start;;
+	p_tuxcald_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxcald_stop;;
+	p_tuxmaild_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxmaild_start;;
+	p_tuxmaild_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxmaild_stop;;
+	p_inadyn_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh inadyn_start;;
+	p_inadyn_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh inadyn_stop;;
+	p_dropbear_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh dropbear_start;;
+	p_dropbear_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh dropbear_stop;;
+	p_ushare_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ushare_start;;
+	p_ushare_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ushare_stop;;
+	p_djmount_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djmount_start;;
+	p_djmount_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djmount_stop;;
 	p_minidlna_start)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_start;;
 	p_minidlna_stop)	%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_stop;;
-	p_xud_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xud_start;;
-	p_xud_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xud_stop;;
-	p_cro_start)    %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh cro_start;;
-	p_cro_stop)     %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh cro_stop;;
+	p_xupnpd_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xupnpd_start;;
+	p_xupnpd_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xupnpd_stop;;
+	p_crond_start)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh crond_start;;
+	p_crond_stop)		%(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh crond_stop;;
 	# plugins on blue-button
 	p_show)
 		PLUGIN=$1