fix naming changes in external references

Change-Id: Ib13596833850ed90acae06f6153dbb90e5c72a5e