Variables names refactoring
Updated