Improve Annotation class names (+in XML)