Fix doc comment.
Simplify valid name regexp.