diff --git a/src/groups.md b/src/groups.md
index 5b0899e1..6a8ab473 100644
--- a/src/groups.md
+++ b/src/groups.md
@@ -270,9 +270,19 @@ and is not meant to be installed anywhere.
 @brief Adafruit Industries
 
 
-@defgroup emax EMax
+@defgroup amphenol Amphenol
 @ingroup byman
-@brief EMax
+@brief Amphenol
+
+
+@defgroup bosch Bosch
+@ingroup byman
+@brief Bosch
+
+
+@defgroup comet Comet
+@ingroup byman
+@brief Comet System
 
 
 @defgroup dfrobot DFRobot
@@ -280,9 +290,9 @@ and is not meant to be installed anywhere.
 @brief DFRobot
 
 
-@defgroup comet Comet
+@defgroup emax EMax
 @ingroup byman
-@brief Comet System
+@brief EMax
 
 
 @defgroup epict EpicTinker
@@ -310,9 +320,9 @@ and is not meant to be installed anywhere.
 @brief Maxim Integrated
 
 
-@defgroup numatolabs Numato Labs
+@defgroup meas Measurement Specialties
 @ingroup byman
-@brief Numato Labs
+@brief Measurement Specialties
 
 
 @defgroup mouser Mouser
@@ -320,21 +330,41 @@ and is not meant to be installed anywhere.
 @brief Mouser
 
 
+@defgroup numatolabs Numato Labs
+@ingroup byman
+@brief Numato Labs
+
+
 @defgroup omega Omega
 @ingroup byman
 @brief Omega
 
 
+@defgroup openelectrons Open Electrons
+@ingroup byman
+@brief Open Electrons
+
+
 @defgroup seeed SeeedStudio
 @ingroup byman
 @brief SeeedStudio - Grove Sensors
 
 
+@defgroup silabs Silicon Labs
+@ingroup byman
+@brief Silicon Labs
+
+
 @defgroup sparkfun Sparkfun
 @ingroup byman
 @brief Sparkfun
 
 
+@defgroup stmicro STMicroelectronics
+@ingroup byman
+@brief STMicroelectronics
+
+
 @defgroup ti Texas Instruments
 @ingroup byman
 @brief Texas Instruments
@@ -345,31 +375,6 @@ and is not meant to be installed anywhere.
 @brief Veris Industries
 
 
-@defgroup silabs Silicon Labs
-@ingroup byman
-@brief Silicon Labs
-
-
-@defgroup bosch Bosch
-@ingroup byman
-@brief Bosch
-
-
-@defgroup amphenol Amphenol
-@ingroup byman
-@brief Amphenol
-
-
-@defgroup openelectrons Open Electrons
-@ingroup byman
-@brief Open Electrons
-
-
-@defgroup meas Measurement Specialties
-@ingroup byman
-@brief Measurement Specialties
-
-
 ### Groups for the various Starter Kits ###
 
 
diff --git a/src/h3lis331dl/h3lis331dl.hpp b/src/h3lis331dl/h3lis331dl.hpp
index 775ec02f..5f49bbd7 100644
--- a/src/h3lis331dl/h3lis331dl.hpp
+++ b/src/h3lis331dl/h3lis331dl.hpp
@@ -35,7 +35,7 @@ namespace upm {
   /**
    * @brief H3LIS331DL I2C Accelerometer (400g) library
    * @defgroup h3lis331dl libupm-h3lis331dl
-   * @ingroup seeed i2c accelerometer
+   * @ingroup seeed stmicro i2c accelerometer
    */
 
   /**
@@ -44,7 +44,7 @@ namespace upm {
    * @comname H3LIS331DL 3-Axis Digital Accelerometer
    * @altname Grove 3-Axis Digital Accelerometer (400g)
    * @type accelerometer
-   * @man seeed
+   * @man seeed stmicro
    * @web http://www.seeedstudio.com/depot/Grove-3Axis-Digital-Accelerometer400g-p-1897.html
    * @con i2c
    *
diff --git a/src/l3gd20/l3gd20.hpp b/src/l3gd20/l3gd20.hpp
index f2271001..c08c37bf 100644
--- a/src/l3gd20/l3gd20.hpp
+++ b/src/l3gd20/l3gd20.hpp
@@ -43,7 +43,7 @@ namespace upm
 /**
  * @brief L3GD20 Tri-axis Digital Gyroscope
  * @defgroup l3gd20 libupm-l3gd20
- * @ingroup STMicroelectronics iio i2c tri-axis digital gyroscope
+ * @ingroup stmicro iio i2c tri-axis digital gyroscope
  */
 
 /**
@@ -51,7 +51,7 @@ namespace upm
  * @sensor l3gd20
  * @comname L3GD20 Tri-axis Digital Gyroscope
  * @type gyroscope
- * @man STMicroelectronics
+ * @man stmicro
  * @con iio i2c
  *
  * @brief L3GD20 Tri-axis Digital Gyroscope API
diff --git a/src/lsm303/lsm303.hpp b/src/lsm303/lsm303.hpp
index 767d547f..adc1bfe5 100644
--- a/src/lsm303/lsm303.hpp
+++ b/src/lsm303/lsm303.hpp
@@ -63,7 +63,7 @@ namespace upm {
 /**
  * @brief LSM303 Accelerometer/Compass library
  * @defgroup lsm303 libupm-lsm303
- * @ingroup seeed adafruit i2c accelerometer compass
+ * @ingroup seeed adafruit stmicro i2c accelerometer compass
  */
 
 /**
@@ -72,7 +72,7 @@ namespace upm {
  * @comname LSM303 Accelerometer & Compass
  * @altname Grove 6-Axis Accelerometer & Compass
  * @type accelerometer compass
- * @man seeed adafruit
+ * @man seeed adafruit stmicro
  * @web http://www.seeedstudio.com/wiki/Grove_-_6-Axis_Accelerometer%26Compass
  * @con i2c
  *
diff --git a/src/lsm9ds0/lsm9ds0.hpp b/src/lsm9ds0/lsm9ds0.hpp
index 0508a5db..952a162c 100644
--- a/src/lsm9ds0/lsm9ds0.hpp
+++ b/src/lsm9ds0/lsm9ds0.hpp
@@ -38,7 +38,7 @@ namespace upm {
   /**
    * @brief LSM9DS0 accelerometer library
    * @defgroup lsm9ds0 libupm-lsm9ds0
-   * @ingroup i2c gpio accelerometer compass
+   * @ingroup sparkfun stmicro i2c gpio accelerometer compass
    */
 
   /**
@@ -46,7 +46,7 @@ namespace upm {
    * @sensor lsm9ds0
    * @comname LSM9DS0 3-axis Gyroscope, Accelerometer, and Magnetometer
    * @type accelerometer compass
-   * @man sparkfun
+   * @man sparkfun stmicro
    * @con i2c gpio
    * @web https://www.sparkfun.com/products/13033
    *