fix some variable name