Code refactoring - variable rename