refactor: rename RelationView to SymbolView

* Add NodeFunctionView for symbols that hold function-like (single
  associated object for each key) relations as integer values for performance.

14 files changed, 83 insertions, 98 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
index 33318abc..f0a950a6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
@@ -8,12 +8,12 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.AnyQuery;
-import tools.refinery.store.query.view.AnyRelationView;
+import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.Collection;
 
 public interface ModelQueryStoreAdapter extends ModelStoreAdapter {
-        Collection<AnyRelationView> getRelationViews();
+        Collection<AnySymbolView> getSymbolViews();
 
         Collection<AnyQuery> getQueries();
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
index ab48386e..c0aa35bf 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
@@ -7,7 +7,6 @@ package tools.refinery.store.query.view;
 
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.FunctionalDependency;
-import tools.refinery.store.query.term.DataSort;
 import tools.refinery.store.query.term.NodeSort;
 import tools.refinery.store.query.term.Sort;
 import tools.refinery.store.representation.Symbol;
@@ -20,19 +19,14 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-public final class FunctionalRelationView<T> extends RelationView<T> {
+public abstract class AbstractFunctionView<T> extends SymbolView<T> {
         private final T defaultValue;
 
-        public FunctionalRelationView(Symbol<T> symbol, String name) {
+        protected AbstractFunctionView(Symbol<T> symbol, String name) {
                 super(symbol, name);
                 defaultValue = symbol.defaultValue();
         }
 
-        public FunctionalRelationView(Symbol<T> symbol) {
-                super(symbol);
-                defaultValue = symbol.defaultValue();
-        }
-
         @Override
         public Set<FunctionalDependency<Integer>> getFunctionalDependencies() {
                 var arity = getSymbol().arity();
@@ -42,18 +36,28 @@ public final class FunctionalRelationView<T> extends RelationView<T> {
         }
 
         @Override
-        public Set<RelationViewImplication> getImpliedRelationViews() {
+        public Set<ViewImplication> getImpliedRelationViews() {
                 var symbol = getSymbol();
                 var impliedIndices = IntStream.range(0, symbol.arity()).boxed().toList();
-                var keyOnlyRelationView = new KeyOnlyRelationView<>(symbol);
-                return Set.of(new RelationViewImplication(this, keyOnlyRelationView, impliedIndices));
+                var keysView = new KeyOnlyView<>(symbol);
+                return Set.of(new ViewImplication(this, keysView, impliedIndices));
         }
 
         @Override
-        public boolean filter(Tuple key, T value) {
+        public final boolean filter(Tuple key, T value) {
                 return !Objects.equals(defaultValue, value);
         }
 
+        protected abstract Sort getForwardMappedValueSort();
+
+        protected Object forwardMapValue(Tuple key, T value) {
+                return value;
+        }
+
+        protected boolean valueEquals(Tuple key, T value, Object otherForwardMappedValue) {
+                return Objects.equals(otherForwardMappedValue, forwardMapValue(key, value));
+        }
+
         @Override
         public Object[] forwardMap(Tuple key, T value) {
                 int size = key.getSize();
@@ -61,7 +65,7 @@ public final class FunctionalRelationView<T> extends RelationView<T> {
                 for (int i = 0; i < size; i++) {
                         result[i] = Tuple.of(key.get(i));
                 }
-                result[key.getSize()] = value;
+                result[key.getSize()] = forwardMapValue(key, value);
                 return result;
         }
 
@@ -69,13 +73,15 @@ public final class FunctionalRelationView<T> extends RelationView<T> {
         public boolean get(Model model, Object[] tuple) {
                 int[] content = new int[tuple.length - 1];
                 for (int i = 0; i < tuple.length - 1; i++) {
-                        content[i] = ((Tuple1) tuple[i]).value0();
+                        if (!(tuple[i] instanceof Tuple1 wrapper)) {
+                                return false;
+                        }
+                        content[i] = wrapper.value0();
                 }
                 Tuple key = Tuple.of(content);
-                @SuppressWarnings("unchecked")
-                T valueInTuple = (T) tuple[tuple.length - 1];
+                var valueInTuple = tuple[tuple.length - 1];
                 T valueInMap = model.getInterpretation(getSymbol()).get(key);
-                return valueInTuple.equals(valueInMap);
+                return valueEquals(key, valueInMap, valueInTuple);
         }
 
         @Override
@@ -90,7 +96,7 @@ public final class FunctionalRelationView<T> extends RelationView<T> {
                 for (int i = 0; i < valueIndex; i++) {
                         sorts[i] = NodeSort.INSTANCE;
                 }
-                sorts[valueIndex] = new DataSort<>(getSymbol().valueType());
+                sorts[valueIndex] = getForwardMappedValueSort();
                 return List.of(sorts);
         }
 
@@ -99,7 +105,7 @@ public final class FunctionalRelationView<T> extends RelationView<T> {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 if (!super.equals(o)) return false;
-                FunctionalRelationView<?> that = (FunctionalRelationView<?>) o;
+                AbstractFunctionView<?> that = (AbstractFunctionView<?>) o;
                 return Objects.equals(defaultValue, that.defaultValue);
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnyRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
index 9aa923af..90b27ebb 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
@@ -12,7 +12,7 @@ import tools.refinery.store.query.Constraint;
 
 import java.util.Set;
 
-public sealed interface AnyRelationView extends Constraint permits RelationView {
+public sealed interface AnySymbolView extends Constraint permits SymbolView {
         AnySymbol getSymbol();
 
         String getViewName();
@@ -21,7 +21,7 @@ public sealed interface AnyRelationView extends Constraint permits RelationView
                 return Set.of();
         }
 
-        default Set<RelationViewImplication> getImpliedRelationViews() {
+        default Set<ViewImplication> getImpliedRelationViews() {
                 return Set.of();
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
index 9717b2c1..922c7355 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
@@ -12,24 +12,24 @@ import java.util.Objects;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
-public class FilteredRelationView<T> extends TuplePreservingRelationView<T> {
+public class FilteredView<T> extends TuplePreservingView<T> {
         private final BiPredicate<Tuple, T> predicate;
 
-        public FilteredRelationView(Symbol<T> symbol, String name, BiPredicate<Tuple, T> predicate) {
+        public FilteredView(Symbol<T> symbol, String name, BiPredicate<Tuple, T> predicate) {
                 super(symbol, name);
                 this.predicate = predicate;
         }
 
-        public FilteredRelationView(Symbol<T> symbol, BiPredicate<Tuple, T> predicate) {
+        public FilteredView(Symbol<T> symbol, BiPredicate<Tuple, T> predicate) {
                 super(symbol);
                 this.predicate = predicate;
         }
 
-        public FilteredRelationView(Symbol<T> symbol, String name, Predicate<T> predicate) {
+        public FilteredView(Symbol<T> symbol, String name, Predicate<T> predicate) {
                 this(symbol, name, (k, v) -> predicate.test(v));
         }
 
-        public FilteredRelationView(Symbol<T> symbol, Predicate<T> predicate) {
+        public FilteredView(Symbol<T> symbol, Predicate<T> predicate) {
                 this(symbol, (k, v) -> predicate.test(v));
         }
 
@@ -43,7 +43,7 @@ public class FilteredRelationView<T> extends TuplePreservingRelationView<T> {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 if (!super.equals(o)) return false;
-                FilteredRelationView<?> that = (FilteredRelationView<?>) o;
+                FilteredView<?> that = (FilteredView<?>) o;
                 return Objects.equals(predicate, that.predicate);
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java
index c19d9282..26b717ee 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java
@@ -9,8 +9,8 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
-public class ForbiddenRelationView extends TuplePreservingRelationView<TruthValue> {
-        public ForbiddenRelationView(Symbol<TruthValue> symbol) {
+public class ForbiddenView extends TuplePreservingView<TruthValue> {
+        public ForbiddenView(Symbol<TruthValue> symbol) {
                 super(symbol, "forbidden");
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/KeyOnlyView.java
index 9553a0cc..7e86f6e4 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/KeyOnlyView.java
@@ -10,12 +10,12 @@ import tools.refinery.store.tuple.Tuple;
 
 import java.util.Objects;
 
-public final class KeyOnlyRelationView<T> extends TuplePreservingRelationView<T> {
+public final class KeyOnlyView<T> extends TuplePreservingView<T> {
         public static final String VIEW_NAME = "key";
 
         private final T defaultValue;
 
-        public KeyOnlyRelationView(Symbol<T> symbol) {
+        public KeyOnlyView(Symbol<T> symbol) {
                 super(symbol, VIEW_NAME);
                 defaultValue = symbol.defaultValue();
         }
@@ -30,7 +30,7 @@ public final class KeyOnlyRelationView<T> extends TuplePreservingRelationView<T>
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 if (!super.equals(o)) return false;
-                KeyOnlyRelationView<?> that = (KeyOnlyRelationView<?>) o;
+                KeyOnlyView<?> that = (KeyOnlyView<?>) o;
                 return Objects.equals(defaultValue, that.defaultValue);
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java
index 60325f35..e75a8171 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java
@@ -9,8 +9,8 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
-public class MayRelationView extends TuplePreservingRelationView<TruthValue> {
-        public MayRelationView(Symbol<TruthValue> symbol) {
+public class MayView extends TuplePreservingView<TruthValue> {
+        public MayView(Symbol<TruthValue> symbol) {
                 super(symbol, "may");
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java
index d7e7ae2e..a48f8045 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java
@@ -9,8 +9,8 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
-public class MustRelationView extends TuplePreservingRelationView<TruthValue> {
-        public MustRelationView(Symbol<TruthValue> symbol) {
+public class MustView extends TuplePreservingView<TruthValue> {
+        public MustView(Symbol<TruthValue> symbol) {
                 super(symbol, "must");
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java
deleted file mode 100644
index c54cce2f..00000000
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.view;
-
-import java.util.List;
-
-public record RelationViewImplication(AnyRelationView implyingRelationView, AnyRelationView impliedRelationView,
-                                                                          List<Integer> impliedIndices) {
-        public RelationViewImplication {
-                if (impliedIndices.size() != impliedRelationView.arity()) {
-                        throw new IllegalArgumentException("Expected %d implied indices for %s, but %d are provided"
-                                        .formatted(impliedRelationView.arity(), impliedRelationView, impliedIndices.size()));
-                }
-                for (var index : impliedIndices) {
-                        if (impliedRelationView.invalidIndex(index)) {
-                                throw new IllegalArgumentException("%d is not a valid index for %s".formatted(index,
-                                                implyingRelationView));
-                        }
-                }
-        }
-}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/RelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/SymbolView.java
index fd4f47b4..267a99d3 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/RelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/SymbolView.java
@@ -19,17 +19,17 @@ import java.util.UUID;
  * @param <T>
  * @author Oszkar Semerath
  */
-public abstract non-sealed class RelationView<T> implements AnyRelationView {
+public abstract non-sealed class SymbolView<T> implements AnySymbolView {
         private final Symbol<T> symbol;
 
         private final String viewName;
 
-        protected RelationView(Symbol<T> symbol, String viewName) {
+        protected SymbolView(Symbol<T> symbol, String viewName) {
                 this.symbol = symbol;
                 this.viewName = viewName;
         }
 
-        protected RelationView(Symbol<T> representation) {
+        protected SymbolView(Symbol<T> representation) {
                 this(representation, UUID.randomUUID().toString());
         }
 
@@ -71,7 +71,7 @@ public abstract non-sealed class RelationView<T> implements AnyRelationView {
         public boolean equals(Object o) {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
-                RelationView<?> that = (RelationView<?>) o;
+                SymbolView<?> that = (SymbolView<?>) o;
                 return Objects.equals(symbol, that.symbol) && Objects.equals(viewName, that.viewName);
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingRelationView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
index e6e54aa1..19862e3a 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingRelationView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
@@ -15,12 +15,12 @@ import tools.refinery.store.representation.Symbol;
 import java.util.Arrays;
 import java.util.List;
 
-public abstract class TuplePreservingRelationView<T> extends RelationView<T> {
-        protected TuplePreservingRelationView(Symbol<T> symbol, String name) {
+public abstract class TuplePreservingView<T> extends SymbolView<T> {
+        protected TuplePreservingView(Symbol<T> symbol, String name) {
                 super(symbol, name);
         }
 
-        protected TuplePreservingRelationView(Symbol<T> symbol) {
+        protected TuplePreservingView(Symbol<T> symbol) {
                 super(symbol);
         }
 
@@ -41,7 +41,10 @@ public abstract class TuplePreservingRelationView<T> extends RelationView<T> {
         public boolean get(Model model, Object[] tuple) {
                 int[] content = new int[tuple.length];
                 for (int i = 0; i < tuple.length; i++) {
-                        content[i] = ((Tuple1) tuple[i]).value0();
+                        if (!(tuple[i] instanceof Tuple1 wrapper)) {
+                                return false;
+                        }
+                        content[i] = wrapper.value0();
                 }
                 Tuple key = Tuple.of(content);
                 T value = model.getInterpretation(getSymbol()).get(key);
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
index 70cd386b..152840f8 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.literal.BooleanLiteral;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -22,7 +22,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
 
                 var actual = Dnf.builder()
                                 .parameters(p, q)
@@ -38,7 +38,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
 
                 var actual = Dnf.builder()
                                 .parameters(p, q)
@@ -55,7 +55,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
 
                 var actual = Dnf.builder()
                                 .parameters(p, q)
@@ -72,7 +72,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
 
                 var actual = Dnf.builder()
                                 .parameters(p, q)
@@ -88,7 +88,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
 
                 var actual = Dnf.builder()
@@ -105,7 +105,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
 
                 var actual = Dnf.builder()
@@ -123,7 +123,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
 
                 var actual = Dnf.builder()
@@ -141,7 +141,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
 
                 var actual = Dnf.builder()
@@ -158,7 +158,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
 
                 var actual = Dnf.builder()
@@ -175,7 +175,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
 
                 var actual = Dnf.builder()
@@ -193,7 +193,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
 
                 var actual = Dnf.builder()
@@ -211,7 +211,7 @@ class DnfBuilderTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
 
                 var actual = Dnf.builder()
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java
index 7be57745..e89ab682 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.query;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -53,7 +53,7 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(friendView.call(p, q)).build();
 
                 assertThat(dnf.toDefinitionString(), is("""
@@ -67,7 +67,7 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(not(friendView.call(p, q))).build();
 
                 assertThat(dnf.toDefinitionString(), is("""
@@ -81,7 +81,7 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(friendView.callTransitive(p, q)).build();
 
                 assertThat(dnf.toDefinitionString(), is("""
@@ -95,7 +95,7 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example").parameters(p, q).clause(friendView.call(p, q)).build();
 
                 assertThat(dnf.toDefinitionString(), is("""
@@ -109,9 +109,9 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var person = new Symbol<>("person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example")
                                 .parameter(p)
                                 .clause(
@@ -134,7 +134,7 @@ class DnfToDefinitionStringTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var dnf = Dnf.builder("Example")
                                 .parameter(p)
                                 .clause(friendView.call(p, q))
@@ -156,9 +156,9 @@ class DnfToDefinitionStringTest {
                 var r = Variable.of("r");
                 var s = Variable.of("s");
                 var person = new Symbol<>("person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
-                var friendView = new KeyOnlyRelationView<>(friend);
+                var friendView = new KeyOnlyView<>(friend);
                 var called  = Dnf.builder("Called").parameters(r, s).clause(friendView.call(r, s)).build();
                 var dnf = Dnf.builder("Example")
                                 .parameter(p)
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
index e292b3ab..a1407288 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.query.tests;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 
 import static org.hamcrest.CoreMatchers.containsString;
@@ -22,7 +22,7 @@ class StructurallyEqualToTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var expected = Dnf.builder("Expected").parameters(q).clause(personView.call(q)).build();
                 var actual = Dnf.builder("Actual").parameters(p).clause(personView.call(p)).build();
@@ -35,7 +35,7 @@ class StructurallyEqualToTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var expected = Dnf.builder("Expected").parameters(q).clause(personView.call(q)).build();
                 var actual = Dnf.builder("Actual").parameters(p).clause(personView.call(q)).build();
@@ -49,7 +49,7 @@ class StructurallyEqualToTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var expected = Dnf.builder("Expected").parameters(q).clause(
                                 Dnf.builder("Expected2").parameters(p).clause(personView.call(p)).build().call(q)
@@ -66,7 +66,7 @@ class StructurallyEqualToTest {
                 var p = Variable.of("p");
                 var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var expected = Dnf.builder("Expected").parameters(q).clause(
                                 Dnf.builder("Expected2").parameters(p).clause(personView.call(p)).build().call(q)