golint: fix some variable names