Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 47237ae4fc638dcb485ec8100e22c63037a744e1)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -36,11 +36,6 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.Calculation.Calculator.Factory;
 using Riskeer.HydraRing.Calculation.Data.Input;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 47237ae4fc638dcb485ec8100e22c63037a744e1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -36,14 +36,6 @@
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Service;
 using Ringtoets.GrassCoverErosionInwards.Service.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
-using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
-using Ringtoets.HydraRing.Calculation.TestUtil;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.Calculation.Calculator.Factory;
 using Riskeer.HydraRing.Calculation.Data;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 47237ae4fc638dcb485ec8100e22c63037a744e1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -36,11 +36,6 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Service;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.Calculation.Calculator.Factory;
 using Riskeer.HydraRing.Calculation.Data.Input;
Index: Ringtoets/Integration/src/Riskeer.Integration.IO/Riskeer.Integration.IO.csproj
===================================================================
diff -u -r35a7681064d58c5df745a2b3ba59e6df29594d32 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/src/Riskeer.Integration.IO/Riskeer.Integration.IO.csproj	(.../Riskeer.Integration.IO.csproj)	(revision 35a7681064d58c5df745a2b3ba59e6df29594d32)
+++ Ringtoets/Integration/src/Riskeer.Integration.IO/Riskeer.Integration.IO.csproj	(.../Riskeer.Integration.IO.csproj)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -186,9 +186,9 @@
       <Name>Ringtoets.HeightStructures.Data</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.IO\Ringtoets.HydraRing.IO.csproj">
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.IO\Riskeer.HydraRing.IO.csproj">
       <Project>{B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}</Project>
-      <Name>Ringtoets.HydraRing.IO</Name>
+      <Name>Riskeer.HydraRing.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
Index: Ringtoets/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj
===================================================================
diff -u -r35a7681064d58c5df745a2b3ba59e6df29594d32 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision 35a7681064d58c5df745a2b3ba59e6df29594d32)
+++ Ringtoets/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -141,9 +141,9 @@
       <Name>Ringtoets.DuneErosion.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.IO\Ringtoets.HydraRing.IO.csproj">
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.IO\Riskeer.HydraRing.IO.csproj">
       <Project>{B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}</Project>
-      <Name>Ringtoets.HydraRing.IO</Name>
+      <Name>Riskeer.HydraRing.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs
===================================================================
diff -u -ra47bfe8c8591c6eb2ea0580608dca4727af3a210 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs	(.../HydraulicLocationConfigurationDatabaseImporterTest.cs)	(revision a47bfe8c8591c6eb2ea0580608dca4727af3a210)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs	(.../HydraulicLocationConfigurationDatabaseImporterTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -32,7 +32,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.IO.TestUtil;
-using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 using Riskeer.Integration.Data;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -33,9 +33,6 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.DuneErosion.Plugin.Handlers;
 using Ringtoets.GrassCoverErosionOutwards.Data;
-using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase;
-using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
-using Ringtoets.HydraRing.IO.TestUtil;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.IO.HydraulicBoundaryDatabase;
 using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -31,8 +31,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
-using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
-using Ringtoets.HydraRing.IO.TestUtil;
 using Ringtoets.Integration.TestUtil;
 using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 using Riskeer.HydraRing.IO.TestUtil;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -53,10 +53,6 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -42,9 +42,9 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Plugin.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
+using Riskeer.HydraRing.Calculation.Calculator.Factory;
+using Riskeer.HydraRing.Calculation.Data.Input;
+using Riskeer.HydraRing.Calculation.TestUtil.Calculator;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Forms.PresentationObjects;
 using Riskeer.Integration.Plugin;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r251015cc7402fe3ed830bb9264780f79e5e61c0e -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 251015cc7402fe3ed830bb9264780f79e5e61c0e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -39,11 +39,6 @@
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r054bbff6d6556e94c0504b210899df3bb43dd7f7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 47237ae4fc638dcb485ec8100e22c63037a744e1)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 054bbff6d6556e94c0504b210899df3bb43dd7f7)
@@ -33,11 +33,6 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.TestUtil;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
-using Ringtoets.Integration.Data;
 using Ringtoets.Integration.TestUtil;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;