Improve help and cmdline option names for --generate-config options.