diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f330.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f330.sdf.jinja
index cc32c6c..3af9b1b 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f330.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f330.sdf.jinja
@@ -90,7 +90,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f450.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f450.sdf.jinja
index e723599..8586b0e 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f450.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f450.sdf.jinja
@@ -94,7 +94,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f550.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f550.sdf.jinja
index a71510d..decc36d 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f550.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/f550.sdf.jinja
@@ -93,7 +93,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/m690.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/m690.sdf.jinja
index 069dfa9..934d0e9 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/m690.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/m690.sdf.jinja
@@ -82,7 +82,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/naki.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/naki.sdf.jinja
index 923f4e2..095372a 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/naki.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/naki.sdf.jinja
@@ -85,7 +85,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/t650.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/t650.sdf.jinja
index 2e8b13a..64468b1 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/t650.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/t650.sdf.jinja
@@ -87,7 +87,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}
diff --git a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/x500.sdf.jinja b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/x500.sdf.jinja
index d48ff62..6756dd4 100644
--- a/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/x500.sdf.jinja
+++ b/ros_packages/mrs_uav_gazebo_simulation/models/mrs_robots_description/sdf/x500.sdf.jinja
@@ -103,7 +103,7 @@
   {%- set prop_izz = 0.0001 -%}
   {# <!--}--> #}
 
-  <model name="{{ name }}">
+  <model name="{{ spawner_args['name'] }}">
 
     {# ================================================================== #}
     {# ||                    bare body definitions                     || #}