Variable name convention refactor

Code now uses underscores instead of capital letters in
variable names throughout.