diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift
similarity index 97%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift
index b1310b16..cdde39ff 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift
@@ -1,5 +1,5 @@
 //
-//  AnyAttributeTests.swift
+//  AnyAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
@@ -9,7 +9,7 @@ import Testing
 // Report to upstream for investigation when we bump to 5.10
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class AnyAttributeTests: AttributeTestBase {
+final class AnyAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func constantValue() throws {
         let attributeNil = AnyAttribute.nil
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift
similarity index 95%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift
index 176989eb..ed6aed1c 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  AttributeTests.swift
+//  AttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class AttributeTests: AttributeTestBase {
+final class AttributeCompatibilityTests: AttributeTestBase {
     @Test
     func initWithValue() {
         let intAttribute = Attribute(value: 0)
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalCompatibilityTests.swift
similarity index 86%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalCompatibilityTests.swift
index 67ea5f4e..f7d28593 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalCompatibilityTests.swift
@@ -1,5 +1,5 @@
 //
-//  ExternalTests.swift
+//  ExternalCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
@@ -9,7 +9,7 @@ import Testing
 // Report to upstream for investigation when we bump to 5.10
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class ExternalTests: AttributeTestBase {
+final class ExternalCompatibilityTests: AttributeTestBase {
     @Test
     func example() throws {
         let type = External<Int>.self
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusCompatibilityTests.swift
similarity index 86%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusCompatibilityTests.swift
index a138b9c5..709f457c 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  FocusTests.swift
+//  FocusCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class FocusTests: AttributeTestBase {
+final class FocusCompatibilityTests: AttributeTestBase {
     struct Demo {
         var a: Int
         var b: Double
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetCompatibilityTests.swift
similarity index 98%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetCompatibilityTests.swift
index 702ff1cd..ba9af6fb 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Attribute/PointerOffsetCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  PointerOffsetTests.swift
+//  PointerOffsetCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import RealModule
 import Testing
 
-struct PointerOffsetTests {
+struct PointerOffsetCompatibilityTests {
     @Test
     func plainInitAndProperty() {
         typealias Base = Tuple<Int, Int>
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift
similarity index 80%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift
index 25be0440..6017ed34 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  IndirectAttributeTests.swift
+//  IndirectAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "IndirectAttribute is not implemented"))
-final class IndirectAttributeTests: AttributeTestBase {
+final class IndirectAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func basic() {
         let source = Attribute(value: 0)
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeCompatibilityTests.swift
similarity index 92%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeCompatibilityTests.swift
index c7ee8b98..1ae19d91 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  AnyOptionalAttributeTests.swift
+//  AnyOptionalAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "AnyOptionalAttribute is not implemented"))
-final class AnyOptionalAttributeTests: AttributeTestBase {
+final class AnyOptionalAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func basicInit() {
         let o1 = AnyOptionalAttribute()
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeCompatibilityTests.swift
similarity index 91%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeCompatibilityTests.swift
index f5adf8b6..317ca5ef 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  OptionalAttributeTests.swift
+//  OptionalAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.disabled(if: !compatibilityTestEnabled, "OptionalAttribute is not implemented"))
-final class OptionalAttributeTests: AttributeTestBase {
+final class OptionalAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func basicInit() {
         let ao1 = AnyOptionalAttribute()
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapCompatibilityTests.swift
similarity index 86%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapCompatibilityTests.swift
index 3f9238b2..4ee6a7d7 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  MapTests.swift
+//  MapCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 @Suite(.disabled(if: !compatibilityTestEnabled))
-final class MapTests: AttributeTestBase {
+final class MapCompatibilityTests: AttributeTestBase {
     @Test
     func description() throws {
         let map = Map(.init(value: 2)) { $0.description }
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleCompatibilityTests.swift
similarity index 78%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleCompatibilityTests.swift
index 2e27ac9d..3bd5ef9d 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Rule/RuleCompatibilityTests.swift
@@ -1,10 +1,10 @@
 //
-//  RuleTests.swift
+//  RuleCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
-struct RuleTests {
+struct RuleCompatibilityTests {
     @Test
     func ruleInitialValue() throws {
         struct A: Rule {
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/OGWeakAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/AnyWeakAttributeCompatibilityTests.swift
similarity index 88%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Weak/OGWeakAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Weak/AnyWeakAttributeCompatibilityTests.swift
index 16dc94e6..b36c5bbb 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/OGWeakAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/AnyWeakAttributeCompatibilityTests.swift
@@ -1,5 +1,5 @@
 //
-//  AnyWeakAttributeTests.swift
+//  AnyWeakAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
@@ -7,7 +7,7 @@ import Testing
 #if canImport(Darwin)
 
 @Suite(.enabled(if: compatibilityTestEnabled))
-final class AnyWeakAttributeTests: AttributeTestBase {
+final class AnyWeakAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func basic() {
         let w1 = AnyWeakAttribute(nil)
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeCompatibilityTests.swift
similarity index 74%
rename from Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeCompatibilityTests.swift
index 6d0bb825..40aa33f2 100644
--- a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeCompatibilityTests.swift
@@ -1,12 +1,12 @@
 //
-//  WeakAttributeTests.swift
+//  WeakAttributeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
 @Suite(.enabled(if: compatibilityTestEnabled))
-final class WeakAttributeTests: AttributeTestBase {
+final class WeakAttributeCompatibilityTests: AttributeTestBase {
     @Test
     func initTest() {
         let _ = WeakAttribute<Int>()
diff --git a/Tests/OpenGraphCompatibilityTests/CompareValuesTests.swift b/Tests/OpenGraphCompatibilityTests/CompareValuesCompatibilityTests.swift
similarity index 95%
rename from Tests/OpenGraphCompatibilityTests/CompareValuesTests.swift
rename to Tests/OpenGraphCompatibilityTests/CompareValuesCompatibilityTests.swift
index 56e64c4b..b499a89c 100644
--- a/Tests/OpenGraphCompatibilityTests/CompareValuesTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/CompareValuesCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  CompareValuesTests.swift
+//  CompareValuesCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 @Suite(.disabled(if: !compatibilityTestEnabled, "OGCompareValues is not implemented"))
-struct CompareValuesTests {
+struct CompareValuesCompatibilityTests {
     @Test
     func intCompare() throws {
         #expect(compareValues(1, 1) == true)
diff --git a/Tests/OpenGraphCompatibilityTests/Data/UniqueIDTests.swift b/Tests/OpenGraphCompatibilityTests/Data/UniqueIDCompatibilityTests.swift
similarity index 71%
rename from Tests/OpenGraphCompatibilityTests/Data/UniqueIDTests.swift
rename to Tests/OpenGraphCompatibilityTests/Data/UniqueIDCompatibilityTests.swift
index ecff48cc..fcea36ea 100644
--- a/Tests/OpenGraphCompatibilityTests/Data/UniqueIDTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Data/UniqueIDCompatibilityTests.swift
@@ -1,10 +1,10 @@
 //
-//  UniqueIDTests.swift
+//  UniqueIDCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
-struct UniqueIDTests {
+struct UniqueIDCompatibilityTests {
     @Test
     func uniqueID() throws {
         let initialID = makeUniqueID()
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphCompatibilityTests.swift
similarity index 97%
rename from Tests/OpenGraphCompatibilityTests/Graph/GraphTests.swift
rename to Tests/OpenGraphCompatibilityTests/Graph/GraphCompatibilityTests.swift
index cdf8b6c4..fa00ca4b 100644
--- a/Tests/OpenGraphCompatibilityTests/Graph/GraphTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Graph/GraphCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  GraphTests.swift
+//  GraphCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 import Foundation
 
-struct GraphTests {
+struct GraphCompatibilityTests {
     @Test
     func graphCreate() throws {
         _ = Graph()
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionCompatibilityTests.swift
similarity index 67%
rename from Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift
rename to Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionCompatibilityTests.swift
index e7afa53a..65b27294 100644
--- a/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  GraphDescriptionTests.swift
+//  GraphDescriptionCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 #if canImport(Darwin)
-struct GraphDescriptionTests {
+struct GraphDescriptionCompatibilityTests {
     @Test
     func format() {
         #expect(Graph.descriptionFormat as String == "format")
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphTracingTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphTracingCompatibilityTests.swift
similarity index 84%
rename from Tests/OpenGraphCompatibilityTests/Graph/GraphTracingTests.swift
rename to Tests/OpenGraphCompatibilityTests/Graph/GraphTracingCompatibilityTests.swift
index 7782c2ab..7236d85e 100644
--- a/Tests/OpenGraphCompatibilityTests/Graph/GraphTracingTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Graph/GraphTracingCompatibilityTests.swift
@@ -1,10 +1,10 @@
 //
-//  GraphTracingTests.swift
+//  GraphTracingCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
-struct GraphTracingTests {
+struct GraphTracingCompatibilityTests {
     @Test
     func tracing() {
         let graph = Graph()
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/SubgraphTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift
similarity index 91%
rename from Tests/OpenGraphCompatibilityTests/Graph/SubgraphTests.swift
rename to Tests/OpenGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift
index 34ef329c..17c47fb9 100644
--- a/Tests/OpenGraphCompatibilityTests/Graph/SubgraphTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  SubgraphTests.swift
+//  SubgraphCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 @Suite(.enabled(if: compatibilityTestEnabled))
-struct SubgraphTests {
+struct SubgraphCompatibilityTests {
     @Test
     func shouldRecordTree() {
         let key = compatibilityTestEnabled ? "AG_TREE" : "OG_TREE"
diff --git a/Tests/OpenGraphCompatibilityTests/Runtime/MetadataTests.swift b/Tests/OpenGraphCompatibilityTests/Runtime/MetadataCompatibilityTests.swift
similarity index 95%
rename from Tests/OpenGraphCompatibilityTests/Runtime/MetadataTests.swift
rename to Tests/OpenGraphCompatibilityTests/Runtime/MetadataCompatibilityTests.swift
index d7ae11d1..87fbb2a1 100644
--- a/Tests/OpenGraphCompatibilityTests/Runtime/MetadataTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Runtime/MetadataCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  MetadataTests.swift
+//  MetadataCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 @Suite(.enabled(if: swiftToolchainSupported))
-struct MetadataTests {
+struct MetadataCompatibilityTests {
     class T1 {
         var a = 0
         var b: Double = 0
@@ -153,9 +153,9 @@ struct MetadataTests {
 
     @Test(.disabled(if: !compatibilityTestEnabled, "Metadata is not implemented"))
     func description() {
-        #expect(Metadata(T1.self).description == "MetadataTests.T1")
-        #expect(Metadata(T2.self).description == "MetadataTests.T2")
-        #expect(Metadata(T3.self).description == "MetadataTests.T3")
+        #expect(Metadata(T1.self).description == "MetadataCompatibilityTests.T1")
+        #expect(Metadata(T2.self).description == "MetadataCompatibilityTests.T2")
+        #expect(Metadata(T3.self).description == "MetadataCompatibilityTests.T3")
     }
     
     @Test(.disabled(if: !compatibilityTestEnabled, "Metadata is not implemented"))
diff --git a/Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeTests.swift b/Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeCompatibilityTests.swift
similarity index 97%
rename from Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeTests.swift
rename to Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeCompatibilityTests.swift
index fb63e44c..838d0707 100644
--- a/Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeTests.swift
+++ b/Tests/OpenGraphCompatibilityTests/Runtime/TupleTypeCompatibilityTests.swift
@@ -1,11 +1,11 @@
 //
-//  TupleTypeTests.swift
+//  TupleTypeCompatibilityTests.swift
 //  OpenGraphCompatibilityTests
 
 import Testing
 
 @Suite(.enabled(if: swiftToolchainSupported))
-struct TupleTypeTests {
+struct TupleTypeCompatibilityTests {
     class T1 {
         var a = 0
         var b: Double = 0
@@ -141,7 +141,7 @@ struct TupleTypeTests {
 }
 
 @Suite(.enabled(if: swiftToolchainSupported))
-struct UnsafeMutableTupleTests {
+struct UnsafeMutableTupleCompatibilityTests {
     class T1 {
         var a = 0
     }