Refactored some method names