diff --git a/sys/auto_init/saul/auto_init_dht.c b/sys/auto_init/saul/auto_init_dht.c
index 3d687d6d90..08175ac71a 100644
--- a/sys/auto_init/saul/auto_init_dht.c
+++ b/sys/auto_init/saul/auto_init_dht.c
@@ -29,29 +29,36 @@
 /**
  * @brief   Define the number of configured sensors
  */
-#define DHT_NUMOF   (sizeof(dht_params) / sizeof(dht_params[0]))
+#define DHT_NUM     (sizeof(dht_params) / sizeof(dht_params[0]))
 
 /**
  * @brief   Allocate memory for the device descriptors
  */
-static dht_t dht_devs[DHT_NUMOF];
+static dht_t dht_devs[DHT_NUM];
 
 /**
- * @brief   Import SAUL endpoints
+ * @brief   Memory for the SAUL registry entries
+ */
+static saul_reg_t saul_entries[DHT_NUM * 2];
+
+/**
+ * @brief   Define the number of saul info
+ */
+#define DHT_INFO_NUM (sizeof(dht_saul_info) / sizeof(dht_saul_info[0]))
+
+/**
+ * @name    Import SAUL endpoints
  * @{
  */
 extern const saul_driver_t dht_temp_saul_driver;
 extern const saul_driver_t dht_hum_saul_driver;
 /** @} */
 
-/**
- * @brief   Memory for the SAUL registry entries
- */
-static saul_reg_t saul_entries[DHT_NUMOF * 2];
-
 void auto_init_dht(void)
 {
-    for (unsigned int i = 0; i < DHT_NUMOF; i++) {
+    assert(DHT_INFO_NUM == DHT_NUM);
+
+    for (unsigned int i = 0; i < DHT_NUM; i++) {
         LOG_DEBUG("[auto_init_saul] initializing dht #%u\n", i);
 
         if (dht_init(&dht_devs[i], &dht_params[i]) != DHT_OK) {
@@ -60,10 +67,10 @@ void auto_init_dht(void)
         }
 
         saul_entries[(i * 2)].dev = &(dht_devs[i]);
-        saul_entries[(i * 2)].name = dht_saul_reg_info[i].name;
+        saul_entries[(i * 2)].name = dht_saul_info[i].name;
         saul_entries[(i * 2)].driver = &dht_temp_saul_driver;
         saul_entries[(i * 2) + 1].dev = &(dht_devs[i]);
-        saul_entries[(i * 2) + 1].name = dht_saul_reg_info[i].name;
+        saul_entries[(i * 2) + 1].name = dht_saul_info[i].name;
         saul_entries[(i * 2) + 1].driver = &dht_hum_saul_driver;
         saul_reg_add(&(saul_entries[(i * 2)]));
         saul_reg_add(&(saul_entries[(i * 2) + 1]));