Fix for enum namespacing