diff --git a/Adafruit_Circuit_Playground.h b/Adafruit_Circuit_Playground.h
index fc30195..8a59127 100644
--- a/Adafruit_Circuit_Playground.h
+++ b/Adafruit_Circuit_Playground.h
@@ -108,7 +108,7 @@ class Adafruit_CircuitPlayground {
   Adafruit_CPlay_Mic mic; ///< the microphone object
   Adafruit_CPlay_Speaker speaker; ///< the speaker object
 
-#if defined (__AVR__) || defined(ARDUINO_CIRCUITPLAY_NRF52840) // Circuit Playground 'classic' or bluefruit
+#if defined (__AVR__) || defined(ARDUINO_NRF52840_CIRCUITPLAY) // Circuit Playground 'classic' or bluefruit
   CPlay_CapacitiveSensor cap[8]; ///< the array of capacitive touch sensors
 #else
   Adafruit_CPlay_FreeTouch     cap[7]; ///< the array of capacitive touch sensors
diff --git a/utility/Adafruit_CPlay_Mic.cpp b/utility/Adafruit_CPlay_Mic.cpp
index f6baedf..59c949b 100644
--- a/utility/Adafruit_CPlay_Mic.cpp
+++ b/utility/Adafruit_CPlay_Mic.cpp
@@ -22,7 +22,7 @@ uint16_t sincfilter[DECIMATION] = {0, 2, 9, 21, 39, 63, 94, 132, 179, 236, 302,
 
 static bool pdmConfigured = false;
 
-#elif defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#elif defined(ARDUINO_NRF52840_CIRCUITPLAY)
 
 #include <PDM.h>
 // The default Circuit Playground Bluefruit pins 
@@ -171,7 +171,7 @@ void Adafruit_CPlay_Mic::capture(int16_t *buf, uint16_t nSamples) {
 
     *ptr++ = runningsum;
   }
-#elif defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#elif defined(ARDUINO_NRF52840_CIRCUITPLAY)
   if(!pdmConfigured){
     PDM.onReceive(onPDMdata);
     PDM.begin(1, SAMPLERATE_HZ);
@@ -214,7 +214,7 @@ float Adafruit_CPlay_Mic::soundPressureLevel(uint16_t ms){
 #elif defined(ARDUINO_ARCH_SAMD)
   gain = 9;
   len = (float)(SAMPLERATE_HZ/1000) * ms;
-#elif defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#elif defined(ARDUINO_NRF52840_CIRCUITPLAY)
   gain = 2;
   len = (float)(SAMPLERATE_HZ/1000) * ms;
 #else
diff --git a/utility/CP_Boards.h b/utility/CP_Boards.h
index cabb2eb..6aac9b5 100644
--- a/utility/CP_Boards.h
+++ b/utility/CP_Boards.h
@@ -722,7 +722,7 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 #define PIN_TO_PWM(p)           PIN_TO_DIGITAL(p)
 
 // Circuit Playground Bluefruit
-#elif defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#elif defined(ARDUINO_NRF52840_CIRCUITPLAY)
 #define TOTAL_ANALOG_PINS       6
 #define TOTAL_PINS              25 // 14 digital + 6 analog + 2 i2c + 3 spi
 #define TOTAL_PORTS             3  // set when TOTAL_PINS > num digitial I/O pins
diff --git a/utility/CPlay_CapacitiveSensor.h b/utility/CPlay_CapacitiveSensor.h
index 515da7f..269ece6 100644
--- a/utility/CPlay_CapacitiveSensor.h
+++ b/utility/CPlay_CapacitiveSensor.h
@@ -19,7 +19,7 @@
 #include "WProgram.h"
 #endif
 
-#if defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#if defined(ARDUINO_NRF52840_CIRCUITPLAY)
 #define RwReg uint32_t
 #elif defined(__AVR__)
 #define RwReg uint8_t
diff --git a/utility/IRLibDecodeBase.cpp b/utility/IRLibDecodeBase.cpp
index 3ce7dd1..ee04772 100644
--- a/utility/IRLibDecodeBase.cpp
+++ b/utility/IRLibDecodeBase.cpp
@@ -8,7 +8,7 @@
  * protocol specific decoders.
  */
 
-#if !defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#if !defined(ARDUINO_NRF52840_CIRCUITPLAY)
 
 #include "IRLibDecodeBase.h"
 #include "IRLibHardware.h"
diff --git a/utility/IRLibHardware.cpp b/utility/IRLibHardware.cpp
index 7c82369..76067be 100644
--- a/utility/IRLibHardware.cpp
+++ b/utility/IRLibHardware.cpp
@@ -28,7 +28,7 @@
  * enableIRIn after every decode and the system handles it.
  */
 
-#if !defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#if !defined(ARDUINO_NRF52840_CIRCUITPLAY)
 
 #include "IRLibHardware.h"
 uint8_t IRLib_didIROut=false;
diff --git a/utility/IRLibProtocols.cpp b/utility/IRLibProtocols.cpp
index b67fbb9..f2a66ce 100644
--- a/utility/IRLibProtocols.cpp
+++ b/utility/IRLibProtocols.cpp
@@ -8,7 +8,7 @@
  * It is used by both Send and Decode sections of the code but not Receive.
  */
 
-#if !defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#if !defined(ARDUINO_NRF52840_CIRCUITPLAY)
 
 #include "IRLibProtocols.h"
 
diff --git a/utility/IRLibRecvBase.cpp b/utility/IRLibRecvBase.cpp
index daac3f1..64293c6 100644
--- a/utility/IRLibRecvBase.cpp
+++ b/utility/IRLibRecvBase.cpp
@@ -15,7 +15,7 @@
  * interrupts is also in a separate folder IRLibFreq.
  */
 
-#if !defined(ARDUINO_CIRCUITPLAY_NRF52840)
+#if !defined(ARDUINO_NRF52840_CIRCUITPLAY)
 
 #include "IRLibRecvBase.h"
 #include "IRLibHardware.h"
diff --git a/utility/IRLibSendBase.cpp b/utility/IRLibSendBase.cpp
index b71c412..356397e 100644
--- a/utility/IRLibSendBase.cpp
+++ b/utility/IRLibSendBase.cpp
@@ -11,7 +11,7 @@
  * spaces of varying length of microseconds in the manner which the protocol defines.
  */
 
-#if !defined(ARDUINO_CIRCUITPLAY_NRF52840 ) 
+#if !defined(ARDUINO_NRF52840_CIRCUITPLAY) 
 
 #include "IRLibSendBase.h"
 #include "IRLibHardware.h"