Subcommand and option name-chgs in response to comments