Renamed ComponentConstructor types