Keep argument naming consistency as suggested by @hank-at-code42.
Update docstring to reflect the previous argument rename.
Fix `{}` in `''.format()` for python 2.6 which requires an index.
Merge pull request #4523 from s0undt3ch/develop

Keep argument naming consistency as suggested by @hank-at-code42.