Revert "Candidate names can include dashes"

This reverts commit 34e9f6a7f44b0d52b0e85c39e12323e0dbb8265b.
Another try at allowing dashes inside names