Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs
===================================================================
diff -u -r871a49bc06dd05c3883e95dd4ec40c5eac55fd6f -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs	(.../DesignTablesSettingsCsvReader.cs)	(revision 871a49bc06dd05c3883e95dd4ec40c5eac55fd6f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs	(.../DesignTablesSettingsCsvReader.cs)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -29,7 +29,7 @@
     /// <summary>
     /// The reader for <see cref="DesignTablesSetting"/> in csv format.
     /// </summary>
-    internal class DesignTablesSettingsCsvReader : HydraRingSettingsCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, DesignTablesSetting>>>
+    internal class DesignTablesSettingsCsvReader : HydraRingSettingsVariableCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, DesignTablesSetting>>>
     {
         private readonly Dictionary<string, int> columns = new Dictionary<string, int>
         {
@@ -47,40 +47,6 @@
             }
         };
 
-        private readonly Dictionary<string, HydraRingFailureMechanismType> failureMechanismTypes = new Dictionary<string, HydraRingFailureMechanismType>
-        {
-            {
-                assessmentLevelKey, HydraRingFailureMechanismType.AssessmentLevel
-            },
-            {
-                waveHeightKey, HydraRingFailureMechanismType.WaveHeight
-            },
-            {
-                wavePeakPeriodKey, HydraRingFailureMechanismType.WavePeakPeriod
-            },
-            {
-                waveSpectralPeriodKey, HydraRingFailureMechanismType.WaveSpectralPeriod
-            },
-            {
-                qVariantKey, HydraRingFailureMechanismType.QVariant
-            },
-            {
-                dikeHeightKey, HydraRingFailureMechanismType.DikesHeight
-            },
-            {
-                grassKey, HydraRingFailureMechanismType.DikesOvertopping
-            },
-            {
-                heightStructuresKey, HydraRingFailureMechanismType.StructuresOvertopping
-            },
-            {
-                closingStructuresKey, HydraRingFailureMechanismType.StructuresClosure
-            },
-            {
-                structuresStructuralFailureKey, HydraRingFailureMechanismType.StructuresStructuralFailure
-            }
-        };
-
         /// <summary>
         /// Creates a new instance of <see cref="DesignTablesSettingsCsvReader"/>.
         /// </summary>
@@ -92,7 +58,7 @@
         protected override void CreateSetting(IList<string> line)
         {
             // Get failure mechanism
-            var failureMechanismType = GetFailureMechanismType(line);
+            var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]]));
 
             if (!Settings.ContainsKey(failureMechanismType))
             {
@@ -107,11 +73,6 @@
             }
         }
 
-        private HydraRingFailureMechanismType GetFailureMechanismType(IList<string> line)
-        {
-            return failureMechanismTypes[GetStringValueFromElement(line[columns[variableKey]])];
-        }
-
         private string GetRingId(IList<string> line)
         {
             return GetStringValueFromElement(line[columns[ringIdKey]]);
@@ -131,20 +92,5 @@
         private const string maxKey = "Max";
 
         #endregion
-
-        #region Variable names
-
-        private const string assessmentLevelKey = "Toetspeil";
-        private const string waveHeightKey = "Hs";
-        private const string wavePeakPeriodKey = "Tp";
-        private const string waveSpectralPeriodKey = "Tm-1,0";
-        private const string qVariantKey = "Q";
-        private const string dikeHeightKey = "HBN";
-        private const string grassKey = "Gras";
-        private const string heightStructuresKey = "KwHoogte";
-        private const string closingStructuresKey = "KwSluiten";
-        private const string structuresStructuralFailureKey = "KwPuntconstructies";
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs
===================================================================
diff -u -r12523c3e374d5e02309863685e7fd973778e8514 -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs	(.../HydraRingSettingsVariableCsvReader.cs)	(revision 12523c3e374d5e02309863685e7fd973778e8514)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsVariableCsvReader.cs	(.../HydraRingSettingsVariableCsvReader.cs)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -66,12 +66,12 @@
         };
 
         /// <summary>
-        /// Creates a new instance of <see cref="HydraRingSettingsVariableCsvReader{TOutput}"/>.
+        /// Creates a new instance of <see cref="HydraRingSettingsVariableCsvReaderSettingsVariableCsvReader{TOutput}"/>.
         /// </summary>
         /// <param name="fileContents">The file contents to read.</param>
         /// <param name="settings">The provided settings object to add the read settings to.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="fileContents"/> or <paramref name="settings"/> is <c>null</c>.</exception>
-        protected HydraRingSettingsVariableCsvReader(string fileContents, TOutput settings)
+        protected HydraRingSettingsVariableCsvReader(string fileContents, TOutput settings) 
             : base(fileContents, settings) {}
 
         protected abstract override void CreateSetting(IList<string> line);
@@ -101,4 +101,4 @@
 
         #endregion
     }
-}
\ No newline at end of file
+}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs
===================================================================
diff -u -r6357d8494ce38bdc23e4c1d97b72a9e62d6f631a -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs	(.../HydraulicModelsSettingsCsvReader.cs)	(revision 6357d8494ce38bdc23e4c1d97b72a9e62d6f631a)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs	(.../HydraulicModelsSettingsCsvReader.cs)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -29,7 +29,7 @@
     /// <summary>
     /// The reader for <see cref="HydraulicModelsSetting"/> in csv format.
     /// </summary>
-    internal class HydraulicModelsSettingsCsvReader : HydraRingSettingsCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, HydraulicModelsSetting>>>
+    internal class HydraulicModelsSettingsCsvReader : HydraRingSettingsVariableCsvReader<IDictionary<HydraRingFailureMechanismType, IDictionary<string, HydraulicModelsSetting>>>
     {
         private readonly Dictionary<string, int> columns = new Dictionary<string, int>
         {
@@ -44,40 +44,6 @@
             }
         };
 
-        private readonly Dictionary<string, HydraRingFailureMechanismType> failureMechanismTypes = new Dictionary<string, HydraRingFailureMechanismType>
-        {
-            {
-                assessmentLevelKey, HydraRingFailureMechanismType.AssessmentLevel
-            },
-            {
-                waveHeightKey, HydraRingFailureMechanismType.WaveHeight
-            },
-            {
-                wavePeakPeriodKey, HydraRingFailureMechanismType.WavePeakPeriod
-            },
-            {
-                waveSpectralPeriodKey, HydraRingFailureMechanismType.WaveSpectralPeriod
-            },
-            {
-                qVariantKey, HydraRingFailureMechanismType.QVariant
-            },
-            {
-                dikeHeightKey, HydraRingFailureMechanismType.DikesHeight
-            },
-            {
-                grassKey, HydraRingFailureMechanismType.DikesOvertopping
-            },
-            {
-                heightStructuresKey, HydraRingFailureMechanismType.StructuresOvertopping
-            },
-            {
-                closingStructuresKey, HydraRingFailureMechanismType.StructuresClosure
-            },
-            {
-                structuresStructuralFailureKey, HydraRingFailureMechanismType.StructuresStructuralFailure
-            }
-        };
-
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicModelsSettingsCsvReader"/>.
         /// </summary>
@@ -89,7 +55,7 @@
         protected override void CreateSetting(IList<string> line)
         {
             // Get failure mechanism
-            var failureMechanismType = GetFailureMechanismType(line);
+            var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]]));
 
             if (!Settings.ContainsKey(failureMechanismType))
             {
@@ -104,11 +70,6 @@
             }
         }
 
-        private HydraRingFailureMechanismType GetFailureMechanismType(IList<string> line)
-        {
-            return failureMechanismTypes[GetStringValueFromElement(line[columns[variableKey]])];
-        }
-
         private string GetRingId(IList<string> line)
         {
             return GetStringValueFromElement(line[columns[ringIdKey]]);
@@ -126,20 +87,5 @@
         private const string timeIntegrationSchemeIdKey = "TimeIntegrationSchemeIdKey";
 
         #endregion
-
-        #region Variable names
-
-        private const string assessmentLevelKey = "Toetspeil";
-        private const string waveHeightKey = "Hs";
-        private const string wavePeakPeriodKey = "Tp";
-        private const string waveSpectralPeriodKey = "Tm-1,0";
-        private const string qVariantKey = "Q";
-        private const string dikeHeightKey = "HBN";
-        private const string grassKey = "Gras";
-        private const string heightStructuresKey = "KwHoogte";
-        private const string closingStructuresKey = "KwSluiten";
-        private const string structuresStructuralFailureKey = "KwPuntconstructies";
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r6357d8494ce38bdc23e4c1d97b72a9e62d6f631a -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 6357d8494ce38bdc23e4c1d97b72a9e62d6f631a)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -70,6 +70,7 @@
     <Compile Include="Data\Settings\HydraulicModelsSetting.cs" />
     <Compile Include="IO\DesignTablesSettingsCsvReader.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReader.cs" />
+    <Compile Include="IO\HydraRingSettingsVariableCsvReader.cs" />
     <Compile Include="IO\HydraulicModelsSettingsCsvReader.cs" />
     <Compile Include="Parsers\ExceedanceProbabilityCalculationParser.cs" />
     <Compile Include="Parsers\IHydraRingFileParser.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs
===================================================================
diff -u -r6357d8494ce38bdc23e4c1d97b72a9e62d6f631a -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs	(.../DesignTablesSettingsCsvReaderTest.cs)	(revision 6357d8494ce38bdc23e4c1d97b72a9e62d6f631a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs	(.../DesignTablesSettingsCsvReaderTest.cs)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -182,7 +182,7 @@
                             "205", new DesignTablesSetting(5, 15)
                         }
                     }
-                },
+                }
             };
         }
     }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsVariableCsvReaderTest.cs
===================================================================
diff -u -r12523c3e374d5e02309863685e7fd973778e8514 -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsVariableCsvReaderTest.cs	(.../HydraRingSettingsVariableCsvReaderTest.cs)	(revision 12523c3e374d5e02309863685e7fd973778e8514)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsVariableCsvReaderTest.cs	(.../HydraRingSettingsVariableCsvReaderTest.cs)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -76,18 +76,18 @@
 
         private class TestVariableCsvReader : HydraRingSettingsVariableCsvReader<object>
         {
-            public TestVariableCsvReader(string fileContents, object settings)
+            public TestVariableCsvReader(string fileContents, object settings) 
                 : base(fileContents, settings) {}
+            
+            protected override void CreateSetting(IList<string> line)
+            {
+                throw new NotImplementedException();
+            }
 
             public HydraRingFailureMechanismType TestGetFailureMechanismType(string variable)
             {
                 return GetFailureMechanismType(variable);
             }
-
-            protected override void CreateSetting(IList<string> line)
-            {
-                throw new NotImplementedException();
-            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r6357d8494ce38bdc23e4c1d97b72a9e62d6f631a -r589527a73ebe7f1605e918060100ab8a513916dd
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 6357d8494ce38bdc23e4c1d97b72a9e62d6f631a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 589527a73ebe7f1605e918060100ab8a513916dd)
@@ -76,6 +76,7 @@
     <Compile Include="Data\Settings\HydraulicModelsSettingTest.cs" />
     <Compile Include="IO\DesignTablesSettingsCsvReaderTest.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReaderTest.cs" />
+    <Compile Include="IO\HydraRingSettingsVariableCsvReaderTest.cs" />
     <Compile Include="IO\HydraulicModelsSettingsCsvReaderTest.cs" />
     <Compile Include="Parsers\ExceedanceProbabilityCalculationParserTest.cs" />
     <Compile Include="Parsers\HydraRingOutputFileParserTest.cs" />