Rename few variables for consistency