Alwasy use the same name for unions

Fixes the <_GTokenValue> vs <GTokenValue> problem.