Merge pull request #14805 from dave-tucker/golint_namesgen

golint: Lint pkg/namesgenerator