rename Cli* class to Command* class