diff --git a/launch/gazebo_multicopter.launch b/launch/gazebo_multicopter.launch
index c01ad163a1..263ee025b1 100644
--- a/launch/gazebo_multicopter.launch
+++ b/launch/gazebo_multicopter.launch
@@ -1,7 +1,7 @@
 <launch>
+<include file="$(find mav_gazebo)/launch/vtol_empty_world.launch" />
 
-<group ns="px4_example">
-	<include file="$(find mav_gazebo)/launch/vtol_empty_world.launch" />
+<group ns="px4_multicopter">
 	<node pkg="joy" name="joy_node" type="joy_node"/>
 	<node pkg="px4" name="manual_input" type="manual_input"/>
 	<node pkg="px4" name="commander" type="commander"/>
diff --git a/launch/multicopter.launch b/launch/multicopter.launch
index e7f49319cb..96ff3ad99c 100644
--- a/launch/multicopter.launch
+++ b/launch/multicopter.launch
@@ -1,6 +1,6 @@
 <launch>
 
-<group ns="px4_example">
+<group ns="px4_multicopter">
 	<node pkg="joy" name="joy_node" type="joy_node"/>
 	<node pkg="px4" name="manual_input" type="manual_input"/>
 	<node pkg="px4" name="commander" type="commander"/>