Remapping for neo layout