diff --git a/ros_packages/mrs_uav_gazebo_simulation/scripts/mrs_drone_spawner.py b/ros_packages/mrs_uav_gazebo_simulation/scripts/mrs_drone_spawner.py
index 566a2bb..c13654f 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/scripts/mrs_drone_spawner.py
+++ b/ros_packages/mrs_uav_gazebo_simulation/scripts/mrs_drone_spawner.py
@@ -19,7 +19,7 @@
 from gazebo_msgs.msg import ModelStates
 from mavros_msgs.msg import State as MavrosState
 
-from mrs_msgs.msg import SpawnerDiagnostics
+from mrs_msgs.msg import GazeboSpawnerDiagnostics
 
 VEHICLE_BASE_PORT = 14000
 MAVLINK_TCP_BASE_PORT = 4560
@@ -87,7 +87,7 @@ def __init__(self, show_help=False, verbose=False):
         # #{ setup communication
 
         # diagnostics
-        self.diagnostics_pub = rospy.Publisher('~diagnostics', SpawnerDiagnostics,queue_size=1)
+        self.diagnostics_pub = rospy.Publisher('~diagnostics', GazeboSpawnerDiagnostics,queue_size=1)
         self.diagnostics_timer = rospy.Timer(rospy.Duration(0.1), self.callback_diagnostics_timer)
         self.action_timer = rospy.Timer(rospy.Duration(0.1), self.callback_action_timer)
 
@@ -187,7 +187,7 @@ def callback_action_timer(self, timer):
 
     # #{ callback_diagnostics_timer
     def callback_diagnostics_timer(self, timer):
-        diagnostics = SpawnerDiagnostics()
+        diagnostics = GazeboSpawnerDiagnostics()
         diagnostics.spawn_called = self.spawn_called
         diagnostics.processing = self.processing
         diagnostics.active_vehicles = self.active_vehicles