Rename a few variables that were forgotten in the past.