Renamed some annotations