Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7abe7a22648e3af0a350e60b21e3c61bb5fb6124 -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs	(.../CalculationConfigurationReaderTest.cs)	(revision 7abe7a22648e3af0a350e60b21e3c61bb5fb6124)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs	(.../CalculationConfigurationReaderTest.cs)	(revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059)
@@ -29,6 +29,7 @@
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Common.IO.Readers;
 using Ringtoets.Common.IO.Schema;
 
@@ -265,12 +266,12 @@
             var calculationConfigurationReader = new CalculationConfigurationReader(filePath, validMainSchemaDefinition, new Dictionary<string, string>());
 
             // Call
-            IList<IReadConfigurationItem> readConfigurationItems = calculationConfigurationReader.Read().ToList();
+            IList<IConfigurationItem> readConfigurationItems = calculationConfigurationReader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
 
-            var group = readConfigurationItems[0] as ReadCalculationGroup;
+            var group = readConfigurationItems[0] as CalculationConfigurationGroup;
             Assert.IsNotNull(group);
             Assert.AreEqual("Calculation group", group.Name);
             CollectionAssert.IsEmpty(group.Items);
@@ -284,53 +285,53 @@
             var calculationConfigurationReader = new CalculationConfigurationReader(filePath, validMainSchemaDefinition, new Dictionary<string, string>());
 
             // Call
-            IList<IReadConfigurationItem> readConfigurationItems = calculationConfigurationReader.Read().ToList();
+            IList<IConfigurationItem> readConfigurationItems = calculationConfigurationReader.Read().ToList();
 
             // Assert
             Assert.AreEqual(5, readConfigurationItems.Count);
 
-            var group1 = readConfigurationItems[0] as ReadCalculationGroup;
+            var group1 = readConfigurationItems[0] as CalculationConfigurationGroup;
             Assert.IsNotNull(group1);
             Assert.AreEqual("Group 1", group1.Name);
 
             var calculation1 = readConfigurationItems[1] as ReadCalculation;
             Assert.IsNotNull(calculation1);
             Assert.AreEqual("Calculation 1", calculation1.Name);
 
-            var group2 = readConfigurationItems[2] as ReadCalculationGroup;
+            var group2 = readConfigurationItems[2] as CalculationConfigurationGroup;
             Assert.IsNotNull(group2);
             Assert.AreEqual("Group 2", group2.Name);
 
             var calculation2 = readConfigurationItems[3] as ReadCalculation;
             Assert.IsNotNull(calculation2);
             Assert.AreEqual("Calculation 2", calculation2.Name);
 
-            var group3 = readConfigurationItems[4] as ReadCalculationGroup;
+            var group3 = readConfigurationItems[4] as CalculationConfigurationGroup;
             Assert.IsNotNull(group3);
             Assert.AreEqual("Group 3", group3.Name);
 
-            List<IReadConfigurationItem> group1Items = group1.Items.ToList();
+            List<IConfigurationItem> group1Items = group1.Items.ToList();
             Assert.AreEqual(1, group1Items.Count);
 
             var calculation3 = group1Items[0] as ReadCalculation;
             Assert.IsNotNull(calculation3);
             Assert.AreEqual("Calculation 3", calculation3.Name);
 
-            List<IReadConfigurationItem> group2Items = group2.Items.ToList();
+            List<IConfigurationItem> group2Items = group2.Items.ToList();
             Assert.AreEqual(2, group2Items.Count);
 
-            var group4 = group2Items[0] as ReadCalculationGroup;
+            var group4 = group2Items[0] as CalculationConfigurationGroup;
             Assert.IsNotNull(group4);
             Assert.AreEqual("Group 4", group4.Name);
 
             var calculation4 = group2Items[1] as ReadCalculation;
             Assert.IsNotNull(calculation4);
             Assert.AreEqual("Calculation 4", calculation4.Name);
 
-            List<IReadConfigurationItem> group3Items = group3.Items.ToList();
+            List<IConfigurationItem> group3Items = group3.Items.ToList();
             Assert.AreEqual(0, group3Items.Count);
 
-            List<IReadConfigurationItem> group4Items = group4.Items.ToList();
+            List<IConfigurationItem> group4Items = group4.Items.ToList();
             Assert.AreEqual(1, group4Items.Count);
 
             var calculation5 = group4Items[0] as ReadCalculation;
@@ -356,7 +357,7 @@
             }
         }
 
-        private class ReadCalculation : IReadConfigurationItem
+        private class ReadCalculation : IConfigurationItem
         {
             public ReadCalculation(string name)
             {