Refactored some names to be more clear
Merge remote-tracking branch 'origin/master'
Refactored some names to be more clear