Uses updated category names.