diff --git a/config/example-cartesian.cfg b/config/example-cartesian.cfg
index c4405aa0..8f8ab578 100644
--- a/config/example-cartesian.cfg
+++ b/config/example-cartesian.cfg
@@ -8,46 +8,46 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_x]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar3
+endstop_pin: ^PE5
 position_endstop: 0
 position_max: 200
 
 [stepper_y]
-step_pin: ar60
-dir_pin: !ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: !PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar14
+endstop_pin: ^PJ1
 position_endstop: 0
 position_max: 200
 
 [stepper_z]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^ar18
+endstop_pin: ^PD3
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.500
 filament_diameter: 3.500
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -56,16 +56,15 @@ min_temp: 0
 max_temp: 210
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 110
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: cartesian
diff --git a/config/example-corexy.cfg b/config/example-corexy.cfg
index 05209aae..313a183b 100644
--- a/config/example-corexy.cfg
+++ b/config/example-corexy.cfg
@@ -8,48 +8,48 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_x]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar3
+endstop_pin: ^PE5
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_y]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar14
+endstop_pin: ^PJ1
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_z]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^ar18
+endstop_pin: ^PD3
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -58,19 +58,18 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [fan]
-pin: ar9
+pin: PH6
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: corexy
diff --git a/config/example-corexz.cfg b/config/example-corexz.cfg
index 6ce9b22e..bea0b699 100644
--- a/config/example-corexz.cfg
+++ b/config/example-corexz.cfg
@@ -7,48 +7,48 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_x]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar3
+endstop_pin: ^PE5
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_y]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar14
+endstop_pin: ^PJ1
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_z]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^ar18
+endstop_pin: ^PD3
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -57,19 +57,18 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [fan]
-pin: ar9
+pin: PH6
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: corexz
diff --git a/config/example-delta.cfg b/config/example-delta.cfg
index 2a5f0e8f..e95e5721 100644
--- a/config/example-delta.cfg
+++ b/config/example-delta.cfg
@@ -7,43 +7,43 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_a]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar2
+endstop_pin: ^PE4
 homing_speed: 50
 position_endstop: 297.05
 arm_length: 333.0
 
 [stepper_b]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar15
+endstop_pin: ^PJ0
 
 [stepper_c]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar19
+endstop_pin: ^PD2
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -52,16 +52,15 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: delta
diff --git a/config/example-polar.cfg b/config/example-polar.cfg
index 8cf7d533..62055038 100644
--- a/config/example-polar.cfg
+++ b/config/example-polar.cfg
@@ -7,44 +7,44 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_bed]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 gear_ratio: 80:16
 
 [stepper_arm]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar14
+endstop_pin: ^PJ1
 position_endstop: 300
 position_max: 300
 homing_speed: 50
 
 [stepper_z]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^ar18
+endstop_pin: ^PD3
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -53,19 +53,18 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [fan]
-pin: ar9
+pin: PH6
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: polar
diff --git a/config/example-rotary-delta.cfg b/config/example-rotary-delta.cfg
index 5325f4ae..d0b0c910 100644
--- a/config/example-rotary-delta.cfg
+++ b/config/example-rotary-delta.cfg
@@ -7,44 +7,44 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_a]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 gear_ratio: 107.000:16, 60:16
-endstop_pin: ^ar2
+endstop_pin: ^PE4
 homing_speed: 50
 position_endstop: 252
 upper_arm_length: 170.000
 lower_arm_length: 320.000
 
 [stepper_b]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 gear_ratio: 107.000:16, 60:16
-endstop_pin: ^ar15
+endstop_pin: ^PJ0
 
 [stepper_c]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 gear_ratio: 107.000:16, 60:16
-endstop_pin: ^ar19
+endstop_pin: ^PD2
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -53,16 +53,15 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: rotary_delta
diff --git a/config/example-winch.cfg b/config/example-winch.cfg
index 3998f840..5813aef7 100644
--- a/config/example-winch.cfg
+++ b/config/example-winch.cfg
@@ -11,9 +11,9 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [stepper_a]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
 anchor_x: 0
@@ -21,9 +21,9 @@ anchor_y: -2000
 anchor_z: -100
 
 [stepper_b]
-step_pin: ar60
-dir_pin: ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
 anchor_x: 2000
@@ -31,9 +31,9 @@ anchor_y: 1000
 anchor_z: -100
 
 [stepper_c]
-step_pin: ar46
-dir_pin: ar48
-enable_pin: !ar62
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
 microsteps: 16
 rotation_distance: 40
 anchor_x: -2000
@@ -41,9 +41,9 @@ anchor_y: 1000
 anchor_z: -100
 
 [stepper_d]
-step_pin: ar36
-dir_pin: ar34
-enable_pin: !ar30
+step_pin: PC1
+dir_pin: PC3
+enable_pin: !PC7
 microsteps: 16
 rotation_distance: 40
 anchor_x: 0
@@ -51,16 +51,16 @@ anchor_y: 0
 anchor_z: 3000
 
 [extruder]
-step_pin: ar26
-dir_pin: ar28
-enable_pin: !ar24
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: ar10
+heater_pin: PB4
 sensor_type: ATC Semitec 104GT-2
-sensor_pin: analog13
+sensor_pin: PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -69,16 +69,15 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: ar8
+heater_pin: PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog14
+sensor_pin: PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [mcu]
 serial: /dev/ttyACM0
-pin_map: arduino
 
 [printer]
 kinematics: winch
diff --git a/config/sample-multi-mcu.cfg b/config/sample-multi-mcu.cfg
index d2984506..82f4af14 100644
--- a/config/sample-multi-mcu.cfg
+++ b/config/sample-multi-mcu.cfg
@@ -9,61 +9,58 @@
 # are connected to the main micro-controller.
 [mcu]
 serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.2:1.0-port0
-pin_map: arduino
 
 # The "zboard" micro-controller will be used to control the Z axis.
 [mcu zboard]
 serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.3:1.0-port0
-pin_map: arduino
 
 # The "auxboard" micro-controller will be used to control the heaters.
 [mcu auxboard]
 serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.4:1.0-port0
-pin_map: arduino
 
 [stepper_x]
-step_pin: ar54
-dir_pin: ar55
-enable_pin: !ar38
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar3
+endstop_pin: ^PE5
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_y]
-step_pin: ar60
-dir_pin: !ar61
-enable_pin: !ar56
+step_pin: PF6
+dir_pin: !PF7
+enable_pin: !PF2
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar14
+endstop_pin: ^PJ1
 position_endstop: 0
 position_max: 200
 homing_speed: 50
 
 [stepper_z]
-step_pin: zboard:ar46
-dir_pin: zboard:ar48
-enable_pin: !zboard:ar62
+step_pin: zboard:PL3
+dir_pin: zboard:PL1
+enable_pin: !zboard:PK0
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^zboard:ar18
+endstop_pin: ^zboard:PD3
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
-step_pin: auxboard:ar26
-dir_pin: auxboard:ar28
-enable_pin: !auxboard:ar24
+step_pin: auxboard:PA4
+dir_pin: auxboard:PA6
+enable_pin: !auxboard:PA2
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.400
 filament_diameter: 1.750
-heater_pin: auxboard:ar10
+heater_pin: auxboard:PB4
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: auxboard:analog13
+sensor_pin: auxboard:PK5
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -72,15 +69,15 @@ min_temp: 0
 max_temp: 250
 
 [heater_bed]
-heater_pin: auxboard:ar8
+heater_pin: auxboard:PH5
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: auxboard:analog14
+sensor_pin: auxboard:PK6
 control: watermark
 min_temp: 0
 max_temp: 130
 
 [fan]
-pin: auxboard:ar9
+pin: auxboard:PH6
 
 [printer]
 kinematics: cartesian