Update for enum namespacing.

Enum variants are now namespaced under their type.