diff --git a/utility/direct_pin_read.h b/utility/direct_pin_read.h
index 2eaf2f8..b8c0fe3 100644
--- a/utility/direct_pin_read.h
+++ b/utility/direct_pin_read.h
@@ -79,7 +79,8 @@
 #define PIN_TO_BITMASK(pin)             digitalPinToPinName(pin)
 #define DIRECT_PIN_READ(base, pin)      nrf_gpio_pin_read(pin)
 
-#elif defined(ARDUINO_NANO_RP2040_CONNECT)
+#elif defined(ARDUINO_ARCH_RP2040)
+  // Covers RP2040 and RP2350 (Pico, Pico W, Pico 2, etc.)
 #define IO_REG_TYPE                     pin_size_t
 #define PIN_TO_BASEREG(pin)             (0)
 #define PIN_TO_BITMASK(pin)             pin
diff --git a/utility/interrupt_pins.h b/utility/interrupt_pins.h
index 8713911..45b0eb2 100644
--- a/utility/interrupt_pins.h
+++ b/utility/interrupt_pins.h
@@ -358,8 +358,8 @@
   #define CORE_INT20_PIN	A6
   #define CORE_INT21_PIN	A7
 
-// Arduino Nano RP2040 Connect
-#elif defined(ARDUINO_NANO_RP2040_CONNECT)
+// Covers RP2040 and RP2350 (Pico, Pico W, Pico 2, etc.)
+#elif defined(ARDUINO_ARCH_RP2040)
   #define CORE_NUM_INTERRUPT	20
   #define CORE_INT0_PIN		0
   #define CORE_INT1_PIN		1