#42 Rename annotations