Rename types to annotations