Renamed DefaultXXX to XXXImpl