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.

4 files changed, 85 insertions, 85 deletions

diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
index da4aba7f..5cffef71 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
@@ -12,8 +12,8 @@ import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.tests.QueryEngineTest;
-import tools.refinery.store.query.view.FunctionalRelationView;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
@@ -30,8 +30,8 @@ class DiagonalQueryTest {
         void inputKeyNegationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -78,8 +78,8 @@ class DiagonalQueryTest {
         void subQueryNegationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -139,8 +139,8 @@ class DiagonalQueryTest {
         void inputKeyCountTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -190,8 +190,8 @@ class DiagonalQueryTest {
         void subQueryCountTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -254,8 +254,8 @@ class DiagonalQueryTest {
         void inputKeyAggregationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new FunctionalRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new FunctionView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -306,8 +306,8 @@ class DiagonalQueryTest {
         void subQueryAggregationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 4, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new FunctionalRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new FunctionView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -374,8 +374,8 @@ class DiagonalQueryTest {
         void inputKeyTransitiveTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 2, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var query = Query.builder("Diagonal")
@@ -420,8 +420,8 @@ class DiagonalQueryTest {
         void subQueryTransitiveTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var symbol = new Symbol<>("symbol", 2, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
-                var symbolView = new KeyOnlyRelationView<>(symbol);
+                var personView = new KeyOnlyView<>(person);
+                var symbolView = new KeyOnlyView<>(symbol);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
index 3af67a50..19584273 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
@@ -13,9 +13,9 @@ import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.tests.QueryEngineTest;
-import tools.refinery.store.query.view.FilteredRelationView;
-import tools.refinery.store.query.view.FunctionalRelationView;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.FilteredView;
+import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
@@ -38,8 +38,8 @@ class FunctionalQueryTest {
         void inputKeyTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -84,8 +84,8 @@ class FunctionalQueryTest {
         void predicateTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -137,8 +137,8 @@ class FunctionalQueryTest {
         void computationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -184,8 +184,8 @@ class FunctionalQueryTest {
         void inputKeyCountTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -233,8 +233,8 @@ class FunctionalQueryTest {
         void predicateCountTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -289,7 +289,7 @@ class FunctionalQueryTest {
         @QueryEngineTest
         void inputKeyAggregationTest(QueryEvaluationHint hint) {
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var ageView = new FunctionalRelationView<>(age);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -324,8 +324,8 @@ class FunctionalQueryTest {
         void predicateAggregationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -371,8 +371,8 @@ class FunctionalQueryTest {
         void extremeValueTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -447,8 +447,8 @@ class FunctionalQueryTest {
         void invalidComputationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -494,8 +494,8 @@ class FunctionalQueryTest {
         void invalidAssumeTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -543,9 +543,9 @@ class FunctionalQueryTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
index e82f0a15..11ee98f5 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
@@ -13,9 +13,9 @@ import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.tests.QueryEngineTest;
-import tools.refinery.store.query.view.FilteredRelationView;
-import tools.refinery.store.query.view.FunctionalRelationView;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.FilteredView;
+import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
@@ -34,7 +34,7 @@ class QueryTest {
         void typeConstraintTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var asset = new Symbol<>("Asset", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")
@@ -73,8 +73,8 @@ class QueryTest {
         void relationConstraintTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -122,8 +122,8 @@ class QueryTest {
         void existTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -172,9 +172,9 @@ class QueryTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var animal = new Symbol<>("Animal", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var animalView = new KeyOnlyRelationView<>(animal);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var animalView = new KeyOnlyView<>(animal);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -230,7 +230,7 @@ class QueryTest {
         @QueryEngineTest
         void equalityTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -273,8 +273,8 @@ class QueryTest {
         void inequalityTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -322,8 +322,8 @@ class QueryTest {
         void patternCallTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -381,8 +381,8 @@ class QueryTest {
         void negativeRelationViewTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -435,8 +435,8 @@ class QueryTest {
         void negativePatternCallTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -500,8 +500,8 @@ class QueryTest {
         void negativeRelationViewWithQuantificationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -547,8 +547,8 @@ class QueryTest {
         void negativeWithQuantificationTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -603,8 +603,8 @@ class QueryTest {
         void transitiveRelationViewTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -656,8 +656,8 @@ class QueryTest {
         void transitivePatternCallTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var friend = new Symbol<>("friend", 2, TruthValue.class, TruthValue.FALSE);
-                var personView = new KeyOnlyRelationView<>(person);
-                var friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must);
+                var personView = new KeyOnlyView<>(person);
+                var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
                 var p1 = Variable.of("p1");
                 var p2 = Variable.of("p2");
@@ -720,8 +720,8 @@ class QueryTest {
         void assumeTest(QueryEvaluationHint hint) {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
index 07b799ac..bd6b6b81 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
@@ -12,9 +12,9 @@ import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.FilteredRelationView;
-import tools.refinery.store.query.view.FunctionalRelationView;
-import tools.refinery.store.query.view.KeyOnlyRelationView;
+import tools.refinery.store.query.view.FilteredView;
+import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
@@ -30,7 +30,7 @@ class QueryTransactionTest {
         @Test
         void flushTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")
@@ -101,7 +101,7 @@ class QueryTransactionTest {
         @Test
         void localSearchTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")
@@ -156,7 +156,7 @@ class QueryTransactionTest {
         void unrelatedChangesTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var asset = new Symbol<>("Asset", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")
@@ -229,8 +229,8 @@ class QueryTransactionTest {
         void tupleChangingChangeTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var ageView = new FunctionalRelationView<>(age);
+                var personView = new KeyOnlyView<>(person);
+                var ageView = new FunctionView<>(age);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -277,8 +277,8 @@ class QueryTransactionTest {
         void tuplePreservingUnchangedTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var age = new Symbol<>("age", 1, Integer.class, null);
-                var personView = new KeyOnlyRelationView<>(person);
-                var adultView = new FilteredRelationView<>(age, "adult", n -> n != null && n >= 18);
+                var personView = new KeyOnlyView<>(person);
+                var adultView = new FilteredView<>(age, "adult", n -> n != null && n >= 18);
 
                 var p1 = Variable.of("p1");
                 var x = Variable.of("x", Integer.class);
@@ -324,7 +324,7 @@ class QueryTransactionTest {
         @Test
         void commitAfterFlushTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")
@@ -382,7 +382,7 @@ class QueryTransactionTest {
         @Test
         void commitWithoutFlushTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var personView = new KeyOnlyRelationView<>(person);
+                var personView = new KeyOnlyView<>(person);
 
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("TypeConstraint")