Refactoring CommandHadler: rename