diff --git a/Turnouts.cpp b/Turnouts.cpp
index ff4ecb0..636922d 100644
--- a/Turnouts.cpp
+++ b/Turnouts.cpp
@@ -114,7 +114,7 @@
 
     // I know it says setClosedStateOnly, but we need to tell others
     //  that the state has changed too.
-    #if defined(RMFT_ACTIVE)
+    #if defined(EXRAIL_ACTIVE)
       RMFT2::turnoutEvent(id, closeFlag);
     #endif
 
@@ -147,7 +147,7 @@
         EEPROM.put(tt->_eepromAddress, tt->_turnoutData.flags);
 #endif
 
-    #if defined(RMFT_ACTIVE)
+    #if defined(EXRAIL_ACTIVE)
       RMFT2::turnoutEvent(id, closeFlag);
     #endif
 
diff --git a/WiThrottle.cpp b/WiThrottle.cpp
index 53e956c..312cf93 100644
--- a/WiThrottle.cpp
+++ b/WiThrottle.cpp
@@ -135,7 +135,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
     else if (!exRailSent) {
       // Send EX-RAIL routes list if not already sent (but not at same time as turnouts above)
       exRailSent=true;
-#ifdef RMFT_ACTIVE
+#ifdef EXRAIL_ACTIVE
       RMFT2::emitWithrottleRouteList(stream);
 #endif
       // allow heartbeat to slow down once all metadata sent     
@@ -205,7 +205,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
 	StringFormatter::send(stream,F("HtDCC-EX v%S, %S, %S, %S\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
 	StringFormatter::send(stream,F("PTT]\\[Turnouts}|{Turnout]\\[THROW}|{2]\\[CLOSE}|{4\n"));
 	StringFormatter::send(stream,F("PPA%x\n"),DCCWaveform::mainTrack.getPowerMode()==POWERMODE::ON);
-#ifdef RMFT_ACTIVE
+#ifdef EXRAIL_ACTIVE
 	RMFT2::emitWithrottleRoster(stream);
 #endif        
 	// set heartbeat to 1 second because we need to sync the metadata