Replaced XAxisBead and YAxisBead with HorizontalCategoryAxisBead and VerticalCategoryAxisBead.