Allow x86 as architecture name. Rename 32 on 64 bit test.