diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index 4ef9e81043..2df1fa72a3 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -3032,7 +3032,7 @@ const cliResourceValue_t resourceTable[] = {
     { OWNER_ESCSERIAL,     PG_ESCSERIAL_CONFIG, offsetof(escSerialConfig_t, ioTag), 0 },
 #endif
 #ifdef BARO
-    { OWNER_BARO_CS,       PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_spi_cs), 0 },
+    { OWNER_BARO_CS,       PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_spi_csn), 0 },
 #endif
 };
 
diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c
index 08a9323f6b..6b14c83d2f 100644
--- a/src/main/sensors/barometer.c
+++ b/src/main/sensors/barometer.c
@@ -64,12 +64,12 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig)
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(BARO_I2C_INSTANCE);
     barometerConfig->baro_i2c_address = BMP085_I2C_ADDR;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(SPIINVALID);
-    barometerConfig->baro_spi_cs = IO_TAG_NONE;
+    barometerConfig->baro_spi_csn = IO_TAG_NONE;
 #elif defined(USE_BARO_MS5611) || defined(USE_BARO_SPI_MS5611)
 #if defined(USE_BARO_SPI_MS5611)
     barometerConfig->baro_bustype = BUSTYPE_SPI;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(MS5611_SPI_INSTANCE));
-    barometerConfig->baro_spi_cs = IO_TAG(MS5611_CS_PIN);
+    barometerConfig->baro_spi_csn = IO_TAG(MS5611_CS_PIN);
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID);
     barometerConfig->baro_i2c_address = 0;
 #else
@@ -77,13 +77,13 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig)
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(BARO_I2C_INSTANCE);
     barometerConfig->baro_i2c_address = MS5611_I2C_ADDR;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(SPIINVALID);
-    barometerConfig->baro_spi_cs = IO_TAG_NONE;
+    barometerConfig->baro_spi_csn = IO_TAG_NONE;
 #endif
 #elif defined(USE_BARO_BMP280) || defined(USE_BARO_SPI_BMP280)
 #if defined(USE_BARO_SPI_BMP280)
     barometerConfig->baro_bustype = BUSTYPE_SPI;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(spiDeviceByInstance(BMP280_SPI_INSTANCE));
-    barometerConfig->baro_spi_cs = IO_TAG(BMP280_CS_PIN);
+    barometerConfig->baro_spi_csn = IO_TAG(BMP280_CS_PIN);
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID);
     barometerConfig->baro_i2c_address = 0;
 #else
@@ -91,7 +91,7 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig)
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(BARO_I2C_INSTANCE);
     barometerConfig->baro_i2c_address = BMP280_I2C_ADDR;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(SPIINVALID);
-    barometerConfig->baro_spi_cs = IO_TAG_NONE;
+    barometerConfig->baro_spi_csn = IO_TAG_NONE;
 #endif
 #else
     barometerConfig->baro_hardware = BARO_NONE;
@@ -99,7 +99,7 @@ void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig)
     barometerConfig->baro_i2c_device = I2C_DEV_TO_CFG(I2CINVALID);
     barometerConfig->baro_i2c_address = 0;
     barometerConfig->baro_spi_device = SPI_DEV_TO_CFG(SPIINVALID);
-    barometerConfig->baro_spi_cs = IO_TAG_NONE;
+    barometerConfig->baro_spi_csn = IO_TAG_NONE;
 #endif
 }
 
@@ -136,7 +136,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
 #ifdef USE_SPI
         dev->busdev.bustype = BUSTYPE_SPI;
         spiBusSetInstance(&dev->busdev, spiInstanceByDevice(SPI_CFG_TO_DEV(barometerConfig()->baro_spi_device)));
-        dev->busdev.busdev_u.spi.csnPin = IOGetByTag(barometerConfig()->baro_spi_cs);
+        dev->busdev.busdev_u.spi.csnPin = IOGetByTag(barometerConfig()->baro_spi_csn);
 #endif
         break;
 
diff --git a/src/main/sensors/barometer.h b/src/main/sensors/barometer.h
index 59ecccd58f..da98f4066b 100644
--- a/src/main/sensors/barometer.h
+++ b/src/main/sensors/barometer.h
@@ -33,7 +33,7 @@ typedef enum {
 typedef struct barometerConfig_s {
     uint8_t baro_bustype;
     uint8_t baro_spi_device;
-    ioTag_t baro_spi_cs;
+    ioTag_t baro_spi_csn;                   // Also used as XCLR (positive logic) for BMP085
     uint8_t baro_i2c_device;
     uint8_t baro_i2c_address;
     uint8_t baro_hardware;                  // Barometer hardware to use