Renaming couple of variables for consistency.