Renamed Enumarte to Enumerator and made it not implement Enumeration.