Unify annotation names 2.0 - Finally

Sorry guys. I am just confused. 

This was the original PR #254