gofmt
Renamings