Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs
===================================================================
diff -u -r56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8 -r4838f004647741cf5409023313b884bd0a610c16
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs	(.../MapDataHelper.cs)	(revision 56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs	(.../MapDataHelper.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -27,7 +27,7 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// Helper methods related to <see cref="MapData"/> instances.
+    /// Helper methods related to <see cref="FeatureBasedMapData"/> instances.
     /// </summary>
     public static class MapDataHelper
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs
===================================================================
diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -36,7 +36,7 @@
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// Factory for creating <see cref="MapData"/> for data used as input in the assessment section.
+    /// Factory for creating <see cref="FeatureBasedMapData"/> for data used as input in the assessment section.
     /// </summary>
     public static class RingtoetsMapDataFactory
     {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r86b6ce2b77450d63016858e8e18796c02bdaad52 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 86b6ce2b77450d63016858e8e18796c02bdaad52)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -40,7 +40,7 @@
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>
     /// (created via <see cref="RingtoetsMapDataFactory"/>).
     /// </summary>
     public static class RingtoetsMapDataFeaturesFactory
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs
===================================================================
diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs	(.../GrassCoverErosionInwardsMapDataFeatureFactory.cs)	(revision 31d83651ac426afc55ed5796843a2cd5f1770480)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsMapDataFeatureFactory.cs	(.../GrassCoverErosionInwardsMapDataFeatureFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -30,7 +30,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>.
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>.
     /// </summary>
     public static class GrassCoverErosionInwardsMapDataFeaturesFactory
     {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs
===================================================================
diff -u -r86b6ce2b77450d63016858e8e18796c02bdaad52 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs)	(revision 86b6ce2b77450d63016858e8e18796c02bdaad52)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -32,7 +32,7 @@
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>.
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>.
     /// </summary>
     public static class GrassCoverErosionOutwardsMapDataFeaturesFactory
     {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs
===================================================================
diff -u -r0b7a1c98a784ad9ac3eff8c0e8f1fae117ab47f0 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision 0b7a1c98a784ad9ac3eff8c0e8f1fae117ab47f0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -31,7 +31,7 @@
 namespace Ringtoets.Piping.Forms.Views
 {
     /// <summary>
-    /// Factory for creating <see cref="MapData"/> for data used as input in the piping failure mechanism.
+    /// Factory for creating <see cref="FeatureBasedMapData"/> for data used as input in the piping failure mechanism.
     /// </summary>
     public static class PipingMapDataFactory
     {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs
===================================================================
diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision 31d83651ac426afc55ed5796843a2cd5f1770480)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -34,7 +34,7 @@
 namespace Ringtoets.Piping.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>
     /// (created via <see cref="PipingMapDataFactory"/>).
     /// </summary>
     public static class PipingMapDataFeaturesFactory
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs
===================================================================
diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs	(.../StabilityStoneCoverMapDataFeaturesFactory.cs)	(revision 31d83651ac426afc55ed5796843a2cd5f1770480)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverMapDataFeaturesFactory.cs	(.../StabilityStoneCoverMapDataFeaturesFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -30,7 +30,7 @@
 namespace Ringtoets.StabilityStoneCover.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>.
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>.
     /// </summary>
     public static class StabilityStoneCoverMapDataFeaturesFactory
     {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs
===================================================================
diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r4838f004647741cf5409023313b884bd0a610c16
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs	(.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs)	(revision 31d83651ac426afc55ed5796843a2cd5f1770480)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverMapDataFeaturesFactory.cs	(.../WaveImpactAsphaltCoverMapDataFeaturesFactory.cs)	(revision 4838f004647741cf5409023313b884bd0a610c16)
@@ -30,7 +30,7 @@
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.Views
 {
     /// <summary>
-    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="MapData"/>.
+    /// Factory for creating arrays of <see cref="MapFeature"/> to use in <see cref="FeatureBasedMapData"/>.
     /// </summary>
     public static class WaveImpactAsphaltCoverMapDataFeaturesFactory
     {