Use cmd.Name when generating completion script
#2012
Merged
cmd.Name when generating completion script
#2012