Fix names parser issue with upper case keywords

(issue introduced with last commit)