Update to match the changed names in string