diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c
index f66ccbb5a76..b7ea5f568da 100644
--- a/configs/stm32f4discovery/src/stm32_bmp180.c
+++ b/configs/stm32f4discovery/src/stm32_bmp180.c
@@ -102,4 +102,4 @@ int stm32_bmp180initialize(FAR const char *devpath)
   return ret;
 }
 
-#endif /* CONFIG_I2C && CONFIG_MPL115A && CONFIG_STM32_I2C1 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MPL115A && CONFIG_STM32_I2C1 */
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index 9161b483ea6..facd9837444 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -417,7 +417,7 @@ Freescale MPL115A barometer sensor
 
     Drivers -> Sensors
       CONFIG_SENSORS=y
-      CONFIG_MPL115A=y
+      CONFIG_SENSORS_MPL115A=y
       CONFIG_NSH_ARCHINIT=y
 
 
diff --git a/configs/viewtool-stm32f107/src/Makefile b/configs/viewtool-stm32f107/src/Makefile
index 0ce9b9bb079..b89df6700c6 100644
--- a/configs/viewtool-stm32f107/src/Makefile
+++ b/configs/viewtool-stm32f107/src/Makefile
@@ -54,7 +54,7 @@ CSRCS += stm32_usbdev.c
 endif
 endif
 
-ifeq ($(CONFIG_MPL115A),y)
+ifeq ($(CONFIG_SENSORS_MPL115A),y)
 CSRCS += stm32_mpl115a.c
 endif
 
diff --git a/configs/viewtool-stm32f107/src/stm32_appinit.c b/configs/viewtool-stm32f107/src/stm32_appinit.c
index ba6e1fd0c94..b3d3808ef06 100644
--- a/configs/viewtool-stm32f107/src/stm32_appinit.c
+++ b/configs/viewtool-stm32f107/src/stm32_appinit.c
@@ -174,7 +174,7 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
-#ifdef CONFIG_MPL115A
+#ifdef CONFIG_SENSORS_MPL115A
   ret = stm32_mpl115ainitialize("/dev/press");
   if (ret < 0)
     {
diff --git a/configs/viewtool-stm32f107/src/stm32_mpl115a.c b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
index 487f7392f41..c6a1b9e6343 100644
--- a/configs/viewtool-stm32f107/src/stm32_mpl115a.c
+++ b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
@@ -49,7 +49,7 @@
 #include "stm32_spi.h"
 #include "viewtool_stm32f107.h"
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MPL115A) && defined(CONFIG_STM32_SPI3)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MPL115A) && defined(CONFIG_STM32_SPI3)
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -98,4 +98,4 @@ int stm32_mpl115ainitialize(FAR const char *devpath)
   return ret;
 }
 
-#endif /* CONFIG_SPI && CONFIG_MPL115A && CONFIG_STM32_SPI3 */
+#endif /* CONFIG_SPI && CONFIG_SENSORS_MPL115A && CONFIG_STM32_SPI3 */
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index aa1516e32b7..24b79f79d0f 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -80,7 +80,7 @@ void weak_function stm32_spidev_initialize(void)
   (void)stm32_configgpio(GPIO_LCDTP_CS);
 #endif
 
-#if defined(CONFIG_STM32_SPI3) && defined(CONFIG_MPL115A)
+#if defined(CONFIG_STM32_SPI3) && defined(CONFIG_SENSORS_MPL115A)
   /* Configure the MPL115A SPI3 CS pin as an output */
 
   (void)stm32_configgpio(GPIO_MPL115A_CS);
diff --git a/configs/viewtool-stm32f107/src/viewtool_stm32f107.h b/configs/viewtool-stm32f107/src/viewtool_stm32f107.h
index b9a0329c924..558d32aadb6 100644
--- a/configs/viewtool-stm32f107/src/viewtool_stm32f107.h
+++ b/configs/viewtool-stm32f107/src/viewtool_stm32f107.h
@@ -368,7 +368,7 @@ int stm32_can_setup(void);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MPL115A) && defined(CONFIG_STM32_SPI3)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MPL115A) && defined(CONFIG_STM32_SPI3)
 int stm32_mpl115ainitialize(FAR const char *devpath);
 #endif
 
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 226466ad6ea..d3b6181e1a4 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -159,7 +159,7 @@ config LIS331DL_I2C_FREQUENCY
 	range 1 100000
 	depends on LIS331DL
 
-config SN_LSM9DS1
+config SENSORS_LSM9DS1
 	bool "STMicro LSM9DS1 support"
 	default n
 	select I2C
@@ -172,14 +172,14 @@ config LSM9DS1_I2C_FREQUENCY
 	range 1 400000
 	depends on SN_LSM9DS1
 
-config LPS25H
+config SENSORS_LPS25H
 	bool "STMicro LPS25H pressure sensor"
 	default n
 	select I2C
 	---help---
 		Enable driver support for the STMicro LPS25H barometer sensor.
 
-if LPS25H
+if SENSORS_LPS25H
 
 config LPS25H_I2C_FREQUENCY
 	int "LPS25H I2C frequency"
@@ -192,16 +192,21 @@ config DEBUG_LPS25H
 	---help---
 		Enables debug features for the LPS25H
 
-endif # LPS25H
+endif # SENSORS_LPS25H
 
-config LTC4151
+config SENSORS_LTC4151
 	bool "LTC4151 current and voltage monitor"
 	default n
 	select I2C
 	---help---
 		Enable driver support for the LinearTechnology LTC4151 current and voltage monitor.
 
-config MB7040
+config LTC4151_I2C_FREQUENCY
+	int "LTC4151 I2C frequency"
+	default 400000
+	depends on SENSORS_LTC4151
+
+config SENSORS_MB7040
 	bool "MaxBotix MB7040 Sonar support"
 	default n
 	select I2C
@@ -212,16 +217,16 @@ config MB7040_I2C_FREQUENCY
 	int "MB7040 I2C frequency"
 	default 400000
 	range 1 400000
-	depends on MB7040
+	depends on SENSORS_MB7040
 
-config MLX90393
+config SENSORS_MLX90393
 	bool "MLX90393 3-Axis Magnetometer"
 	default n
 	select SPI
 	---help---
 		Enable driver support for the Melex MLX90393 3-Axis magnetometer.
 
-config MCP9844
+config SENSORS_MCP9844
 	bool "MCP9844 Temperature Sensor"
 	default n
 	select I2C
@@ -232,9 +237,9 @@ config MCP9844_I2C_FREQUENCY
 	int "MCP9844 I2C frequency"
 	default 400000
 	range 1 400000
-	depends on MCP9844
+	depends on SENSORS_MCP9844
 
-config MS58XX
+config SENSORS_MS58XX
 	bool "MEAS MS58XX Altimeter support"
 	default n
 	select I2C
@@ -245,20 +250,27 @@ config MS58XX_I2C_FREQUENCY
 	int "MS58XX I2C frequency"
 	default 400000
 	range 1 400000
-	depends on MS58XX
+	depends on SENSORS_MS58XX
 
 config MS58XX_VDD
 	int "MEAS MS58XX VDD"
 	default 30
-	depends on MS58XX
+	depends on SENSORS_MS58XX
 
-config MPL115A
+config SENSORS_MPL115A
 	bool "Freescale MPL115A Barometer Sensor support"
 	default n
 	select SPI
 	---help---
 		Enable driver support for the Freescale MPL115A barometer sensor.
 
+config MPL115A_REGDEBUG
+	bool "Debug support for the MPL115A"
+	default n
+	depends on SENSORS_MPL115A
+	---help---
+		Enables register level debug features for the MPL115A
+
 config SENSORS_ADXL345
 	bool "AnalogDevices ADXL345 Driver"
 	default n
@@ -379,9 +391,10 @@ config SENSORS_XEN1210
 	---help---
 		Enable driver support for the Sensixs XEN1210 Magnetometer.
 
-config XEN1210_REGDBUG
+config XEN1210_REGDEBUG
 	bool "Debug support for the XEN1210"
 	default n
+	depends on SENSORS_XEN1210
 	---help---
 		Enables register level debug features for the XEN1210
 
diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs
index dbcd515a4ee..a783e11c96d 100644
--- a/drivers/sensors/Make.defs
+++ b/drivers/sensors/Make.defs
@@ -65,11 +65,11 @@ ifeq ($(CONFIG_LIS331DL),y)
   CSRCS += lis331dl.c
 endif
 
-ifeq ($(CONFIG_SN_LSM9DS1),y)
+ifeq ($(CONFIG_SENSORS_LSM9DS1),y)
   CSRCS += lsm9ds1.c
 endif
 
-ifeq ($(CONFIG_LPS25H),y)
+ifeq ($(CONFIG_SENSORS_LPS25H),y)
   CSRCS += lps25h.c
 endif
 
@@ -101,23 +101,23 @@ ifeq ($(CONFIG_SENSORS_LM92),y)
   CSRCS += lm92.c
 endif
 
-ifeq ($(CONFIG_MB7040),y)
+ifeq ($(CONFIG_SENSORS_MB7040),y)
   CSRCS += mb7040.c
 endif
 
-ifeq ($(CONFIG_MCP9844),y)
+ifeq ($(CONFIG_SENSORS_MCP9844),y)
   CSRCS += mcp9844.c
 endif
 
-ifeq ($(CONFIG_MLX90393),y)
+ifeq ($(CONFIG_SENSORS_MLX90393),y)
   CSRCS += mlx90393.c
 endif
 
-ifeq ($(CONFIG_MS58XX),y)
+ifeq ($(CONFIG_SENSORS_MS58XX),y)
   CSRCS += ms58xx.c
 endif
 
-ifeq ($(CONFIG_LTC4151),y)
+ifeq ($(CONFIG_SENSORS_LTC4151),y)
   CSRCS += ltc4151.c
 endif
 
@@ -142,7 +142,7 @@ ifeq ($(CONFIG_SENSORS_MAX6675),y)
   CSRCS += max6675.c
 endif
 
-ifeq ($(CONFIG_MPL115A),y)
+ifeq ($(CONFIG_SENSORS_MPL115A),y)
   CSRCS += mpl115a.c
 endif
 
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index d54cdce3797..65276cf0faa 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -52,7 +52,7 @@
 #include <nuttx/sensors/lsm9ds1.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_SN_LSM9DS1)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LSM9DS1)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -1581,4 +1581,4 @@ int lsm9ds1mag_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
                           LSM9DS1_OUT_X_L_M);
 }
 
-#endif /* CONFIG_I2C && CONFIG_SN_LSM9DS1 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_LSM9DS1 */
diff --git a/drivers/sensors/ltc4151.c b/drivers/sensors/ltc4151.c
index 7f6defc44b3..81eb772afbb 100644
--- a/drivers/sensors/ltc4151.c
+++ b/drivers/sensors/ltc4151.c
@@ -50,7 +50,7 @@
 #include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/ltc4151.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_LTC4151)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LTC4151)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -365,4 +365,4 @@ int ltc4151_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   return ret;
 }
-#endif /* CONFIG_I2C && CONFIG_LTC4151 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_LTC4151 */
diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c
index 125825cab08..bba31620234 100644
--- a/drivers/sensors/mb7040.c
+++ b/drivers/sensors/mb7040.c
@@ -53,7 +53,7 @@
 #include <nuttx/sensors/mb7040.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MB7040)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MB7040)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -406,4 +406,4 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   return ret;
 }
 
-#endif /* CONFIG_I2C && CONFIG_MB7040 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MB7040 */
diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c
index 1d5ec6823ce..22f9057fac9 100644
--- a/drivers/sensors/mcp9844.c
+++ b/drivers/sensors/mcp9844.c
@@ -52,7 +52,7 @@
 #include <nuttx/sensors/mcp9844.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MCP9844)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MCP9844)
 
 /****************************************************************************
  * Pre-process Definitions
diff --git a/drivers/sensors/mlx90393.c b/drivers/sensors/mlx90393.c
index d5b27b801e4..f50d657527d 100644
--- a/drivers/sensors/mlx90393.c
+++ b/drivers/sensors/mlx90393.c
@@ -52,7 +52,7 @@
 #include <nuttx/sensors/mlx90393.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MLX90393)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MLX90393)
 
 /****************************************************************************
  * Private
@@ -627,4 +627,4 @@ int mlx90393_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   return OK;
 }
 
-#endif /* CONFIG_SPI && CONFIG_MLX90393 */
+#endif /* CONFIG_SPI && CONFIG_SENSORS_MLX90393 */
diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c
index 4107e8986aa..0e5ad6a971a 100644
--- a/drivers/sensors/mpl115a.c
+++ b/drivers/sensors/mpl115a.c
@@ -52,7 +52,7 @@
 #include <nuttx/sensors/mpl115a.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MPL115A)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MPL115A)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -409,4 +409,4 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
 
   return ret;
 }
-#endif /* CONFIG_SPI && CONFIG_MPL115A */
+#endif /* CONFIG_SPI && CONFIG_SENSORS_MPL115A */
diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c
index 4e4ff74aee9..d36b5865f69 100644
--- a/drivers/sensors/ms58xx.c
+++ b/drivers/sensors/ms58xx.c
@@ -55,7 +55,7 @@
 #include <nuttx/sensors/ms58xx.h>
 #include <nuttx/random.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MS58XX)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MS58XX)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -1211,4 +1211,4 @@ errout:
   return ret;
 }
 
-#endif /* CONFIG_I2C && CONFIG_MS58XX */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MS58XX */
diff --git a/include/nuttx/sensors/lsm9ds1.h b/include/nuttx/sensors/lsm9ds1.h
index dc7b103ef62..bc160507c9d 100644
--- a/include/nuttx/sensors/lsm9ds1.h
+++ b/include/nuttx/sensors/lsm9ds1.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/sensors/ioctl.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_SN_LSM9DS1)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LSM9DS1)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -141,5 +141,5 @@ int lsm9ds1mag_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 }
 #endif
 
-#endif /* CONFIG_I2C && CONFIG_SN_LSM9DS1 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_LSM9DS1 */
 #endif /* __INCLUDE_NUTTX_SENSORS_LSM9DS1 */
diff --git a/include/nuttx/sensors/ltc4151.h b/include/nuttx/sensors/ltc4151.h
index fd7b53b812e..85fbc9dbce9 100644
--- a/include/nuttx/sensors/ltc4151.h
+++ b/include/nuttx/sensors/ltc4151.h
@@ -44,7 +44,7 @@
 #include <nuttx/sensors/ioctl.h>
 #include <fixedmath.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_LTC4151)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_LTC4151)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -126,5 +126,5 @@ int ltc4151_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 }
 #endif
 
-#endif /* CONFIG_I2C && CONFIG_LTC4151 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_LTC4151 */
 #endif /* __INCLUDE_NUTTX_SENSORS_LTC4151_H */
diff --git a/include/nuttx/sensors/mb7040.h b/include/nuttx/sensors/mb7040.h
index 1c7ed9c51b8..70c40ac2c63 100644
--- a/include/nuttx/sensors/mb7040.h
+++ b/include/nuttx/sensors/mb7040.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/sensors/ioctl.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MB7040)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MB7040)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -53,7 +53,7 @@
  *
  * CONFIG_I2C
  *   Enables support for I2C drivers
- * CONFIG_MB7040
+ * CONFIG_SENSORS_MB7040
  *   Enables support for the MB7040 driver
  */
 
@@ -110,5 +110,5 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 }
 #endif
 
-#endif /* CONFIG_I2C && CONFIG_MB7040 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MB7040 */
 #endif /* __INCLUDE_NUTTX_SENSORS_MB7040 */
diff --git a/include/nuttx/sensors/mcp9844.h b/include/nuttx/sensors/mcp9844.h
index 2ef65702fd4..754e4d6679e 100644
--- a/include/nuttx/sensors/mcp9844.h
+++ b/include/nuttx/sensors/mcp9844.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/sensors/ioctl.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MCP9844)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MCP9844)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -119,5 +119,5 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 }
 #endif
 
-#endif /* CONFIG_I2C && CONFIG_MCP9844 */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MCP9844 */
 #endif /* __INCLUDE_NUTTX_SENSORS_MCP9844_H */
diff --git a/include/nuttx/sensors/mlx90393.h b/include/nuttx/sensors/mlx90393.h
index 16ea5a73c68..06e26a3cb4f 100644
--- a/include/nuttx/sensors/mlx90393.h
+++ b/include/nuttx/sensors/mlx90393.h
@@ -45,7 +45,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MLX90393)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MLX90393)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -148,6 +148,6 @@ int mlx90393_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
 }
 #endif
 
-#endif /* CONFIG_SPI && CONFIG_MLX90393 */
+#endif /* CONFIG_SPI && CONFIG_SENSORS_MLX90393 */
 
 #endif /* __INCLUDE_NUTTX_SENSORS_MLX90393_H */
diff --git a/include/nuttx/sensors/mpl115a.h b/include/nuttx/sensors/mpl115a.h
index 4df7de55d13..94e306c0f38 100644
--- a/include/nuttx/sensors/mpl115a.h
+++ b/include/nuttx/sensors/mpl115a.h
@@ -38,7 +38,7 @@
 
 #include <nuttx/config.h>
 
-#if defined(CONFIG_SPI) && defined(CONFIG_MPL115A)
+#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_MPL115A)
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -126,5 +126,5 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi);
 }
 #endif
 
-#endif /* CONFIG_SPI && CONFIG_MPL115A */
+#endif /* CONFIG_SPI && CONFIG_SENSORS_MPL115A */
 #endif /* __INCLUDE_NUTTX_SENSORS_MPL115A_H */
diff --git a/include/nuttx/sensors/ms58xx.h b/include/nuttx/sensors/ms58xx.h
index fc2bf1c2c30..44c5c05a26d 100644
--- a/include/nuttx/sensors/ms58xx.h
+++ b/include/nuttx/sensors/ms58xx.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/sensors/ioctl.h>
 
-#if defined(CONFIG_I2C) && defined(CONFIG_MS58XX)
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MS58XX)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -53,7 +53,7 @@
  *
  * CONFIG_I2C
  *   Enables support for I2C drivers
- * CONFIG_MS58XX
+ * CONFIG_SENSORS_MS58XX
  *   Enables support for the MS58XX driver
  * CONFIG_MS58XX_VDD
  */
@@ -125,5 +125,5 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 }
 #endif
 
-#endif /* CONFIG_I2C && CONFIG_MS58XX */
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MS58XX */
 #endif /* __INCLUDE_NUTTX_SENSORS_MS58XX */