595-32 - Fix Code Review

Fixed code review issues such as underscores in variable names and
lowercase method names.