Revert mismatch name support and move base type enumerators