   }
   if (current_position[ROUTE_A2] == MINUS) {
     blocked[ROUTE_A1] = true;
-    blocked[ROUTE_BERENBACH1] = true;
-    blocked[ROUTE_BERENBACH2] = true;
+    blocked[ROUTE_P1] = true;
+    blocked[ROUTE_P2] = true;
 
     blocked[SWITCH_5] = true;
     blocked[SWITCH_1] = true;
     blocked[SWITCHING_PERMISSION] = true;
   }
-  if (current_position[ROUTE_BERENBACH1] == MINUS) {
+  if (current_position[ROUTE_P1] == MINUS) {
     blocked[ROUTE_A1] = true;
     blocked[ROUTE_A2] = true;
-    blocked[ROUTE_BERENBACH2] = true;
+    blocked[ROUTE_P2] = true;
 
     blocked[SWITCH_1] = true;
     blocked[SWITCHING_PERMISSION] = true;
   }
-  if (current_position[ROUTE_BERENBACH2] == MINUS) {
+  if (current_position[ROUTE_P2] == MINUS) {
     blocked[ROUTE_A1] = true;
     blocked[ROUTE_A2] = true;
-    blocked[ROUTE_BERENBACH1] = true;
+    blocked[ROUTE_P1] = true;
 
     blocked[SWITCH_1] = true;
     blocked[SWITCHING_PERMISSION] = true;
   }
 
   // Route fixation blocks routes.
-  if (current_position[ROUTE_A_FIXATION] == MINUS) {
+  if (current_position[ROUTE_AP_FIXATION] == MINUS) {
     blocked[ROUTE_A1] = true;
     blocked[ROUTE_A2] = true;
+    blocked[ROUTE_P1] = true;
+    blocked[ROUTE_P2] = true;
     // Special case: also keep yourself blocked (it is only un-blocked by
     // moving a signal back to PLUS).
-    blocked[ROUTE_A_FIXATION] = true;
+    blocked[ROUTE_AP_FIXATION] = true;
   }
 
   // Signals also block routes.

// Route levers
int PIN_LEVER_ROUTE_A1 = 36;
int PIN_LEVER_ROUTE_A2 = 38;
int PIN_LEVER_ROUTE_BERENBACH1 = 40;
int PIN_LEVER_ROUTE_BERENBACH2 = 42;
// Push button for route fixing
int PIN_BUTTON_ROUTE_A_FIXATION = 46;
// Switch/lock for route recall
int PIN_LOCK_ROUTE_A_RECALL = 47;

// Output pins (pull to 0 means go out of the ground position)
int PIN_OUTPUT_SWITCH_1 = A1;

int SWITCHING_PERMISSION = 2;  // Note: PLUS means 'key in lock'.
int ROUTE_A1 = 3;
int ROUTE_A2 = 4;
int ROUTE_P1 = 5;
int ROUTE_P2 = 6;
int ROUTE_AP_FIXATION = 7;
int SIGNAL_A1 = 8;
int SIGNAL_A2 = 9;
int ROUTE_AP_RECALL = 10;

// The two possible positions. Plus is the default, minus the actuated state.
bool PLUS = true;
