diff --git a/src/ads1x15/ads1015.hpp b/src/ads1x15/ads1015.hpp
index 1876c35a..2e205753 100644
--- a/src/ads1x15/ads1015.hpp
+++ b/src/ads1x15/ads1015.hpp
@@ -82,6 +82,8 @@ namespace upm {
    *
    * @image html ads1015.jpg
    * @snippet ads1x15.cxx Interesting
+   * @snippet ads1x15-ads1015.cxx Interesting
+   * @snippet ads1x15-adc-sensor.cxx Interesting
    */
     class ADS1015 : public ADS1X15, public IADC {
 
diff --git a/src/ads1x15/ads1115.hpp b/src/ads1x15/ads1115.hpp
index bd90828a..70bdfbf9 100644
--- a/src/ads1x15/ads1115.hpp
+++ b/src/ads1x15/ads1115.hpp
@@ -81,6 +81,7 @@ namespace upm {
    *
    * @image html ads1115.jpg
    * @snippet ads1x15.cxx Interesting
+   * @snippet ads1x15-ads1115.cxx Interesting
    */
     class ADS1115 : public ADS1X15 {
 
diff --git a/src/bmp280/bme280.hpp b/src/bmp280/bme280.hpp
index ce46b29f..c431b5a7 100644
--- a/src/bmp280/bme280.hpp
+++ b/src/bmp280/bme280.hpp
@@ -54,7 +54,7 @@ namespace upm {
      * performance compatible to the Bosch Sensortec BMP280 digital
      * pressure sensor.
      *
-     * @snippet bme280.cxx Interesting
+     * @snippet bmp280-bme280.cxx Interesting
      */
 
     class BME280 : public BMP280, public IHumiditySensor {
diff --git a/src/bmx055/bmc150.hpp b/src/bmx055/bmc150.hpp
index c933622e..eb197bc3 100644
--- a/src/bmx055/bmc150.hpp
+++ b/src/bmx055/bmc150.hpp
@@ -67,7 +67,7 @@ namespace upm {
      * initializes both devices, and provides a mechanism to read
      * accelerometer and magnetometer data from them.
      *
-     * @snippet bmc150.cxx Interesting
+     * @snippet bmx055-bmc150.cxx Interesting
      */
 
     class BMC150 {
diff --git a/src/bmx055/bmi055.hpp b/src/bmx055/bmi055.hpp
index ca19b585..1eb81223 100644
--- a/src/bmx055/bmi055.hpp
+++ b/src/bmx055/bmi055.hpp
@@ -61,7 +61,7 @@ namespace upm {
      * simply initializes both devices, and provides a mechanism to
      * read accelerometer and gyroscope data from them.
      *
-     * @snippet bmi055.cxx Interesting
+     * @snippet bmx055-bmi055.cxx Interesting
      */
 
     class BMI055 {
diff --git a/src/buzzer/buzzer.hpp b/src/buzzer/buzzer.hpp
index 0778e5ea..b914d4f6 100644
--- a/src/buzzer/buzzer.hpp
+++ b/src/buzzer/buzzer.hpp
@@ -56,7 +56,7 @@ namespace upm {
      * frequencies based on the input voltage.
      *
      * @image html buzzer.jpg
-     * @snippet buzzer-sound.cxx Interesting
+     * @snippet buzzer.cxx Interesting
      */
 
     class Buzzer {
diff --git a/src/ds1808lc/ds1808lc.hpp b/src/ds1808lc/ds1808lc.hpp
index cdaf74d2..0e96d187 100644
--- a/src/ds1808lc/ds1808lc.hpp
+++ b/src/ds1808lc/ds1808lc.hpp
@@ -48,6 +48,7 @@ namespace upm
  * @type light
  * @man maxim
  * @con i2c
+ * @snippet ds1808lc.cxx Interesting
  * @if ilightcontroller
  */
 class DS1808LC : public upm::ILightController
diff --git a/src/gas/mq2.hpp b/src/gas/mq2.hpp
index f34cf12b..6c21495f 100644
--- a/src/gas/mq2.hpp
+++ b/src/gas/mq2.hpp
@@ -46,7 +46,7 @@ namespace upm {
    * sensor with a detection range of 300-10,000 ppm.
    *
    * @image html mq2-5.jpeg
-   * @snippet mq2.cxx Interesting
+   * @snippet gas-mq2.cxx Interesting
    */
     class MQ2 : public Gas {
         public:
diff --git a/src/gas/mq3.hpp b/src/gas/mq3.hpp
index 3ef69bc6..840da7f9 100644
--- a/src/gas/mq3.hpp
+++ b/src/gas/mq3.hpp
@@ -45,7 +45,7 @@ namespace upm {
    * detection range is 0.04-4 mg/L Alcohol.
    *
    * @image html mq3-9.jpeg
-   * @snippet mq3.cxx Interesting
+   * @snippet gas-mq3.cxx Interesting
    */
     class MQ3 : public Gas {
         public:
diff --git a/src/gas/mq4.hpp b/src/gas/mq4.hpp
index 6bc8e8dd..6fe25c15 100644
--- a/src/gas/mq4.hpp
+++ b/src/gas/mq4.hpp
@@ -47,7 +47,7 @@ namespace upm {
    * at least 24 hours.  See the datasheet for details.
    *
    * @image html mq2-5.jpeg
-   * @snippet mq4.cxx Interesting
+   * @snippet gas-mq4.cxx Interesting
    */
     class MQ4 : public Gas {
         public:
diff --git a/src/gas/mq5.hpp b/src/gas/mq5.hpp
index 4030050f..065775c1 100644
--- a/src/gas/mq5.hpp
+++ b/src/gas/mq5.hpp
@@ -46,7 +46,7 @@ namespace upm {
    * 300-10,000 ppm.
    *
    * @image html mq2-5.jpeg
-   * @snippet mq5.cxx Interesting
+   * @snippet gas-mq5.cxx Interesting
    */
     class MQ5 : public Gas {
         public:
diff --git a/src/gas/mq6.hpp b/src/gas/mq6.hpp
index 88ccb9de..d6ecb469 100644
--- a/src/gas/mq6.hpp
+++ b/src/gas/mq6.hpp
@@ -47,7 +47,7 @@ namespace upm {
    * at least 24 hours.  See the datasheet for details.
    *
    * @image html mq2-5.jpeg
-   * @snippet mq6.cxx Interesting
+   * @snippet gas-mq6.cxx Interesting
    */
     class MQ6 : public Gas {
         public:
diff --git a/src/gas/mq7.hpp b/src/gas/mq7.hpp
index 55517a10..ffd98e26 100644
--- a/src/gas/mq7.hpp
+++ b/src/gas/mq7.hpp
@@ -47,7 +47,7 @@ namespace upm {
    * 48 hours.  See the datasheet for details.
    *
    * @image html mq3-9.jpeg
-   * @snippet mq7.cxx Interesting
+   * @snippet gas-mq7.cxx Interesting
    */
     class MQ7 : public Gas {
         public:
diff --git a/src/gas/mq8.hpp b/src/gas/mq8.hpp
index 1e158a8e..a3f25887 100644
--- a/src/gas/mq8.hpp
+++ b/src/gas/mq8.hpp
@@ -47,7 +47,7 @@ namespace upm {
    * at least 24 hours.  See the datasheet for details.
    *
    * @image html mq2-5.jpeg
-   * @snippet mq8.cxx Interesting
+   * @snippet gas-mq8.cxx Interesting
    */
     class MQ8 : public Gas {
         public:
diff --git a/src/gas/mq9.hpp b/src/gas/mq9.hpp
index ced23d38..2edbf2e1 100644
--- a/src/gas/mq9.hpp
+++ b/src/gas/mq9.hpp
@@ -44,7 +44,7 @@ namespace upm {
    * liquefied gas. Its sensitivity is 10-1,000 ppm CO, and 100-10,000 ppm Gas.
    *
    * @image html mq3-9.jpeg
-   * @snippet mq9.cxx Interesting
+   * @snippet gas-mq9.cxx Interesting
    */
     class MQ9 : public Gas {
         public:
diff --git a/src/gas/tp401.hpp b/src/gas/tp401.hpp
index 1930924b..76cd6313 100644
--- a/src/gas/tp401.hpp
+++ b/src/gas/tp401.hpp
@@ -50,7 +50,7 @@ namespace upm {
    * operation to stabilize completely.
    *
    * @image html tp401.jpeg
-   * @snippet tp401.cxx Interesting
+   * @snippet gas-tp401.cxx Interesting
    */
     class TP401 : public Gas {
         public:
diff --git a/src/grove/grovebutton.hpp b/src/grove/grovebutton.hpp
index 4983de82..6152362d 100644
--- a/src/grove/grovebutton.hpp
+++ b/src/grove/grovebutton.hpp
@@ -49,7 +49,7 @@ namespace upm {
  * Basic UPM module for the Grove button
  *
  * @image html grovebutton.jpg
- * @snippet grovebutton.cxx Interesting
+ * @snippet grove-grovebutton.cxx Interesting
  */
 class GroveButton: public Grove {
     public:
diff --git a/src/grove/groveled.hpp b/src/grove/groveled.hpp
index c0daf3d1..627aec79 100644
--- a/src/grove/groveled.hpp
+++ b/src/grove/groveled.hpp
@@ -53,8 +53,8 @@ namespace upm {
  * to the cathode, while the rounded side corresponds to the anode.
  *
  * @image html groveled.jpg
- * @snippet groveled.cxx Interesting
- * @snippet groveled-multi.cxx Interesting
+ * @snippet grove-groveled.cxx Interesting
+ * @snippet grove-groveled-multi.cxx Interesting
  */
 class GroveLed: public Grove {
     public:
diff --git a/src/grove/grovelight.hpp b/src/grove/grovelight.hpp
index a6bcc59d..336f5851 100644
--- a/src/grove/grovelight.hpp
+++ b/src/grove/grovelight.hpp
@@ -52,7 +52,7 @@ namespace upm {
  * An approximate lux value can also be returned.
  *
  * @image html grovelight.jpg
- * @snippet grovelight.cxx Interesting
+ * @snippet grove-grovelight.cxx Interesting
  */
 class GroveLight: public Grove {
     public:
diff --git a/src/grove/groverelay.hpp b/src/grove/groverelay.hpp
index be6a314f..bcd7e0a9 100644
--- a/src/grove/groverelay.hpp
+++ b/src/grove/groverelay.hpp
@@ -51,7 +51,7 @@ namespace upm {
  * the indicator LED lights up and current is allowed to flow.
  *
  * @image html groverelay.jpg
- * @snippet groverelay.cxx Interesting
+ * @snippet grove-groverelay.cxx Interesting
  */
 class GroveRelay: public Grove {
     public:
diff --git a/src/grove/groverotary.hpp b/src/grove/groverotary.hpp
index 12070485..de5142c2 100644
--- a/src/grove/groverotary.hpp
+++ b/src/grove/groverotary.hpp
@@ -51,7 +51,7 @@ namespace upm {
  * to do the same relative to the center of the knob's range.
  *
  * @image html rotaryencoder.jpg
- * @snippet groverotary.cxx Interesting
+ * @snippet grove-groverotary.cxx Interesting
  */
 class GroveRotary: public Grove {
     public:
diff --git a/src/grove/groveslide.hpp b/src/grove/groveslide.hpp
index b9f7f738..8b5f7b8f 100644
--- a/src/grove/groveslide.hpp
+++ b/src/grove/groveslide.hpp
@@ -48,7 +48,7 @@ namespace upm {
  * returns either a raw value or a scaled voltage value.
  *
  * @image html slide.jpg
- * @snippet groveslide.cxx Interesting
+ * @snippet grove-groveslide.cxx Interesting
  */
 class GroveSlide: public Grove {
     public:
diff --git a/src/grove/grovetemp.hpp b/src/grove/grovetemp.hpp
index b70eee62..abb6ad65 100644
--- a/src/grove/grovetemp.hpp
+++ b/src/grove/grovetemp.hpp
@@ -52,7 +52,7 @@ namespace upm {
  * device. The range of this sensor is -40 to 125 C and accuracy is +/- 1.5 C.
  *
  * @image html grovetemp.jpg
- * @snippet grovetemp.cxx Interesting
+ * @snippet grove-grovetemp.cxx Interesting
  */
 class GroveTemp: public Grove {
     public:
diff --git a/src/hlg150h/hlg150h.hpp b/src/hlg150h/hlg150h.hpp
index e8eccccb..2c2edb00 100644
--- a/src/hlg150h/hlg150h.hpp
+++ b/src/hlg150h/hlg150h.hpp
@@ -48,6 +48,7 @@ namespace upm
  * @altname HLG150H
  * @type light
  * @con pwm
+ * @snippet hlg150h.cxx Interesting
  * @web https://www.meanwell-web.com/en/product-info/ac-dc-power-supply/led-driver/101-180-w-led-driver/hlg-150h/product/HLG-150H-24B
  * @if ilightcontroller
  */
diff --git a/src/joystick12/joystick12.hpp b/src/joystick12/joystick12.hpp
index 969d6090..8975b1c5 100644
--- a/src/joystick12/joystick12.hpp
+++ b/src/joystick12/joystick12.hpp
@@ -52,7 +52,7 @@ namespace upm {
  * 2-axis analog joystick.
  *
  * @image html joystick12.jpg
- * @snippet joystick12-example.cxx Interesting
+ * @snippet joystick12.cxx Interesting
  */
 class Joystick12 {
     public:
diff --git a/src/lcd/eboled.hpp b/src/lcd/eboled.hpp
index 11d42b69..d3e4cab2 100644
--- a/src/lcd/eboled.hpp
+++ b/src/lcd/eboled.hpp
@@ -79,7 +79,7 @@ namespace upm
    * <a href=https://creativecommons.org/licenses/by-nc-sa/3.0/>
    * CC BY-NC-SA-3.0</a>.</em>
    *
-   * @snippet eboled.cxx Interesting
+   * @snippet i2clcd-eboled.cxx Interesting
    */
   class EBOLED : public LCD
   {
diff --git a/src/lcd/ssd1306.hpp b/src/lcd/ssd1306.hpp
index d2fd15fe..71583e33 100644
--- a/src/lcd/ssd1306.hpp
+++ b/src/lcd/ssd1306.hpp
@@ -103,7 +103,7 @@ const uint8_t  SSD1306_LCDHEIGHT = 64;
  * SSD1306 device from eBay.
  *
  * @image html ssd1306.jpeg
- * @snippet ssd1306-oled.cxx Interesting
+ * @snippet i2clcd-ssd1306-oled.cxx Interesting
  */
 class SSD1306 : public LCD
 {
diff --git a/src/lcd/ssd1308.hpp b/src/lcd/ssd1308.hpp
index 9ee90c05..59a31638 100644
--- a/src/lcd/ssd1308.hpp
+++ b/src/lcd/ssd1308.hpp
@@ -51,7 +51,7 @@ const uint8_t DISPLAY_CMD_SET_NORMAL_1308 = 0xA6;
  * Display module, which is an OLED monochrome display.
  *
  * @image html ssd1308.jpeg
- * @snippet ssd1308-oled.cxx Interesting
+ * @snippet i2clcd-ssd1308-oled.cxx Interesting
  */
 class SSD1308 : public LCD
 {
diff --git a/src/lcd/ssd1327.hpp b/src/lcd/ssd1327.hpp
index 50157ed8..3545a8fb 100644
--- a/src/lcd/ssd1327.hpp
+++ b/src/lcd/ssd1327.hpp
@@ -50,7 +50,7 @@ const uint8_t DISPLAY_CMD_SET_NORMAL = 0xA4;
  * which is an OLED monochrome display.
  *
  * @image html ssd1327.jpeg
- * @snippet ssd1327-oled.cxx Interesting
+ * @snippet i2clcd-ssd1327-oled.cxx Interesting
  */
 class SSD1327 : public LCD
 {
diff --git a/src/led/led.hpp b/src/led/led.hpp
index e9ad67a8..02b56a7d 100644
--- a/src/led/led.hpp
+++ b/src/led/led.hpp
@@ -57,8 +57,7 @@ namespace upm {
  * to the cathode, while the rounded side corresponds to the anode.
  *
  * @image html led.jpg
- * @snippet groveled.cxx Interesting
- * @snippet groveled-multi.cxx Interesting
+ * @snippet led.cxx Interesting
  */
 class Led {
     public:
diff --git a/src/lol/lol.hpp b/src/lol/lol.hpp
index 8bd900cd..d993b5ef 100644
--- a/src/lol/lol.hpp
+++ b/src/lol/lol.hpp
@@ -52,7 +52,7 @@ namespace upm {
  * This module defines the LoL API and implementation for a simple framebuffer.
  *
  * @image html lolshield.jpg
- * @snippet lol-example.cxx Interesting
+ * @snippet lol.cxx Interesting
  */
 class LoL {
     public:
diff --git a/src/lp8860/lp8860.hpp b/src/lp8860/lp8860.hpp
index 06a7601f..25c06a75 100644
--- a/src/lp8860/lp8860.hpp
+++ b/src/lp8860/lp8860.hpp
@@ -47,6 +47,7 @@ namespace upm
  * @type light
  * @man ti
  * @con i2c
+ * @snippet lp8860.cxx Interesting
  * @web http://www.ti.com/product/LP8860-Q1
  * @if ilightcontroller
  *
diff --git a/src/max44009/max44009.hpp b/src/max44009/max44009.hpp
index e2e1bc79..e11a5238 100644
--- a/src/max44009/max44009.hpp
+++ b/src/max44009/max44009.hpp
@@ -103,7 +103,7 @@ namespace upm {
  * @web https://www.maximintegrated.com/en/products/analog/sensors-and-sensor-interface/MAX44009.html
  * @if ilightsensor
  *
- * @snippet iLightSensor.hpp Interesting
+ * @snippet max44009.cxx Interesting
  *
  */
 class MAX44009 : public ILightSensor {
diff --git a/src/mpu9150/ak8975.hpp b/src/mpu9150/ak8975.hpp
index 0f7c9312..fe0089fd 100644
--- a/src/mpu9150/ak8975.hpp
+++ b/src/mpu9150/ak8975.hpp
@@ -48,7 +48,7 @@ namespace upm {
    * coupled with another device (such as the mcu9150 9-axis motion
    * sensor).
    *
-   * @snippet ak8975.cxx Interesting
+   * @snippet mpu9150-ak8975.cxx Interesting
    */
   class AK8975 {
   public:
diff --git a/src/mpu9150/mpu60x0.hpp b/src/mpu9150/mpu60x0.hpp
index 8269f823..50874709 100644
--- a/src/mpu9150/mpu60x0.hpp
+++ b/src/mpu9150/mpu60x0.hpp
@@ -57,7 +57,7 @@ namespace upm {
    * required.
    *
    * @image html mpu60x0.jpg
-   * @snippet mpu60x0.cxx Interesting
+   * @snippet mpu9150-mpu60x0.cxx Interesting
    */
   class MPU60X0 {
   public:
diff --git a/src/mpu9150/mpu9250.hpp b/src/mpu9150/mpu9250.hpp
index 241f048d..59345865 100644
--- a/src/mpu9150/mpu9250.hpp
+++ b/src/mpu9150/mpu9250.hpp
@@ -47,7 +47,7 @@ namespace upm {
    * This module defines the MPU9250 interface for libmpu9150
    *
    * @image html mpu9250.jpg
-   * @snippet mpu9250.cxx Interesting
+   * @snippet mpu9150-mpu9250.cxx Interesting
    */
 
   class MPU9250: public MPU9150
diff --git a/src/my9221/grovecircularled.hpp b/src/my9221/grovecircularled.hpp
index 33e11d4c..87ba20b4 100644
--- a/src/my9221/grovecircularled.hpp
+++ b/src/my9221/grovecircularled.hpp
@@ -56,7 +56,7 @@ namespace upm {
    * with a rotary encoder and has 24 controllable LEDs.
    *
    * @image html grovecircularled.jpg
-   * @snippet grovecircularled.cxx Interesting
+   * @snippet my9221-grovecircularled.cxx Interesting
    */
 
   class GroveCircularLED : public MY9221 {
diff --git a/src/my9221/groveledbar.hpp b/src/my9221/groveledbar.hpp
index d585ed91..3eebd721 100644
--- a/src/my9221/groveledbar.hpp
+++ b/src/my9221/groveledbar.hpp
@@ -60,7 +60,7 @@ namespace upm {
    * so that this module can control multiple LED bars.
    *
    * @image html my9221.jpg
-   * @snippet groveledbar.cxx Interesting
+   * @snippet my9221-groveledbar.cxx Interesting
    */
 
   class GroveLEDBar : public MY9221 {
diff --git a/src/nmea_gps/nmea_gps.hpp b/src/nmea_gps/nmea_gps.hpp
index 52123fad..b9e4739a 100644
--- a/src/nmea_gps/nmea_gps.hpp
+++ b/src/nmea_gps/nmea_gps.hpp
@@ -61,7 +61,7 @@ namespace upm {
    * An example using the UART.
    * @snippet nmea_gps.cxx Interesting
    * An example using I2C.
-   * @snippet nmea_gps_i2c.cxx Interesting
+   * @snippet nmea_gps-i2c.cxx Interesting
    */
 
   class NMEAGPS {
diff --git a/src/ozw/aeotecdsb09104.hpp b/src/ozw/aeotecdsb09104.hpp
index 0a5146c5..4cee6963 100644
--- a/src/ozw/aeotecdsb09104.hpp
+++ b/src/ozw/aeotecdsb09104.hpp
@@ -35,6 +35,7 @@ namespace upm {
    * @sensor dsb09104
    * @type wifi
    * @con uart
+   * @snippet ozw-aeotecdsb09104.cxx Interesting
    * @man aeon
    * @web http://aeotec.com/z-wave-home-energy-measure/918-home-energy-meter-instructions.html
    *
diff --git a/src/ozw/aeotecdw2e.hpp b/src/ozw/aeotecdw2e.hpp
index 207288f8..f97b3612 100644
--- a/src/ozw/aeotecdw2e.hpp
+++ b/src/ozw/aeotecdw2e.hpp
@@ -36,6 +36,7 @@ namespace upm {
    * @altname DSB29
    * @type wifi
    * @con uart
+   * @snippet ozw-aeotecdw2e.cxx Interesting
    * @man aeon
    * @web http://aeotec.com/z-wave-door-window-sensor
    *
diff --git a/src/ozw/aeotecsdg2.hpp b/src/ozw/aeotecsdg2.hpp
index 71da7bbe..e3ef5121 100644
--- a/src/ozw/aeotecsdg2.hpp
+++ b/src/ozw/aeotecsdg2.hpp
@@ -34,6 +34,7 @@ namespace upm {
    * @sensor dg2
    * @comname Aeotec Smart Dimmer Gen 2
    * @con uart
+   * @snippet ozw-aeotecsdg2.cxx Interesting
    * @type wifi
    * @man aeon
    * @web http://aeotec.com/z-wave-in-wall-switches/877-micro-sei-2e-manual-instructions.html
diff --git a/src/ozw/aeotecss6.hpp b/src/ozw/aeotecss6.hpp
index a0b978b2..f5f6d706 100644
--- a/src/ozw/aeotecss6.hpp
+++ b/src/ozw/aeotecss6.hpp
@@ -34,6 +34,7 @@ namespace upm {
    * @sensor ss6
    * @comname Aeotec Smart Switch 6
    * @con uart
+   * @snippet ozw-aeotecss6.cxx Interesting
    * @type wifi
    * @man aeon
    * @web http://aeotec.com/z-wave-plug-in-switch
diff --git a/src/ozw/ozwdump.hpp b/src/ozw/ozwdump.hpp
index dc90d5db..fec0ce33 100644
--- a/src/ozw/ozwdump.hpp
+++ b/src/ozw/ozwdump.hpp
@@ -41,7 +41,7 @@ namespace upm {
    * (ozwdump), which initializes OZW on a Z-Wave network, and then
    * prints out all Nodes (devices) and their associated valueids.
    *
-   * @snippet ozwdump.cxx
+   * @snippet ozw-ozwdump.cxx Interesting
    */
 
   class OZWDUMP : public ozwInterface {
diff --git a/src/ozw/tzemt400.hpp b/src/ozw/tzemt400.hpp
index 66d7c0d2..7d77d0e0 100644
--- a/src/ozw/tzemt400.hpp
+++ b/src/ozw/tzemt400.hpp
@@ -34,6 +34,7 @@ namespace upm {
    * @sensor tzemt400
    * @comname Trane TZEMT400 Z-Wave Thermostat.
    * @con uart
+   * @snippet ozw-tzemt400.cxx Interesting
    * @man trane
    *
    * @brief UPM API for Trane TZEMT400 Z-Wave Thermostat
diff --git a/src/rsc/rsc.hpp b/src/rsc/rsc.hpp
index b3f650c1..7c96cc89 100644
--- a/src/rsc/rsc.hpp
+++ b/src/rsc/rsc.hpp
@@ -41,6 +41,7 @@ namespace upm {
      * @type pressure temperature
      * @man honeywell
      * @con spi
+     * @snippet rsc.cxx Interesting
      * @web https://sensing.honeywell.com/honeywell-sensing-trustability-rsc-series-data-sheet-32321348-b-en.pdf
      *
      * @brief Description for the RSC TruStability line
diff --git a/src/sensortemplate/sensortemplate.hpp b/src/sensortemplate/sensortemplate.hpp
index b5fff190..26910644 100644
--- a/src/sensortemplate/sensortemplate.hpp
+++ b/src/sensortemplate/sensortemplate.hpp
@@ -59,7 +59,7 @@ namespace upm
  * board-specifics, testing, etc...
  *
  * @image html sensortemplate.png
- * @snippet <example-name.cxx> Interesting
+ * @snippet sensortemplate.cxx Interesting
  */
 
 class SensorTemplate
diff --git a/src/servo/es08a.hpp b/src/servo/es08a.hpp
index 6d3028ea..856c820a 100644
--- a/src/servo/es08a.hpp
+++ b/src/servo/es08a.hpp
@@ -48,7 +48,7 @@ namespace upm {
  * maximum period.
  *
  * @image html es08a.jpg
- * @snippet es08a.cxx Interesting
+ * @snippet servo-es08a.cxx Interesting
  */
  class ES08A : public Servo {
     public:
diff --git a/src/si1132/si1132.hpp b/src/si1132/si1132.hpp
index 1e8e4c5d..beb5cf1a 100644
--- a/src/si1132/si1132.hpp
+++ b/src/si1132/si1132.hpp
@@ -52,6 +52,7 @@ namespace upm {
  * @man silabs
  * @web http://www.silabs.com/products/sensors/infraredsensors/Pages/si1132.aspx
  * @con i2c
+ * @snippet si1132.cxx Interesting
  * @if ilightsensor
 
  */
diff --git a/src/speaker/speaker.hpp b/src/speaker/speaker.hpp
index 71115ce8..c0a07006 100644
--- a/src/speaker/speaker.hpp
+++ b/src/speaker/speaker.hpp
@@ -65,6 +65,7 @@ namespace upm {
      *
      * @image html speaker.jpg
      * @snippet speaker.cxx Interesting
+     * @snippet speaker-pwm.cxx Interesting
      */
     class Speaker {
     public:
diff --git a/src/t6713/t6713.hpp b/src/t6713/t6713.hpp
index 121fe988..9f4533d0 100644
--- a/src/t6713/t6713.hpp
+++ b/src/t6713/t6713.hpp
@@ -51,7 +51,7 @@ namespace upm {
  * is a CO2 Module sensor.
  *
  * @snippet t6713.cxx Interesting
- * @snippet co2-sensor.cxx Interesting
+ * @snippet t6713-co2-sensor.cxx Interesting
  */
 
 namespace t6713_co2
diff --git a/src/uartat/uartat.hpp b/src/uartat/uartat.hpp
index e67fc581..47eda6b0 100644
--- a/src/uartat/uartat.hpp
+++ b/src/uartat/uartat.hpp
@@ -41,6 +41,7 @@ namespace upm {
      * @comname Generic AT Command Based UART Device
      * @type other
      * @con uart
+     * @snippet uartat-le910.cxx Interesting
      *
      * @brief API for a Generic AT command based UART device
      *
diff --git a/src/waterlevel/waterlevel.hpp b/src/waterlevel/waterlevel.hpp
index a2b3a3cb..5148b338 100644
--- a/src/waterlevel/waterlevel.hpp
+++ b/src/waterlevel/waterlevel.hpp
@@ -45,7 +45,7 @@ namespace upm {
    * it may actuate a pump, an indicator, an alarm, or other devices.
    *
    * @image html waterlevel.jpg 
-   * @snippet apds9002.cxx Interesting
+   * @snippet waterlevel.cxx Interesting
    */
   class WaterLevel {
   public: