Rename a variable to be more consistent and stuff