diff --git a/klippy/pins.py b/klippy/pins.py
index 3c20513f..f93d3aa0 100644
--- a/klippy/pins.py
+++ b/klippy/pins.py
@@ -46,9 +46,9 @@ MCU_PINS = {
     "atmega1280": port_pins(12), "atmega2560": port_pins(12),
     "sam3x8e": port_pins(4, 32), "sam3x8c": port_pins(2, 32),
     "sam4s8c": port_pins(3, 32), "sam4e8e" : port_pins(5, 32),
-    "samd21g": port_pins(2, 32),
-    "samd51g19": port_pins(2, 32), "samd51j19": port_pins(3, 32),
-    "samd51n19": port_pins(3, 32), "samd51p20": port_pins(4, 32),
+    "samd21g18a": port_pins(2, 32),
+    "samd51g19a": port_pins(2, 32), "samd51j19a": port_pins(3, 32),
+    "samd51n19a": port_pins(3, 32), "samd51p20a": port_pins(4, 32),
     "stm32f103": port_pins(5, 16),
     "lpc176x": lpc_pins(),
     "pru": beaglebone_pins(),
diff --git a/src/atsamd/Kconfig b/src/atsamd/Kconfig
index 236a2a0e..68232acd 100644
--- a/src/atsamd/Kconfig
+++ b/src/atsamd/Kconfig
@@ -42,11 +42,11 @@ config MACH_SAMD51
 
 config MCU
     string
-    default "samd21g" if MACH_SAMD21G18
-    default "samd51g19" if MACH_SAMD51G19
-    default "samd51j19" if MACH_SAMD51J19
-    default "samd51n19" if MACH_SAMD51N19
-    default "samd51p20" if MACH_SAMD51P20
+    default "samd21g18a" if MACH_SAMD21G18
+    default "samd51g19a" if MACH_SAMD51G19
+    default "samd51j19a" if MACH_SAMD51J19
+    default "samd51n19a" if MACH_SAMD51N19
+    default "samd51p20a" if MACH_SAMD51P20
 
 config CLOCK_FREQ
     int