Enum name change. From, for example, EntityTypeS -> EntityType.