refactoring naming conventions
fixed uppercase
gofmt-d and golint-d