Rename so that the sys files have the architecture.

    They are, after all, arch specific.