fix some variable names
Merge pull request #24 from gsarjeant/underscores

fix some variable names