Fix the name autocompletion