Renamed classes and refactored projected