We could revert to the three classifications: Deck Ape, Snipe, and Aerdale.
I would suspect that we'll also do away with the Gold vs. Red stripes so as not to affend some.