Renamed annotations and removed all html* keys