Renamed Classes according to Class-Diagram.