Allow underline and dash for machine name