Refactoring of variable names