diff --git a/src/bma220/bma220.hpp b/src/bma220/bma220.hpp
index 7f362785..8077ade4 100644
--- a/src/bma220/bma220.hpp
+++ b/src/bma220/bma220.hpp
@@ -36,7 +36,7 @@ namespace upm {
   /**
    * @brief BMA220 Accelerometer library
    * @defgroup bma220 libupm-bma220
-   * @ingroup i2c gpio accelerometer
+   * @ingroup i2c gpio accelerometer bosch dfrobot
    */
 
   /**
@@ -44,7 +44,7 @@ namespace upm {
    * @sensor bma220
    * @comname Digital Triaxial Acceleration Sensor
    * @type accelerometer
-   * @man dfrobot
+   * @man bosch dfrobot
    * @con i2c gpio
    * @web http://www.dfrobot.com/index.php?route=product/product&product_id=1085
    *
diff --git a/src/bmi160/bmi160.hpp b/src/bmi160/bmi160.hpp
index 82575493..c2e492e9 100644
--- a/src/bmi160/bmi160.hpp
+++ b/src/bmi160/bmi160.hpp
@@ -33,7 +33,7 @@ namespace upm {
     /**
      * @brief BMI160 3-axis Accelerometer, Gyroscope and Magnetometer
      * @defgroup bmi160 libupm-bmi160
-     * @ingroup i2c accelerometer compass
+     * @ingroup i2c accelerometer compass bosch mouser
      */
 
 
@@ -43,7 +43,7 @@ namespace upm {
      * @comname Low-power IMU (triaxial Accelerometer and Triaxial Gyroscope)
      * and Magnetometer
      * @type accelerometer compass
-     * @man mouser
+     * @man bosch mouser
      * @con i2c
      * @web https://www.bosch-sensortec.com/bst/products/all_products/bmi160
      *
diff --git a/src/bmp280/bme280.hpp b/src/bmp280/bme280.hpp
index f65e727b..fd03992e 100644
--- a/src/bmp280/bme280.hpp
+++ b/src/bmp280/bme280.hpp
@@ -37,7 +37,7 @@ namespace upm {
      * @sensor bme280
      * @comname Digital Humidity, Pressure, and Temperature Sensor
      * @type pressure humidity
-     * @man adafruit
+     * @man bosch adafruit
      * @con i2c spi gpio
      * @web https://www.adafruit.com/products/2652
      *
diff --git a/src/bmp280/bmp280.hpp b/src/bmp280/bmp280.hpp
index d6346ca9..73dae30a 100644
--- a/src/bmp280/bmp280.hpp
+++ b/src/bmp280/bmp280.hpp
@@ -36,7 +36,7 @@ namespace upm {
     /**
      * @brief BMP280 Digital Pressure Sensor
      * @defgroup bmp280 libupm-bmp280
-     * @ingroup i2c spi gpio pressure
+     * @ingroup i2c spi gpio pressure bosch adafruit
      */
 
     /**
@@ -44,7 +44,7 @@ namespace upm {
      * @sensor bmp280
      * @comname Digital Pressure Sensor
      * @type pressure
-     * @man adafruit
+     * @man bosch adafruit
      * @con i2c spi gpio
      * @web https://www.adafruit.com/products/2651
      *
diff --git a/src/bmpx8x/bmpx8x.hpp b/src/bmpx8x/bmpx8x.hpp
index 8a6f4e24..b25c8d3d 100644
--- a/src/bmpx8x/bmpx8x.hpp
+++ b/src/bmpx8x/bmpx8x.hpp
@@ -39,7 +39,8 @@ namespace upm {
 
     /**
      * @brief Bosch BMP & GY65 Atmospheric Pressure Sensor library
-     * @defgroup bmpx8x libupm-bmpx8x @ingroup seeed adafruit sparkfun i2c
+     * @defgroup bmpx8x libupm-bmpx8x
+     * @ingroup bosch seeed adafruit sparkfun i2c
      * pressure
      */
 
@@ -49,7 +50,7 @@ namespace upm {
      * @comname BMP Atmospheric Pressure Sensor
      * @altname GY65 BMP085 BMP180 BMP183
      * @type pressure
-     * @man seeed adafruit sparkfun
+     * @man bosch seeed adafruit sparkfun
      * @con i2c
      * @web https://www.sparkfun.com/datasheets/Components/General/BST-BMP085-DS000-05.pdf
      * @web https://www.bosch-sensortec.com/bst/products/all_products/bmp180
diff --git a/src/bno055/bno055.hpp b/src/bno055/bno055.hpp
index 68fdfadd..c7b5722a 100644
--- a/src/bno055/bno055.hpp
+++ b/src/bno055/bno055.hpp
@@ -33,7 +33,7 @@ namespace upm {
     /**
      * @brief BNO055 Absolute Orientation 9DOF Fusion Hub
      * @defgroup bno055 libupm-bno055
-     * @ingroup i2c gpio accelerometer compass
+     * @ingroup i2c gpio accelerometer compass bosch adafruit
      */
 
     /**
@@ -41,7 +41,7 @@ namespace upm {
      * @sensor bno055
      * @comname Intelligent 9-axis Absolute Orientation Sensor
      * @type accelerometer compass
-     * @man adafruit
+     * @man bosch adafruit
      * @con i2c gpio
      * @web https://www.adafruit.com/products/2472
      *