Refactored name.
Renamed class.
Intermediate changes.