Update for the enum namespacing changes.