consistent naming of member variables
Merge pull request #5 from nem0/member_naming

consistent naming of member variables