Renamed DefaultXXX to XXXImpl

Change-Id: Ia8715600730dd40f942df22ebcfff3e45f2138d7