Re-map some stuff to new APC layout