Refactored some names to be consistent with instructions