Refactored some names.