Refactor naming for cli classes