Refactoring variable naming.