Fix argument names and order that are contrary to Style Guide,
introduced in Commit rB8960c6e06017

Commit rB8960c6e06017 added changes that have function argument names that do not conform to return arguments (should use r_ prefix). It also placed some return arguments before non-return arguments.