Refactoring: variable and class renaming