Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs
===================================================================
diff -u -r89c7c9e14125203dc769583b62808b291bd3558b -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs	(.../TestStabilityPointStructureTest.cs)	(revision 89c7c9e14125203dc769583b62808b291bd3558b)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs	(.../TestStabilityPointStructureTest.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -68,7 +68,7 @@
             const string name = "cool name too!";
 
             // Call
-            var structure = new TestStabilityPointStructure(name, id);
+            var structure = new TestStabilityPointStructure(id, name);
 
             // Assert
             Assert.IsInstanceOf<StabilityPointStructure>(structure);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs
===================================================================
diff -u -re60dadeb730f975383e6c9febd0fd10f89ca1961 -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs	(.../StabilityPointStructurePermutationHelper.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs	(.../StabilityPointStructurePermutationHelper.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -87,7 +87,7 @@
 
             var testCaseData = new List<TestCaseData>
             {
-                new TestCaseData(new TestStabilityPointStructure("Different name", referenceStructureId))
+                new TestCaseData(new TestStabilityPointStructure(referenceStructureId, "Different name"))
                     .SetName($"{targetName}_DifferentName_{testResultDescription}"),
                 new TestCaseData(new TestStabilityPointStructure(new Point2D(1, 1), referenceStructureId))
                     .SetName($"{targetName}_DifferentLocation_{testResultDescription}")
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructure.cs
===================================================================
diff -u -r89c7c9e14125203dc769583b62808b291bd3558b -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructure.cs	(.../TestStabilityPointStructure.cs)	(revision 89c7c9e14125203dc769583b62808b291bd3558b)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/TestStabilityPointStructure.cs	(.../TestStabilityPointStructure.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -46,11 +46,11 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestStabilityPointStructure"/>.
         /// </summary>
-        /// <param name="name">The name of the structure.</param>
         /// <param name="id">The id of the structure.</param>
+        /// <param name="name">The name of the structure.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="name"/>
         /// or <paramref name="id"/> is <c>null</c>, empty or consists of only whitespaces.</exception>
-        public TestStabilityPointStructure(string name, string id) : this(name, id, new Point2D(1.234, 2.3456)) {}
+        public TestStabilityPointStructure(string id, string name) : this(name, id, new Point2D(1.234, 2.3456)) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="TestStabilityPointStructure"/>.
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -r89541dc8ef2d8b38372169ddecc0b37e9b225f6d -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs	(.../StabilityPointStructureReplaceDataStrategyTest.cs)	(revision 89541dc8ef2d8b38372169ddecc0b37e9b225f6d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs	(.../StabilityPointStructureReplaceDataStrategyTest.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -178,8 +178,8 @@
             const string duplicateId = "I am a duplicate id";
             StabilityPointStructure[] importedClosingStructures =
             {
-                new TestStabilityPointStructure("name", duplicateId),
-                new TestStabilityPointStructure("Other name", duplicateId)
+                new TestStabilityPointStructure(duplicateId, "name"),
+                new TestStabilityPointStructure(duplicateId, "Other name")
             };
 
             var targetCollection = new StructureCollection<StabilityPointStructure>();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs
===================================================================
diff -u -r89541dc8ef2d8b38372169ddecc0b37e9b225f6d -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs	(.../StabilityPointStructuresUpdateDataStrategyTest.cs)	(revision 89541dc8ef2d8b38372169ddecc0b37e9b225f6d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs	(.../StabilityPointStructuresUpdateDataStrategyTest.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -90,8 +90,8 @@
             const string duplicateId = "I am a duplicate id";
             var readStructures = new[]
             {
-                new TestStabilityPointStructure("First Name", duplicateId),
-                new TestStabilityPointStructure("Second Name", duplicateId),
+                new TestStabilityPointStructure(duplicateId, "First Name"),
+                new TestStabilityPointStructure(duplicateId, "Second Name")
             };
 
             var targetCollection = new StructureCollection<StabilityPointStructure>();
@@ -119,8 +119,8 @@
             StructureCollection<StabilityPointStructure> structures = failureMechanism.StabilityPointStructures;
             structures.AddRange(new[]
             {
-                new TestStabilityPointStructure("name", "id"),
-                new TestStabilityPointStructure("other name", "other id"),
+                new TestStabilityPointStructure("id", "name"),
+                new TestStabilityPointStructure("other id", "other name")
             }, sourceFilePath);
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
@@ -179,8 +179,8 @@
         {
             // Setup
             const string sameId = "sameId";
-            StabilityPointStructure readStructure = new TestStabilityPointStructure("new structure", sameId);
-            StabilityPointStructure structure = new TestStabilityPointStructure("original structure", sameId);
+            StabilityPointStructure readStructure = new TestStabilityPointStructure(sameId, "new structure");
+            StabilityPointStructure structure = new TestStabilityPointStructure(sameId, "original structure");
 
             var calculation = new TestStabilityPointStructuresCalculation
             {
@@ -238,8 +238,8 @@
             const string affectedId = "affectedId";
             const string unaffectedId = "unaffectedId";
             const string unaffectedStructureName = "unaffectedStructure";
-            var affectedStructure = new TestStabilityPointStructure("Old name", affectedId);
-            var unaffectedStructure = new TestStabilityPointStructure(unaffectedStructureName, unaffectedId);
+            var affectedStructure = new TestStabilityPointStructure(affectedId, "Old name");
+            var unaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName);
 
             var affectedCalculation = new TestStabilityPointStructuresCalculation
             {
@@ -280,8 +280,8 @@
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
 
-            StabilityPointStructure readAffectedStructure = new TestStabilityPointStructure("New name", affectedId);
-            StabilityPointStructure readUnaffectedStructure = new TestStabilityPointStructure(unaffectedStructureName, unaffectedId);
+            StabilityPointStructure readAffectedStructure = new TestStabilityPointStructure(affectedId, "New name");
+            StabilityPointStructure readUnaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName);
 
             // Call
             IEnumerable<IObservable> affectedObjects = strategy.UpdateStructuresWithImportedData(targetDataCollection,
@@ -314,7 +314,7 @@
         {
             // Setup
             const string removedId = "sameId";
-            StabilityPointStructure structure = new TestStabilityPointStructure("original structure", removedId);
+            StabilityPointStructure structure = new TestStabilityPointStructure(removedId, "original structure");
 
             var calculation = new TestStabilityPointStructuresCalculation
             {
@@ -369,8 +369,8 @@
             const string removedId = "removedId";
             const string unaffectedId = "unaffectedId";
             const string unaffectedStructureName = "unaffectedStructure";
-            var removedStructure = new TestStabilityPointStructure("Old name", removedId);
-            var unaffectedStructure = new TestStabilityPointStructure(unaffectedStructureName, unaffectedId);
+            var removedStructure = new TestStabilityPointStructure(removedId, "Old name");
+            var unaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName);
 
             var affectedCalculation = new TestStabilityPointStructuresCalculation
             {
@@ -411,7 +411,7 @@
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
 
-            StabilityPointStructure readUnaffectedStructure = new TestStabilityPointStructure(unaffectedStructureName, unaffectedId);
+            StabilityPointStructure readUnaffectedStructure = new TestStabilityPointStructure(unaffectedId, unaffectedStructureName);
 
             // Call
             IEnumerable<IObservable> affectedObjects = strategy.UpdateStructuresWithImportedData(targetDataCollection,
@@ -441,7 +441,7 @@
         {
             // Setup
             const string affectedId = "affectedId";
-            var affectedStructure = new TestStabilityPointStructure("Old name", affectedId);
+            var affectedStructure = new TestStabilityPointStructure(affectedId, "Old name");
             var affectedCalculation = new TestStabilityPointStructuresCalculation
             {
                 InputParameters =
@@ -469,7 +469,7 @@
                 affectedStructure
             }, sourceFilePath);
 
-            var structureToUpdateFrom = new TestStabilityPointStructure("New name", affectedId);
+            var structureToUpdateFrom = new TestStabilityPointStructure(affectedId, "New name");
 
             var strategy = new StabilityPointStructureUpdateDataStrategy(failureMechanism);
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs
===================================================================
diff -u -r24fd7e5c494169bf0729ed5dd762d2d90af671f3 -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs	(.../StabilityPointStructureTreeNodeInfoTest.cs)	(revision 24fd7e5c494169bf0729ed5dd762d2d90af671f3)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs	(.../StabilityPointStructureTreeNodeInfoTest.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -71,7 +71,7 @@
         {
             // Setup
             const string name = "a nice name";
-            StabilityPointStructure structure = new TestStabilityPointStructure(name, "id");
+            StabilityPointStructure structure = new TestStabilityPointStructure("id", name);
 
             using (var plugin = new StabilityPointStructuresPlugin())
             {
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r50270a48a7cdc395d4fc4b964a42730740fb15ee -r7326c5c94201fa88fcfa4c73215f79088fcfee42
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 50270a48a7cdc395d4fc4b964a42730740fb15ee)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 7326c5c94201fa88fcfa4c73215f79088fcfee42)
@@ -1556,7 +1556,7 @@
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
 
                 const string existingCalculationName = "StabilityPoint structure";
-                StabilityPointStructure stabilityPointStructure = new TestStabilityPointStructure(existingCalculationName, "id");
+                StabilityPointStructure stabilityPointStructure = new TestStabilityPointStructure("id", existingCalculationName);
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism
                 {