Handling of name change for variable with id/name pair like location/cooperator/pi

Reviewer: Tiff Go (post commit)

Issue: GCP-9331