fix naming changes in external references

Change-Id: I3bc5dc727766d3a63b48096677a67e7cd44ef1de