Change argument name to match docstring and implementations.
Delete some unnecessary code while I'm here.
Merge pull request #395 from ClusterHQ/change-owner-arguments-394

Change owner arguments.

Fixes #394.