rename some variables
Merge pull request #96 from folieadrien/naming-refactor

rename some variables