Use simpler and more flexible name validator (#291).