Classes refactored. Renamed to make more sense to developers.