Finish renaming a few variables.