swapped EnumType to Enum and EUType to EnumType