improve cli with better command naming