rename some varialbes
Merge pull request #986 from ruil2/rename

rename some varialbes