Rearranging parameter names to be more consistent.  I wanted to wait the the unit/regression tests to be in place before this refactoring.