changed class names for annotated vs non-annotated objects