Renamed trait to composition.