Changing some variable names