Fix compilation errors brought by enum namespacing change