fixed naming conventions
Merge branch 'master' of https://github.com/cry-inc/breathalyzer