Fix for using the local name when generating a design

Reviewer: Tiff Go (post commit)

Issue: GCP-9803