Some method and class name refactoring.