Refactored some classes names.