Updated changed function and annotation names