refactoring naming conventions

run go fmt on save :)