Update to use Name attribute instead of ID