Update for enum namespacing