Some Refactoring of class names