Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfiguration.cs
===================================================================
diff -u -r2057d3372084602a2d959db2e33dcf81de971a73 -r4274bc4f40504c659612e15175dc635fc6e5bba9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfiguration.cs	(.../WaveConditionsCalculationConfiguration.cs)	(revision 2057d3372084602a2d959db2e33dcf81de971a73)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfiguration.cs	(.../WaveConditionsCalculationConfiguration.cs)	(revision 4274bc4f40504c659612e15175dc635fc6e5bba9)
@@ -29,94 +29,97 @@
     /// </summary>
     public class WaveConditionsCalculationConfiguration : IConfigurationItem
     {
+        private string name;
+
         /// <summary>
         /// Creates a new instance of <see cref="WaveConditionsCalculationConfiguration"/>.
         /// </summary>
-        /// <param name="constructionProperties">The container of the properties for the <see cref="WaveConditionsCalculationConfiguration"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="constructionProperties"/> is <c>null</c>.</exception>
-        public WaveConditionsCalculationConfiguration(ConstructionProperties constructionProperties)
+        /// <param name="name">The name of the <see cref="WaveConditionsCalculationConfiguration"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> is <c>null</c>.</exception>
+        public WaveConditionsCalculationConfiguration(string name)
         {
-            if (constructionProperties == null)
-            {
-                throw new ArgumentNullException(nameof(constructionProperties));
-            }
-
-            Name = constructionProperties.Name;
-            HydraulicBoundaryLocation = constructionProperties.HydraulicBoundaryLocation;
-            UpperBoundaryRevetment = constructionProperties.UpperBoundaryRevetment;
-            LowerBoundaryRevetment = constructionProperties.LowerBoundaryRevetment;
-            UpperBoundaryWaterLevels = constructionProperties.UpperBoundaryWaterLevels;
-            LowerBoundaryWaterLevels = constructionProperties.LowerBoundaryWaterLevels;
-            StepSize = constructionProperties.StepSize;
-            ForeshoreProfile = constructionProperties.ForeshoreProfile;
-            Orientation = constructionProperties.Orientation;
-            UseBreakWater = constructionProperties.UseBreakWater;
-            BreakWaterType = constructionProperties.BreakWaterType;
-            BreakWaterHeight = constructionProperties.BreakWaterHeight;
-            UseForeshore = constructionProperties.UseForeshore;
+            Name = name;
         }
 
         /// <summary>
         /// Gets the name of the hydraulic boundary location of the read calculation.
         /// </summary>
-        public string HydraulicBoundaryLocation { get; }
+        public string HydraulicBoundaryLocation { get; set; }
 
         /// <summary>
         /// Gets the upper boundary of the revetment of the read calculation.
         /// </summary>
-        public double? UpperBoundaryRevetment { get; }
+        public double? UpperBoundaryRevetment { get; set; }
 
         /// <summary>
         /// Gets the lower boundary of the revetment of the read calculation.
         /// </summary>
-        public double? LowerBoundaryRevetment { get; }
+        public double? LowerBoundaryRevetment { get; set; }
 
         /// <summary>
         /// Gets the upper boundary of the water levels of the read calculation.
         /// </summary>
-        public double? UpperBoundaryWaterLevels { get; }
+        public double? UpperBoundaryWaterLevels { get; set; }
 
         /// <summary>
         /// Gets the lower boundary of the water levels of the read calculation.
         /// </summary>
-        public double? LowerBoundaryWaterLevels { get; }
+        public double? LowerBoundaryWaterLevels { get; set; }
 
         /// <summary>
         /// Gets the step size of the read calculation.
         /// </summary>
-        public ConfigurationWaveConditionsInputStepSize? StepSize { get; }
+        public ConfigurationWaveConditionsInputStepSize? StepSize { get; set; }
 
         /// <summary>
         /// Gets the name of the foreshore profile of the read calculation.
         /// </summary>
-        public string ForeshoreProfile { get; }
+        public string ForeshoreProfile { get; set; }
 
         /// <summary>
         /// Gets the orientation of the read calculation.
         /// </summary>
-        public double? Orientation { get; }
+        public double? Orientation { get; set; }
 
         /// <summary>
         /// Gets whether the breakwater should be used for the read calculation.
         /// </summary>
-        public bool? UseBreakWater { get; }
+        public bool? UseBreakWater { get; set; }
 
         /// <summary>
         /// Gets the breakwater type of the read calculation.
         /// </summary>
-        public ConfigurationBreakWaterType? BreakWaterType { get; }
+        public ConfigurationBreakWaterType? BreakWaterType { get; set; }
 
         /// <summary>
         /// Gets the breakwater height of the read calculation.
         /// </summary>
-        public double? BreakWaterHeight { get; }
+        public double? BreakWaterHeight { get; set; }
 
         /// <summary>
         /// Gets whether the foreshore should be used for the read calculation.
         /// </summary>
-        public bool? UseForeshore { get; }
+        public bool? UseForeshore { get; set; }
 
-        public string Name { get; }
+        /// <summary>
+        /// Gets or sets the name of the <see cref="WaveConditionsCalculationConfiguration"/>.
+        /// </summary>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value), @"Name is required for a structure calculation configuration.");
+                }
+                name = value;
+            }
+        }
 
         /// <summary>
         /// Class holding the various construction parameters for <see cref="WaveConditionsCalculationConfiguration"/>.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r2057d3372084602a2d959db2e33dcf81de971a73 -r4274bc4f40504c659612e15175dc635fc6e5bba9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 2057d3372084602a2d959db2e33dcf81de971a73)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 4274bc4f40504c659612e15175dc635fc6e5bba9)
@@ -77,9 +77,8 @@
 
         protected override WaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
         {
-            var constructionProperties = new WaveConditionsCalculationConfiguration.ConstructionProperties
-            {
-                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value,
+            return new WaveConditionsCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
+            { 
                 HydraulicBoundaryLocation = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment),
                 LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment),
@@ -93,8 +92,6 @@
                 BreakWaterHeight = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.BreakWaterHeight),
                 UseForeshore = calculationElement.GetBoolValueFromDescendantElement(ConfigurationSchemaIdentifiers.UseForeshore)
             };
-
-            return new WaveConditionsCalculationConfiguration(constructionProperties);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs
===================================================================
diff -u -r2057d3372084602a2d959db2e33dcf81de971a73 -r4274bc4f40504c659612e15175dc635fc6e5bba9
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs	(.../WaveConditionsCalculationConfigurationTest.cs)	(revision 2057d3372084602a2d959db2e33dcf81de971a73)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationTest.cs	(.../WaveConditionsCalculationConfigurationTest.cs)	(revision 4274bc4f40504c659612e15175dc635fc6e5bba9)
@@ -36,19 +36,21 @@
             TestDelegate test = () => new WaveConditionsCalculationConfiguration(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("constructionProperties", exception.ParamName);
+            Assert.Throws<ArgumentNullException>(test);
         }
 
         [Test]
         public void Constructor_ConstructionPropertiesWithoutValues_PropertiesAreDefault()
         {
+            // Setup
+            var name = "some name";
+
             // Call
-            var readCalculation = new WaveConditionsCalculationConfiguration(new WaveConditionsCalculationConfiguration.ConstructionProperties());
+            var readCalculation = new WaveConditionsCalculationConfiguration(name);
 
             // Assert
             Assert.IsInstanceOf<IConfigurationItem>(readCalculation);
-            Assert.IsNull(readCalculation.Name);
+            Assert.AreEqual(name, readCalculation.Name);
             Assert.IsNull(readCalculation.HydraulicBoundaryLocation);
             Assert.IsNull(readCalculation.UpperBoundaryRevetment);
             Assert.IsNull(readCalculation.LowerBoundaryRevetment);
@@ -82,9 +84,8 @@
             const bool useForeshore = false;
 
             // Call
-            var readWaveConditionsCalculation = new WaveConditionsCalculationConfiguration(new WaveConditionsCalculationConfiguration.ConstructionProperties
-            {
-                Name = calculationName,
+            var readWaveConditionsCalculation = new WaveConditionsCalculationConfiguration(calculationName)
+            { 
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                 UpperBoundaryRevetment = upperBoundaryRevetment,
                 LowerBoundaryRevetment = lowerBoundaryRevetment,
@@ -97,7 +98,7 @@
                 BreakWaterType = breakWaterType,
                 BreakWaterHeight = breakWaterHeight,
                 UseForeshore = useForeshore
-            });
+            };
 
             // Assert
             Assert.AreEqual(calculationName, readWaveConditionsCalculation.Name);