Renamed some of the components