Unify annotation names 2.0

Re-PR See #254