SHDP-343 Rename some Yarn Annotations