Updating more enum namespaces