Fixed for enum namespacing