diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop
index 7b1b8a1db..265a77c7c 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop
@@ -26,7 +26,7 @@ address=###node_server_IP_4###
 port=###node_server_port_4###
 protocol=MySQLBackend
 
-[MySQL Monitor]
+[MySQL-Monitor]
 type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
@@ -34,7 +34,7 @@ user=maxskysql
 password=skysql
 monitor_interval=1000
 
-[RW Split Router]
+[RW-Split-Router]
 type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
@@ -43,8 +43,8 @@ password=skysql
 max_sescmd_history=20
 disable_sescmd_history=false
 
-[RW Split Listener]
+[RW-Split-Listener]
 type=listener
-service=RW Split Router
+service=RW-Split-Router
 protocol=MySQLClient
 port=4006
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning
index 6c8da9817..9310a3a57 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning
@@ -26,7 +26,7 @@ address=###node_server_IP_4###
 port=###node_server_port_4###
 protocol=MySQLBackend
 
-[MySQL Monitor]
+[MySQL-Monitor]
 type=monitor
 module=mysqlmon
 servers=server1,server2,server3,server4
@@ -34,7 +34,7 @@ user=maxskysql
 password=skysql
 monitor_interval=1000
 
-[RW Split Router]
+[RW-Split-Router]
 type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
@@ -44,7 +44,7 @@ max_sescmd_history=10
 prune_sescmd_history=true
 max_slave_connections=1
 
-[RW Split Listener]
+[RW-Split-Listener]
 type=listener
 service=RW Split Router
 protocol=MySQLClient
diff --git a/maxscale-system-test/mxs1457_ignore_deleted.cpp b/maxscale-system-test/mxs1457_ignore_deleted.cpp
index 6c27fa232..1a8293763 100644
--- a/maxscale-system-test/mxs1457_ignore_deleted.cpp
+++ b/maxscale-system-test/mxs1457_ignore_deleted.cpp
@@ -21,7 +21,7 @@ int main(int argc, char* argv[])
      * The monitor needs to be stopped before the slaves are stopped to prevent
      * it from detecting the broken replication.
      */
-    test.maxscales->ssh_node(0, "maxadmin shutdown monitor \"MySQL Monitor\"", true);
+    test.maxscales->ssh_node(0, "maxadmin shutdown monitor MySQL-Monitor", true);
     // Stop slaves and drop the user on the master
     test.repl->stop_slaves();
     test.repl->connect();
@@ -38,7 +38,7 @@ int main(int argc, char* argv[])
     test.add_result(mysql_errno(conn) == 0, "Connection with users from master should fail");
     mysql_close(conn);
 
-    test.maxscales->ssh_node(0, "maxadmin remove server server1 \"RW-Split-Router\"", true);
+    test.maxscales->ssh_node(0, "maxadmin remove server server1 RW-Split-Router", true);
     conn = open_conn_db(test.maxscales->rwsplit_port[0],
                         test.maxscales->ip(0),
                         "test",