Revert mismatch name support and move base type enumerators

Mismatch name patterns currently aren't guaranteed to produce different terms, so I'm reverting that.