diff --git a/EX-IOExpanderPinMaps.h b/EX-IOExpanderPinMaps.h
index b09dca3..b4fed55 100644
--- a/EX-IOExpanderPinMaps.h
+++ b/EX-IOExpanderPinMaps.h
@@ -29,10 +29,8 @@
 #define DEFAULT_NANO_DIGITAL_PINMAP new EXIODigitalPinMap(12,2,3,4,5,6,7,8,9,10,11,12,13,A0,A1,A2,A3,A6,A7)
 #define DEFAULT_NANO_ANALOGUE_PINMAP new EXIOAnaloguePinMap(6,A0,A1,A2,A3,A6,A7)
 
-#define DEFAULT_UNO F("DEFAULT_UNO"), \
-  new EXIODigitalPinMap(12,2,3,4,5,6,7,8,9,10,11,12,13,A0,A1,A2,A3,A6,A7) \
-  new EXIOAnaloguePinMap(4,A0,A1,A2,A3)
+#define DEFAULT_UNO_DIGITAL_PINMAP new EXIODigitalPinMap(12,2,3,4,5,6,7,8,9,10,11,12,13,A0,A1,A2,A3,A6,A7)
+#define DEFAULT_UNO_ANALOGUE_PINMAP  new EXIOAnaloguePinMap(4,A0,A1,A2,A3)
 
-#define DEFAULT_MEGA F("DEFAULT_MEGA"), \
-  new EXIODigitalPinMap(12,2,3,4,5,6,7,8,9,10,11,12,13,A0,A1,A2,A3,A6,A7) \
-  new EXIOAnaloguePinMap(4,A0,A1,A2,A3)
\ No newline at end of file
+#define DEFAULT_MEGA_DIGITAL_PINMAP new EXIODigitalPinMap(12,2,3,4,5,6,7,8,9,10,11,12,13,A0,A1,A2,A3,A6,A7)
+#define DEFAULT_MEGA_ANALOGUE_PINMAP new EXIOAnaloguePinMap(4,A0,A1,A2,A3)