Added support for additional ways of representing the x86_64 machine name