Refactor command type names
Fit the help to 80 columns