golint: fix more var and func names