Index: Core/Components/src/Core.Components.Gis/Data/MapData.cs
===================================================================
diff -u -rfcc528ff894c3ef3521a3d4ec8adcda05ea5b54e -r31734a202bd9be72c6babcf8b61a9bb9acfb2686
--- Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision fcc528ff894c3ef3521a3d4ec8adcda05ea5b54e)
+++ Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision 31734a202bd9be72c6babcf8b61a9bb9acfb2686)
@@ -56,7 +56,7 @@
             {
                 if (string.IsNullOrWhiteSpace(value))
                 {
-                    throw new ArgumentException(@"A name must be set to the map data.", nameof(Name));
+                    throw new ArgumentException(@"A name must be set to the map data.", nameof(value));
                 }
 
                 name = value;
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r31734a202bd9be72c6babcf8b61a9bb9acfb2686
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision 31734a202bd9be72c6babcf8b61a9bb9acfb2686)
@@ -371,7 +371,7 @@
             {
                 if (!identicalAperturesValidityRange.InRange(value))
                 {
-                    throw new ArgumentOutOfRangeException(nameof(IdenticalApertures),
+                    throw new ArgumentOutOfRangeException(nameof(value),
                                                           Resources.ClosingStructuresInput_IdenticalApertures_must_be_equal_or_greater_to_one);
                 }