Fix a name contamination in AutoComplete