Clarify name of Patio data element definitions

4 files changed, 20 insertions, 20 deletions

diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
index f7dcbcb5..893e93ef 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
@@ -24,7 +24,7 @@ public abstract class PatioExampleTests {
 
     @Test
     public void canLoadDataElementInt() throws IOException, InterruptedException {
-        var patioDataElement = new PatioDataElementImmutable(
+        var patioDataElement = new PatioDataElementImmutableDefinition(
             "answer",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(42),
@@ -59,7 +59,7 @@ public abstract class PatioExampleTests {
 
     @Test
     public void canLoadIntFromMiddleOfDataElement() throws IOException, InterruptedException {
-        var patioDataElement = new PatioDataElementImmutable(
+        var patioDataElement = new PatioDataElementImmutableDefinition(
             "answer",
             PatioVisibility.PRIVATE,
             PatioDataValues.struct(List.of(
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
index dcbec92f..b2a83658 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java
@@ -44,7 +44,7 @@ public class PatioSerializerTests {
 
     @Test
     public void canSerializeDataElementImmutable() {
-        var element = Patio.dataElementImmutable(
+        var element = Patio.dataElementImmutableDefinition(
             "x",
             PatioVisibility.PRIVATE,
             PatioDataValues.array(
@@ -62,7 +62,7 @@ public class PatioSerializerTests {
 
     @Test
     public void canSerializeDataElementMutable() {
-        var element = Patio.dataElementMutable(
+        var element = Patio.dataElementMutableDefinition(
             "x",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(42)
diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
index 35d34741..47c25172 100644
--- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
+++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java
@@ -78,12 +78,12 @@ public class Patio {
         return new PatioCompilationUnit(elements, Sources.NULL);
     }
 
-    public static PatioDataElementImmutable dataElementImmutable(
+    public static PatioDataElementImmutableDefinition dataElementImmutableDefinition(
         String name,
         PatioVisibility visibility,
         PatioDataValue value
     ) {
-        return new PatioDataElementImmutable(
+        return new PatioDataElementImmutableDefinition(
             name,
             visibility,
             value,
@@ -91,12 +91,12 @@ public class Patio {
         );
     }
 
-    public static PatioDataElementMutable dataElementMutable(
+    public static PatioDataElementMutableDefinition dataElementMutableDefinition(
         String name,
         PatioVisibility visibility,
         PatioDataValue initialValue
     ) {
-        return new PatioDataElementMutable(
+        return new PatioDataElementMutableDefinition(
             name,
             visibility,
             initialValue,
diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
index 634ca53a..a8e985b0 100644
--- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
+++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioContextTests.java
@@ -1,7 +1,7 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.junit.jupiter.api.Test;
-import org.shedlang.compiler.patio.PatioDataElementImmutable;
+import org.shedlang.compiler.patio.PatioDataElementImmutableDefinition;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.types.PatioDataValues;
 import org.shedlang.compiler.shidtopatio.errors.DuplicateCompilationUnitElementName;
@@ -16,13 +16,13 @@ public class ShidToPatioContextTests {
     public void canAddCompilationUnitElementsWithDistinctNames() {
         var context = ShidToPatioContext.EMPTY;
 
-        context = context.addCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.addCompilationUnitElement(new PatioDataElementImmutableDefinition(
             "x",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(0),
             Sources.NULL
         ));
-        context = context.addCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.addCompilationUnitElement(new PatioDataElementImmutableDefinition(
             "y",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(0),
@@ -30,15 +30,15 @@ public class ShidToPatioContextTests {
         ));
 
         assertThat(context.toCompilationUnit(Sources.NULL).value().elements(), isSequence(
-            instanceOf(PatioDataElementImmutable.class, has("name", x -> x.name(), equalTo("x"))),
-            instanceOf(PatioDataElementImmutable.class, has("name", x -> x.name(), equalTo("y")))
+            instanceOf(PatioDataElementImmutableDefinition.class, has("name", x -> x.name(), equalTo("x"))),
+            instanceOf(PatioDataElementImmutableDefinition.class, has("name", x -> x.name(), equalTo("y")))
         ));
     }
 
     @Test
     public void addingCompilationUnitsWithSameNameThrowsError() {
         var context = ShidToPatioContext.EMPTY
-            .addCompilationUnitElement(new PatioDataElementImmutable(
+            .addCompilationUnitElement(new PatioDataElementImmutableDefinition(
                 "x",
                 PatioVisibility.PRIVATE,
                 PatioDataValues.int_(0),
@@ -47,7 +47,7 @@ public class ShidToPatioContextTests {
 
         var error = assertThrows(
             DuplicateCompilationUnitElementName.class,
-            () -> context.addCompilationUnitElement(new PatioDataElementImmutable(
+            () -> context.addCompilationUnitElement(new PatioDataElementImmutableDefinition(
                 "x",
                 PatioVisibility.PRIVATE,
                 PatioDataValues.int_(0),
@@ -62,13 +62,13 @@ public class ShidToPatioContextTests {
     public void canEnsureCompilationUnitElementsWithSameNameAndSameValue() {
         var context = ShidToPatioContext.EMPTY;
 
-        context = context.ensureCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.ensureCompilationUnitElement(new PatioDataElementImmutableDefinition(
             "x",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(0),
             Sources.RUNTIME
         ));
-        context = context.ensureCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.ensureCompilationUnitElement(new PatioDataElementImmutableDefinition(
             "x",
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(0),
@@ -76,14 +76,14 @@ public class ShidToPatioContextTests {
         ));
 
         assertThat(context.toCompilationUnit(Sources.NULL).value().elements(), isSequence(
-            instanceOf(PatioDataElementImmutable.class, has("name", x -> x.name(), equalTo("x")))
+            instanceOf(PatioDataElementImmutableDefinition.class, has("name", x -> x.name(), equalTo("x")))
         ));
     }
 
     @Test
     public void ensuringCompilationUnitsWithSameNameAndDifferentValueThrowsError() {
         var context = ShidToPatioContext.EMPTY
-            .ensureCompilationUnitElement(new PatioDataElementImmutable(
+            .ensureCompilationUnitElement(new PatioDataElementImmutableDefinition(
                 "x",
                 PatioVisibility.PRIVATE,
                 PatioDataValues.int_(0),
@@ -92,7 +92,7 @@ public class ShidToPatioContextTests {
 
         var error = assertThrows(
             DuplicateCompilationUnitElementName.class,
-            () -> context.ensureCompilationUnitElement(new PatioDataElementImmutable(
+            () -> context.ensureCompilationUnitElement(new PatioDataElementImmutableDefinition(
                 "x",
                 PatioVisibility.PRIVATE,
                 PatioDataValues.int_(1),