chore: adjust names and comments

... as golint suggest.