Changing naming convention
Merge branch 'master' of github.com:freedomjs/freedom-for-chrome