Fix nits and other naming conventions
Merge branch 'master' of ssh://github.com/svic/mozilla-central into master1