Renames some variables to improve readability