diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 b/maxscale-system-test/cnf/maxscale.cnf.template.bug670
index 14790d9c0..598f5ccd0 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.bug670
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug670
@@ -94,7 +94,7 @@ service=Read-Connection-Router
 protocol=MySQLClient
 port=4008
 
-[Read-Connection-Router Slave]
+[Read-Connection-Router-Slave]
 type=service
 router=readconnroute
 router_options= slave
@@ -102,9 +102,9 @@ servers=server1,server2,server3,server4
 user=maxskysql
 password=skysql
 
-[Read-Connection-Listener Slave]
+[Read-Connection-Listener-Slave]
 type=listener
-service=Read-Connection-Router Slave
+service=Read-Connection-Router-Slave
 protocol=MySQLClient
 port=4009
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.bug681
index 55ad0032b..07acc607e 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.bug681
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug681
@@ -29,11 +29,11 @@ password=skysql
 
 [Read-Connection-Listener-Slave]
 type=listener
-service=Read-Connection-Router Slave
+service=Read-Connection-Router-Slave
 protocol=MySQLClient
 port=4009
 
-[Read-Connection-Router Slave]
+[Read-Connection-Router-Slave]
 type=service
 router=readconnroute
 router_options=slave
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 b/maxscale-system-test/cnf/maxscale.cnf.template.bug718
index 7f209774a..4a138005d 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.bug718
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug718
@@ -26,7 +26,7 @@ user=maxskysql
 password=skysql
 
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=g_server1, g_server2, g_server3, g_server4
@@ -52,9 +52,9 @@ service=Read-Connection-Router-Master
 protocol=MySQLClient
 port=4008
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
index aa230bae4..8684c5530 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
@@ -27,7 +27,7 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
@@ -58,9 +58,9 @@ protocol=MySQLClient
 port=4006
 #socket=/tmp/rwsplit.sock
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 #socket=/tmp/rwsplit.sock
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters
index ad4f7e633..2ab09278e 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters
@@ -98,7 +98,7 @@ protocol=MySQLBackend
 [duplicate]
 type=filter
 module=tee
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 
 [hints]
 type=filter
@@ -164,7 +164,7 @@ password=skysql
 monitor_interval=100
 root_node_as_master=false
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
@@ -172,9 +172,9 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
index ed8b103a3..a80a3bde4 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
@@ -9,7 +9,7 @@ servers= server1, server2,server3  ,server4
 user=maxskysql
 password= skysql
 
-[MySQL-Monitor 1]
+[MySQL-Monitor-1]
 type=monitor
 module=galeramon
 servers= server1, server2,server3  ,server4
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
index 1cd4ea0cc..61998875f 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
@@ -64,7 +64,7 @@ protocol=maxscaled
 #address=localhost
 socket=default
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
@@ -72,9 +72,9 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
index 28d14085e..61766307f 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
@@ -64,7 +64,7 @@ protocol=maxscaled
 #address=localhost
 socket=default
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
@@ -72,9 +72,9 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script
index 4de5f9ec8..260930392 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.script
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.script
@@ -32,7 +32,7 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
 
-[RW-Split-Router Galera]
+[RW-Split-Router-Galera]
 type=service
 router= readwritesplit
 servers=gserver1,gserver2,gserver3,gserver4
@@ -63,9 +63,9 @@ protocol=MySQLClient
 port=4006
 #socket=/tmp/rwsplit.sock
 
-[RW-Split-Listener Galera]
+[RW-Split-Listener-Galera]
 type=listener
-service=RW-Split-Router Galera
+service=RW-Split-Router-Galera
 protocol=MySQLClient
 port=4016
 #socket=/tmp/rwsplit.sock