Canonicalise machine name in distro.py