Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IUseBreakWaterPropertyChangeHandler.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IUseBreakWaterPropertyChangeHandler.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IUseBreakWaterPropertyChangeHandler.cs	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -0,0 +1,14 @@
+namespace Ringtoets.Common.Forms.PropertyClasses
+{
+    /// <summary>
+    /// Interface defining the operations of handling a change of <see cref="UseBreakWaterProperties"/>.
+    /// </summary>
+    public interface IUseBreakWaterPropertyChangeHandler
+    {
+        /// <summary>
+        /// Defines the action that is executed after a property of <see cref="UseBreakWaterProperties"/>
+        /// has been changed.
+        /// </summary>
+        void PropertyChanged();
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -rf808c0a7745d68543626578246691a6f1ec76aae -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision f808c0a7745d68543626578246691a6f1ec76aae)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -55,7 +55,7 @@
         IHasHydraulicBoundaryLocationProperty,
         IHasStructureProperty<TStructure>,
         IHasForeshoreProfileProperty, 
-        UseBreakWaterProperties.IChangeHandler, 
+        IUseBreakWaterPropertyChangeHandler, 
         IDistributionPropertyChangeHandler where TStructure : StructureBase
         where TStructureInput : StructuresInputBase<TStructure>
         where TCalculation : ICalculation
@@ -539,7 +539,7 @@
 
         #endregion
 
-        void UseBreakWaterProperties.IChangeHandler.PropertyChanged()
+        void IUseBreakWaterPropertyChangeHandler.PropertyChanged()
         {
             // TODO WTI-969/WTI-970/WTI-971
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs
===================================================================
diff -u -rf808c0a7745d68543626578246691a6f1ec76aae -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision f808c0a7745d68543626578246691a6f1ec76aae)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -41,7 +41,7 @@
         private const int breakWaterTypePropertyIndex = 2;
         private const int breakWaterHeightPropertyIndex = 3;
         private readonly IUseBreakWater data;
-        private readonly IChangeHandler changeHandler;
+        private readonly IUseBreakWaterPropertyChangeHandler changeHandler;
 
         /// <summary>
         /// Creates a new instance of <see cref="UseBreakWaterProperties"/>, in which
@@ -56,7 +56,7 @@
         /// <param name="useBreakWaterData">The data to use for the properties.</param>
         /// <param name="handler">Optional handler that is used to handle property changes.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public UseBreakWaterProperties(IUseBreakWater useBreakWaterData, IChangeHandler handler)
+        public UseBreakWaterProperties(IUseBreakWater useBreakWaterData, IUseBreakWaterPropertyChangeHandler handler)
         {
             if (useBreakWaterData == null)
             {
@@ -151,17 +151,5 @@
             }
             data.NotifyObservers();
         }
-
-        /// <summary>
-        /// Interface defining the operations of handling a change of <see cref="UseBreakWaterProperties"/>.
-        /// </summary>
-        public interface IChangeHandler
-        {
-            /// <summary>
-            /// Defines the action that is executed after a property of <see cref="UseBreakWaterProperties"/>
-            /// has been changed.
-            /// </summary>
-            void PropertyChanged();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rf808c0a7745d68543626578246691a6f1ec76aae -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision f808c0a7745d68543626578246691a6f1ec76aae)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -69,6 +69,7 @@
     <Compile Include="PresentationObjects\FailureMechanismItemContextBase.cs" />
     <Compile Include="PropertyClasses\IDistributionPropertyChangeHandler.cs" />
     <Compile Include="PropertyClasses\IFailureMechanismPropertyChangeHandler.cs" />
+    <Compile Include="PropertyClasses\IUseBreakWaterPropertyChangeHandler.cs" />
     <Compile Include="PropertyClasses\StructuresInputBaseProperties.cs" />
     <Compile Include="PresentationObjects\TreeFolderCategory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs
===================================================================
diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision 545b105a213ed85564861b4bcf6d2d6425dbde50)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs	(.../UseBreakWaterPropertiesTest.cs)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -228,7 +228,7 @@
             var calculationObserver = mocks.StrictMock<IObserver>();
             var inputObserver = mocks.StrictMock<IObserver>();
             inputObserver.Expect(o => o.UpdateObserver());
-            var handler = mocks.StrictMock<UseBreakWaterProperties.IChangeHandler>();
+            var handler = mocks.StrictMock<IUseBreakWaterPropertyChangeHandler>();
             handler.Expect(o => o.PropertyChanged());
             mocks.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -rf808c0a7745d68543626578246691a6f1ec76aae -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision f808c0a7745d68543626578246691a6f1ec76aae)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -49,7 +49,7 @@
     /// </summary>
     public class GrassCoverErosionInwardsInputContextProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>,
                                                                   IHasHydraulicBoundaryLocationProperty,
-                                                                  UseBreakWaterProperties.IChangeHandler,
+                                                                  IUseBreakWaterPropertyChangeHandler,
                                                                   IDistributionPropertyChangeHandler
     {
         private const int dikeProfilePropertyIndex = 1;
@@ -259,7 +259,7 @@
             ClearCalculationOutput();
         }
 
-        void UseBreakWaterProperties.IChangeHandler.PropertyChanged()
+        void IUseBreakWaterPropertyChangeHandler.PropertyChanged()
         {
             ClearCalculationOutput();
         }
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs
===================================================================
diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rb87e54cb353ebb09cbe6d136b9195e958adfb774
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision c48f16746209f799f93c6fc79a5202a9e3fd419f)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision b87e54cb353ebb09cbe6d136b9195e958adfb774)
@@ -51,7 +51,7 @@
     public abstract class WaveConditionsInputContextProperties<T> : ObjectProperties<T>,
                                                                     IHasHydraulicBoundaryLocationProperty,
                                                                     IHasForeshoreProfileProperty,
-                                                                    UseBreakWaterProperties.IChangeHandler
+                                                                    IUseBreakWaterPropertyChangeHandler
         where T : WaveConditionsInputContext
     {
         private const int hydraulicBoundaryLocationPropertyIndex = 0;
@@ -312,7 +312,7 @@
             }
         }
 
-        void UseBreakWaterProperties.IChangeHandler.PropertyChanged()
+        void IUseBreakWaterPropertyChangeHandler.PropertyChanged()
         {
             ClearCalculationOutput();
         }