fix naming changes in external references

Change-Id: Ia0a95b804373f1cf954c078043e85023ac221e88