Adhere to rust naming conventions
Merge pull request #174 from nwin/master

Adhere to rust naming conventions