Rfc5

cpplint, renamed some variables according to style guide