Renamed some components