Changed some unlogical variable names.