Avoid underscores in Go variable names

[#81524216]