diff --git a/ports/samd/boards/pins_prefix.c b/ports/samd/boards/pins_prefix.c
index 4f0095d332..2437859339 100644
--- a/ports/samd/boards/pins_prefix.c
+++ b/ports/samd/boards/pins_prefix.c
@@ -11,11 +11,11 @@
 #if defined(MCU_SAMD21)
 
 #define PIN(p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2) \
-    {{&machine_pin_type}, PIN_##p_name, MP_QSTR_##p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2 }
+    {{&machine_pin_type}, MP_QSTR_##p_name, PIN_##p_name, p_eic, p_adc0, p_sercom1, p_sercom2, p_tcc1, p_tcc2 }
 
 #elif defined(MCU_SAMD51)
 
 #define PIN(p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2) \
-    {{&machine_pin_type}, PIN_##p_name, MP_QSTR_##p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2 }
+    {{&machine_pin_type}, MP_QSTR_##p_name, PIN_##p_name, p_eic, p_adc0, p_adc1, p_sercom1, p_sercom2, p_tc, p_tcc1, p_tcc2 }
 
 #endif
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index bc65e8ae23..11ef75c63f 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -32,8 +32,8 @@
 
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
+    qstr_short_t name;
     uint8_t pin_id;
-    qstr name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t sercom1;
@@ -50,8 +50,8 @@ typedef struct _machine_pin_obj_t {
 
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
+    qstr_short_t name;
     uint8_t pin_id;
-    qstr name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t adc1;