Variables names refactoring