Fix for change to enum namespaces