chore: reorganize cli params and rename some types

chore: reorganize cli params and rename some types #421