HEYW-111 Add underscore as an allowed character in names