GMV name conflict fix for compilation with clang++

One of our enums is also 'GMV', which apparently technically rules it
out as a namespace name.