diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 3059a8348..3feb0b41c 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -39,7 +39,7 @@
 #include "Sensor/T1000xSensor.h"
 #include "Sensor/TSL2591Sensor.h"
 #include "Sensor/VEML7700Sensor.h"
-#ifdef CAN_HAVE_RAK12035
+#ifdef CAN_HOST_RAK12035VBSOIL
 #include "Sensor/RAK12035VBSensor.h"
 #endif
 
@@ -61,7 +61,7 @@ MLX90632Sensor mlx90632Sensor;
 DFRobotLarkSensor dfRobotLarkSensor;
 NAU7802Sensor nau7802Sensor;
 BMP3XXSensor bmp3xxSensor;
-#ifdef CAN_HAVE_RAK12035
+#ifdef CAN_HOST_RAK12035VBSOIL
 RAK12035VBSensor rak12035vbSensor;
 #endif
 #ifdef T1000X_SENSOR_EN
@@ -157,7 +157,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
                 result = max17048Sensor.runOnce();
             if (cgRadSens.hasSensor())
                 result = cgRadSens.runOnce();
-    #ifdef CAN_HAVE_RAK12035
+    #ifdef CAN_HOST_RAK12035VBSOIL
             if (rak12035vbSensor.hasSensor())
                 result = rak12035vbSensor.runOnce();
     #endif
@@ -417,7 +417,7 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
         valid = valid && cgRadSens.getMetrics(m);
         hasSensor = true;
     }
-    #ifdef CAN_HAVE_RAK12035
+    #ifdef CAN_HOST_RAK12035VBSOIL
     if (rak12035vbSensor.hasSensor()){
         valid = valid && rak12035vbSensor.getMetrics(m);
         hasSensor = true;
@@ -629,7 +629,7 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
         if (result != AdminMessageHandleResult::NOT_HANDLED)
             return result;
     }
-    #ifdef CAN_HAVE_RAK12035
+    #ifdef CAN_HOST_RAK12035VBSOIL
     if (rak12035vbSensor.hasSensor()){
         result = rak12035vbSensor.handleAdminMessage(mp, request, response);
         if (result != AdminMessageHandleResult::NOT_HANDLED)
diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
index a8da42246..b1ecc5df4 100644
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -37,8 +37,6 @@
 extern "C" {
 #endif // __cplusplus
 
-//#define CAN_HAVE_RAK12035 1
-
 // Number of pins defined in PinDescription array
 #define PINS_COUNT (48)
 #define NUM_DIGITAL_PINS (48)