Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs
===================================================================
diff -u -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs	(.../IHydraulicLocationOutputEntity.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs	(.../IHydraulicLocationOutputEntity.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -37,7 +37,7 @@
         double? TargetProbability { get; set; }
 
         /// <summary>
-        /// Gets or set the required (maximum allowed) reliability of the failure mechanism.
+        /// Gets or sets the required (maximum allowed) reliability of the failure mechanism.
         /// </summary>
         double? TargetReliability { get; set; }
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IProbabilityAssessmentOutputEntity.cs
===================================================================
diff -u -r9e54793f4e953bf1a1b9c9f9d731de4831dd9ff6 -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IProbabilityAssessmentOutputEntity.cs	(.../IProbabilityAssessmentOutputEntity.cs)	(revision 9e54793f4e953bf1a1b9c9f9d731de4831dd9ff6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IProbabilityAssessmentOutputEntity.cs	(.../IProbabilityAssessmentOutputEntity.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -32,7 +32,7 @@
         double? RequiredProbability { get; set; }
 
         /// <summary>
-        /// Gets or set the required (maximum allowed) reliability of the failure mechanism.
+        /// Gets or sets the required (maximum allowed) reliability of the failure mechanism.
         /// </summary>
         double? RequiredReliability { get; set; }
 
Index: Core/Common/src/Core.Common.Controls/DataGrid/CellStyle.cs
===================================================================
diff -u -r49c5da81f49a23dd6e66526d264a08bf510e6963 -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Core/Common/src/Core.Common.Controls/DataGrid/CellStyle.cs	(.../CellStyle.cs)	(revision 49c5da81f49a23dd6e66526d264a08bf510e6963)
+++ Core/Common/src/Core.Common.Controls/DataGrid/CellStyle.cs	(.../CellStyle.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -50,12 +50,12 @@
         };
 
         /// <summary>
-        /// Gets and sets the color of the text.
+        /// Gets or sets the color of the text.
         /// </summary>
         public Color TextColor { get; private set; }
 
         /// <summary>
-        /// Gets and sets the color of the background.
+        /// Gets or sets the color of the background.
         /// </summary>
         public Color BackgroundColor { get; private set; }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs
===================================================================
diff -u -rd95fb69687882a10441dbda4682b2cef974f833b -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs	(.../RingtoetsMapControl.cs)	(revision d95fb69687882a10441dbda4682b2cef974f833b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs	(.../RingtoetsMapControl.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -28,7 +28,7 @@
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// This class describes a map view with background.
+    /// This class describes a map control with background.
     /// </summary>
     public class RingtoetsMapControl : MapControl
     {
@@ -45,7 +45,7 @@
         }
 
         /// <summary>
-        /// Gets ans sets the <see cref="BackgroundData"/>.
+        /// Gets or sets the <see cref="BackgroundData"/>.
         /// </summary>
         public BackgroundData BackgroundData
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -r35fa216f8255ce431cd920b991297fa80592b64a -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -49,7 +49,7 @@
         private DirectoryDisposeHelper directoryDisposeHelper;
         private TestSettingsHelper testSettingsHelper;
 
-        private static IEnumerable<TestCaseData> BackgroundTypes
+        private static IEnumerable<TestCaseData> BackgroundDataTypeTransitions
         {
             get
             {
@@ -167,7 +167,7 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(BackgroundTypes))]
+        [TestCaseSource(nameof(BackgroundDataTypeTransitions))]
         public void GivenBackgroundData_WhenBackgroundDataChangedToOtherTypeAndNotified_ThenNewInstanceSetOnBackgroundMapData(
             BackgroundData originalBackgroundData,
             BackgroundData newBackgroundData)
@@ -209,7 +209,7 @@
 
                 // Then
                 Assert.IsNotNull(control.BackgroundMapData);
-                Assert.AreNotEqual(oldMapData, control.BackgroundMapData);
+                Assert.AreNotSame(oldMapData, control.BackgroundMapData);
                 Assert.AreNotEqual(oldMapData.GetType(), control.BackgroundMapData.GetType());
                 mocks.VerifyAll(); // Expect no observers notified
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r436f6d5ac9f4b8cb261be071d2e53140f422aa00
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs	(.../PipingScenarioRow.cs)	(revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs	(.../PipingScenarioRow.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
@@ -63,7 +63,7 @@
         }
 
         /// <summary>
-        /// Gets and sets the <see cref="PipingCalculationScenario"/> is relevant.
+        /// Gets or sets the <see cref="PipingCalculationScenario"/> is relevant.
         /// </summary>
         public bool IsRelevant
         {
@@ -79,7 +79,7 @@
         }
 
         /// <summary>
-        /// Gets and sets the contribution of the <see cref="PipingCalculationScenario"/>.
+        /// Gets or sets the contribution of the <see cref="PipingCalculationScenario"/>.
         /// </summary>
         public RoundedDouble Contribution
         {