diff --git a/src/bmi160/bmi160.hpp b/src/bmi160/bmi160.hpp
index 84448c04..c9be4125 100644
--- a/src/bmi160/bmi160.hpp
+++ b/src/bmi160/bmi160.hpp
@@ -40,7 +40,7 @@ namespace upm {
   /**
    * @library bmi160
    * @sensor bmi160
-   * @comname UPM API for the BMI160 3-axis Accelerometer, Gyroscope
+   * @comname BMI160 3-axis Accelerometer, Gyroscope
    * and Magnetometer
    * @type accelerometer compass
    * @man mouser
diff --git a/src/e50hx/e50hx.hpp b/src/e50hx/e50hx.hpp
index c2f4b514..0fe8776d 100644
--- a/src/e50hx/e50hx.hpp
+++ b/src/e50hx/e50hx.hpp
@@ -40,7 +40,7 @@ namespace upm {
   /**
    * @library e50hx
    * @sensor e50hx
-   * @comname UPM API for the Veris E50HX Energy Meters
+   * @comname Veris E50HX Energy Meters
    * @type electic
    * @man veris
    * @con uart
diff --git a/src/h803x/h803x.hpp b/src/h803x/h803x.hpp
index 472f5e18..3fb4b830 100644
--- a/src/h803x/h803x.hpp
+++ b/src/h803x/h803x.hpp
@@ -38,7 +38,7 @@ namespace upm {
   /**
    * @library h803x
    * @sensor h803x
-   * @comname UPM API for the Veris H803X Energy Meter
+   * @comname Veris H803X Energy Meter
    * @type electic
    * @man veris
    * @con uart
diff --git a/src/hwxpxx/hwxpxx.hpp b/src/hwxpxx/hwxpxx.hpp
index 47e3a0c2..568fbc17 100644
--- a/src/hwxpxx/hwxpxx.hpp
+++ b/src/hwxpxx/hwxpxx.hpp
@@ -38,7 +38,7 @@ namespace upm {
   /**
    * @library hwxpxx
    * @sensor hwxpxx
-   * @comname UPM API for the Veris HWXPXX Hardware Protocol Humidity and Temperature Sensor
+   * @comname Veris HWXPXX Hardware Protocol Humidity and Temperature Sensor
    * @type temp
    * @man veris
    * @con uart
diff --git a/src/ozw/aeotecdsb09104.hpp b/src/ozw/aeotecdsb09104.hpp
index 3e9dca62..8bb17985 100644
--- a/src/ozw/aeotecdsb09104.hpp
+++ b/src/ozw/aeotecdsb09104.hpp
@@ -31,7 +31,7 @@ namespace upm {
 
   /**
    * @library ozw
-   * @comname UPM API for he Aeotec Home Energy Meter Gen 1
+   * @comname Aeotec Home Energy Meter Gen 1
    * @con uart
    *
    * @brief UPM API for Aeotec Home Energy Meter Gen 1
diff --git a/src/ozw/aeotecdw2e.hpp b/src/ozw/aeotecdw2e.hpp
index 27edf553..fe4c2425 100644
--- a/src/ozw/aeotecdw2e.hpp
+++ b/src/ozw/aeotecdw2e.hpp
@@ -31,7 +31,7 @@ namespace upm {
 
   /**
    * @library ozw
-   * @comname UPM API for he Aeotec Door/Window Sensor 2nd Edition
+   * @comname Aeotec Door/Window Sensor 2nd Edition
    * @altname DSB29
    * @con uart
    *
diff --git a/src/ozw/aeotecsdg2.hpp b/src/ozw/aeotecsdg2.hpp
index 78f65e84..89ef0b87 100644
--- a/src/ozw/aeotecsdg2.hpp
+++ b/src/ozw/aeotecsdg2.hpp
@@ -31,7 +31,7 @@ namespace upm {
 
   /**
    * @library ozw
-   * @comname UPM API for the Aeotec Smart Dimmer Gen 2
+   * @comname Aeotec Smart Dimmer Gen 2
    * @con uart
    *
    * @brief UPM API for Aeotec Smart Dimmer Gen 2
diff --git a/src/ozw/aeotecss6.hpp b/src/ozw/aeotecss6.hpp
index e28d23e8..3ec9bdac 100644
--- a/src/ozw/aeotecss6.hpp
+++ b/src/ozw/aeotecss6.hpp
@@ -31,7 +31,7 @@ namespace upm {
 
   /**
    * @library ozw
-   * @comname UPM API for he Aeotec Smart Switch 6
+   * @comname Aeotec Smart Switch 6
    * @con uart
    *
    * @brief UPM API for Aeotec Smart Switch 6
diff --git a/src/ozw/tzemt400.hpp b/src/ozw/tzemt400.hpp
index 204a8af9..d4b666f3 100644
--- a/src/ozw/tzemt400.hpp
+++ b/src/ozw/tzemt400.hpp
@@ -31,7 +31,7 @@ namespace upm {
 
   /**
    * @library ozw
-   * @comname UPM API for the Trane TZEMT400 Z-Wave Thermostat.
+   * @comname Trane TZEMT400 Z-Wave Thermostat.
    * @con uart
    *
    * @brief UPM API for Trane TZEMT400 Z-Wave Thermostat
diff --git a/src/rhusb/rhusb.hpp b/src/rhusb/rhusb.hpp
index ee44d6ef..ba3d08f0 100644
--- a/src/rhusb/rhusb.hpp
+++ b/src/rhusb/rhusb.hpp
@@ -37,7 +37,7 @@ namespace upm {
   /**
    * @library rhusb
    * @sensor rhusb
-   * @comname UPM API for the Omega RH-USB Temperature and Humidity Sensor
+   * @comname Omega RH-USB Temperature and Humidity Sensor
    * @type temp
    * @man omega
    * @con uart
diff --git a/src/t3311/t3311.hpp b/src/t3311/t3311.hpp
index ec577e52..e811230a 100644
--- a/src/t3311/t3311.hpp
+++ b/src/t3311/t3311.hpp
@@ -38,7 +38,7 @@ namespace upm {
   /**
    * @library t3311
    * @sensor t3311
-   * @comname UPM API for the T3311 Temperature and Humidity Sensor
+   * @comname T3311 Temperature and Humidity Sensor
    * @type temp
    * @man comet
    * @con uart
diff --git a/src/t8100/t8100.hpp b/src/t8100/t8100.hpp
index 71825520..ed2754b3 100644
--- a/src/t8100/t8100.hpp
+++ b/src/t8100/t8100.hpp
@@ -40,7 +40,7 @@ namespace upm {
   /**
    * @library t8100
    * @sensor t8100
-   * @comname UPM API for the Amphenol Telaire Ventostat T8100
+   * @comname Amphenol Telaire Ventostat T8100
    * Ventilation Controller
    * @type gaseous temp
    * @man amphenol
diff --git a/src/tb7300/tb7300.hpp b/src/tb7300/tb7300.hpp
index 425bf63d..78d16e54 100644
--- a/src/tb7300/tb7300.hpp
+++ b/src/tb7300/tb7300.hpp
@@ -40,7 +40,7 @@ namespace upm {
   /**
    * @library tb7300
    * @sensor tb7300
-   * @comname UPM API for the Honeywell TB7300 Communicating Fan Coil
+   * @comname Honeywell TB7300 Communicating Fan Coil
    * Thermostat
    * @type temp
    * @man honeywell