Variables renaming refactoring.
Add test methods.