Refactored some names