Renamed and refactored all the things.