Renamed models based on updated UML diagram.