Name these enums to make postgresql happy
Merge branch 'i14'