Rename main type
work on subparser