Refactored some method and function names
Did some rename refactoring