Renamed subcommand classes