fix some variable names