diff --git a/launch/microstrain_imu_sim.launch b/launch/microstrain_imu_sim.launch
index 4db1c1fa6c81d1b4d850f0535d2d964d5220f196..2999382738f53f009e6c60c1f7911f2cb65a711d 100644
--- a/launch/microstrain_imu_sim.launch
+++ b/launch/microstrain_imu_sim.launch
@@ -8,14 +8,11 @@
     <arg name="extra_gazebo_args" value=""/>
     <arg name="gui" value="true"/>
     <arg name="recording" value="false"/>
-    <!-- Note that 'headless' is currently non-functional.  See gazebo_ros_pkgs issue #491 (-r arg does not disable
-         rendering, but instead enables recording). The arg definition has been left here to prevent breaking downstream
-         launch files, but it does nothing. -->
     <arg name="headless" value="false"/>
     <arg name="debug" value="false"/>
     <arg name="physics" value="ode"/>
     <arg name="verbose" value="false"/>
-    <arg name="world_name" value="worlds/empty.world"/> <!-- Note: the world_name is with respect to GAZEBO_RESOURCE_PATH environmental variable -->
+    <arg name="world_name" value="worlds/empty.world"/> 
     <arg name="respawn_gazebo" value="false"/>
     <arg name="use_clock_frequency" value="false"/>
     <arg name="pub_clock_frequency" value="100"/>
@@ -29,7 +26,6 @@
     <param name="publish_frequency" type="double" value="20.0"/>
   </node>
 
-  <!-- Spawn a robot into Gazebo -->
   <node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model microstrain_imu -x 0 -y 0 -z 0 -R 0 -P 0 -Y 0" />
 
 </launch>
diff --git a/urdf/imu.gazebo b/urdf/imu.gazebo
index 583720f238fca26d2a12d3d6374430f6f4ed93c0..07dc8c966a6b8d6c90ae37f977f9878c70d337b8 100644
--- a/urdf/imu.gazebo
+++ b/urdf/imu.gazebo
@@ -3,12 +3,12 @@
   <xacro:macro name="iri_imu_gazebo" params="name config">
     <xacro:property name="properties" value="${load_yaml(config)}"/>
 
-    <gazebo reference="${name}_microstrain_imu">
+    <gazebo reference="${name}_imu">
       <material>Gazebo/Black</material>
     </gazebo>
 
     <gazebo>
-      <plugin name="${name}_microstrain_imu_sim" filename="libhector_gazebo_ros_imu.so">
+      <plugin name="${name}_imu_sim" filename="libhector_gazebo_ros_imu.so">
         <updateRate>${properties['rate']}</updateRate>
         <robotNamespace>${properties['namespace']}</robotNamespace>
         <bodyName>${name}_microstrain_imu</bodyName>