replace non-enum collections with enum collections (#1066)

16 files changed