Fix some naming conventions
Merge pull request #3 from TruckMuncher/fixes

Fix some naming conventions