Also include arch in name, slightly longer ref