Annotation names are more meaningful. #20