Er, rename AMD64 back to x86-64