Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationType.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -rb9cc64bfe83bec1db372feaba0e39a38cd54b957
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationType.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationType.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationType.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationType.cs)	(revision b9cc64bfe83bec1db372feaba0e39a38cd54b957)
@@ -43,17 +43,17 @@
         WaveRunUpAndWaveImpact = 3,
 
         /// <summary>
-        /// Calculate the tailor made wave impact.
+        /// Calculate the wave impact with wave direction.
         /// </summary>
-        TailorMadeWaveImpact = 4,
+        WaveImpactWithWaveDirection = 4,
 
         /// <summary>
-        /// Calculate the wave run up and tailor made wave impact.
+        /// Calculate the wave run up and wave impact with wave direction.
         /// </summary>
-        WaveRunUpAndTailorMadeWaveImpact = 5,
+        WaveRunUpAndWaveImpactWithWaveDirection = 5,
 
         /// <summary>
-        /// Calculate the wave run up, wave impact and tailor made wave impact.
+        /// Calculate the wave run up, wave impact and wave impact with wave direction.
         /// </summary>
         All = 6
     }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -rb9cc64bfe83bec1db372feaba0e39a38cd54b957
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter.cs)	(revision b9cc64bfe83bec1db372feaba0e39a38cd54b957)
@@ -62,9 +62,9 @@
                         return GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact;
                     case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact:
                         return GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact;
-                    case ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact:
+                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection:
                         return GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact;
-                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact:
+                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection:
                         return GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact;
                     case ConfigurationGrassCoverErosionOutwardsCalculationType.All:
                         return GrassCoverErosionOutwardsWaveConditionsCalculationType.All;
@@ -83,9 +83,9 @@
                         return RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_WaveImpact_DisplayName;
                     case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact:
                         return RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_WaveRunUp_and_WaveImpact_DisplayName;
-                    case ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact:
+                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection:
                         return RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_TailorMadeWaveImpact_DisplayName;
-                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact:
+                    case ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection:
                         return RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_WaveRunUp_and_TailorMadeWaveImpact_DisplayName;
                     case ConfigurationGrassCoverErosionOutwardsCalculationType.All:
                         return RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_All_DisplayName;
@@ -131,12 +131,12 @@
 
                 if (stringValue == RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_TailorMadeWaveImpact_DisplayName)
                 {
-                    return ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact;
+                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection;
                 }
 
                 if (stringValue == RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_WaveRunUp_and_TailorMadeWaveImpact_DisplayName)
                 {
-                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact;
+                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection;
                 }
 
                 if (stringValue == RiskeerGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculationType_All_DisplayName)
@@ -167,9 +167,9 @@
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact:
                     return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact;
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact:
-                    return ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact;
+                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection;
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact:
-                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact;
+                    return ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection;
                 case GrassCoverErosionOutwardsWaveConditionsCalculationType.All:
                     return ConfigurationGrassCoverErosionOutwardsCalculationType.All;
                 default:
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -rb9cc64bfe83bec1db372feaba0e39a38cd54b957
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeTest.cs)	(revision b9cc64bfe83bec1db372feaba0e39a38cd54b957)
@@ -45,10 +45,10 @@
                         ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact, 3
                     },
                     {
-                        ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact, 4
+                        ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection, 4
                     },
                     {
-                        ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact, 5
+                        ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection, 5
                     },
                     {
                         ConfigurationGrassCoverErosionOutwardsCalculationType.All, 6
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverterTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -rb9cc64bfe83bec1db372feaba0e39a38cd54b957
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverterTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeConverterTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCalculationTypeConverterTest.cs	(.../ConfigurationGrassCoverErosionOutwardsCalculationTypeConverterTest.cs)	(revision b9cc64bfe83bec1db372feaba0e39a38cd54b957)
@@ -103,8 +103,8 @@
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact, GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact)]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUp, GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp)]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact, GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact)]
-        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact, GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact)]
-        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact, GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact)]
+        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection, GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact)]
+        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection, GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact)]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.All, GrassCoverErosionOutwardsWaveConditionsCalculationType.All)]
         public void ConvertTo_ValidConfigurationGrassCoverErosionOutwardsCalculationType_ReturnGrassCoverErosionOutwardsWaveConditionsCalculationType(
             ConfigurationGrassCoverErosionOutwardsCalculationType originalValue, GrassCoverErosionOutwardsWaveConditionsCalculationType expectedResult)
@@ -123,8 +123,8 @@
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact, "Gras (golfoploop en golfklap)")]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUp, "Gras (golfoploop)")]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact, "Gras (golfklap)")]
-        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact, "Gras (golfklap voor toets op maat)")]
-        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact, "Gras (golfoploop en golfklap voor toets op maat)")]
+        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection, "Gras (golfklap voor toets op maat)")]
+        [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection, "Gras (golfoploop en golfklap voor toets op maat)")]
         [TestCase(ConfigurationGrassCoverErosionOutwardsCalculationType.All, "Gras (alle types)")]
         public void ConvertTo_ValidConfigurationGrassCoverErosionOutwardsCalculationType_ReturnExpectedText(
             ConfigurationGrassCoverErosionOutwardsCalculationType originalValue, string expectedText)
@@ -197,8 +197,8 @@
         [TestCase("Gras (golfoploop en golfklap)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact)]
         [TestCase("Gras (golfoploop)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUp)]
         [TestCase("Gras (golfklap)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact)]
-        [TestCase("Gras (golfklap voor toets op maat)", ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact)]
-        [TestCase("Gras (golfoploop en golfklap voor toets op maat)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact)]
+        [TestCase("Gras (golfklap voor toets op maat)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection)]
+        [TestCase("Gras (golfoploop en golfklap voor toets op maat)", ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection)]
         [TestCase("Gras (alle types)", ConfigurationGrassCoverErosionOutwardsCalculationType.All)]
         public void ConvertFrom_ValidStringValue_ReturnConfigurationGrassCoverErosionOutwardsCalculationType(
             string originalValue, ConfigurationGrassCoverErosionOutwardsCalculationType expectedValue)
@@ -217,8 +217,8 @@
         [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpact)]
         [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUp)]
         [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact)]
-        [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.TailorMadeWaveImpact)]
-        [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndTailorMadeWaveImpact)]
+        [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpactWithWaveDirection)]
+        [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact, ConfigurationGrassCoverErosionOutwardsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection)]
         [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.All, ConfigurationGrassCoverErosionOutwardsCalculationType.All)]
         public void ConvertFrom_ValidGrassCoverErosionOutwardsWaveConditionsCalculationType_ReturnConfigurationGrassCoverErosionOutwardsCalculationType(
             GrassCoverErosionOutwardsWaveConditionsCalculationType originalValue, ConfigurationGrassCoverErosionOutwardsCalculationType expectedValue)
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -ref8bf2f90306f8281026cecd4c44782ebe8407ed -rb9cc64bfe83bec1db372feaba0e39a38cd54b957
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ef8bf2f90306f8281026cecd4c44782ebe8407ed)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision b9cc64bfe83bec1db372feaba0e39a38cd54b957)
@@ -181,7 +181,7 @@
                 GetViewData = context => context.WrappedData,
                 GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName,
                 CreateInstance = context => new HeightStructuresScenariosView(context.WrappedData, context.ParentFailureMechanism),
-                CloseForData = CloseScenariosViewForData,
+                CloseForData = CloseScenariosViewForData
             };
 
             yield return new RiskeerViewInfo<