Restoring argument renames

Signed-off-by: Tim Tripcony <me@timtripcony.com>