Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/BackgroundMapDataCreateExtensions.cs
===================================================================
diff -u -r9724ee9c253738d65bab64c26e567d4ae58dd086 -r9046346e9f7d535ae1dc2c774e0eb27c2accf174
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/BackgroundMapDataCreateExtensions.cs	(.../BackgroundMapDataCreateExtensions.cs)	(revision 9724ee9c253738d65bab64c26e567d4ae58dd086)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/BackgroundMapDataCreateExtensions.cs	(.../BackgroundMapDataCreateExtensions.cs)	(revision 9046346e9f7d535ae1dc2c774e0eb27c2accf174)
@@ -23,12 +23,11 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Utils.Extensions;
 using Core.Components.Gis.Data;
-using Ringtoets.Integration.Data;
 
 namespace Application.Ringtoets.Storage.Create
 {
     /// <summary>
-    /// Extensions methods for <see cref="AssessmentSection.BackgroundMapData"/> related to 
+    /// Extensions methods for <see cref="WmtsMapData"/> related to 
     /// creating a <see cref="BackgroundMapDataEntity"/>.
     /// </summary>
     internal static class BackgroundMapDataCreateExtensions
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r03a263822252a5020135a7de96ea8e50d5eb5cc6 -r9046346e9f7d535ae1dc2c774e0eb27c2accf174
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 03a263822252a5020135a7de96ea8e50d5eb5cc6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 9046346e9f7d535ae1dc2c774e0eb27c2accf174)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Base.Geometry;
+using Core.Components.Gis.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
@@ -108,7 +109,7 @@
 
         private static void ReadBackgroundMapData(this AssessmentSectionEntity entity, IAssessmentSection assessmentSection)
         {
-            var backgroundMapData = entity.BackgroundMapDataEntities.Single().Read();
+            WmtsMapData backgroundMapData = entity.BackgroundMapDataEntities.Single().Read();
 
             assessmentSection.BackgroundMapData.Name = backgroundMapData.Name;
 
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs
===================================================================
diff -u -r03a263822252a5020135a7de96ea8e50d5eb5cc6 -r9046346e9f7d535ae1dc2c774e0eb27c2accf174
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs	(.../BackgroundMapDataEntityReadExtensions.cs)	(revision 03a263822252a5020135a7de96ea8e50d5eb5cc6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs	(.../BackgroundMapDataEntityReadExtensions.cs)	(revision 9046346e9f7d535ae1dc2c774e0eb27c2accf174)
@@ -23,12 +23,11 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Base.Data;
 using Core.Components.Gis.Data;
-using Ringtoets.Integration.Data;
 
 namespace Application.Ringtoets.Storage.Read
 {
     /// <summary>
-    /// Extension methods for read operations for <see cref="AssessmentSection.BackgroundMapData"/>
+    /// Extension methods for read operations for <see cref="WmtsMapData"/>
     /// based on the <see cref="BackgroundMapDataEntity"/>.
     /// </summary>
     internal static class BackgroundMapDataEntityReadExtensions
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r03a263822252a5020135a7de96ea8e50d5eb5cc6 -r9046346e9f7d535ae1dc2c774e0eb27c2accf174
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 03a263822252a5020135a7de96ea8e50d5eb5cc6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 9046346e9f7d535ae1dc2c774e0eb27c2accf174)
@@ -95,7 +95,7 @@
         [Test]
         [TestCase(false)]
         [TestCase(true)]
-        public void Read_WithBackgroundMapData_ReturnnewAssessmentSectionWithBackgroundMapData(bool isConfigured)
+        public void Read_WithBackgroundMapData_ReturnsNewAssessmentSectionWithBackgroundMapData(bool isConfigured)
         {
             // Setup
             const string mapDataName = "Background";