Refactoring Commands, fixing typos in class and method names.