diff --git a/abb_experimental/package.xml b/abb_experimental/package.xml
index e144d4e6..c216308a 100644
--- a/abb_experimental/package.xml
+++ b/abb_experimental/package.xml
@@ -3,8 +3,8 @@
   <name>abb_experimental</name>
   <version>0.1.0</version>
   <description>Experimental packages for ABB manipulators within ROS-Industrial.</description>
-  <author email="sedwards@swri.org">Shaun Edwards</author>
-  <maintainer email="sedwards@swri.org">Shaun Edwards</maintainer>
+  <author>Shaun Edwards</author>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>BSD</license>
 
   <url type="website">http://wiki.ros.org/abb_experimental</url>
diff --git a/abb_irb120_gazebo/package.xml b/abb_irb120_gazebo/package.xml
index 19382b80..58722c91 100644
--- a/abb_irb120_gazebo/package.xml
+++ b/abb_irb120_gazebo/package.xml
@@ -17,9 +17,10 @@
       configuration you intend to use them with.
     </p>
   </description>
-  <author email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</author>
+  <author>Mark Culleton (Trinity College Dublin)</author>
   <author>Kevin Kelly (Trinity College Dublin)</author>
   <maintainer email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache2</license>
 
   <url type="website">http://wiki.ros.org/abb</url>
diff --git a/abb_irb120_moveit_config/package.xml b/abb_irb120_moveit_config/package.xml
index de1451d8..11b83fce 100644
--- a/abb_irb120_moveit_config/package.xml
+++ b/abb_irb120_moveit_config/package.xml
@@ -14,6 +14,7 @@
   </description>
   <author email="assistant@moveit.ros.org">MoveIt Setup Assistant</author>
   <maintainer email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
 
   <license>BSD</license>
 
diff --git a/abb_irb120_support/package.xml b/abb_irb120_support/package.xml
index c505cde3..76d59a46 100644
--- a/abb_irb120_support/package.xml
+++ b/abb_irb120_support/package.xml
@@ -30,7 +30,7 @@
       robot model and configuration you intend to use them with.
     </p>
   </description>
-  <author email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</author>
+  <author>Mark Culleton (Trinity College Dublin)</author>
   <author>Kevin Kelly (Trinity College Dublin)</author>
   <maintainer email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</maintainer>
   <maintainer email="levi.armstrong@swri.org">Levi Armstrong (SwRI)</maintainer>
diff --git a/abb_irb120t_moveit_config/package.xml b/abb_irb120t_moveit_config/package.xml
index 6eb460b4..7db7f48c 100644
--- a/abb_irb120t_moveit_config/package.xml
+++ b/abb_irb120t_moveit_config/package.xml
@@ -14,6 +14,7 @@
   </description>
   <author email="assistant@moveit.ros.org">MoveIt Setup Assistant</author>
   <maintainer email="culletom@tcd.ie">Mark Culleton (Trinity College Dublin)</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
 
   <license>BSD</license>
 
diff --git a/abb_irb1600_support/package.xml b/abb_irb1600_support/package.xml
index 8dab0f3f..71744377 100644
--- a/abb_irb1600_support/package.xml
+++ b/abb_irb1600_support/package.xml
@@ -25,6 +25,7 @@
   </description>
   <author email="aabdelmawgoud@swri.org">Ahmed Abdelmawgoud (Southwest Research Institute)</author>
   <maintainer email="aderic@swri.org">Austin Deric (Southwest Research Institute)</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache2</license>
 
   <url type="website">http://wiki.ros.org/abb_irb1600_support</url>
diff --git a/abb_irb2600_support/package.xml b/abb_irb2600_support/package.xml
index 617fed95..e42eb6e0 100644
--- a/abb_irb2600_support/package.xml
+++ b/abb_irb2600_support/package.xml
@@ -29,6 +29,7 @@
   <author email="cody.bressler@swri.org">Cody Bressler (SwRI)</author>
   <author email="jonathan.meyer@swri.org">Jonathan Meyer (SwRI)</author>
   <maintainer email="jonathan.meyer@swri.org">Jonathan Meyer (SwRI)</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache2</license>
 
   <url type="website">http://wiki.ros.org/abb_irb2600_support</url>
diff --git a/abb_irb52_support/package.xml b/abb_irb52_support/package.xml
index 223e71b1..2711b5d2 100644
--- a/abb_irb52_support/package.xml
+++ b/abb_irb52_support/package.xml
@@ -26,7 +26,7 @@
     </p>
   </description>
   <author email="michael.ripperger@swri.org">Michael Ripperger</author>
-  <maintainer email="levi.armstrong@swri.org">Levi Armstrong</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache 2.0</license>
 
   <url type="website">http://wiki.ros.org/abb_irb52_support</url>
diff --git a/abb_irb6650s_support/package.xml b/abb_irb6650s_support/package.xml
index 1a6cf1a2..0ffce444 100644
--- a/abb_irb6650s_support/package.xml
+++ b/abb_irb6650s_support/package.xml
@@ -24,7 +24,7 @@
     </p>
   </description>
   <author email="michael.ripperger@swri.org">Michael Ripperger</author>
-  <maintainer email="levi.armstrong@swri.org">Levi Armstrong</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache 2.0</license>
 
   <url type="website">http://ros.org/wiki/abb_irb_6650s_support</url>
diff --git a/abb_irb7600_support/package.xml b/abb_irb7600_support/package.xml
index b6886687..5f1d7e49 100644
--- a/abb_irb7600_support/package.xml
+++ b/abb_irb7600_support/package.xml
@@ -26,7 +26,7 @@
     </p>
   </description>
   <author email="michael.riperger@swri.org">Michael Ripperger</author>
-  <maintainer email="levi.armstrong@swri.org">Levi Armstrong</maintainer>
+  <maintainer email="levi.armstrong@swri.org">Levi Armstrong (Southwest Research Institute)</maintainer>
   <license>Apache 2.0</license>
 
   <url type="website">http://wiki.ros.org/abb_irb7600_support</url>