Edit naming styles for consistency
Merge pull request #43 from cs27x/group2/pull_request/Aston_King

Group2: Edit naming styles for consistency