Refactoring: names of private fields changed.