Fix class and subcommands naming