WP-1933 Changed labels used for academic year.