Renamed XML IDs to coincide with new standard