fixed some variable/function names