Improvements to singular and plural definitions of custom post types and taoxnomies