Changed variable names

Changed some variable names.