Refactored some naming