changing some variable names