Some of the enums have obviously changed names at some point in the
past.
Note that the code still has more compile errors.

Change-Id: Ibb152fa0ee35a0580876e621e42d049541c088bb