fixed some variable names to fit conventions