Code review PR

“See http://golang.org/doc/effective_go.html#mixed-caps. This applies even when it breaks conventions in other languages.” (https://code.google.com/p/go-wiki/wiki/CodeReviewComments#Mixed_Caps)