fixed naming to not collide with annotation names and removed class comments