Rename RimSummaryCaseCollection to RimSummaryEnsemble.

2026-10-26 07:00:17 -05:00 · 2024-07-30 08:55:12 +02:00
1 parent 1d7b40fbdd
commit e9c46c5cec
@@ -4,7 +4,7 @@ set(SOURCE_GROUP_HEADER_FILES
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.h
    ${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.h
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryEnsemble.h
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.h
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesData.h
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h
@@ -63,7 +63,7 @@ set(SOURCE_GROUP_SOURCE_FILES
    ${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.cpp
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.cpp
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryEnsemble.cpp
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.cpp
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesData.cpp
    ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.cpp
@@ -23,8 +23,8 @@
 #include "RimDerivedEnsembleCaseCollection.h"
 #include "RimDerivedSummaryCase.h"
 #include "RimProject.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "RifSummaryReaderInterface.h"

@@ -96,7 +96,7 @@ RimDerivedEnsembleCaseCollection::~RimDerivedEnsembleCaseCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryCaseCollection* ensemble )
+void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryEnsemble* ensemble )
 {
    m_ensemble1 = ensemble;
    updateAutoName();
@@ -105,7 +105,7 @@ void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryCaseCollection* e
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimDerivedEnsembleCaseCollection::setEnsemble2( RimSummaryCaseCollection* ensemble )
+void RimDerivedEnsembleCaseCollection::setEnsemble2( RimSummaryEnsemble* ensemble )
 {
    m_ensemble2 = ensemble;
    updateAutoName();
@@ -253,7 +253,7 @@ QList<caf::PdmOptionItemInfo> RimDerivedEnsembleCaseCollection::calculateValueOp

    if ( fieldNeedingOptions == &m_fixedTimeStepIndex )
    {
-        RimSummaryCaseCollection* sourceEnsemble = nullptr;
+        RimSummaryEnsemble* sourceEnsemble = nullptr;
        if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 )
        {
            sourceEnsemble = m_ensemble1;
@@ -282,7 +282,7 @@ QList<caf::PdmOptionItemInfo> RimDerivedEnsembleCaseCollection::calculateValueOp
 //--------------------------------------------------------------------------------------------------
 void RimDerivedEnsembleCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
-    RimSummaryCaseCollection::defineUiOrdering( uiConfigName, uiOrdering );
+    RimSummaryEnsemble::defineUiOrdering( uiConfigName, uiOrdering );

    uiOrdering.add( &m_caseCount );
    uiOrdering.add( &m_ensemble1 );
@@ -443,7 +443,7 @@ RimDerivedSummaryCase* RimDerivedEnsembleCaseCollection::firstCaseNotInUse()
 std::vector<RimDerivedSummaryCase*> RimDerivedEnsembleCaseCollection::allDerivedCases( bool activeOnly ) const
 {
    std::vector<RimDerivedSummaryCase*> activeCases;
-    for ( auto sumCase : RimSummaryCaseCollection::allSummaryCases() )
+    for ( auto sumCase : RimSummaryEnsemble::allSummaryCases() )
    {
        auto derivedCase = dynamic_cast<RimDerivedSummaryCase*>( sumCase );
        if ( derivedCase && ( !activeOnly || derivedCase->isInUse() ) )
@@ -461,7 +461,7 @@ void RimDerivedEnsembleCaseCollection::updateAutoName()
 {
    QString timeStepString;
    {
-        RimSummaryCaseCollection* sourceEnsemble = nullptr;
+        RimSummaryEnsemble* sourceEnsemble = nullptr;
        if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 )
        {
            sourceEnsemble = m_ensemble1;
@@ -598,9 +598,9 @@ std::vector<RimDerivedEnsembleCaseCollection*> RimDerivedEnsembleCaseCollection:
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimSummaryCaseCollection*> RimDerivedEnsembleCaseCollection::allEnsembles() const
+std::vector<RimSummaryEnsemble*> RimDerivedEnsembleCaseCollection::allEnsembles() const
 {
-    std::vector<RimSummaryCaseCollection*> ensembles;
+    std::vector<RimSummaryEnsemble*> ensembles;

    auto project = RimProject::current();

@@ -19,7 +19,7 @@
 #pragma once

 #include "RimDerivedSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
@@ -34,7 +34,7 @@ class RimSummaryCase;
 //==================================================================================================
 ///
 //==================================================================================================
-class RimDerivedEnsembleCaseCollection : public RimSummaryCaseCollection
+class RimDerivedEnsembleCaseCollection : public RimSummaryEnsemble
 {
    CAF_PDM_HEADER_INIT;

@@ -50,13 +50,13 @@ public:
    RimDerivedEnsembleCaseCollection();
    ~RimDerivedEnsembleCaseCollection() override;

-    RimSummaryCaseCollection* ensemble1() const { return m_ensemble1; }
-    RimSummaryCaseCollection* ensemble2() const { return m_ensemble2; }
-    DerivedSummaryOperator    op() const { return m_operator(); }
-    bool                      isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }
+    RimSummaryEnsemble*    ensemble1() const { return m_ensemble1; }
+    RimSummaryEnsemble*    ensemble2() const { return m_ensemble2; }
+    DerivedSummaryOperator op() const { return m_operator(); }
+    bool                   isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }

-    void setEnsemble1( RimSummaryCaseCollection* ensemble );
-    void setEnsemble2( RimSummaryCaseCollection* ensemble );
+    void setEnsemble1( RimSummaryEnsemble* ensemble );
+    void setEnsemble2( RimSummaryEnsemble* ensemble );

    std::vector<RimSummaryCase*>       allSummaryCases() const override;
    std::set<RifEclipseSummaryAddress> ensembleSummaryAddresses() const override;
@@ -85,11 +85,11 @@ private:
    std::vector<RimDerivedEnsembleCaseCollection*> findReferringEnsembles() const;

 private:
-    std::vector<RimSummaryCaseCollection*> allEnsembles() const;
+    std::vector<RimSummaryEnsemble*> allEnsembles() const;

 private:
-    caf::PdmPtrField<RimSummaryCaseCollection*>         m_ensemble1;
-    caf::PdmPtrField<RimSummaryCaseCollection*>         m_ensemble2;
+    caf::PdmPtrField<RimSummaryEnsemble*>               m_ensemble1;
+    caf::PdmPtrField<RimSummaryEnsemble*>               m_ensemble2;
    caf::PdmField<caf::AppEnum<DerivedSummaryOperator>> m_operator;
    caf::PdmField<bool>                                 m_swapEnsemblesButton;
    caf::PdmField<QString>                              m_caseCount;
@@ -25,7 +25,7 @@
 #include "RifDerivedEnsembleReader.h"

 #include "RimProject.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryPlot.h"

 #include "cafPdmUiTreeSelectionEditor.h"
@@ -28,7 +28,7 @@

 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleStatisticsCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include <limits>
 #include <set>
@@ -29,7 +29,7 @@
 #include "RimObjectiveFunctionTools.h"
 #include "RimSummaryAddress.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "RiuSummaryVectorSelectionDialog.h"

@@ -271,7 +271,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveFilter::calculateValueOptions( con
    else if ( fieldNeedingOptions == &m_categories )
    {
        auto curveSet = parentCurveSet();
-        auto ensemble = curveSet ? curveSet->summaryCaseCollection() : nullptr;
+        auto ensemble = curveSet ? curveSet->summaryEnsemble() : nullptr;
        auto eParam   = ensemble ? ensemble->ensembleParameter( m_ensembleParameterName ) : RigEnsembleParameter();

        if ( eParam.isText() )
@@ -378,7 +378,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change
    {
        RiuSummaryVectorSelectionDialog dlg( nullptr );
        RimObjectiveFunctionTools::configureDialogForObjectiveFunctions( &dlg );
-        RimSummaryCaseCollection* candidateEnsemble = parentCurveSet()->summaryCaseCollection();
+        RimSummaryEnsemble* candidateEnsemble = parentCurveSet()->summaryEnsemble();

        std::vector<RifEclipseSummaryAddress> candidateAddresses;
        for ( auto address : m_objectiveValuesSummaryAddresses().childrenByType() )
@@ -516,7 +516,7 @@ void RimEnsembleCurveFilter::defineEditorAttribute( const caf::PdmFieldHandle* f
 std::vector<RimSummaryCase*> RimEnsembleCurveFilter::applyFilter( const std::vector<RimSummaryCase*>& allSumCases )
 {
    auto curveSet = parentCurveSet();
-    auto ensemble = curveSet ? curveSet->summaryCaseCollection() : nullptr;
+    auto ensemble = curveSet ? curveSet->summaryEnsemble() : nullptr;
    if ( !ensemble || !isActive() ) return allSumCases;

    bool          useIntegerSelection = false;
@@ -712,7 +712,7 @@ void RimEnsembleCurveFilter::updateMaxMinAndDefaultValues( bool forceDefault )
            addresses.push_back( address->address() );
        }
        {
-            auto summaryCases = parentCurveSet()->summaryCaseCollection()->allSummaryCases();
+            auto summaryCases = parentCurveSet()->summaryEnsemble()->allSummaryCases();

            auto [minObjValue, maxObjValue] =
                objectiveFunction->minMaxValues( summaryCases, addresses, parentCurveSet()->objectiveFunctionTimeConfig() );
@@ -751,6 +751,6 @@ void RimEnsembleCurveFilter::updateMaxMinAndDefaultValues( bool forceDefault )
 RigEnsembleParameter RimEnsembleCurveFilter::selectedEnsembleParameter() const
 {
    auto curveSet = parentCurveSet();
-    auto ensemble = curveSet ? curveSet->summaryCaseCollection() : nullptr;
+    auto ensemble = curveSet ? curveSet->summaryEnsemble() : nullptr;
    return ensemble ? ensemble->ensembleParameter( m_ensembleParameterName ) : RigEnsembleParameter();
 }
@@ -49,9 +49,9 @@
 #include "RimSummaryAddressSelector.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveAutoName.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryPlot.h"
 #include "RimTimeStepFilter.h"
@@ -126,9 +126,9 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
    m_showCurves.uiCapability()->setUiHidden( true );

    // Y Values
-    CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCaseCollection, "SummaryGroup", "Ensemble" );
-    m_yValuesSummaryCaseCollection.uiCapability()->setUiTreeChildrenHidden( true );
-    m_yValuesSummaryCaseCollection.uiCapability()->setAutoAddingOptionFromValue( false );
+    CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryEnsemble, "SummaryGroup", "Ensemble" );
+    m_yValuesSummaryEnsemble.uiCapability()->setUiTreeChildrenHidden( true );
+    m_yValuesSummaryEnsemble.uiCapability()->setAutoAddingOptionFromValue( false );

    CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector" );
    m_yValuesSummaryAddressUiField.xmlCapability()->disableIO();
@@ -643,18 +643,18 @@ void RimEnsembleCurveSet::onLegendDefinitionChanged()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimEnsembleCurveSet::setSummaryCaseCollection( RimSummaryCaseCollection* sumCaseCollection )
+void RimEnsembleCurveSet::setSummaryEnsemble( RimSummaryEnsemble* sumCaseCollection )
 {
-    m_yValuesSummaryCaseCollection = sumCaseCollection;
+    m_yValuesSummaryEnsemble = sumCaseCollection;
    m_xAddressSelector->setEnsemble( sumCaseCollection );
 }

 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimEnsembleCurveSet::summaryCaseCollection() const
+RimSummaryEnsemble* RimEnsembleCurveSet::summaryEnsemble() const
 {
-    return m_yValuesSummaryCaseCollection();
+    return m_yValuesSummaryEnsemble();
 }

 //--------------------------------------------------------------------------------------------------
@@ -696,8 +696,8 @@ RigEnsembleParameter::Type RimEnsembleCurveSet::currentEnsembleParameterType() c
 {
    if ( m_colorMode() == ColorMode::BY_ENSEMBLE_PARAM )
    {
-        RimSummaryCaseCollection* group         = m_yValuesSummaryCaseCollection();
-        QString                   parameterName = m_ensembleParameter();
+        RimSummaryEnsemble* group         = m_yValuesSummaryEnsemble();
+        QString             parameterName = m_ensembleParameter();

        if ( group && !parameterName.isEmpty() )
        {
@@ -713,8 +713,8 @@ RigEnsembleParameter::Type RimEnsembleCurveSet::currentEnsembleParameterType() c
 //--------------------------------------------------------------------------------------------------
 void RimEnsembleCurveSet::updateAllCurves()
 {
-    RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
-    RimSummaryAddress*        addr  = m_yValuesSummaryAddress();
+    RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();
+    RimSummaryAddress*  addr  = m_yValuesSummaryAddress();

    if ( group && addr->address().category() != RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID )
    {
@@ -797,7 +797,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi

        updateTextInPlot = true;
    }
-    else if ( changedField == &m_yValuesSummaryCaseCollection )
+    else if ( changedField == &m_yValuesSummaryEnsemble )
    {
        updateAllCurves();

@@ -814,7 +814,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
        {
            if ( !m_xAddressSelector->ensemble() )
            {
-                m_xAddressSelector->setEnsemble( summaryCaseCollection() );
+                m_xAddressSelector->setEnsemble( summaryEnsemble() );
            }

            if ( !m_xAddressSelector->summaryAddress().isValid() )
@@ -968,7 +968,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
    else if ( changedField == &m_yPushButtonSelectSummaryAddress )
    {
        RiuSummaryVectorSelectionDialog dlg( nullptr );
-        RimSummaryCaseCollection*       candidateEnsemble = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble*             candidateEnsemble = m_yValuesSummaryEnsemble();
        RifEclipseSummaryAddress        candicateAddress  = m_yValuesSummaryAddress->address();

        dlg.hideSummaryCases();
@@ -979,7 +979,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
            auto curveSelection = dlg.curveSelection();
            if ( !curveSelection.empty() )
            {
-                m_yValuesSummaryCaseCollection = curveSelection[0].ensemble();
+                m_yValuesSummaryEnsemble = curveSelection[0].ensemble();
                m_yValuesSummaryAddress->setAddress( curveSelection[0].summaryAddressY() );

                loadDataAndUpdate( true );
@@ -999,7 +999,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
    {
        RiuSummaryVectorSelectionDialog dlg( nullptr );
        RimObjectiveFunctionTools::configureDialogForObjectiveFunctions( &dlg );
-        RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble* candidateEnsemble = m_yValuesSummaryEnsemble();

        std::vector<RifEclipseSummaryAddress> candidateAddresses;
        for ( auto address : m_objectiveValuesSummaryAddresses().childrenByType() )
@@ -1119,7 +1119,7 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde

    {
        caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Summary Vector" );
-        curveDataGroup->add( &m_yValuesSummaryCaseCollection );
+        curveDataGroup->add( &m_yValuesSummaryEnsemble );
        curveDataGroup->add( &m_yValuesSummaryAddressUiField );
        curveDataGroup->add( &m_yPushButtonSelectSummaryAddress, { .newRow = false, .totalColumnSpan = 1, .leftLabelColumnSpan = 0 } );

@@ -1295,7 +1295,7 @@ void RimEnsembleCurveSet::onObjectiveFunctionChanged( const caf::SignalEmitter*
 void RimEnsembleCurveSet::appendColorGroup( caf::PdmUiOrdering& uiOrdering )
 {
    caf::PdmUiGroup* colorsGroup = uiOrdering.addNewGroup( "Appearance" );
-    m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
+    m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryEnsemble() );
    colorsGroup->add( &m_colorMode );

    if ( m_colorMode() == RimEnsembleCurveSetColorManager::ColorMode::SINGLE_COLOR )
@@ -1309,7 +1309,7 @@ void RimEnsembleCurveSet::appendColorGroup( caf::PdmUiOrdering& uiOrdering )
    }
    else if ( m_colorMode == ColorMode::BY_ENSEMBLE_PARAM )
    {
-        m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
+        m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryEnsemble() );
        colorsGroup->add( &m_ensembleParameterSorting );
        colorsGroup->add( &m_ensembleParameter );
    }
@@ -1461,12 +1461,12 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
 {
    QList<caf::PdmOptionItemInfo> options;

-    if ( fieldNeedingOptions == &m_yValuesSummaryCaseCollection )
+    if ( fieldNeedingOptions == &m_yValuesSummaryEnsemble )
    {
-        RimProject*                            proj   = RimProject::current();
-        std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
+        RimProject*                      proj   = RimProject::current();
+        std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();

-        for ( RimSummaryCaseCollection* group : groups )
+        for ( RimSummaryEnsemble* group : groups )
        {
            if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
        }
@@ -1484,7 +1484,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
        options.push_back( caf::PdmOptionItemInfo( singleColorOption.uiText(), ColorMode::SINGLE_COLOR ) );
        options.push_back( caf::PdmOptionItemInfo( singleColorWithAlphaOption.uiText(), ColorMode::SINGLE_COLOR_WITH_ALPHA ) );

-        RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();
        if ( group && group->hasEnsembleParameters() )
        {
            options.push_back( caf::PdmOptionItemInfo( byEnsParamOption.uiText(), ColorMode::BY_ENSEMBLE_PARAM ) );
@@ -1504,7 +1504,7 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
    }
    else if ( fieldNeedingOptions == &m_yValuesSummaryAddressUiField )
    {
-        appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryCaseCollection() );
+        appendOptionItemsForSummaryAddresses( &options, m_yValuesSummaryEnsemble() );
    }
    else if ( fieldNeedingOptions == &m_selectedTimeSteps )
    {
@@ -1591,7 +1591,7 @@ std::set<time_t> RimEnsembleCurveSet::allAvailableTimeSteps() const
 {
    std::set<time_t> timeStepUnion;

-    for ( RimSummaryCase* sumCase : summaryCaseCollection()->allSummaryCases() )
+    for ( RimSummaryCase* sumCase : summaryEnsemble()->allSummaryCases() )
    {
        if ( sumCase->summaryReader() )
        {
@@ -1659,8 +1659,7 @@ std::vector<RiaSummaryCurveDefinition> RimEnsembleCurveSet::curveDefinitions() c
 //--------------------------------------------------------------------------------------------------
 /// Optimization candidate
 //--------------------------------------------------------------------------------------------------
-void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
-                                                                RimSummaryCaseCollection*      summaryCaseGroup )
+void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, RimSummaryEnsemble* summaryCaseGroup )
 {
    if ( !summaryCaseGroup ) return;

@@ -1837,7 +1836,7 @@ std::vector<cvf::Color3f> RimEnsembleCurveSet::generateColorsForCases( const std

    if ( m_colorMode == ColorMode::BY_ENSEMBLE_PARAM )
    {
-        RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();

        QString parameterName = m_ensembleParameter();

@@ -1860,7 +1859,7 @@ std::vector<cvf::Color3f> RimEnsembleCurveSet::generateColorsForCases( const std
    }
    else if ( m_colorMode == ColorMode::BY_OBJECTIVE_FUNCTION )
    {
-        RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();

        if ( group && !group->allSummaryCases().empty() )
        {
@@ -1889,7 +1888,7 @@ std::vector<cvf::Color3f> RimEnsembleCurveSet::generateColorsForCases( const std
    }
    else if ( m_colorMode == ColorMode::BY_CUSTOM_OBJECTIVE_FUNCTION )
    {
-        RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
+        RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();

        if ( group && !group->allSummaryCases().empty() && m_customObjectiveFunction() && m_customObjectiveFunction->isValid() )
        {
@@ -1943,7 +1942,7 @@ void RimEnsembleCurveSet::updateCurveColors()
    auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
    if ( plot && plot->plotWidget() )
    {
-        if ( m_yValuesSummaryCaseCollection() && isCurvesVisible() &&
+        if ( m_yValuesSummaryEnsemble() && isCurvesVisible() &&
             !RimEnsembleCurveSetColorManager::hasSameColorForAllRealizationCurves( m_colorMode() ) && m_legendConfig->showLegend() )
        {
            if ( !m_legendOverlayFrame )
@@ -2120,8 +2119,8 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
 {
    using SAddr = RifEclipseSummaryAddress;

-    RimSummaryCaseCollection* group = m_yValuesSummaryCaseCollection();
-    RimSummaryAddress*        addr  = m_yValuesSummaryAddress();
+    RimSummaryEnsemble* group = m_yValuesSummaryEnsemble();
+    RimSummaryAddress*  addr  = m_yValuesSummaryAddress();

    if ( m_disableStatisticCurves || !group || addr->address().category() == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID )
        return;
@@ -2283,7 +2282,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves()
 RimEnsembleCurveSet* RimEnsembleCurveSet::clone() const
 {
    auto copy = copyObject<RimEnsembleCurveSet>();
-    copy->setSummaryCaseCollection( m_yValuesSummaryCaseCollection() );
+    copy->setSummaryEnsemble( m_yValuesSummaryEnsemble() );

    // Update summary case references
    for ( size_t i = 0; i < m_curves.size(); i++ )
@@ -2320,7 +2319,7 @@ void RimEnsembleCurveSet::updateAllTextInPlot()
 //--------------------------------------------------------------------------------------------------
 std::vector<RigEnsembleParameter> RimEnsembleCurveSet::variationSortedEnsembleParameters() const
 {
-    RimSummaryCaseCollection* ensemble = m_yValuesSummaryCaseCollection;
+    RimSummaryEnsemble* ensemble = m_yValuesSummaryEnsemble;
    if ( ensemble )
    {
        return ensemble->variationSortedEnsembleParameters();
@@ -2336,7 +2335,7 @@ std::vector<RigEnsembleParameter> RimEnsembleCurveSet::variationSortedEnsemblePa
 //--------------------------------------------------------------------------------------------------
 std::vector<std::pair<RigEnsembleParameter, double>> RimEnsembleCurveSet::ensembleParameters( ParameterSorting sortingMode ) const
 {
-    RimSummaryCaseCollection* ensemble = m_yValuesSummaryCaseCollection;
+    RimSummaryEnsemble* ensemble = m_yValuesSummaryEnsemble;
    if ( ensemble )
    {
        if ( sortingMode == ParameterSorting::ABSOLUTE_VALUE )
@@ -2474,7 +2473,7 @@ void RimEnsembleCurveSet::updateEnsembleLegendItem()
 //--------------------------------------------------------------------------------------------------
 int RimEnsembleCurveSet::ensembleId() const
 {
-    if ( m_yValuesSummaryCaseCollection() != nullptr ) return m_yValuesSummaryCaseCollection()->ensembleId();
+    if ( m_yValuesSummaryEnsemble() != nullptr ) return m_yValuesSummaryEnsemble()->ensembleId();

    return -1;
 }
@@ -51,7 +51,7 @@
 #include <QPointer>

 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RimSummaryCurve;
 class RimSummaryAddress;
 class RimSummaryPlotSourceStepping;
@@ -139,8 +139,8 @@ public:

    void onLegendDefinitionChanged();

-    void                      setSummaryCaseCollection( RimSummaryCaseCollection* sumCaseCollection );
-    RimSummaryCaseCollection* summaryCaseCollection() const;
+    void                setSummaryEnsemble( RimSummaryEnsemble* sumEnsemble );
+    RimSummaryEnsemble* summaryEnsemble() const;

    RimEnsembleCurveFilterCollection* filterCollection() const;

@@ -180,7 +180,7 @@ public:

    void appendColorGroup( caf::PdmUiOrdering& uiOrdering );

-    static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, RimSummaryCaseCollection* summaryCaseGroup );
+    static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, RimSummaryEnsemble* summaryCaseGroup );

    const RimEnsembleCurveFilterCollection* curveFilters() const;

@@ -252,7 +252,7 @@ private:

    caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;

-    caf::PdmPtrField<RimSummaryCaseCollection*>   m_yValuesSummaryCaseCollection;
+    caf::PdmPtrField<RimSummaryEnsemble*>         m_yValuesSummaryEnsemble;
    caf::PdmChildField<RimSummaryAddress*>        m_yValuesSummaryAddress;
    caf::PdmField<RifEclipseSummaryAddress>       m_yValuesSummaryAddressUiField;
    caf::PdmField<bool>                           m_yPushButtonSelectSummaryAddress;
@@ -26,7 +26,7 @@
 #include "RimObjectiveFunction.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "cvfScalarMapper.h"

@@ -24,7 +24,7 @@
 #include "RigStatisticsMath.h"

 #include "RimEnsembleCurveSet.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include <limits>
 #include <set>
@@ -19,7 +19,7 @@
 #include "RimObjectiveFunction.h"

 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "RifReaderEclipseSummary.h"

@@ -28,7 +28,7 @@
 #include <vector>

 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RifEclipseSummaryAddress;

 class ObjectiveFunctionTimeConfig
@@ -28,7 +28,7 @@
 #include "RimProject.h"
 #include "RimSummaryAddress.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryPlot.h"

 #include "RiuSummaryVectorSelectionDialog.h"
@@ -85,7 +85,7 @@ void RimSummaryAddressSelector::setSummaryCase( RimSummaryCase* summaryCase )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryAddressSelector::setEnsemble( RimSummaryCaseCollection* ensemble )
+void RimSummaryAddressSelector::setEnsemble( RimSummaryEnsemble* ensemble )
 {
    m_summaryCaseCollection = ensemble;
 }
@@ -149,7 +149,7 @@ RimSummaryCase* RimSummaryAddressSelector::summaryCase() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimSummaryAddressSelector::ensemble() const
+RimSummaryEnsemble* RimSummaryAddressSelector::ensemble() const
 {
    return m_summaryCaseCollection();
 }
@@ -245,10 +245,10 @@ auto createOptionsForEnsemble = []() -> QList<caf::PdmOptionItemInfo>
 {
    QList<caf::PdmOptionItemInfo> options;

-    RimProject*                            proj   = RimProject::current();
-    std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
+    RimProject*                      proj   = RimProject::current();
+    std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();

-    for ( RimSummaryCaseCollection* group : groups )
+    for ( RimSummaryEnsemble* group : groups )
    {
        if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
    }
@@ -31,7 +31,7 @@
 #include "cafPdmPtrField.h"

 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RimSummaryAddress;
 class RimPlotAxisPropertiesInterface;

@@ -46,7 +46,7 @@ public:
    RimSummaryAddressSelector();

    void setSummaryCase( RimSummaryCase* summaryCase );
-    void setEnsemble( RimSummaryCaseCollection* ensemble );
+    void setEnsemble( RimSummaryEnsemble* ensemble );
    void setAddress( const RifEclipseSummaryAddress& address );
    void setResamplingPeriod( RiaDefines::DateTimePeriodEnum resampling );
    void setPlotAxisProperties( RimPlotAxisPropertiesInterface* plotAxisProperties );
@@ -56,7 +56,7 @@ public:
    void setShowResampling( bool enable );

    RimSummaryCase*                 summaryCase() const;
-    RimSummaryCaseCollection*       ensemble() const;
+    RimSummaryEnsemble*             ensemble() const;
    RifEclipseSummaryAddress        summaryAddress() const;
    RiaDefines::DateTimePeriodEnum  resamplingPeriod() const;
    RimPlotAxisPropertiesInterface* plotAxisProperties() const;
@@ -71,7 +71,7 @@ private:

 private:
    caf::PdmPtrField<RimSummaryCase*>                 m_summaryCase;
-    caf::PdmPtrField<RimSummaryCaseCollection*>       m_summaryCaseCollection;
+    caf::PdmPtrField<RimSummaryEnsemble*>             m_summaryCaseCollection;
    caf::PdmChildField<RimSummaryAddress*>            m_summaryAddress;
    caf::PdmField<RifEclipseSummaryAddress>           m_summaryAddressUiField;
    caf::PdmField<bool>                               m_pushButtonSelectSummaryAddress;
@@ -25,7 +25,7 @@

 #include "RimProject.h"
 #include "RimSummaryAddressCollection.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmUiCheckBoxEditor.h"
@@ -145,9 +145,9 @@ bool RimSummaryCase::hasCaseRealizationParameters() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimSummaryCase::ensemble() const
+RimSummaryEnsemble* RimSummaryCase::ensemble() const
 {
-    RimSummaryCaseCollection* e = firstAncestorOrThisOfType<RimSummaryCaseCollection>();
+    RimSummaryEnsemble* e = firstAncestorOrThisOfType<RimSummaryEnsemble>();
    return e && e->isEnsemble() ? e : nullptr;
 }

@@ -31,7 +31,7 @@

 class RifReaderRftInterface;
 class RifSummaryReaderInterface;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RimSummaryAddressCollection;

 //==================================================================================================
@@ -85,7 +85,7 @@ public:
    void setCaseRealizationParameters( const std::shared_ptr<RigCaseRealizationParameters>& crlParameters );
    std::shared_ptr<RigCaseRealizationParameters> caseRealizationParameters() const;
    bool                                          hasCaseRealizationParameters() const;
-    RimSummaryCaseCollection*                     ensemble() const;
+    RimSummaryEnsemble*                           ensemble() const;
    void                                          copyFrom( const RimSummaryCase& rhs );
    bool                                          operator<( const RimSummaryCase& rhs ) const;

@@ -40,8 +40,8 @@
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlotCollection.h"
 #include "RimSummaryPlot.h"

@@ -170,7 +170,7 @@ void RimSummaryCaseMainCollection::removeCase( RimSummaryCase* summaryCase, bool

    m_cases.removeChild( summaryCase );

-    for ( RimSummaryCaseCollection* summaryCaseCollection : m_caseCollections )
+    for ( RimSummaryEnsemble* summaryCaseCollection : m_caseCollections )
    {
        summaryCaseCollection->removeCase( summaryCase, notifyChange );
    }
@@ -194,7 +194,7 @@ void RimSummaryCaseMainCollection::removeCases( std::vector<RimSummaryCase*>& ca
        removeCase( sumCase, false );
    }

-    for ( RimSummaryCaseCollection* summaryCaseCollection : m_caseCollections )
+    for ( RimSummaryEnsemble* summaryCaseCollection : m_caseCollections )
    {
        summaryCaseCollection->updateReferringCurveSets();
    }
@@ -205,12 +205,12 @@ void RimSummaryCaseMainCollection::removeCases( std::vector<RimSummaryCase*>& ca
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimSummaryCaseMainCollection::addCaseCollection( std::vector<RimSummaryCase*>               summaryCases,
-                                                                           const QString&                             collectionName,
-                                                                           bool                                       isEnsemble,
-                                                                           std::function<RimSummaryCaseCollection*()> allocator )
+RimSummaryEnsemble* RimSummaryCaseMainCollection::addEnsemble( const std::vector<RimSummaryCase*>&  summaryCases,
+                                                               const QString&                       collectionName,
+                                                               bool                                 isEnsemble,
+                                                               std::function<RimSummaryEnsemble*()> allocator )
 {
-    RimSummaryCaseCollection* summaryCaseCollection = allocator();
+    RimSummaryEnsemble* summaryCaseCollection = allocator();
    if ( !collectionName.isEmpty() ) summaryCaseCollection->setName( collectionName );

    if ( summaryCaseCollection->ensembleId() == -1 )
@@ -221,7 +221,7 @@ RimSummaryCaseCollection* RimSummaryCaseMainCollection::addCaseCollection( std::

    for ( RimSummaryCase* summaryCase : summaryCases )
    {
-        auto currentSummaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
+        auto currentSummaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
        if ( currentSummaryCaseCollection )
        {
            currentSummaryCaseCollection->removeCase( summaryCase );
@@ -251,7 +251,7 @@ RimSummaryCaseCollection* RimSummaryCaseMainCollection::addCaseCollection( std::
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseMainCollection::removeCaseCollection( RimSummaryCaseCollection* caseCollection )
+void RimSummaryCaseMainCollection::removeCaseCollection( RimSummaryEnsemble* caseCollection )
 {
    m_caseCollections.removeChild( caseCollection );

@@ -261,7 +261,7 @@ void RimSummaryCaseMainCollection::removeCaseCollection( RimSummaryCaseCollectio
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseMainCollection::addEnsemble( RimSummaryCaseCollection* ensemble )
+void RimSummaryCaseMainCollection::addEnsemble( RimSummaryEnsemble* ensemble )
 {
    CVF_ASSERT( ensemble );

@@ -327,9 +327,9 @@ std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::topLevelSummaryCases(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimSummaryCaseCollection*> RimSummaryCaseMainCollection::summaryCaseCollections() const
+std::vector<RimSummaryEnsemble*> RimSummaryCaseMainCollection::summaryCaseCollections() const
 {
-    std::vector<RimSummaryCaseCollection*> summaryCaseCollections;
+    std::vector<RimSummaryEnsemble*> summaryCaseCollections;
    for ( const auto& caseColl : m_caseCollections )
    {
        summaryCaseCollections.push_back( caseColl );
@@ -511,9 +511,9 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vector<RimFileS
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimSummaryCaseMainCollection::defaultAllocator()
+RimSummaryEnsemble* RimSummaryCaseMainCollection::defaultAllocator()
 {
-    return new RimSummaryCaseCollection();
+    return new RimSummaryEnsemble();
 }

 //--------------------------------------------------------------------------------------------------
@@ -27,7 +27,7 @@
 class RimSummaryCase;
 class RimFileSummaryCase;
 class RimEclipseResultCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RifSummaryCaseFileResultInfo;

 //==================================================================================================
@@ -47,9 +47,9 @@ public:
    RimSummaryCase* summaryCase( size_t idx );
    size_t          summaryCaseCount() const;

-    std::vector<RimSummaryCase*>           allSummaryCases() const;
-    std::vector<RimSummaryCase*>           topLevelSummaryCases() const;
-    std::vector<RimSummaryCaseCollection*> summaryCaseCollections() const;
+    std::vector<RimSummaryCase*>     allSummaryCases() const;
+    std::vector<RimSummaryCase*>     topLevelSummaryCases() const;
+    std::vector<RimSummaryEnsemble*> summaryCaseCollections() const;

    std::vector<RimSummaryCase*> createSummaryCasesFromFileInfos( const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos,
                                                                  bool                                             showProgress = false );
@@ -61,12 +61,12 @@ public:
    void removeCase( RimSummaryCase* summaryCase, bool notifyChange = true );
    void removeCases( std::vector<RimSummaryCase*>& cases );

-    RimSummaryCaseCollection* addCaseCollection( std::vector<RimSummaryCase*>               summaryCases,
-                                                 const QString&                             coolectionName,
-                                                 bool                                       isEnsemble,
-                                                 std::function<RimSummaryCaseCollection*()> allocator = defaultAllocator );
-    void                      removeCaseCollection( RimSummaryCaseCollection* caseCollection );
-    void                      addEnsemble( RimSummaryCaseCollection* ensemble );
+    RimSummaryEnsemble* addEnsemble( const std::vector<RimSummaryCase*>&  summaryCases,
+                                     const QString&                       coolectionName,
+                                     bool                                 isEnsemble,
+                                     std::function<RimSummaryEnsemble*()> allocator = defaultAllocator );
+    void                removeCaseCollection( RimSummaryEnsemble* caseCollection );
+    void                addEnsemble( RimSummaryEnsemble* ensemble );

    void loadAllSummaryCaseData();

@@ -78,13 +78,13 @@ public:
 private:
    void initAfterRead() override;

-    static void                      loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases );
-    static void                      loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases );
-    static RimSummaryCaseCollection* defaultAllocator();
+    static void                loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases );
+    static void                loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases );
+    static RimSummaryEnsemble* defaultAllocator();

    void onCaseNameChanged( const SignalEmitter* emitter );

 private:
-    caf::PdmChildArrayField<RimSummaryCase*>           m_cases;
-    caf::PdmChildArrayField<RimSummaryCaseCollection*> m_caseCollections;
+    caf::PdmChildArrayField<RimSummaryCase*>     m_cases;
+    caf::PdmChildArrayField<RimSummaryEnsemble*> m_caseCollections;
 };
@@ -39,9 +39,9 @@
 #include "RimSummaryAddress.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurveAutoName.h"
 #include "RimSummaryCurveCollection.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryPlot.h"
 #include "RimSummaryTimeAxisProperties.h"
@@ -1021,7 +1021,7 @@ QString RimSummaryCurve::curveExportDescription( const RifEclipseSummaryAddress&
    RimEnsembleCurveSetCollection* coll = firstAncestorOrThisOfType<RimEnsembleCurveSetCollection>();

    auto curveSet = coll ? coll->findCurveSetFromPlotCurve( m_plotCurve ) : nullptr;
-    auto group    = curveSet ? curveSet->summaryCaseCollection() : nullptr;
+    auto group    = curveSet ? curveSet->summaryEnsemble() : nullptr;

    auto addressUiText = addr.uiText();
    if ( !m_yValuesSummaryCase() )
@@ -25,8 +25,8 @@
 #include "RimSummaryCalculation.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryNameHelper.h"

 #include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
@@ -121,9 +121,9 @@ QString RimSummaryCurveAutoName::curveNameY( const RifEclipseSummaryAddress& sum

    {
        auto ensembleCurveSet = firstAncestorOrThisOfType<RimEnsembleCurveSet>();
-        if ( ensembleCurveSet && ensembleCurveSet->summaryCaseCollection() )
+        if ( ensembleCurveSet && ensembleCurveSet->summaryEnsemble() )
        {
-            caseNameY = ensembleCurveSet->summaryCaseCollection()->name().toStdString();
+            caseNameY = ensembleCurveSet->summaryEnsemble()->name().toStdString();
        }
    }

@@ -155,9 +155,9 @@ QString RimSummaryCurveAutoName::curveNameX( const RifEclipseSummaryAddress& sum

    {
        auto ensembleCurveSet = firstAncestorOrThisOfType<RimEnsembleCurveSet>();
-        if ( ensembleCurveSet && ensembleCurveSet->summaryCaseCollection() )
+        if ( ensembleCurveSet && ensembleCurveSet->summaryEnsemble() )
        {
-            caseNameX = ensembleCurveSet->summaryCaseCollection()->name().toStdString();
+            caseNameX = ensembleCurveSet->summaryEnsemble()->name().toStdString();
        }
    }

@@ -26,8 +26,8 @@
 #include "RimAsciiDataCurve.h"
 #include "RimGridTimeHistoryCurve.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryPlot.h"

 #include "cvfAssert.h"
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "RiaEnsembleNameTools.h"
 #include "RiaFieldHandleTools.h"
@@ -41,12 +41,12 @@

 #include <cmath>

-CAF_PDM_SOURCE_INIT( RimSummaryCaseCollection, "SummaryCaseSubCollection" );
+CAF_PDM_SOURCE_INIT( RimSummaryEnsemble, "SummaryCaseSubCollection" );

 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection::RimSummaryCaseCollection()
+RimSummaryEnsemble::RimSummaryEnsemble()
    : caseNameChanged( this )
    , caseRemoved( this )
 {
@@ -58,7 +58,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
    CAF_PDM_InitScriptableField( &m_autoName, "CreateAutoName", true, "Auto Name" );

    CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name" );
-    m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount );
+    m_nameAndItemCount.registerGetMethod( this, &RimSummaryEnsemble::nameAndItemCount );
    RiaFieldHandleTools::disableWriteAndSetFieldHidden( &m_nameAndItemCount );

    CAF_PDM_InitScriptableField( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble" );
@@ -81,7 +81,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection::~RimSummaryCaseCollection()
+RimSummaryEnsemble::~RimSummaryEnsemble()
 {
    m_cases.deleteChildrenAsync();
    updateReferringCurveSets();
@@ -90,7 +90,7 @@ RimSummaryCaseCollection::~RimSummaryCaseCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::removeCase( RimSummaryCase* summaryCase, bool notifyChange )
+void RimSummaryEnsemble::removeCase( RimSummaryCase* summaryCase, bool notifyChange )
 {
    size_t caseCountBeforeRemove = m_cases.size();

@@ -117,9 +117,9 @@ void RimSummaryCaseCollection::removeCase( RimSummaryCase* summaryCase, bool not
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::addCase( RimSummaryCase* summaryCase )
+void RimSummaryEnsemble::addCase( RimSummaryCase* summaryCase )
 {
-    summaryCase->nameChanged.connect( this, &RimSummaryCaseCollection::onCaseNameChanged );
+    summaryCase->nameChanged.connect( this, &RimSummaryEnsemble::onCaseNameChanged );

    summaryCase->setShowVectorItemsInProjectTree( m_cases.empty() );

@@ -151,7 +151,7 @@ void RimSummaryCaseCollection::addCase( RimSummaryCase* summaryCase )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimSummaryCase*> RimSummaryCaseCollection::allSummaryCases() const
+std::vector<RimSummaryCase*> RimSummaryEnsemble::allSummaryCases() const
 {
    return m_cases.childrenByType();
 }
@@ -159,7 +159,7 @@ std::vector<RimSummaryCase*> RimSummaryCaseCollection::allSummaryCases() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCase* RimSummaryCaseCollection::firstSummaryCase() const
+RimSummaryCase* RimSummaryEnsemble::firstSummaryCase() const
 {
    if ( !m_cases.empty() ) return m_cases[0];

@@ -169,7 +169,7 @@ RimSummaryCase* RimSummaryCaseCollection::firstSummaryCase() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::setName( const QString& name )
+void RimSummaryEnsemble::setName( const QString& name )
 {
    m_name = name;
 }
@@ -177,7 +177,7 @@ void RimSummaryCaseCollection::setName( const QString& name )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RimSummaryCaseCollection::name() const
+QString RimSummaryEnsemble::name() const
 {
    return m_name;
 }
@@ -185,7 +185,7 @@ QString RimSummaryCaseCollection::name() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::ensureNameIsUpdated()
+void RimSummaryEnsemble::ensureNameIsUpdated()
 {
    if ( m_autoName )
    {
@@ -208,7 +208,7 @@ void RimSummaryCaseCollection::ensureNameIsUpdated()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RimSummaryCaseCollection::isEnsemble() const
+bool RimSummaryEnsemble::isEnsemble() const
 {
    return m_isEnsemble();
 }
@@ -216,7 +216,7 @@ bool RimSummaryCaseCollection::isEnsemble() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::setAsEnsemble( bool isEnsemble )
+void RimSummaryEnsemble::setAsEnsemble( bool isEnsemble )
 {
    if ( isEnsemble != m_isEnsemble )
    {
@@ -236,7 +236,7 @@ void RimSummaryCaseCollection::setAsEnsemble( bool isEnsemble )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<RifEclipseSummaryAddress> RimSummaryCaseCollection::ensembleSummaryAddresses() const
+std::set<RifEclipseSummaryAddress> RimSummaryEnsemble::ensembleSummaryAddresses() const
 {
    std::set<RifEclipseSummaryAddress> addresses;
    size_t                             maxAddrCount = 0;
@@ -270,7 +270,7 @@ std::set<RifEclipseSummaryAddress> RimSummaryCaseCollection::ensembleSummaryAddr
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<time_t> RimSummaryCaseCollection::ensembleTimeSteps() const
+std::set<time_t> RimSummaryEnsemble::ensembleTimeSteps() const
 {
    std::set<time_t> allTimeSteps;
    size_t           maxAddrCount = 0;
@@ -313,7 +313,7 @@ std::set<time_t> RimSummaryCaseCollection::ensembleTimeSteps() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RigEnsembleParameter> RimSummaryCaseCollection::variationSortedEnsembleParameters( bool excludeNoVariation ) const
+std::vector<RigEnsembleParameter> RimSummaryEnsemble::variationSortedEnsembleParameters( bool excludeNoVariation ) const
 {
    if ( m_cachedSortedEnsembleParameters.empty() )
    {
@@ -341,7 +341,7 @@ std::vector<RigEnsembleParameter> RimSummaryCaseCollection::variationSortedEnsem
 ///
 //--------------------------------------------------------------------------------------------------
 std::vector<std::pair<RigEnsembleParameter, double>>
-    RimSummaryCaseCollection::correlationSortedEnsembleParameters( const RifEclipseSummaryAddress& address ) const
+    RimSummaryEnsemble::correlationSortedEnsembleParameters( const RifEclipseSummaryAddress& address ) const
 {
    auto parameters = parameterCorrelationsAllTimeSteps( address );
    std::sort( parameters.begin(),
@@ -355,7 +355,7 @@ std::vector<std::pair<RigEnsembleParameter, double>>
 ///
 //--------------------------------------------------------------------------------------------------
 std::vector<std::pair<RigEnsembleParameter, double>>
-    RimSummaryCaseCollection::correlationSortedEnsembleParameters( const RifEclipseSummaryAddress& address, time_t selectedTimeStep ) const
+    RimSummaryEnsemble::correlationSortedEnsembleParameters( const RifEclipseSummaryAddress& address, time_t selectedTimeStep ) const
 {
    auto parameters = parameterCorrelations( address, selectedTimeStep );
    std::sort( parameters.begin(),
@@ -378,10 +378,10 @@ time_t timeDiff( time_t lhs, time_t rhs )
 ///
 //--------------------------------------------------------------------------------------------------
 std::vector<std::pair<RigEnsembleParameter, double>>
-    RimSummaryCaseCollection::parameterCorrelations( const RifEclipseSummaryAddress&  address,
-                                                     time_t                           timeStep,
-                                                     const std::vector<QString>&      selectedParameters,
-                                                     const std::set<RimSummaryCase*>& selectedCases ) const
+    RimSummaryEnsemble::parameterCorrelations( const RifEclipseSummaryAddress&  address,
+                                               time_t                           timeStep,
+                                               const std::vector<QString>&      selectedParameters,
+                                               const std::set<RimSummaryCase*>& selectedCases ) const
 {
    auto parameters = variationSortedEnsembleParameters( true );

@@ -454,8 +454,8 @@ std::vector<std::pair<RigEnsembleParameter, double>>
 /// Returns a vector of the parameters and the average absolute values of correlations per time step
 //--------------------------------------------------------------------------------------------------
 std::vector<std::pair<RigEnsembleParameter, double>>
-    RimSummaryCaseCollection::parameterCorrelationsAllTimeSteps( const RifEclipseSummaryAddress& address,
-                                                                 const std::vector<QString>&     selectedParameters ) const
+    RimSummaryEnsemble::parameterCorrelationsAllTimeSteps( const RifEclipseSummaryAddress& address,
+                                                           const std::vector<QString>&     selectedParameters ) const
 {
    const size_t     maxTimeStepCount = 10;
    std::set<time_t> timeSteps        = ensembleTimeSteps();
@@ -491,7 +491,7 @@ std::vector<std::pair<RigEnsembleParameter, double>>
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RigEnsembleParameter RimSummaryCaseCollection::ensembleParameter( const QString& paramName ) const
+RigEnsembleParameter RimSummaryEnsemble::ensembleParameter( const QString& paramName ) const
 {
    if ( !isEnsemble() || paramName.isEmpty() ) return {};

@@ -506,7 +506,7 @@ RigEnsembleParameter RimSummaryCaseCollection::ensembleParameter( const QString&
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::calculateEnsembleParametersIntersectionHash()
+void RimSummaryEnsemble::calculateEnsembleParametersIntersectionHash()
 {
    m_commonAddressCount = RimSummaryEnsembleTools::calculateEnsembleParametersIntersectionHash( allSummaryCases() );
 }
@@ -514,7 +514,7 @@ void RimSummaryCaseCollection::calculateEnsembleParametersIntersectionHash()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::loadDataAndUpdate()
+void RimSummaryEnsemble::loadDataAndUpdate()
 {
    onLoadDataAndUpdate();
 }
@@ -522,7 +522,7 @@ void RimSummaryCaseCollection::loadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RimSummaryCaseCollection::validateEnsembleCases( const std::vector<RimSummaryCase*> cases )
+bool RimSummaryEnsemble::validateEnsembleCases( const std::vector<RimSummaryCase*> cases )
 {
    // Validate ensemble parameters
    QString                errors;
@@ -576,7 +576,7 @@ bool RimSummaryCaseCollection::validateEnsembleCases( const std::vector<RimSumma
 //--------------------------------------------------------------------------------------------------
 /// Sorting operator for sets and maps. Sorts by name.
 //--------------------------------------------------------------------------------------------------
-bool RimSummaryCaseCollection::operator<( const RimSummaryCaseCollection& rhs ) const
+bool RimSummaryEnsemble::operator<( const RimSummaryEnsemble& rhs ) const
 {
    return name() < rhs.name();
 }
@@ -584,7 +584,7 @@ bool RimSummaryCaseCollection::operator<( const RimSummaryCaseCollection& rhs )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RiaDefines::EclipseUnitSystem RimSummaryCaseCollection::unitSystem() const
+RiaDefines::EclipseUnitSystem RimSummaryEnsemble::unitSystem() const
 {
    if ( m_cases.empty() )
    {
@@ -596,7 +596,7 @@ RiaDefines::EclipseUnitSystem RimSummaryCaseCollection::unitSystem() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimSummaryCaseCollection::userDescriptionField()
+caf::PdmFieldHandle* RimSummaryEnsemble::userDescriptionField()
 {
    return &m_name;
 }
@@ -604,7 +604,7 @@ caf::PdmFieldHandle* RimSummaryCaseCollection::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::onLoadDataAndUpdate()
+void RimSummaryEnsemble::onLoadDataAndUpdate()
 {
    if ( m_isEnsemble )
    {
@@ -616,7 +616,7 @@ void RimSummaryCaseCollection::onLoadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::updateReferringCurveSets()
+void RimSummaryEnsemble::updateReferringCurveSets()
 {
    // Update curve set referring to this group
    std::vector<caf::PdmObject*> referringObjects = objectsWithReferringPtrFieldsOfType<PdmObject>();
@@ -636,7 +636,7 @@ void RimSummaryCaseCollection::updateReferringCurveSets()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RiaSummaryAddressAnalyzer* RimSummaryCaseCollection::addressAnalyzer()
+RiaSummaryAddressAnalyzer* RimSummaryEnsemble::addressAnalyzer()
 {
    if ( !m_analyzer )
    {
@@ -651,7 +651,7 @@ RiaSummaryAddressAnalyzer* RimSummaryCaseCollection::addressAnalyzer()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::computeMinMax( const RifEclipseSummaryAddress& address )
+void RimSummaryEnsemble::computeMinMax( const RifEclipseSummaryAddress& address )
 {
    if ( m_minMaxValues.count( address ) > 0 ) return;

@@ -680,7 +680,7 @@ void RimSummaryCaseCollection::computeMinMax( const RifEclipseSummaryAddress& ad
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::setMinMax( const RifEclipseSummaryAddress& address, double min, double max )
+void RimSummaryEnsemble::setMinMax( const RifEclipseSummaryAddress& address, double min, double max )
 {
    m_minMaxValues[address] = std::pair( min, max );
 }
@@ -688,7 +688,7 @@ void RimSummaryCaseCollection::setMinMax( const RifEclipseSummaryAddress& addres
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::pair<double, double> RimSummaryCaseCollection::minMax( const RifEclipseSummaryAddress& address )
+std::pair<double, double> RimSummaryEnsemble::minMax( const RifEclipseSummaryAddress& address )
 {
    computeMinMax( address );

@@ -698,7 +698,7 @@ std::pair<double, double> RimSummaryCaseCollection::minMax( const RifEclipseSumm
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RimSummaryCaseCollection::nameAndItemCount() const
+QString RimSummaryEnsemble::nameAndItemCount() const
 {
    size_t       itemCount          = m_cases.size();
    const size_t itemCountThreshold = 20;
@@ -713,7 +713,7 @@ QString RimSummaryCaseCollection::nameAndItemCount() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::updateIcon()
+void RimSummaryEnsemble::updateIcon()
 {
    if ( m_isEnsemble )
        setUiIconFromResourceString( ":/SummaryEnsemble.svg" );
@@ -724,7 +724,7 @@ void RimSummaryCaseCollection::updateIcon()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::initAfterRead()
+void RimSummaryEnsemble::initAfterRead()
 {
    if ( m_ensembleId() == -1 )
    {
@@ -736,7 +736,7 @@ void RimSummaryCaseCollection::initAfterRead()

    for ( const auto& summaryCase : m_cases )
    {
-        summaryCase->nameChanged.connect( this, &RimSummaryCaseCollection::onCaseNameChanged );
+        summaryCase->nameChanged.connect( this, &RimSummaryEnsemble::onCaseNameChanged );
    }

    if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2022.06.2" ) ) m_autoName = false;
@@ -745,7 +745,7 @@ void RimSummaryCaseCollection::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
+void RimSummaryEnsemble::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
    if ( changedField == &m_isEnsemble )
    {
@@ -765,7 +765,7 @@ void RimSummaryCaseCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::onCaseNameChanged( const SignalEmitter* emitter )
+void RimSummaryEnsemble::onCaseNameChanged( const SignalEmitter* emitter )
 {
    caseNameChanged.send();
 }
@@ -773,7 +773,7 @@ void RimSummaryCaseCollection::onCaseNameChanged( const SignalEmitter* emitter )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
+void RimSummaryEnsemble::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
    uiOrdering.add( &m_autoName );
    uiOrdering.add( &m_name );
@@ -787,7 +787,7 @@ void RimSummaryCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmU
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
+void RimSummaryEnsemble::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
 {
    if ( m_isEnsemble() )
    {
@@ -811,7 +811,7 @@ void RimSummaryCaseCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::setEnsembleId( int ensembleId )
+void RimSummaryEnsemble::setEnsembleId( int ensembleId )
 {
    m_ensembleId = ensembleId;
 }
@@ -819,7 +819,7 @@ void RimSummaryCaseCollection::setEnsembleId( int ensembleId )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-int RimSummaryCaseCollection::ensembleId() const
+int RimSummaryEnsemble::ensembleId() const
 {
    return m_ensembleId();
 }
@@ -827,7 +827,7 @@ int RimSummaryCaseCollection::ensembleId() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RimSummaryCaseCollection::hasEnsembleParameters() const
+bool RimSummaryEnsemble::hasEnsembleParameters() const
 {
    for ( RimSummaryCase* rimCase : allSummaryCases() )
    {
@@ -843,7 +843,7 @@ bool RimSummaryCaseCollection::hasEnsembleParameters() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::buildChildNodes()
+void RimSummaryEnsemble::buildChildNodes()
 {
    if ( m_dataVectorFolders->isEmpty() )
    {
@@ -854,7 +854,7 @@ void RimSummaryCaseCollection::buildChildNodes()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::buildMetaData()
+void RimSummaryEnsemble::buildMetaData()
 {
    clearChildNodes();
    buildChildNodes();
@@ -864,7 +864,7 @@ void RimSummaryCaseCollection::buildMetaData()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::onCalculationUpdated()
+void RimSummaryEnsemble::onCalculationUpdated()
 {
    m_dataVectorFolders->deleteCalculatedAddresses();
    m_dataVectorFolders->updateFolderStructure( ensembleSummaryAddresses(), -1, m_ensembleId );
@@ -877,7 +877,7 @@ void RimSummaryCaseCollection::onCalculationUpdated()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCaseCollection::clearChildNodes()
+void RimSummaryEnsemble::clearChildNodes()
 {
    m_dataVectorFolders->deleteChildren();
 }
@@ -43,7 +43,7 @@ class RiaSummaryAddressAnalyzer;
 //==================================================================================================
 ///
 //==================================================================================================
-class RimSummaryCaseCollection : public caf::PdmObject
+class RimSummaryEnsemble : public caf::PdmObject
 {
    CAF_PDM_HEADER_INIT;

@@ -52,8 +52,8 @@ public:
    caf::Signal<RimSummaryCase*> caseRemoved;

 public:
-    RimSummaryCaseCollection();
-    ~RimSummaryCaseCollection() override;
+    RimSummaryEnsemble();
+    ~RimSummaryEnsemble() override;

    void                                 removeCase( RimSummaryCase* summaryCase, bool notifyChange = true );
    void                                 addCase( RimSummaryCase* summaryCase );
@@ -91,7 +91,7 @@ public:
    void loadDataAndUpdate();

    static bool validateEnsembleCases( const std::vector<RimSummaryCase*> cases );
-    bool        operator<( const RimSummaryCaseCollection& rhs ) const;
+    bool        operator<( const RimSummaryEnsemble& rhs ) const;

    RiaDefines::EclipseUnitSystem unitSystem() const;

@@ -44,8 +44,8 @@
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryAddressModifier.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlotCollection.h"
 #include "RimSummaryPlot.h"
 #include "RimSummaryPlotControls.h"
@@ -231,7 +231,7 @@ void RimSummaryMultiPlot::handleDroppedObjects( const std::vector<caf::PdmObject
    std::vector<RimSummaryAddress*>           addresses;
    std::vector<RimSummaryAddressCollection*> addressCollections;
    std::vector<RimSummaryCase*>              cases;
-    std::vector<RimSummaryCaseCollection*>    ensembles;
+    std::vector<RimSummaryEnsemble*>          ensembles;

    for ( auto o : objects )
    {
@@ -253,7 +253,7 @@ void RimSummaryMultiPlot::handleDroppedObjects( const std::vector<caf::PdmObject

        auto summaryCase = dynamic_cast<RimSummaryCase*>( o );
        if ( summaryCase ) cases.push_back( summaryCase );
-        auto ensemble = dynamic_cast<RimSummaryCaseCollection*>( o );
+        auto ensemble = dynamic_cast<RimSummaryEnsemble*>( o );
        if ( ensemble ) ensembles.push_back( ensemble );
    }

@@ -357,9 +357,9 @@ void RimSummaryMultiPlot::populateNameHelper( RimSummaryPlotNameHelper* nameHelp
 {
    nameHelper->clear();

-    std::vector<RiaSummaryCurveAddress>    addresses;
-    std::vector<RimSummaryCase*>           sumCases;
-    std::vector<RimSummaryCaseCollection*> ensembleCases;
+    std::vector<RiaSummaryCurveAddress> addresses;
+    std::vector<RimSummaryCase*>        sumCases;
+    std::vector<RimSummaryEnsemble*>    ensembleCases;

    for ( RimSummaryCurve* curve : allCurves() )
    {
@@ -370,7 +370,7 @@ void RimSummaryMultiPlot::populateNameHelper( RimSummaryPlotNameHelper* nameHelp
    for ( auto curveSet : curveSets() )
    {
        addresses.push_back( curveSet->curveAddress() );
-        ensembleCases.push_back( curveSet->summaryCaseCollection() );
+        ensembleCases.push_back( curveSet->summaryEnsemble() );
    }

    nameHelper->appendAddresses( addresses );
@@ -1104,7 +1104,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange()

            for ( auto curveSet : plot->curveSets() )
            {
-                if ( !curveSet->summaryCaseCollection() ) continue;
+                if ( !curveSet->summaryEnsemble() ) continue;

                if ( curveSet->axisY() == axis->plotAxis() )
                {
@@ -1122,7 +1122,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange()

                        for ( const auto& adr : addresses )
                        {
-                            auto [min, max] = curveSet->summaryCaseCollection()->minMax( adr );
+                            auto [min, max] = curveSet->summaryEnsemble()->minMax( adr );

                            minimum = std::min( min, minimum );
                            maximum = std::max( max, maximum );
@@ -1534,10 +1534,10 @@ void RimSummaryMultiPlot::appendSubPlotByStepping( int direction )
        }
        else if ( m_sourceStepping()->stepDimension() == RimSummaryDataSourceStepping::SourceSteppingDimension::ENSEMBLE )
        {
-            RimSummaryCaseCollection* newEnsemble = m_sourceStepping()->stepEnsemble( direction );
+            RimSummaryEnsemble* newEnsemble = m_sourceStepping()->stepEnsemble( direction );
            for ( auto curveSet : newPlot->curveSets() )
            {
-                curveSet->setSummaryCaseCollection( newEnsemble );
+                curveSet->setSummaryEnsemble( newEnsemble );
            }
        }
        else
@@ -1594,7 +1594,7 @@ void RimSummaryMultiPlot::appendCurveByStepping( int direction )
        for ( auto curveSet : plot->curveSets() )
        {
            auto address  = curveSet->summaryAddressY();
-            auto sumEns   = curveSet->summaryCaseCollection();
+            auto sumEns   = curveSet->summaryEnsemble();
            int  sumEnsId = sumEns->ensembleId();
            if ( m_sourceStepping()->stepDimension() == RimSummaryDataSourceStepping::SourceSteppingDimension::ENSEMBLE )
            {
@@ -25,7 +25,7 @@
 class QString;

 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RifEclipseSummaryAddress;

 //==================================================================================================
@@ -55,10 +55,10 @@
 #include "RimSummaryAddressCollection.h"
 #include "RimSummaryCalculationCollection.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
 #include "RimSummaryCurvesData.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryPlotAxisFormatter.h"
 #include "RimSummaryPlotControls.h"
 #include "RimSummaryPlotNameHelper.h"
@@ -911,13 +911,13 @@ void RimSummaryPlot::updateNumericalAxis( RiaDefines::PlotAxis plotAxis )
                {
                    if ( curveSet->axisY() == riuPlotAxis )
                    {
-                        RiaSummaryCurveDefinition def( curveSet->summaryCaseCollection(), curveSet->summaryAddressY() );
+                        RiaSummaryCurveDefinition def( curveSet->summaryEnsemble(), curveSet->summaryAddressY() );
                        curveDefs.push_back( def );
                    }
                    if ( curveSet->axisX() == riuPlotAxis )
                    {
                        RiaSummaryCurveDefinition def;
-                        def.setEnsemble( curveSet->summaryCaseCollection() );
+                        def.setEnsemble( curveSet->summaryEnsemble() );
                        def.setSummaryAddressX( curveSet->curveAddress().summaryAddressX() );

                        curveDefs.push_back( def );
@@ -2308,17 +2308,17 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleSummaryCaseDrop( RimSummaryCase*
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryPlot::CurveInfo RimSummaryPlot::handleEnsembleDrop( RimSummaryCaseCollection* ensemble )
+RimSummaryPlot::CurveInfo RimSummaryPlot::handleEnsembleDrop( RimSummaryEnsemble* ensemble )
 {
    int                               newCurves = 0;
    std::vector<RimEnsembleCurveSet*> curveSetsToUpdate;

-    std::map<RiaSummaryCurveAddress, std::set<RimSummaryCaseCollection*>> dataVectorMap;
+    std::map<RiaSummaryCurveAddress, std::set<RimSummaryEnsemble*>> dataVectorMap;

    for ( auto& curve : curveSets() )
    {
        const auto addr = curve->curveAddress();
-        dataVectorMap[addr].insert( curve->summaryCaseCollection() );
+        dataVectorMap[addr].insert( curve->summaryEnsemble() );
    }

    for ( const auto& [addr, ensembles] : dataVectorMap )
@@ -2474,12 +2474,12 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleSummaryAddressDrop( RimSummaryAd

    if ( summaryAddr->isEnsemble() )
    {
-        std::map<RifEclipseSummaryAddress, std::set<RimSummaryCaseCollection*>> dataVectorMap;
+        std::map<RifEclipseSummaryAddress, std::set<RimSummaryEnsemble*>> dataVectorMap;

        for ( auto& curve : curveSets() )
        {
            const auto addr = curve->summaryAddressY();
-            dataVectorMap[addr].insert( curve->summaryCaseCollection() );
+            dataVectorMap[addr].insert( curve->summaryEnsemble() );
        }

        auto ensemble = RiaSummaryTools::ensembleById( summaryAddr->ensembleId() );
@@ -2557,7 +2557,7 @@ void RimSummaryPlot::handleDroppedObjects( const std::vector<caf::PdmObjectHandl
        {
            curveInfo.appendCurveInfo( handleSummaryCaseDrop( summaryCase ) );
        }
-        else if ( auto ensemble = dynamic_cast<RimSummaryCaseCollection*>( obj ) )
+        else if ( auto ensemble = dynamic_cast<RimSummaryEnsemble*>( obj ) )
        {
            curveInfo.appendCurveInfo( handleEnsembleDrop( ensemble ) );
        }
@@ -2833,9 +2833,9 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
    if ( !nameHelper ) return;

    nameHelper->clear();
-    std::vector<RiaSummaryCurveAddress>    addresses;
-    std::vector<RimSummaryCase*>           sumCases;
-    std::vector<RimSummaryCaseCollection*> ensembleCases;
+    std::vector<RiaSummaryCurveAddress> addresses;
+    std::vector<RimSummaryCase*>        sumCases;
+    std::vector<RimSummaryEnsemble*>    ensembleCases;

    if ( m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible() )
    {
@@ -2854,7 +2854,7 @@ void RimSummaryPlot::updateNameHelperWithCurveData( RimSummaryPlotNameHelper* na
    for ( auto curveSet : m_ensembleCurveSetCollection->curveSets() )
    {
        addresses.push_back( curveSet->curveAddress() );
-        ensembleCases.push_back( curveSet->summaryCaseCollection() );
+        ensembleCases.push_back( curveSet->summaryEnsemble() );
    }

    nameHelper->clear();
@@ -45,7 +45,7 @@ class RimGridTimeHistoryCurve;
 class RimSummaryAddress;
 class RimSummaryAddressCollection;
 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RimSummaryCurve;
 class RimSummaryCurveCollection;
 class RimEnsembleCurveSet;
@@ -311,7 +311,7 @@ private:
    struct CurveInfo;

    CurveInfo handleSummaryCaseDrop( RimSummaryCase* summaryCase );
-    CurveInfo handleEnsembleDrop( RimSummaryCaseCollection* ensemble );
+    CurveInfo handleEnsembleDrop( RimSummaryEnsemble* ensemble );
    CurveInfo handleAddressCollectionDrop( RimSummaryAddressCollection* addrColl );
    CurveInfo handleSummaryAddressDrop( RimSummaryAddress* summaryAddr );

@@ -27,8 +27,8 @@
 #include "RimAsciiDataCurve.h"
 #include "RimPlotAxisProperties.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "Tools/RimPlotAxisTools.h"

 #include "RiuQtChartsPlotWidget.h"
@@ -33,9 +33,9 @@
 #include "RimMultiPlotCollection.h"
 #include "RimProject.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurve.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlotCollection.h"
 #include "RimSummaryPlot.h"

@@ -387,8 +387,8 @@ void RimSummaryPlotManager::createNewPlot()
 {
    if ( m_filterText().trimmed().isEmpty() ) return;

-    std::vector<RimSummaryCase*>           summaryCases;
-    std::vector<RimSummaryCaseCollection*> ensembles;
+    std::vector<RimSummaryCase*>     summaryCases;
+    std::vector<RimSummaryEnsemble*> ensembles;
    findFilteredSummaryCasesAndEnsembles( summaryCases, ensembles );

    std::set<RifEclipseSummaryAddress> filteredAddressesFromSource;
@@ -484,8 +484,8 @@ void RimSummaryPlotManager::updateUiFromSelection()
 //--------------------------------------------------------------------------------------------------
 std::set<RifEclipseSummaryAddress> RimSummaryPlotManager::filteredAddresses()
 {
-    std::vector<RimSummaryCase*>           summaryCases;
-    std::vector<RimSummaryCaseCollection*> ensembles;
+    std::vector<RimSummaryCase*>     summaryCases;
+    std::vector<RimSummaryEnsemble*> ensembles;
    findFilteredSummaryCasesAndEnsembles( summaryCases, ensembles );

    std::set<RifEclipseSummaryAddress> nativeAddresses;
@@ -512,8 +512,8 @@ void RimSummaryPlotManager::appendCurvesToPlot( RimSummaryPlot* destinationPlot
 {
    CAF_ASSERT( destinationPlot );

-    std::vector<RimSummaryCase*>           summaryCases;
-    std::vector<RimSummaryCaseCollection*> ensembles;
+    std::vector<RimSummaryCase*>     summaryCases;
+    std::vector<RimSummaryEnsemble*> ensembles;
    findFilteredSummaryCasesAndEnsembles( summaryCases, ensembles );

    std::set<RifEclipseSummaryAddress> filteredAddressesFromSource = filteredAddresses();
@@ -599,8 +599,8 @@ QStringList RimSummaryPlotManager::extractDataSourceFilters() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryPlotManager::findFilteredSummaryCasesAndEnsembles( std::vector<RimSummaryCase*>&           summaryCases,
-                                                                  std::vector<RimSummaryCaseCollection*>& ensembles ) const
+void RimSummaryPlotManager::findFilteredSummaryCasesAndEnsembles( std::vector<RimSummaryCase*>&     summaryCases,
+                                                                  std::vector<RimSummaryEnsemble*>& ensembles ) const
 {
    auto filteredDataSources = findDataSourceCandidates();
    for ( const auto& [dataSourceName, dataSource] : filteredDataSources )
@@ -616,7 +616,7 @@ void RimSummaryPlotManager::findFilteredSummaryCasesAndEnsembles( std::vector<Ri
            summaryCases.push_back( summaryCase );
        }

-        auto ensemble = dynamic_cast<RimSummaryCaseCollection*>( dataSource );
+        auto ensemble = dynamic_cast<RimSummaryEnsemble*>( dataSource );
        if ( ensemble )
        {
            ensembles.push_back( ensemble );
@@ -26,7 +26,7 @@
 class RifEclipseSummaryAddress;
 class RimSummaryPlot;
 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RimEnsembleCurveSet;
 class RimSummaryCurve;
 class RimMultiPlot;
@@ -77,8 +77,7 @@ private:

    QStringList extractDataSourceFilters() const;

-    void findFilteredSummaryCasesAndEnsembles( std::vector<RimSummaryCase*>&           summaryCases,
-                                               std::vector<RimSummaryCaseCollection*>& ensembles ) const;
+    void findFilteredSummaryCasesAndEnsembles( std::vector<RimSummaryCase*>& summaryCases, std::vector<RimSummaryEnsemble*>& ensembles ) const;

    static void    setFocusToEditorWidget( caf::PdmUiFieldHandle* uiFieldHandle );
    static QString curveFilterRecentlyUsedRegistryKey();
@@ -23,7 +23,7 @@

 #include "RimObjectiveFunctionTools.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 //--------------------------------------------------------------------------------------------------
 ///
@@ -75,7 +75,7 @@ void RimSummaryPlotNameHelper::setSummaryCases( const std::vector<RimSummaryCase
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSummaryPlotNameHelper::setEnsembleCases( const std::vector<RimSummaryCaseCollection*>& ensembleCases )
+void RimSummaryPlotNameHelper::setEnsembleCases( const std::vector<RimSummaryEnsemble*>& ensembleCases )
 {
    m_ensembleCases.clear();

@@ -395,9 +395,9 @@ std::set<RimSummaryCase*> RimSummaryPlotNameHelper::setOfSummaryCases() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<RimSummaryCaseCollection*> RimSummaryPlotNameHelper::setOfEnsembleCases() const
+std::set<RimSummaryEnsemble*> RimSummaryPlotNameHelper::setOfEnsembleCases() const
 {
-    std::set<RimSummaryCaseCollection*> ensembleCases;
+    std::set<RimSummaryEnsemble*> ensembleCases;

    for ( const auto& ensemble : m_ensembleCases )
    {
@@ -30,7 +30,7 @@

 class RimSummaryCurve;
 class RimSummaryCase;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RiaSummaryAddressAnalyzer;
 class RifEclipseSummaryAddress;
 class RiaSummaryCurveAddress;
@@ -47,7 +47,7 @@ public:

    void appendAddresses( const std::vector<RiaSummaryCurveAddress>& addresses );
    void setSummaryCases( const std::vector<RimSummaryCase*>& summaryCases );
-    void setEnsembleCases( const std::vector<RimSummaryCaseCollection*>& ensembleCases );
+    void setEnsembleCases( const std::vector<RimSummaryEnsemble*>& ensembleCases );

    QString plotTitle() const override;

@@ -79,14 +79,14 @@ private:
    void clearTitleSubStrings();
    void extractPlotTitleSubStrings();

-    std::set<RimSummaryCase*>           setOfSummaryCases() const;
-    std::set<RimSummaryCaseCollection*> setOfEnsembleCases() const;
+    std::set<RimSummaryCase*>     setOfSummaryCases() const;
+    std::set<RimSummaryEnsemble*> setOfEnsembleCases() const;

 private:
    std::unique_ptr<RiaSummaryAddressAnalyzer> m_analyzer;

-    std::vector<caf::PdmPointer<RimSummaryCase>>           m_summaryCases;
-    std::vector<caf::PdmPointer<RimSummaryCaseCollection>> m_ensembleCases;
+    std::vector<caf::PdmPointer<RimSummaryCase>>     m_summaryCases;
+    std::vector<caf::PdmPointer<RimSummaryEnsemble>> m_ensembleCases;

    std::string m_titleQuantity;
    std::string m_titleWellName;
@@ -30,11 +30,11 @@
 #include "RimProject.h"
 #include "RimSummaryAddressModifier.h"
 #include "RimSummaryCase.h"
-#include "RimSummaryCaseCollection.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
 #include "RimSummaryDataSourceStepping.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryMultiPlot.h"
 #include "RimSummaryPlot.h"
 #include "RimSummaryPlotControls.h"
@@ -208,9 +208,9 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
    if ( !dataSourceSteppingObject()->curveSets().empty() )
    {
        auto first = dataSourceSteppingObject()->curveSets().front();
-        if ( first->summaryCaseCollection() )
+        if ( first->summaryEnsemble() )
        {
-            analyzer = first->summaryCaseCollection()->addressAnalyzer();
+            analyzer = first->summaryEnsemble()->addressAnalyzer();
        }
    }

@@ -419,13 +419,13 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
        if ( m_ensemble() && dataSourceSteppingObject() )
        {
            caf::PdmPointer<caf::PdmObjectHandle> variantHandle      = oldValue.value<caf::PdmPointer<caf::PdmObjectHandle>>();
-            RimSummaryCaseCollection*             previousCollection = dynamic_cast<RimSummaryCaseCollection*>( variantHandle.p() );
+            RimSummaryEnsemble*                   previousCollection = dynamic_cast<RimSummaryEnsemble*>( variantHandle.p() );

            for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
            {
-                if ( curveSet->summaryCaseCollection() == previousCollection )
+                if ( curveSet->summaryEnsemble() == previousCollection )
                {
-                    curveSet->setSummaryCaseCollection( m_ensemble );
+                    curveSet->setSummaryEnsemble( m_ensemble );
                }
            }

@@ -607,9 +607,9 @@ std::set<RifEclipseSummaryAddress> RimSummaryPlotSourceStepping::adressesForSour
    {
        for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
        {
-            if ( curveSet && curveSet->summaryCaseCollection() )
+            if ( curveSet && curveSet->summaryEnsemble() )
            {
-                auto addresses = curveSet->summaryCaseCollection()->ensembleSummaryAddresses();
+                auto addresses = curveSet->summaryEnsemble()->ensembleSummaryAddresses();
                addressSet.insert( addresses.begin(), addresses.end() );
            }
        }
@@ -875,17 +875,17 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForD
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<RimSummaryCaseCollection*> RimSummaryPlotSourceStepping::ensembleCollection() const
+std::set<RimSummaryEnsemble*> RimSummaryPlotSourceStepping::ensembleCollection() const
 {
-    std::set<RimSummaryCaseCollection*> summaryCaseCollections;
+    std::set<RimSummaryEnsemble*> summaryCaseCollections;

    if ( dataSourceSteppingObject() )
    {
        for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
        {
-            if ( curveSet && curveSet->summaryCaseCollection() )
+            if ( curveSet && curveSet->summaryEnsemble() )
            {
-                summaryCaseCollections.insert( curveSet->summaryCaseCollection() );
+                summaryCaseCollections.insert( curveSet->summaryEnsemble() );
            }
        }
    }
@@ -914,7 +914,7 @@ std::vector<RimSummaryCase*> RimSummaryPlotSourceStepping::summaryCasesForSource
    {
        if ( sumCase->isObservedData() ) continue;

-        auto sumCaseColl = sumCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
+        auto sumCaseColl = sumCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
        if ( sumCaseColl && sumCaseColl->isEnsemble() )
        {
            if ( m_includeEnsembleCasesForCaseStepping() )
@@ -1352,9 +1352,9 @@ RimSummaryCase* RimSummaryPlotSourceStepping::stepCase( int direction )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSummaryCaseCollection* RimSummaryPlotSourceStepping::stepEnsemble( int direction )
+RimSummaryEnsemble* RimSummaryPlotSourceStepping::stepEnsemble( int direction )
 {
-    std::vector<RimSummaryCaseCollection*> ensembles;
+    std::vector<RimSummaryEnsemble*> ensembles;

    RimProject* proj = RimProject::current();
    for ( auto ensemble : proj->summaryGroups() )
@@ -33,7 +33,7 @@
 class RimSummaryCase;
 class RimSummaryCurve;
 class RifSummaryReaderInterface;
-class RimSummaryCaseCollection;
+class RimSummaryEnsemble;
 class RifEclipseSummaryAddress;
 class RiaSummaryAddressAnalyzer;
 class RimSummaryPlot;
@@ -56,9 +56,9 @@ public:

    std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();

-    RifEclipseSummaryAddress  stepAddress( RifEclipseSummaryAddress addr, int direction );
-    RimSummaryCase*           stepCase( int direction );
-    RimSummaryCaseCollection* stepEnsemble( int direction );
+    RifEclipseSummaryAddress stepAddress( RifEclipseSummaryAddress addr, int direction );
+    RimSummaryCase*          stepCase( int direction );
+    RimSummaryEnsemble*      stepEnsemble( int direction );

    void syncWithStepper( RimSummaryPlotSourceStepping* other );
    void setStep( QString stepIdentifier );
@@ -84,9 +84,9 @@ private:

    std::set<RifEclipseSummaryAddress> adressesForSourceStepping() const;

-    std::set<RifEclipseSummaryAddress>  addressesForCurvesInPlot() const;
-    std::set<RimSummaryCase*>           summaryCasesCurveCollection() const;
-    std::set<RimSummaryCaseCollection*> ensembleCollection() const;
+    std::set<RifEclipseSummaryAddress> addressesForCurvesInPlot() const;
+    std::set<RimSummaryCase*>          summaryCasesCurveCollection() const;
+    std::set<RimSummaryEnsemble*>      ensembleCollection() const;

    std::vector<caf::PdmFieldHandle*> activeFieldsForDataSourceStepping();
    std::vector<caf::PdmFieldHandle*> toolbarFieldsForDataSourceStepping();
@@ -109,8 +109,8 @@ private:

    caf::PdmField<caf::AppEnum<RimSummaryDataSourceStepping::SourceSteppingDimension>> m_stepDimension;

-    caf::PdmPtrField<RimSummaryCase*>           m_summaryCase;
-    caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
+    caf::PdmPtrField<RimSummaryCase*>     m_summaryCase;
+    caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;

    caf::PdmField<QString> m_wellName;
    caf::PdmField<QString> m_groupName;
@@ -27,7 +27,7 @@
 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleCurveSetCollection.h"
 #include "RimEnsembleStatistics.h"
-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"
 #include "RimSummaryPlot.h"
 #include "RimTimeAxisAnnotation.h"

@@ -308,7 +308,7 @@ void RimSummaryRegressionAnalysisCurve::extractSourceCurveData()
            {
                // Fallback to use time steps from summary case
                // The time steps are used for reference, not used when computing the regression curve
-                auto summaryCase  = m_ensembleCurveSet->summaryCaseCollection()->allSummaryCases().back();
+                auto summaryCase  = m_ensembleCurveSet->summaryEnsemble()->allSummaryCases().back();
                auto allTimeSteps = summaryCase->summaryReader()->timeSteps( {} );
                yTimeSteps        = allTimeSteps;

@@ -294,7 +294,7 @@ void RimSummaryEnsembleSumo::buildMetaData()
        summaryCase->summaryReader()->buildMetaData();
    }

-    RimSummaryCaseCollection::buildMetaData();
+    RimSummaryEnsemble::buildMetaData();
 }

 //--------------------------------------------------------------------------------------------------
@@ -305,7 +305,7 @@ void RimSummaryEnsembleSumo::defineUiOrdering( QString uiConfigName, caf::PdmUiO
    uiOrdering.add( &m_sumoDataSource );

    auto group = uiOrdering.addNewGroup( "General" );
-    RimSummaryCaseCollection::defineUiOrdering( uiConfigName, *group );
+    RimSummaryEnsemble::defineUiOrdering( uiConfigName, *group );
 }

 //--------------------------------------------------------------------------------------------------
@@ -417,5 +417,5 @@ void RimSummaryEnsembleSumo::onLoadDataAndUpdate()
    buildMetaData();

    // call the base class method after data has been loaded
-    RimSummaryCaseCollection::onLoadDataAndUpdate();
+    RimSummaryEnsemble::onLoadDataAndUpdate();
 }
@@ -18,7 +18,7 @@

 #pragma once

-#include "RimSummaryCaseCollection.h"
+#include "RimSummaryEnsemble.h"

 #include "Cloud/RiaSumoConnector.h"

@@ -51,7 +51,7 @@ namespace arrow
 class Table;
 }

-class RimSummaryEnsembleSumo : public RimSummaryCaseCollection
+class RimSummaryEnsembleSumo : public RimSummaryEnsemble
 {
    CAF_PDM_HEADER_INIT;