Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rced4d3286ef6a071e8b29ffc3998ca319d4a2120 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision ced4d3286ef6a071e8b29ffc3998ca319d4a2120)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs	(.../ClosingStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -38,7 +38,7 @@
     /// </summary>
     public class ClosingStructuresCalculationConfigurationReader : CalculationConfigurationReader<ClosingStructuresCalculationConfiguration>
     {
-        private const string hbLocatieSchemaName = "HbLocatieSchema.xsd";
+        private const string hbLocatieSchemaName = "HbLocatieSchema_0.xsd";
         private const string orientatieSchemaName = "OrientatieSchema.xsd";
         private const string golfReductieSchemaName = "GolfReductieSchema.xsd";
         private const string voorlandProfielSchemaName = "VoorlandProfielSchema.xsd";
@@ -69,7 +69,7 @@
                     new Dictionary<string, string>
                     {
                         {
-                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0
                         },
                         {
                             orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema
Index: Riskeer/Common/src/Riskeer.Common.IO/Resources/KunstwerkenBasisSchema.xsd
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/Common/src/Riskeer.Common.IO/Resources/KunstwerkenBasisSchema.xsd	(.../KunstwerkenBasisSchema.xsd)	(revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.IO/Resources/KunstwerkenBasisSchema.xsd	(.../KunstwerkenBasisSchema.xsd)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -25,7 +25,7 @@
   <!--Algemene structuur met configuratie, mappen en berekeningen.-->
 
   <!--Generieke definitie van de geselecteerde HB locatie voor alle toetssporen.-->
-  <xs:include schemaLocation="HbLocatieSchema.xsd"/>
+  <xs:include schemaLocation="HbLocatieSchema_0.xsd"/>
 
   <!--Generieke definitie voor de orientatie voor alle toetssporen.-->
   <xs:include schemaLocation="OrientatieSchema.xsd"/>
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -rced4d3286ef6a071e8b29ffc3998ca319d4a2120 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision ced4d3286ef6a071e8b29ffc3998ca319d4a2120)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -39,7 +39,7 @@
     /// </summary>
     public class GrassCoverErosionInwardsCalculationConfigurationReader : CalculationConfigurationReader<GrassCoverErosionInwardsCalculationConfiguration>
     {
-        private const string hbLocatieSchemaName = "HbLocatieSchema.xsd";
+        private const string hbLocatieSchemaName = "HbLocatieSchema_0.xsd";
         private const string orientatieSchemaName = "OrientatieSchema.xsd";
         private const string golfReductieSchemaName = "GolfReductieSchema.xsd";
         private const string stochastSchemaName = "StochastSchema.xsd";
@@ -68,7 +68,7 @@
                            new Dictionary<string, string>
                            {
                                {
-                                   hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                                   hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0
                                },
                                {
                                    orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd
===================================================================
diff -u -rb07ac6b1e90cab46e4f856c76a40a5fc25e7df11 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision b07ac6b1e90cab46e4f856c76a40a5fc25e7df11)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd	(.../GEKBConfiguratieSchema.xsd)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -52,7 +52,7 @@
   </xs:redefine>
 
   <!--Generieke definitie voor de geselecteerde HB locatie voor alle toetssporen.-->
-  <xs:include schemaLocation="HbLocatieSchema.xsd"/>
+  <xs:include schemaLocation="HbLocatieSchema_0.xsd"/>
 
   <!--Generieke definitie voor de orientatie voor alle toetssporen.-->
   <xs:include schemaLocation="OrientatieSchema.xsd"/>
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rced4d3286ef6a071e8b29ffc3998ca319d4a2120 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision ced4d3286ef6a071e8b29ffc3998ca319d4a2120)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs	(.../HeightStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -37,7 +37,7 @@
     /// </summary>
     public class HeightStructuresCalculationConfigurationReader : CalculationConfigurationReader<HeightStructuresCalculationConfiguration>
     {
-        private const string hbLocatieSchemaName = "HbLocatieSchema.xsd";
+        private const string hbLocatieSchemaName = "HbLocatieSchema_0.xsd";
         private const string orientatieSchemaName = "OrientatieSchema.xsd";
         private const string golfReductieSchemaName = "GolfReductieSchema.xsd";
         private const string voorlandProfielSchemaName = "VoorlandProfielSchema.xsd";
@@ -68,7 +68,7 @@
                     new Dictionary<string, string>
                     {
                         {
-                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0
                         },
                         {
                             orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -rced4d3286ef6a071e8b29ffc3998ca319d4a2120 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision ced4d3286ef6a071e8b29ffc3998ca319d4a2120)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -40,7 +40,7 @@
     public abstract class WaveConditionsCalculationConfigurationReader<T> : CalculationConfigurationReader<T>
         where T : WaveConditionsCalculationConfiguration
     {
-        private const string hbLocationSchemaName = "HbLocatieSchema.xsd";
+        private const string hbLocationSchemaName = "HbLocatieSchema_0.xsd";
         private const string orientationSchemaName = "OrientatieSchema.xsd";
         private const string foreshoreProfileSchemaName = "VoorlandProfielSchema.xsd";
         private const string waveReductionSchemaName = "GolfReductieSchema.xsd";
@@ -72,7 +72,7 @@
                             revetmentBaseSchemaName, Resources.BekledingenConfiguratieBasisSchema
                         },
                         {
-                            hbLocationSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                            hbLocationSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0
                         },
                         {
                             orientationSchemaName, RiskeerCommonIOResources.OrientatieSchema
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieBasisSchema.xsd
===================================================================
diff -u -r08552d0a7f52e55a76f843a0fdab116300cfa44d -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieBasisSchema.xsd	(.../BekledingenConfiguratieBasisSchema.xsd)	(revision 08552d0a7f52e55a76f843a0fdab116300cfa44d)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieBasisSchema.xsd	(.../BekledingenConfiguratieBasisSchema.xsd)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -48,7 +48,7 @@
   </xs:redefine>
   
   <!--Generieke definitie van de geselecteerde HB locatie voor alle toetssporen.-->
-  <xs:include schemaLocation="HbLocatieSchema.xsd"/>
+  <xs:include schemaLocation="HbLocatieSchema_0.xsd"/>
 
   <!--Generieke definitie voor de orientatie voor alle toetssporen.-->
   <xs:include schemaLocation="OrientatieSchema.xsd"/>
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rced4d3286ef6a071e8b29ffc3998ca319d4a2120 -r3c6627960ecb62ff59882a80802196b0ad061a14
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision ced4d3286ef6a071e8b29ffc3998ca319d4a2120)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs	(.../StabilityPointStructuresCalculationConfigurationReader.cs)	(revision 3c6627960ecb62ff59882a80802196b0ad061a14)
@@ -38,7 +38,7 @@
     /// </summary>
     public class StabilityPointStructuresCalculationConfigurationReader : CalculationConfigurationReader<StabilityPointStructuresCalculationConfiguration>
     {
-        private const string hbLocatieSchemaName = "HbLocatieSchema.xsd";
+        private const string hbLocatieSchemaName = "HbLocatieSchema_0.xsd";
         private const string orientatieSchemaName = "OrientatieSchema.xsd";
         private const string golfReductieSchemaName = "GolfReductieSchema.xsd";
         private const string voorlandProfielSchemaName = "VoorlandProfielSchema.xsd";
@@ -69,7 +69,7 @@
                     new Dictionary<string, string>
                     {
                         {
-                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema
+                            hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0
                         },
                         {
                             orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema