Renamed some more references