Code Updates: Renamed Classes