Rename rake tasks
Fix publish rake task
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix publish rake task
  Rename rake tasks