diff --git a/config/generic-simulavr.cfg b/config/generic-simulavr.cfg
index e5ac5d28..84c08940 100644
--- a/config/generic-simulavr.cfg
+++ b/config/generic-simulavr.cfg
@@ -8,52 +8,52 @@
 
 [stepper_x]
 # Pins: PA5, PA4, PA1
-step_pin: ar29
-dir_pin: ar28
-enable_pin: ar25
+step_pin: PA5
+dir_pin: PA4
+enable_pin: PA1
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar0
+endstop_pin: ^PB0
 position_min: -0.25
 position_endstop: 0
 position_max: 200
 
 [stepper_y]
 # Pins: PA3, PA2
-step_pin: ar27
-dir_pin: ar26
-enable_pin: ar25
+step_pin: PA3
+dir_pin: PA2
+enable_pin: PA1
 microsteps: 16
 rotation_distance: 40
-endstop_pin: ^ar1
+endstop_pin: ^PB1
 position_min: -0.25
 position_endstop: 0
 position_max: 200
 
 [stepper_z]
 # Pins: PC7, PC6
-step_pin: ar23
-dir_pin: ar22
-enable_pin: ar25
+step_pin: PC7
+dir_pin: PC6
+enable_pin: PA1
 microsteps: 16
 rotation_distance: 8
-endstop_pin: ^ar2
+endstop_pin: ^PB2
 position_min: 0.1
 position_endstop: 0.5
 position_max: 200
 
 [extruder]
 # Pins: PC3, PC2
-step_pin: ar19
-dir_pin: ar18
-enable_pin: ar25
+step_pin: PC3
+dir_pin: PC2
+enable_pin: PA1
 microsteps: 16
 rotation_distance: 33.500
 nozzle_diameter: 0.500
 filament_diameter: 3.500
-heater_pin: ar4
+heater_pin: PB4
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog7
+sensor_pin: PA7
 control: pid
 pid_Kp: 22.2
 pid_Ki: 1.08
@@ -63,19 +63,18 @@ min_extrude_temp: 0
 max_temp: 210
 
 [heater_bed]
-heater_pin: ar3
+heater_pin: PB3
 sensor_type: EPCOS 100K B57560G104F
-sensor_pin: analog0
+sensor_pin: PA0
 control: watermark
 min_temp: 0
 max_temp: 110
 
 [fan]
-pin: ar14
+pin: PD6
 
 [mcu]
 serial: /tmp/pseudoserial
-pin_map: arduino
 
 [printer]
 kinematics: cartesian