diff --git a/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
index c4a9312d2b..da6bd5896b 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
@@ -28,6 +28,7 @@
 #include "RigMainGrid.h"
 #include "RimFishbonesMultipleSubs.h"
 #include "RimFishboneWellPathCollection.h"
+#include "RimWellPathCompletions.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -59,7 +60,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
 
                 size_t i, j, k;
                 grid->ijkFromCellIndex(intersection.cellIndex, &i, &j, &k);
-                RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
+                RigCompletionData completion(wellPath->completions()->wellNameForExport(), IJKCellIndex(i, j, k));
                 completion.addMetadata(location.fishbonesSubs->name(), QString("Sub: %1 Lateral: %2").arg(location.subIndex).arg(lateral.lateralIndex));
                 double diameter = location.fishbonesSubs->holeDiameter() / 1000;
                 if (settings.computeTransmissibility())
@@ -178,7 +179,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
 
         for (WellBorePartForTransCalc wellBorePart : wellBoreParts)
         {
-            RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
+            RigCompletionData completion(wellPath->completions()->wellNameForExport(), IJKCellIndex(i, j, k));
             completion.addMetadata(wellBorePart.metaData, "");
             if (settings.computeTransmissibility())
             {
@@ -224,7 +225,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
             
             size_t i, j, k;
             settings.caseToApply->eclipseCaseData()->mainGrid()->ijkFromCellIndex(cell.cellIndex, &i, &j, &k);
-            RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
+            RigCompletionData completion(wellPath->completions()->wellNameForExport(), IJKCellIndex(i, j, k));
             completion.addMetadata(fishbonesPath->name(), "");
             if (settings.computeTransmissibility())
             {
diff --git a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
index d6857515ee..25c65c17c1 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
@@ -31,6 +31,7 @@
 #include "RimPerforationInterval.h"
 #include "RimPerforationCollection.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimWellPathCompletions.h"
 
 #include "RicExportCompletionDataSettingsUi.h"
 
@@ -344,7 +345,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateP
         {
             size_t i, j, k;
             settings.caseToApply->eclipseCaseData()->mainGrid()->ijkFromCellIndex(cell.cellIndex, &i, &j, &k);
-            RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
+            RigCompletionData completion(wellPath->completions()->wellNameForExport(), IJKCellIndex(i, j, k));
             completion.addMetadata("Perforation", QString("StartMD: %1 - EndMD: %2").arg(interval->startMD()).arg(interval->endMD()));
             double diameter = interval->diameter();
             CellDirection direction = calculateDirectionInCell(settings.caseToApply, cell.cellIndex, cell.internalCellLengths);
diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
index 5401cac275..e2099a6735 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
@@ -204,6 +204,14 @@ const RimPerforationCollection* RimWellPath::perforationIntervalCollection() con
     return m_completions->perforationCollection();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const RimWellPathCompletions* RimWellPath::completions() const
+{
+    return m_completions();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h
index a88df6d32c..b2af0067f3 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPath.h
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.h
@@ -82,6 +82,7 @@ public:
     const RimFishbonesCollection*       fishbonesCollection() const;
     RimPerforationCollection*           perforationIntervalCollection();
     const RimPerforationCollection*     perforationIntervalCollection() const;
+    const RimWellPathCompletions*       completions() const;
 
     RigWellPath*                        wellPathGeometry();
     const RigWellPath*                  wellPathGeometry() const;