updated annotation type names so that they don't collide