Fix templates to create subcommands including '-'