Order variants in alphabetical order, rename typo'd variant
Broken up apierror into more accurate subsets of types