Rename parameters to eliminate confusion.