diff --git a/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-coloured.launch b/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-coloured.launch
index 162b9a29d428c56d1dec8649215142a581a19b0f..024eb11c36342529a285f6346cb84d3809603fe0 100644
--- a/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-coloured.launch
+++ b/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-coloured.launch
@@ -4,7 +4,7 @@
     <arg name="mqtt_server" default="tcp://localhost:1883"
          doc="address of the mqtt server for the connection to the controller"/>
 
-    <include file="$(find ccf)/launch/noop-sim_setup.launch"/>
+    <include file="$(find ccf)/launch/simulation_setup.launch"/>
 
     <param name="/connector_node_ros_ccf/topics/command" value="/ceti_cell_1/command"/>
 
diff --git a/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-grey.launch b/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-grey.launch
index 694569b2bcec7cf207b96d374a05ce309b8a11c1..36a2f21e17c7f73ed1dbe03cc4d00945b58e5bc9 100644
--- a/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-grey.launch
+++ b/launch/cell-controllers/noop-sim-cell_ceti-table-1-emptyworld-grey.launch
@@ -4,7 +4,7 @@
     <arg name="mqtt_server" default="tcp://localhost:1883"
          doc="address of the mqtt server for the connection to the controller"/>
 
-    <include file="$(find ccf)/launch/noop-sim_setup.launch"/>
+    <include file="$(find ccf)/launch/simulation_setup.launch"/>
 
     <param name="/connector_node_ros_ccf/topics/command" value="/ceti_cell_1/command"/>
 
diff --git a/launch/cell-controllers/noop-sim-cell_ceti-table-1-fullworld-grey.launch b/launch/cell-controllers/noop-sim-cell_ceti-table-1-fullworld-grey.launch
index 92f194c6c873778cffaba0c49d04698e4530ae58..512aa29b9be60a87bbb272b78a0bb46ce839bc31 100644
--- a/launch/cell-controllers/noop-sim-cell_ceti-table-1-fullworld-grey.launch
+++ b/launch/cell-controllers/noop-sim-cell_ceti-table-1-fullworld-grey.launch
@@ -4,7 +4,7 @@
     <arg name="mqtt_server" default="tcp://localhost:1883"
          doc="address of the mqtt server for the connection to the controller"/>
 
-    <include file="$(find ccf)/launch/noop-sim_setup.launch"/>
+    <include file="$(find ccf)/launch/simulation_setup.launch"/>
 
     <param name="/connector_node_ros_ccf/topics/command" value="/ceti_cell_1/command"/>
 
diff --git a/launch/cell-controllers/noop-sim-cell_ceti-table-1-placeworld.launch b/launch/cell-controllers/noop-sim-cell_ceti-table-1-placeworld.launch
index b67ff51990c5b12652575b73a4ec2e2dd30955a4..5a7669c2f92e6c226f9b6e1680500158639097ec 100644
--- a/launch/cell-controllers/noop-sim-cell_ceti-table-1-placeworld.launch
+++ b/launch/cell-controllers/noop-sim-cell_ceti-table-1-placeworld.launch
@@ -7,7 +7,7 @@
     <!-- Use rviz -->
     <arg name="use_rviz" default="true" doc="use rviz"/>
 
-    <include file="$(find ccf)/launch/noop-sim_setup.launch">
+    <include file="$(find ccf)/launch/simulation_setup.launch">
         <arg name="use_rviz" value="$(arg use_rviz)"/>
     </include>
 
diff --git a/launch/cell-controllers/noop-sim-cell_ceti-table-2-placeworld.launch b/launch/cell-controllers/noop-sim-cell_ceti-table-2-placeworld.launch
index 34e78a42d541b600072e77fc5d7e995a54e94c79..c4bad343ec5171b52a68ff60c17d2c4d41b2f648 100644
--- a/launch/cell-controllers/noop-sim-cell_ceti-table-2-placeworld.launch
+++ b/launch/cell-controllers/noop-sim-cell_ceti-table-2-placeworld.launch
@@ -4,7 +4,7 @@
     <arg name="mqtt_server" default="tcp://192.168.0.122:1883"
          doc="address of the mqtt server for the connection to the controller"/>
 
-    <include file="$(find ccf)/launch/noop-sim_setup.launch"/>
+    <include file="$(find ccf)/launch/simulation_setup.launch"/>
 
     <param name="/connector_node_ros_ccf/topics/command" value="/ceti_cell_placeworld/command"/>