Renamed component classes