Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -37,14 +37,14 @@
         /// </summary>
         /// <param name="waveRunUpOutput">The wave conditions output for wave run up.</param>
         /// <param name="waveImpactOutput">The wave conditions output for wave impact.</param>
-        /// <param name="tailorMadeWaveImpact">The wave conditions output for tailor made wave impact.</param>
+        /// <param name="waveImpactWithWaveDirection">The wave conditions output for wave impact with wave dirction.</param>
         internal GrassCoverErosionOutwardsWaveConditionsOutput(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
                                                                IEnumerable<WaveConditionsOutput> waveImpactOutput,
-                                                               IEnumerable<WaveConditionsOutput> tailorMadeWaveImpact)
+                                                               IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirection)
         {
             WaveRunUpOutput = waveRunUpOutput;
             WaveImpactOutput = waveImpactOutput;
-            TailorMadeWaveImpactOutput = tailorMadeWaveImpact;
+            WaveImpactWithWaveDirectionOutput = waveImpactWithWaveDirection;
         }
 
         /// <summary>
@@ -58,17 +58,17 @@
         public IEnumerable<WaveConditionsOutput> WaveImpactOutput { get; private set; }
 
         /// <summary>
-        /// Gets the wave conditions output for tailor made wave impact.
+        /// Gets the wave conditions output for wave impact with wave direction.
         /// </summary>
-        public IEnumerable<WaveConditionsOutput> TailorMadeWaveImpactOutput { get; private set; }
+        public IEnumerable<WaveConditionsOutput> WaveImpactWithWaveDirectionOutput { get; private set; }
 
         public override object Clone()
         {
             var clone = (GrassCoverErosionOutwardsWaveConditionsOutput) base.Clone();
 
             clone.WaveRunUpOutput = WaveRunUpOutput?.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
             clone.WaveImpactOutput = WaveImpactOutput?.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
-            clone.TailorMadeWaveImpactOutput = TailorMadeWaveImpactOutput?.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
+            clone.WaveImpactWithWaveDirectionOutput = WaveImpactWithWaveDirectionOutput?.Select(s => (WaveConditionsOutput) s.Clone()).ToArray();
 
             return clone;
         }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutputFactory.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutputFactory.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputFactory.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutputFactory.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputFactory.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -71,8 +71,9 @@
         /// <param name="waveImpactOutput">The wave impact output to set.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpAndWaveImpact(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
-                                                                                                           IEnumerable<WaveConditionsOutput> waveImpactOutput)
+        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpAndWaveImpact(
+            IEnumerable<WaveConditionsOutput> waveRunUpOutput,
+            IEnumerable<WaveConditionsOutput> waveImpactOutput)
         {
             if (waveRunUpOutput == null)
             {
@@ -88,56 +89,59 @@
         }
 
         /// <summary>
-        /// Creates <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/> with tailor made wave impact output set.
+        /// Creates <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/> with wave impact with wave direction output set.
         /// </summary>
-        /// <param name="tailorMadeWaveImpactOutput">The tailor made wave impact output to set.</param>
+        /// <param name="waveImpactWithWaveDirectionOutput">The wave impact with wave direction output to set.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="tailorMadeWaveImpactOutput"/>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="waveImpactWithWaveDirectionOutput"/>
         /// is <c>null</c>.</exception>
-        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithTailorMadeWaveImpact(IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput)
+        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveImpactWithWaveDirection(
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
-            if (tailorMadeWaveImpactOutput == null)
+            if (waveImpactWithWaveDirectionOutput == null)
             {
-                throw new ArgumentNullException(nameof(tailorMadeWaveImpactOutput));
+                throw new ArgumentNullException(nameof(waveImpactWithWaveDirectionOutput));
             }
 
-            return new GrassCoverErosionOutwardsWaveConditionsOutput(null, null, tailorMadeWaveImpactOutput);
+            return new GrassCoverErosionOutwardsWaveConditionsOutput(null, null, waveImpactWithWaveDirectionOutput);
         }
 
         /// <summary>
-        /// Creates <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/> with wave run up and tailor made wave impact output set.
+        /// Creates <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/> with wave run up and wave impact with wave direction output set.
         /// </summary>
         /// <param name="waveRunUpOutput">The wave run up output to set.</param>
-        /// <param name="tailorMadeWaveImpact">The tailor made wave impact output to set.</param>
+        /// <param name="waveImpactWithWaveDirectionOutput">The wave impact with wave direction output to set.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
-                                                                                                                     IEnumerable<WaveConditionsOutput> tailorMadeWaveImpact)
+        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(
+            IEnumerable<WaveConditionsOutput> waveRunUpOutput,
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
             if (waveRunUpOutput == null)
             {
                 throw new ArgumentNullException(nameof(waveRunUpOutput));
             }
 
-            if (tailorMadeWaveImpact == null)
+            if (waveImpactWithWaveDirectionOutput == null)
             {
-                throw new ArgumentNullException(nameof(tailorMadeWaveImpact));
+                throw new ArgumentNullException(nameof(waveImpactWithWaveDirectionOutput));
             }
 
-            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, null, tailorMadeWaveImpact);
+            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, null, waveImpactWithWaveDirectionOutput);
         }
 
         /// <summary>
         /// Creates <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/> with wave run up, wave impact and tailor made wave impact output set.
         /// </summary>
         /// <param name="waveRunUpOutput">The wave run up output to set.</param>
         /// <param name="waveImpactOutput">The wave impact output to set.</param>
-        /// <param name="tailorMadeWaveImpact">The tailor made wave impact output to set.</param>
+        /// <param name="waveImpactWithWaveDirectionOutput">The wave impact with wave direction output to set.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
-                                                                                                                               IEnumerable<WaveConditionsOutput> waveImpactOutput,
-                                                                                                                               IEnumerable<WaveConditionsOutput> tailorMadeWaveImpact)
+        public static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(
+            IEnumerable<WaveConditionsOutput> waveRunUpOutput,
+            IEnumerable<WaveConditionsOutput> waveImpactOutput,
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
             if (waveRunUpOutput == null)
             {
@@ -149,12 +153,12 @@
                 throw new ArgumentNullException(nameof(waveImpactOutput));
             }
 
-            if (tailorMadeWaveImpact == null)
+            if (waveImpactWithWaveDirectionOutput == null)
             {
-                throw new ArgumentNullException(nameof(tailorMadeWaveImpact));
+                throw new ArgumentNullException(nameof(waveImpactWithWaveDirectionOutput));
             }
 
-            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpact);
+            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs
===================================================================
diff -u -reee2dd42910cdfaa2ecadca3702c1aba56c546d6 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs)	(revision eee2dd42910cdfaa2ecadca3702c1aba56c546d6)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -99,7 +99,7 @@
         {
             get
             {
-                return data.TailorMadeWaveImpactOutput.Select(output => new WaveConditionsOutputProperties
+                return data.WaveImpactWithWaveDirectionOutput.Select(output => new WaveConditionsOutputProperties
                 {
                     Data = output
                 }).ToArray();
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs
===================================================================
diff -u -rb488cc05750d849cd91fb36920d8ad346889c7c3 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporter.cs)	(revision b488cc05750d849cd91fb36920d8ad346889c7c3)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporter.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -94,7 +94,7 @@
                 {
                     exportableWaveConditions.AddRange(
                         ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(
-                            calculation.Name, calculation.InputParameters, calculation.Output.TailorMadeWaveImpactOutput, CoverType.GrassTailorMadeWaveImpact, getTargetProbabilityFunc));
+                            calculation.Name, calculation.InputParameters, calculation.Output.WaveImpactWithWaveDirectionOutput, CoverType.GrassTailorMadeWaveImpact, getTargetProbabilityFunc));
                 }
             }
 
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r229883cef2d430554ef437720205d7c7d78418af -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision 229883cef2d430554ef437720205d7c7d78418af)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -205,14 +205,14 @@
         /// <param name="calculationType">The type of the calculation.</param>
         /// <param name="waveRunUpOutput">The output of the wave run up calculation.</param>
         /// <param name="waveImpactOutput">The output of the wave impact calculation.</param>
-        /// <param name="tailorMadeWaveImpactOutput">The output of the tailor made wave impact calculation.</param>
+        /// <param name="waveImpactWithWaveDirectionOutput">The output of the wave impact with wave direction calculation.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
         /// <exception cref="NotSupportedException">Thrown when <see cref="GrassCoverErosionOutwardsWaveConditionsCalculationType"/>
         /// is a valid value, but unsupported.</exception> 
         private static GrassCoverErosionOutwardsWaveConditionsOutput CreateOutput(GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType,
                                                                                   IEnumerable<WaveConditionsOutput> waveRunUpOutput,
                                                                                   IEnumerable<WaveConditionsOutput> waveImpactOutput,
-                                                                                  IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput)
+                                                                                  IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
             switch (calculationType)
             {
@@ -223,11 +223,11 @@
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact:
                     return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpact(waveRunUpOutput, waveImpactOutput);
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact:
-                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithTailorMadeWaveImpact(tailorMadeWaveImpactOutput);
+                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpactWithWaveDirection(waveImpactWithWaveDirectionOutput);
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact:
-                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(waveRunUpOutput, tailorMadeWaveImpactOutput);
+                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(waveRunUpOutput, waveImpactWithWaveDirectionOutput);
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.All:
-                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput);
+                    return GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
                 default:
                     throw new NotSupportedException();
             }
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputFactoryTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputFactoryTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputFactoryTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputFactoryTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputFactoryTest.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -55,7 +55,7 @@
             // Assert
             Assert.AreSame(waveRunUpOutput, output.WaveRunUpOutput);
             Assert.IsNull(output.WaveImpactOutput);
-            Assert.IsNull(output.TailorMadeWaveImpactOutput);
+            Assert.IsNull(output.WaveImpactWithWaveDirectionOutput);
         }
 
         [Test]
@@ -83,7 +83,7 @@
             // Assert
             Assert.AreSame(waveImpactOutput, output.WaveImpactOutput);
             Assert.IsNull(output.WaveRunUpOutput);
-            Assert.IsNull(output.TailorMadeWaveImpactOutput);
+            Assert.IsNull(output.WaveImpactWithWaveDirectionOutput);
         }
 
         [Test]
@@ -133,159 +133,159 @@
             // Assert
             Assert.AreSame(waveRunUpOutput, output.WaveRunUpOutput);
             Assert.AreSame(waveImpactOutput, output.WaveImpactOutput);
-            Assert.IsNull(output.TailorMadeWaveImpactOutput);
+            Assert.IsNull(output.WaveImpactWithWaveDirectionOutput);
         }
 
         [Test]
-        public void CreateOutputWithTailorMadeWaveImpact_TailorMadeWaveImpactOutputNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveImpactWithWaveDirection_WaveImpactWithWaveDirectionOutputNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithTailorMadeWaveImpact(null);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpactWithWaveDirection(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("tailorMadeWaveImpactOutput", exception.ParamName);
+            Assert.AreEqual("waveImpactWithWaveDirectionOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithTailorMadeWaveImpact_WithOutput_ReturnsOutput()
+        public void CreateOutputWithWaveImpactWithWaveDirection_WithOutput_ReturnsOutput()
         {
             // Setup
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             GrassCoverErosionOutwardsWaveConditionsOutput output =
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithTailorMadeWaveImpact(tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpactWithWaveDirection(waveImpactWithWaveDirectionOutput);
 
             // Assert
-            Assert.AreSame(tailorMadeWaveImpactOutput, output.TailorMadeWaveImpactOutput);
+            Assert.AreSame(waveImpactWithWaveDirectionOutput, output.WaveImpactWithWaveDirectionOutput);
             Assert.IsNull(output.WaveRunUpOutput);
             Assert.IsNull(output.WaveImpactOutput);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpAndTailorMadeWaveImpact_WaveRunUpOutputNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection_WaveRunUpOutputNull_ThrowsArgumentNullException()
         {
             //Setup
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirection = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(null,
-                                                                                                                      tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(null,
+                                                                                                                             waveImpactWithWaveDirection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("waveRunUpOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpAndTailorMadeWaveImpact_TailorMadeWaveImpactNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection_WaveImpactWithWaveDirectionOutputNull_ThrowsArgumentNullException()
         {
             //Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(waveRunUpOutput,
-                                                                                                                      null);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(waveRunUpOutput,
+                                                                                                                             null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("tailorMadeWaveImpact", exception.ParamName);
+            Assert.AreEqual("waveImpactWithWaveDirectionOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpAndTailorMadeWaveImpact_WithOutput_ReturnsOutput()
+        public void CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection_WithOutput_ReturnsOutput()
         {
             // Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             GrassCoverErosionOutwardsWaveConditionsOutput output =
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(waveRunUpOutput,
-                                                                                                                      tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(waveRunUpOutput,
+                                                                                                                             waveImpactWithWaveDirectionOutput);
 
             // Assert
             Assert.AreSame(waveRunUpOutput, output.WaveRunUpOutput);
-            Assert.AreSame(tailorMadeWaveImpactOutput, output.TailorMadeWaveImpactOutput);
+            Assert.AreSame(waveImpactWithWaveDirectionOutput, output.WaveImpactWithWaveDirectionOutput);
             Assert.IsNull(output.WaveImpactOutput);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact_WaveRunUpOutputNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection_WaveRunUpOutputNull_ThrowsArgumentNullException()
         {
             //Setup
             IEnumerable<WaveConditionsOutput> waveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(null,
-                                                                                                                                waveImpactOutput,
-                                                                                                                                tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(null, 
+                                                                                                                                       waveImpactOutput,
+                                                                                                                                       waveImpactWithWaveDirectionOutput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("waveRunUpOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact_WaveImpactOutputNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection_WaveImpactOutputNull_ThrowsArgumentNullException()
         {
             //Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(waveRunUpOutput,
-                                                                                                                                null,
-                                                                                                                                tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(waveRunUpOutput,
+                                                                                                                                       null,
+                                                                                                                                       waveImpactWithWaveDirectionOutput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("waveImpactOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact_TailorMadeWaveImpactOutputNull_ThrowsArgumentNullException()
+        public void CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection_WaveImpactWithWaveDirectionOutputNull_ThrowsArgumentNullException()
         {
             //Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
             IEnumerable<WaveConditionsOutput> waveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             TestDelegate call = () =>
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(waveRunUpOutput,
-                                                                                                                                waveImpactOutput,
-                                                                                                                                null);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(waveRunUpOutput,
+                                                                                                                                       waveImpactOutput,
+                                                                                                                                       null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("tailorMadeWaveImpact", exception.ParamName);
+            Assert.AreEqual("waveImpactWithWaveDirectionOutput", exception.ParamName);
         }
 
         [Test]
-        public void CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact_WithOutput_ReturnsOutput()
+        public void CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection_WithOutput_ReturnsOutput()
         {
             // Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
             IEnumerable<WaveConditionsOutput> waveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
             GrassCoverErosionOutwardsWaveConditionsOutput output =
-                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(waveRunUpOutput,
-                                                                                                                                waveImpactOutput,
-                                                                                                                                tailorMadeWaveImpactOutput);
+                GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(waveRunUpOutput,
+                                                                                                                                       waveImpactOutput,
+                                                                                                                                       waveImpactWithWaveDirectionOutput);
 
             // Assert
             Assert.AreSame(waveRunUpOutput, output.WaveRunUpOutput);
             Assert.AreSame(waveImpactOutput, output.WaveImpactOutput);
-            Assert.AreSame(tailorMadeWaveImpactOutput, output.TailorMadeWaveImpactOutput);
+            Assert.AreSame(waveImpactWithWaveDirectionOutput, output.WaveImpactWithWaveDirectionOutput);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTest.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -40,17 +40,17 @@
             // Setup
             IEnumerable<WaveConditionsOutput> waveRunUpOutput = Enumerable.Empty<WaveConditionsOutput>();
             IEnumerable<WaveConditionsOutput> waveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
-            IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = Enumerable.Empty<WaveConditionsOutput>();
+            IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput = Enumerable.Empty<WaveConditionsOutput>();
 
             // Call
-            var output = new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput);
+            var output = new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
 
             // Assert
             Assert.IsInstanceOf<CloneableObservable>(output);
             Assert.IsInstanceOf<ICalculationOutput>(output);
             Assert.AreSame(waveRunUpOutput, output.WaveRunUpOutput);
             Assert.AreSame(waveImpactOutput, output.WaveImpactOutput);
-            Assert.AreSame(tailorMadeWaveImpactOutput, output.TailorMadeWaveImpactOutput);
+            Assert.AreSame(waveImpactWithWaveDirectionOutput, output.WaveImpactWithWaveDirectionOutput);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsCloneAssert.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsCloneAssert.cs	(.../GrassCoverErosionOutwardsCloneAssert.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsCloneAssert.cs	(.../GrassCoverErosionOutwardsCloneAssert.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -59,7 +59,7 @@
         {
             CoreCloneAssert.AreEnumerationClones(original.WaveRunUpOutput, clone.WaveRunUpOutput, WaveConditionsCloneAssert.AreClones);
             CoreCloneAssert.AreEnumerationClones(original.WaveImpactOutput, clone.WaveImpactOutput, WaveConditionsCloneAssert.AreClones);
-            CoreCloneAssert.AreEnumerationClones(original.TailorMadeWaveImpactOutput, clone.TailorMadeWaveImpactOutput, WaveConditionsCloneAssert.AreClones);
+            CoreCloneAssert.AreEnumerationClones(original.WaveImpactWithWaveDirectionOutput, clone.WaveImpactWithWaveDirectionOutput, WaveConditionsCloneAssert.AreClones);
         }
 
         /// <summary>
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -49,13 +49,13 @@
         /// </summary>
         /// <param name="waveRunUpOutput">The wave run up output.</param>
         /// <param name="waveImpactOutput">The wave impact output.</param>
-        /// <param name="tailorMadeWaveImpactOutput">The tailor made wave impact output.</param>
+        /// <param name="waveImpactWithWaveDirectionOutput">The wave impact with wave direction output.</param>
         /// <returns>The created <see cref="GrassCoverErosionOutwardsWaveConditionsOutput"/>.</returns>
         public static GrassCoverErosionOutwardsWaveConditionsOutput Create(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
                                                                            IEnumerable<WaveConditionsOutput> waveImpactOutput,
-                                                                           IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput)
+                                                                           IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
-            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput);
+            return new GrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r229883cef2d430554ef437720205d7c7d78418af -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 229883cef2d430554ef437720205d7c7d78418af)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -585,7 +585,7 @@
                 Assert.IsNotNull(calculationOutput);
                 Assert.AreEqual(waveRunUpNull, calculationOutput.WaveRunUpOutput == null);
                 Assert.AreEqual(waveImpactNull, calculationOutput.WaveImpactOutput == null);
-                Assert.AreEqual(tailorMadeWaveImpactNull, calculationOutput.TailorMadeWaveImpactOutput == null);
+                Assert.AreEqual(tailorMadeWaveImpactNull, calculationOutput.WaveImpactWithWaveDirectionOutput == null);
 
                 if (!waveRunUpNull)
                 {
@@ -599,7 +599,7 @@
 
                 if (!tailorMadeWaveImpactNull)
                 {
-                    Assert.AreEqual(3, calculationOutput.TailorMadeWaveImpactOutput.Count());
+                    Assert.AreEqual(3, calculationOutput.WaveImpactWithWaveDirectionOutput.Count());
                 }
             }
 
@@ -785,8 +785,8 @@
                 WaveConditionsOutput[] waveImpactOutputs = calculation.Output.WaveImpactOutput.ToArray();
                 Assert.AreEqual(3, waveImpactOutputs.Length);
 
-                WaveConditionsOutput[] tailorMadeWaveImpactOutputs = calculation.Output.TailorMadeWaveImpactOutput.ToArray();
-                Assert.AreEqual(3, tailorMadeWaveImpactOutputs.Length);
+                WaveConditionsOutput[] waveImpactWithWaveDirectionOutputs = calculation.Output.WaveImpactWithWaveDirectionOutput.ToArray();
+                Assert.AreEqual(3, waveImpactWithWaveDirectionOutputs.Length);
 
                 WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment,
                                                                   assessmentSection.FailureMechanismContribution.LowerLimitNorm,
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -re47ac86398c5a5814dd1fa8760c9d1cc0537c531 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -113,7 +113,7 @@
                 var i = 0;
                 SetOutputEntities(entity, calculation.Output.WaveRunUpOutput, GrassCoverErosionOutwardsWaveConditionsOutputType.WaveRunUp, ref i);
                 SetOutputEntities(entity, calculation.Output.WaveImpactOutput, GrassCoverErosionOutwardsWaveConditionsOutputType.WaveImpact, ref i);
-                SetOutputEntities(entity, calculation.Output.TailorMadeWaveImpactOutput, GrassCoverErosionOutwardsWaveConditionsOutputType.TailorMadeWaveImpact, ref i);
+                SetOutputEntities(entity, calculation.Output.WaveImpactWithWaveDirectionOutput, GrassCoverErosionOutwardsWaveConditionsOutputType.TailorMadeWaveImpact, ref i);
             }
         }
 
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r7fe8b34e802664f48739a8c46bd463668ccac9bd -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision 7fe8b34e802664f48739a8c46bd463668ccac9bd)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -107,7 +107,7 @@
 
             var waveRunUpOutput = new List<WaveConditionsOutput>();
             var waveImpactOutput = new List<WaveConditionsOutput>();
-            var tailorMadeWaveImpactOutput = new List<WaveConditionsOutput>();
+            var waveImpactWithWaveDirectionOutput = new List<WaveConditionsOutput>();
             foreach (GrassCoverErosionOutwardsWaveConditionsOutputEntity outputEntity in
                 entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.OrderBy(e => e.Order))
             {
@@ -123,37 +123,37 @@
 
                 if (outputEntity.OutputType == Convert.ToByte(GrassCoverErosionOutwardsWaveConditionsOutputType.TailorMadeWaveImpact))
                 {
-                    tailorMadeWaveImpactOutput.Add(outputEntity.Read());
+                    waveImpactWithWaveDirectionOutput.Add(outputEntity.Read());
                 }
             }
 
-            calculation.Output = CreateGrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput);
+            calculation.Output = CreateGrassCoverErosionOutwardsWaveConditionsOutput(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
         }
 
         private static GrassCoverErosionOutwardsWaveConditionsOutput CreateGrassCoverErosionOutwardsWaveConditionsOutput(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
                                                                                                                          IEnumerable<WaveConditionsOutput> waveImpactOutput,
-                                                                                                                         IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput)
+                                                                                                                         IEnumerable<WaveConditionsOutput> waveImpactWithWaveDirectionOutput)
         {
             bool hasWaveRunUpOutput = waveRunUpOutput.Any();
             bool hasWaveImpactOutput = waveImpactOutput.Any();
-            bool hasTailorMadeWaveImpactOutput = tailorMadeWaveImpactOutput.Any();
+            bool hasWaveImpactWithWaveDirectionOutput = waveImpactWithWaveDirectionOutput.Any();
 
             if (!hasWaveRunUpOutput)
             {
                 return hasWaveImpactOutput
                            ? GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpact(waveImpactOutput)
-                           : GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithTailorMadeWaveImpact(tailorMadeWaveImpactOutput);
+                           : GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpactWithWaveDirection(waveImpactWithWaveDirectionOutput);
             }
 
             if (hasWaveImpactOutput)
             {
-                return !hasTailorMadeWaveImpactOutput
+                return !hasWaveImpactWithWaveDirectionOutput
                            ? GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpact(waveRunUpOutput, waveImpactOutput)
-                           : GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(waveRunUpOutput, waveImpactOutput, tailorMadeWaveImpactOutput);
+                           : GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(waveRunUpOutput, waveImpactOutput, waveImpactWithWaveDirectionOutput);
             }
 
-            return hasTailorMadeWaveImpactOutput
-                       ? GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndTailorMadeWaveImpact(waveRunUpOutput, tailorMadeWaveImpactOutput)
+            return hasWaveImpactWithWaveDirectionOutput
+                       ? GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpAndWaveImpactWithWaveDirection(waveRunUpOutput, waveImpactWithWaveDirectionOutput)
                        : GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUp(waveRunUpOutput);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r7fe8b34e802664f48739a8c46bd463668ccac9bd -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 7fe8b34e802664f48739a8c46bd463668ccac9bd)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -252,7 +252,7 @@
             var registry = new PersistenceRegistry();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndTailorMadeWaveImpact(
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveRunUpWaveImpactAndWaveImpactWithWaveDirection(
                     new[]
                     {
                         new TestWaveConditionsOutput()
@@ -352,7 +352,7 @@
             var registry = new PersistenceRegistry();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithTailorMadeWaveImpact(
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpactWithWaveDirection(
                     new[]
                     {
                         new TestWaveConditionsOutput(),
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r3b1aea305fa3407ef2d830bac9096ea670c86321 -refdf0effa904bccf1f3f96e28f013e20d01fbc7a
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision 3b1aea305fa3407ef2d830bac9096ea670c86321)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision efdf0effa904bccf1f3f96e28f013e20d01fbc7a)
@@ -345,7 +345,7 @@
         }
 
         [Test]
-        public void Read_EntityWithCalculationOutputEntityWithWaveRunUpAndTailorMadeWaveImpact_CalculationWithOutput()
+        public void Read_EntityWithCalculationOutputEntityWithWaveRunUpAndWaveImpactWithWaveDirection_CalculationWithOutput()
         {
             // Setup
             const double outputALevel = 0;
@@ -386,18 +386,18 @@
 
             // Assert
             Assert.IsNotNull(calculation.Output);
-            double accuracy = calculation.Output.TailorMadeWaveImpactOutput.First().WaterLevel.GetAccuracy();
+            double accuracy = calculation.Output.WaveImpactWithWaveDirectionOutput.First().WaterLevel.GetAccuracy();
 
             Assert.AreEqual(2, calculation.Output.WaveRunUpOutput.Count());
             Assert.AreEqual(outputALevel, calculation.Output.WaveRunUpOutput.ElementAt(0).WaterLevel, accuracy);
             Assert.AreEqual(outputBLevel, calculation.Output.WaveRunUpOutput.ElementAt(1).WaterLevel, accuracy);
 
-            Assert.AreEqual(1, calculation.Output.TailorMadeWaveImpactOutput.Count());
-            Assert.AreEqual(outputCLevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(0).WaterLevel, accuracy);
+            Assert.AreEqual(1, calculation.Output.WaveImpactWithWaveDirectionOutput.Count());
+            Assert.AreEqual(outputCLevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(0).WaterLevel, accuracy);
         }
 
         [Test]
-        public void Read_EntityWithCalculationOutputEntityWithWaveRunUpAndWaveImpactAndTailorMadeWaveImpact_CalculationWithOutput()
+        public void Read_EntityWithCalculationOutputEntityWithWaveRunUpAndWaveImpactAndWaveImpactWithWaveDirection_CalculationWithOutput()
         {
             // Setup
             const double outputALevel = 0;
@@ -468,10 +468,10 @@
             Assert.AreEqual(1, calculation.Output.WaveImpactOutput.Count());
             Assert.AreEqual(outputCLevel, calculation.Output.WaveImpactOutput.ElementAt(0).WaterLevel, accuracy);
 
-            Assert.AreEqual(3, calculation.Output.TailorMadeWaveImpactOutput.Count());
-            Assert.AreEqual(outputALevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(0).WaterLevel, accuracy);
-            Assert.AreEqual(outputBLevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(1).WaterLevel, accuracy);
-            Assert.AreEqual(outputCLevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(2).WaterLevel, accuracy);
+            Assert.AreEqual(3, calculation.Output.WaveImpactWithWaveDirectionOutput.Count());
+            Assert.AreEqual(outputALevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(0).WaterLevel, accuracy);
+            Assert.AreEqual(outputBLevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(1).WaterLevel, accuracy);
+            Assert.AreEqual(outputCLevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(2).WaterLevel, accuracy);
         }
 
         [Test]
@@ -561,7 +561,7 @@
         }
 
         [Test]
-        public void Read_EntityWithCalculationOutputEntityWithTailorMadeWaveImpact_CalculationWithOutput()
+        public void Read_EntityWithCalculationOutputEntityWithWaveImpactWithWaveDirection_CalculationWithOutput()
         {
             // Setup
             const double outputALevel = 0;
@@ -594,11 +594,11 @@
 
             // Assert
             Assert.IsNotNull(calculation.Output);
-            double accuracy = calculation.Output.TailorMadeWaveImpactOutput.First().WaterLevel.GetAccuracy();
+            double accuracy = calculation.Output.WaveImpactWithWaveDirectionOutput.First().WaterLevel.GetAccuracy();
 
-            Assert.AreEqual(2, calculation.Output.TailorMadeWaveImpactOutput.Count());
-            Assert.AreEqual(outputALevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(0).WaterLevel, accuracy);
-            Assert.AreEqual(outputBLevel, calculation.Output.TailorMadeWaveImpactOutput.ElementAt(1).WaterLevel, accuracy);
+            Assert.AreEqual(2, calculation.Output.WaveImpactWithWaveDirectionOutput.Count());
+            Assert.AreEqual(outputALevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(0).WaterLevel, accuracy);
+            Assert.AreEqual(outputBLevel, calculation.Output.WaveImpactWithWaveDirectionOutput.ElementAt(1).WaterLevel, accuracy);
 
             Assert.IsNull(calculation.Output.WaveRunUpOutput);
         }