Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd
===================================================================
diff -u -rfcd598284a0dfe0fd6142a9ab514ee1ec12edee0 -r26fd8ac2fc914b15cb213410c0de0ff4b4fec06f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd	(.../GEBUConfiguratieSchema.xsd)	(revision fcd598284a0dfe0fd6142a9ab514ee1ec12edee0)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd	(.../GEBUConfiguratieSchema.xsd)	(revision 26fd8ac2fc914b15cb213410c0de0ff4b4fec06f)
@@ -25,39 +25,18 @@
   
   <!--Basis elementen voor een bekledingen configuratie.-->
   <xs:include schemaLocation="BekledingenHrConfiguratieSchemaBasis.xsd" />
+  <xs:include schemaLocation="ConfiguratieSchema.xsd" />
 
-  <!--Herdefinieer berekening, zodat deze de juiste inhoud heeft.-->
-  <xs:redefine schemaLocation="ConfiguratieSchema.xsd">
-    <xs:complexType name="berekeningType">
-      <xs:complexContent>
-        <xs:extension base="berekeningType">
-          <xs:all>
-            <xs:element ref="hrlocatie" minOccurs="0"/>
-            <xs:element ref="bovengrensbekleding" minOccurs="0"/>
-            <xs:element ref="ondergrensbekleding" minOccurs="0"/>
-            <xs:element ref="bovengrenswaterstanden" minOccurs="0"/>
-            <xs:element ref="ondergrenswaterstanden" minOccurs="0"/>
-            <xs:element ref="stapgrootte" minOccurs="0"/>
-            <xs:element ref="voorlandprofiel" minOccurs="0"/>
-            <xs:element ref="orientatie" minOccurs="0"/>
-            <xs:element ref="golfreductie" minOccurs="0"/>
-            <xs:element ref="categoriegrens" minOccurs="0"/>
-          </xs:all>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:redefine>
-
-  <!--Specificeert de categoriegrens waarmee de berekening uitgevoerd moet worden.-->
-  <xs:element name="categoriegrens">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
+  <!--Herdefinieer categorie grens, zodat deze de juiste inhoud heeft.-->
+  <xs:redefine schemaLocation="BekledingenHrConfiguratieSchemaBasis.xsd">
+    <xs:simpleType name="categoriegrensType">
+      <xs:restriction base="categoriegrensType">
         <xs:enumeration value="Iv-IIv"/>
         <xs:enumeration value="IIv-IIIv"/>
         <xs:enumeration value="IIIv-IVv"/>
         <xs:enumeration value="IVv-Vv"/>
         <xs:enumeration value="Vv-VIv"/>
       </xs:restriction>
     </xs:simpleType>
-  </xs:element>
+  </xs:redefine>
 </xs:schema>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r1d673996ebb0e733630f2355c54d32a9e826a531 -r26fd8ac2fc914b15cb213410c0de0ff4b4fec06f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 1d673996ebb0e733630f2355c54d32a9e826a531)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 26fd8ac2fc914b15cb213410c0de0ff4b4fec06f)
@@ -46,7 +46,7 @@
                                               "Element 'categoriegrens' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleCategoryType");
                 yield return new TestCaseData("invalidCategoryTypeUnknownValue.xml",
-                                              "The 'categoriegrens' element is invalid - The value 'A-B' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
+                                              "The 'categoriegrens' element is invalid - The value 'A-B' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.")
                     .SetName("invalidCategoryTypeUnknownValue");
             }
         }
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd
===================================================================
diff -u -r85b7f2b6d2eec9850c023e7146a64f6250e9ba6d -r26fd8ac2fc914b15cb213410c0de0ff4b4fec06f
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision 85b7f2b6d2eec9850c023e7146a64f6250e9ba6d)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision 26fd8ac2fc914b15cb213410c0de0ff4b4fec06f)
@@ -25,38 +25,17 @@
 
   <!--Basis elementen voor een bekledingen configuratie.-->
   <xs:include schemaLocation="BekledingenHrConfiguratieSchemaBasis.xsd" />
+  <xs:include schemaLocation="ConfiguratieSchema.xsd" />
 
-  <!--Herdefinieer berekening, zodat deze de juiste inhoud heeft.-->
-  <xs:redefine schemaLocation="ConfiguratieSchema.xsd">
-    <xs:complexType name="berekeningType">
-      <xs:complexContent>
-        <xs:extension base="berekeningType">
-          <xs:all>
-            <xs:element ref="hrlocatie" minOccurs="0"/>
-            <xs:element ref="bovengrensbekleding" minOccurs="0"/>
-            <xs:element ref="ondergrensbekleding" minOccurs="0"/>
-            <xs:element ref="bovengrenswaterstanden" minOccurs="0"/>
-            <xs:element ref="ondergrenswaterstanden" minOccurs="0"/>
-            <xs:element ref="stapgrootte" minOccurs="0"/>
-            <xs:element ref="voorlandprofiel" minOccurs="0"/>
-            <xs:element ref="orientatie" minOccurs="0"/>
-            <xs:element ref="golfreductie" minOccurs="0"/>
-            <xs:element ref="categoriegrens" minOccurs="0"/>
-          </xs:all>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:redefine>
-
-  <!--Specificeert de categoriegrens waarmee de berekening uitgevoerd moet worden.-->
-  <xs:element name="categoriegrens">
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
+  <!--Herdefinieer categorie grens, zodat deze de juiste inhoud heeft.-->
+  <xs:redefine schemaLocation="BekledingenHrConfiguratieSchemaBasis.xsd">
+    <xs:simpleType name="categoriegrensType">
+      <xs:restriction base="categoriegrensType">
         <xs:enumeration value="A+-A"/>
         <xs:enumeration value="A-B"/>
         <xs:enumeration value="B-C"/>
         <xs:enumeration value="C-D"/>
       </xs:restriction>
     </xs:simpleType>
-  </xs:element>
+  </xs:redefine>
 </xs:schema>
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchemaBasis.xsd
===================================================================
diff -u -r85b7f2b6d2eec9850c023e7146a64f6250e9ba6d -r26fd8ac2fc914b15cb213410c0de0ff4b4fec06f
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchemaBasis.xsd	(.../BekledingenHrConfiguratieSchemaBasis.xsd)	(revision 85b7f2b6d2eec9850c023e7146a64f6250e9ba6d)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchemaBasis.xsd	(.../BekledingenHrConfiguratieSchemaBasis.xsd)	(revision 26fd8ac2fc914b15cb213410c0de0ff4b4fec06f)
@@ -25,6 +25,26 @@
   <!--Algemene structuur met configuratie, mappen en berekeningen.-->
   
   <!--Herdefinieer berekening, zodat deze de juiste inhoud heeft.-->
+  <xs:redefine schemaLocation="ConfiguratieSchema.xsd">
+    <xs:complexType name="berekeningType">
+      <xs:complexContent>
+        <xs:extension base="berekeningType">
+          <xs:all>
+            <xs:element ref="hrlocatie" minOccurs="0"/>
+            <xs:element ref="bovengrensbekleding" minOccurs="0"/>
+            <xs:element ref="ondergrensbekleding" minOccurs="0"/>
+            <xs:element ref="bovengrenswaterstanden" minOccurs="0"/>
+            <xs:element ref="ondergrenswaterstanden" minOccurs="0"/>
+            <xs:element ref="stapgrootte" minOccurs="0"/>
+            <xs:element ref="voorlandprofiel" minOccurs="0"/>
+            <xs:element ref="orientatie" minOccurs="0"/>
+            <xs:element ref="golfreductie" minOccurs="0"/>
+            <xs:element ref="categoriegrens" minOccurs="0"/>
+          </xs:all>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:redefine>
   
   <!--Generieke definitie van de geselecteerde HR locatie voor alle toetssporen.-->
   <xs:include schemaLocation="HrLocatieSchema.xsd"/>
@@ -80,5 +100,12 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:element>
+
+  <!--Specificeert de categoriegrens waarmee de berekening uitgevoerd moet worden.-->
+  <xs:element name="categoriegrens" type="categoriegrensType"/>
+
+  <xs:simpleType name="categoriegrensType">
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
   
 </xs:schema>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r1d673996ebb0e733630f2355c54d32a9e826a531 -r26fd8ac2fc914b15cb213410c0de0ff4b4fec06f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 1d673996ebb0e733630f2355c54d32a9e826a531)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 26fd8ac2fc914b15cb213410c0de0ff4b4fec06f)
@@ -45,7 +45,7 @@
                                               "Element 'categoriegrens' cannot appear more than once if content model type is \"all\".")
                     .SetName("invalidCalculationMultipleCategoryType");
                 yield return new TestCaseData("invalidCategoryTypeUnknownValue.xml",
-                                              "The 'categoriegrens' element is invalid - The value 'F-G' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
+                                              "The 'categoriegrens' element is invalid - The value 'F-G' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.")
                     .SetName("invalidCategoryTypeUnknownValue");
             }
         }