Changed xml values to nondeprecated values.