Rename some class parameters for clarity