small renames
Merge branch 'master' of github.com:samzilverberg/PushPlugin