Use local names instead of testing for substrings