Consolidate parameter names.
Solves pull request: 27