Add annotation name checking