diff --git a/tests/ARSAS.Tests/SiemensStaticDataSetSelectionRegressionTests.cs b/tests/ARSAS.Tests/CrossLdStaticDataSetSelectionRegressionTests.cs
similarity index 95%
rename from tests/ARSAS.Tests/SiemensStaticDataSetSelectionRegressionTests.cs
rename to tests/ARSAS.Tests/CrossLdStaticDataSetSelectionRegressionTests.cs
index 77cd87307..1af26ab17 100644
--- a/tests/ARSAS.Tests/SiemensStaticDataSetSelectionRegressionTests.cs
+++ b/tests/ARSAS.Tests/CrossLdStaticDataSetSelectionRegressionTests.cs
@@ -6,12 +6,12 @@
 
 namespace ARSAS.Tests;
 
-public sealed class SiemensStaticDataSetSelectionRegressionTests
+public sealed class CrossLdStaticDataSetSelectionRegressionTests
 {
     [Fact]
-    public void SiemensLike_58Member_CrossLd_StaticDataSets_AreRepresented58Of58()
+    public void Synthetic_58Member_CrossLd_StaticDataSets_AreRepresented58Of58()
     {
-        var model = SclLiveModelProjectionBuilder.Build(BuildFixture(), "Siprotec_58_member.cid");
+        var model = SclLiveModelProjectionBuilder.Build(BuildFixture(), "CrossLd_58_member.cid");
         var signals = new List<SignalDefinition>();
 
         var merge = Iec61850DataSetSignalInventoryService.EnsureMandatorySignals(signals, model);
@@ -37,9 +37,9 @@ public void SiemensLike_58Member_CrossLd_StaticDataSets_AreRepresented58Of58()
     }
 
     [Fact]
-    public void SiemensLike_58Member_CrossLd_StaticDataSets_Survive_Real_SclMapper_Path()
+    public void Synthetic_58Member_CrossLd_StaticDataSets_Survive_Real_SclMapper_Path()
     {
-        var model = SclLiveModelProjectionBuilder.Build(BuildFixture(), "Siprotec_58_member.cid");
+        var model = SclLiveModelProjectionBuilder.Build(BuildFixture(), "CrossLd_58_member.cid");
         var workspace = new SclIedWorkspace
         {
             IedName = "AA1C1F13R4",
@@ -109,7 +109,7 @@ private static XDocument BuildFixture()
             new XElement(ns + "SCL",
                 new XAttribute("version", "2007"),
                 new XAttribute("revision", "B"),
-                new XElement(ns + "Header", new XAttribute("id", "SIEMENS_58")),
+                new XElement(ns + "Header", new XAttribute("id", "ARSAS_CROSS_LD_58")),
                 new XElement(ns + "IED",
                     new XAttribute("name", "AA1C1F13R4"),
                     new XElement(ns + "AccessPoint",
diff --git a/tests/ARSAS.Tests/RcbIedScoutParityRegressionTests.cs b/tests/ARSAS.Tests/RcbReferenceParityRegressionTests.cs
similarity index 97%
rename from tests/ARSAS.Tests/RcbIedScoutParityRegressionTests.cs
rename to tests/ARSAS.Tests/RcbReferenceParityRegressionTests.cs
index 11e70c409..62f855d50 100644
--- a/tests/ARSAS.Tests/RcbIedScoutParityRegressionTests.cs
+++ b/tests/ARSAS.Tests/RcbReferenceParityRegressionTests.cs
@@ -1,6 +1,6 @@
 namespace ARSAS.Tests;
 
-public sealed class RcbIedScoutParityRegressionTests
+public sealed class RcbReferenceParityRegressionTests
 {
     [Fact]
     public void SourceBackedRuntimeInstances_Suppress_Logical_Scl_Duplicate()