Renamed friend types