Changing some variable names for uniformity.