Revert mismatch name support and move base type enumerators

Remove support for mismatch named patterns because they're broken.