Rename and move arch-specific locks.