Be a bit more thorough and make sure names with _ at the end aren't
confused with the name '_'.