fixed "_" not being a valid name character re issue:7