Revert mismatch name support and move base type enumerators
Name all repeats
Start implementing mismatch repeats