builds with a hyphen in the name are fubar

Any branch name containing a dash breaks the determination of branch name, minor revision, etc.  Changed them to underscores to workaround.