More parameter renaming to better reflect meaning.