Refactored names of classes and methods