Renamed implementation classes