Refactor to use Id instead of Name as the default identifier.