diff --git a/inteno-netmodes/files/etc/init.d/netmode b/inteno-netmodes/files/etc/init.d/netmode
index bb2e4cfa9..bdb97a3af 100755
--- a/inteno-netmodes/files/etc/init.d/netmode
+++ b/inteno-netmodes/files/etc/init.d/netmode
@@ -198,10 +198,10 @@ start_client_listener() {
 
 	case "$mode" in
 		repeater*)
-			killall -SIGKILL client_listener >/dev/null 2>&1
+			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
 		;;
 		*)
-			pidof client_listener || /sbin/client_listener &
+			pidof netmode-client-detect || /sbin/netmode-client-detect &
 		;;
 	esac
 }
@@ -217,11 +217,12 @@ reload_service() {
 	# set default JUCI page to overview
 	uci -q set juci.juci.homepage="overview"
 	uci commit juci
+
 	start_client_listener
 }
 
 stop_service() {
-	killall -SIGKILL client_listener >/dev/null 2>&1
+	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
 }
 
 service_triggers()
diff --git a/inteno-netmodes/files/sbin/repeater_credentials b/inteno-netmodes/files/sbin/netmode-conf
similarity index 100%
rename from inteno-netmodes/files/sbin/repeater_credentials
rename to inteno-netmodes/files/sbin/netmode-conf
diff --git a/inteno-netmodes/files/sbin/client_listener b/inteno-netmodes/files/sbin/netmode-detect
similarity index 100%
rename from inteno-netmodes/files/sbin/client_listener
rename to inteno-netmodes/files/sbin/netmode-detect
diff --git a/inteno-netmodes/files/usr/libexec/rpcd/repeater b/inteno-netmodes/files/usr/libexec/rpcd/repeater
index d11d89a69..34b40e214 100755
--- a/inteno-netmodes/files/usr/libexec/rpcd/repeater
+++ b/inteno-netmodes/files/usr/libexec/rpcd/repeater
@@ -92,7 +92,7 @@ case "$1" in
 				json_add_string "status" success
 				json_dump
 
-				repeater_credentials $file >/dev/null 2>&1 &
+				netmode-conf $file >/dev/null 2>&1 &
 			;;
 		esac
 	;;