Rename completion files; More descriptive completion file names