Minor changes to warning messages
Remove underscore from name

Having a name with an underscore in it is just going to make certain
packaging bits complicated (esp. Debian packaging where it'll need
changing to a dash). Better to just remove it early although it'll
entail some painful renaming