Changing some variable names to more explicit ones to improve readability