Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -rfc3b0b96c11a1e048daa4984cb080486abea89ad -re7a8412d2e46f508cd5653810d5a28f13cceeb9a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision fc3b0b96c11a1e048daa4984cb080486abea89ad)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(.../Ringtoets.Integration.Plugin.csproj)	(revision e7a8412d2e46f508cd5653810d5a28f13cceeb9a)
@@ -244,6 +244,11 @@
       <Name>Ringtoets.Integration.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Integration.IO\Ringtoets.Integration.IO.csproj">
+      <Project>{D693D18E-C257-4FDE-96BC-F6E6FB043ECF}</Project>
+      <Name>Ringtoets.Integration.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Integration.Service\Ringtoets.Integration.Service.csproj">
       <Project>{28811c4a-6c18-42c1-88b2-a03a3784e2d0}</Project>
       <Name>Ringtoets.Integration.Service</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r8d8603a2f3146888bbec04eeeb0ecaa91759687b -re7a8412d2e46f508cd5653810d5a28f13cceeb9a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 8d8603a2f3146888bbec04eeeb0ecaa91759687b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision e7a8412d2e46f508cd5653810d5a28f13cceeb9a)
@@ -59,7 +59,6 @@
 using Ringtoets.Common.IO.FileImporters;
 using Ringtoets.Common.IO.FileImporters.MessageProviders;
 using Ringtoets.Common.IO.HydraRing;
-using Ringtoets.Common.IO.Hydraulics;
 using Ringtoets.Common.IO.ReferenceLines;
 using Ringtoets.Common.Plugin;
 using Ringtoets.Common.Service;
@@ -86,9 +85,9 @@
 using Ringtoets.Integration.Forms.Views;
 using Ringtoets.Integration.Forms.Views.SectionResultRows;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
+using Ringtoets.Integration.IO.Exporters;
 using Ringtoets.Integration.Plugin.FileImporters;
 using Ringtoets.Integration.Plugin.Handlers;
-using Ringtoets.Integration.Plugin.MetaDataAttributeNameProviders;
 using Ringtoets.Integration.Service;
 using Ringtoets.Integration.Service.MessageProviders;
 using Ringtoets.MacroStabilityInwards.Data;
@@ -625,8 +624,7 @@
             yield return new ExportInfo<HydraulicBoundaryDatabaseContext>
             {
                 Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName,
-                CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter(
-                    context.WrappedData.Locations, filePath, new HydraulicBoundaryLocationMetaDataAttributeNameProvider()),
+                CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter(context.AssessmentSection, filePath),
                 IsEnabled = context => context.WrappedData.IsLinked(),
                 FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension,
                                                               RingtoetsCommonIOResources.Shape_file_filter_Description)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs
===================================================================
diff -u -rc114776ae9eae9848dd5841211bbe2105ae57dc7 -re7a8412d2e46f508cd5653810d5a28f13cceeb9a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision c114776ae9eae9848dd5841211bbe2105ae57dc7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision e7a8412d2e46f508cd5653810d5a28f13cceeb9a)
@@ -27,9 +27,9 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.IO.Hydraulics;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.IO.Exporters;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ExportInfos
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -rebca6343380bd74afcdb2c0bf4f98de0844c07af -re7a8412d2e46f508cd5653810d5a28f13cceeb9a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision ebca6343380bd74afcdb2c0bf4f98de0844c07af)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision e7a8412d2e46f508cd5653810d5a28f13cceeb9a)
@@ -338,6 +338,10 @@
       <Project>{ad0cdc89-0a00-4068-aeec-9838863c2fe8}</Project>
       <Name>Ringtoets.Integration.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Integration.IO\Ringtoets.Integration.IO.csproj">
+      <Project>{D693D18E-C257-4FDE-96BC-F6E6FB043ECF}</Project>
+      <Name>Ringtoets.Integration.IO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Integration.Plugin\Ringtoets.Integration.Plugin.csproj">
       <Project>{c8383b76-b3f1-4e6e-b56c-527b469fa20a}</Project>
       <Name>Ringtoets.Integration.Plugin</Name>