Refactoring variables names