For proper application of name alias to ID / NAME counterparts

GCP-9786

Code review : Daniel Jao