Renamed some parts