Unify annotation names 2.0

See #225