Renamed some more things