Renamed some elements