Refactored some names
Working hard!