fix issue with updating local name
Reviwer: Dan Jao
Issue: GCP-8876