updated annotation links to use the new naming
merging upstream changes