3 files changed, 21 insertions, 21 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
index 714d41c0..b511a5c7 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
@@ -29,7 +29,7 @@ import tools.refinery.store.query.term.ConstantTerm;
 import tools.refinery.store.query.term.StatefulAggregator;
 import tools.refinery.store.query.term.StatelessAggregator;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.AnyRelationView;
+import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.util.CycleDetectingMapper;
 
 import java.util.*;
@@ -53,8 +53,8 @@ public class Dnf2PQuery {
                 return mapper.map(dnfQuery);
         }
 
-        public Map<AnyRelationView, IInputKey> getRelationViews() {
-                return wrapperFactory.getRelationViews();
+        public Map<AnySymbolView, IInputKey> getSymbolViews() {
+                return wrapperFactory.getSymbolViews();
         }
 
         public void hint(Dnf dnf, QueryEvaluationHint hint) {
@@ -165,8 +165,8 @@ public class Dnf2PQuery {
                         if (constraint instanceof Dnf dnf) {
                                 var pattern = translate(dnf);
                                 new PositivePatternCall(body, substitution, pattern);
-                        } else if (constraint instanceof AnyRelationView relationView) {
-                                var inputKey = wrapperFactory.getInputKey(relationView);
+                        } else if (constraint instanceof AnySymbolView symbolView) {
+                                var inputKey = wrapperFactory.getInputKey(symbolView);
                                 new TypeConstraint(body, substitution, inputKey);
                         } else {
                                 throw new IllegalArgumentException("Unknown Constraint: " + constraint);
@@ -178,8 +178,8 @@ public class Dnf2PQuery {
                         PQuery pattern;
                         if (constraint instanceof Dnf dnf) {
                                 pattern = translate(dnf);
-                        } else if (constraint instanceof AnyRelationView relationView) {
-                                pattern = wrapperFactory.wrapRelationViewIdentityArguments(relationView);
+                        } else if (constraint instanceof AnySymbolView symbolView) {
+                                pattern = wrapperFactory.wrapSymbolViewIdentityArguments(symbolView);
                         } else {
                                 throw new IllegalArgumentException("Unknown Constraint: " + constraint);
                         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
index 30f848a6..0d046455 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
@@ -21,8 +21,8 @@ import tools.refinery.store.query.dnf.DnfClause;
 import tools.refinery.store.query.dnf.DnfUtils;
 import tools.refinery.store.query.literal.AbstractCallLiteral;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.view.AnyRelationView;
-import tools.refinery.store.query.view.RelationView;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.SymbolView;
 import tools.refinery.store.util.CycleDetectingMapper;
 
 import java.util.*;
@@ -30,7 +30,7 @@ import java.util.function.ToIntFunction;
 
 class QueryWrapperFactory {
         private final Dnf2PQuery dnf2PQuery;
-        private final Map<AnyRelationView, RelationViewWrapper> view2WrapperMap = new LinkedHashMap<>();
+        private final Map<AnySymbolView, SymbolViewWrapper> view2WrapperMap = new LinkedHashMap<>();
         private final CycleDetectingMapper<RemappedConstraint, RawPQuery> wrapConstraint = new CycleDetectingMapper<>(
                         RemappedConstraint::toString, this::doWrapConstraint);
 
@@ -38,12 +38,12 @@ class QueryWrapperFactory {
                 this.dnf2PQuery = dnf2PQuery;
         }
 
-        public PQuery wrapRelationViewIdentityArguments(AnyRelationView relationView) {
-                var identity = new int[relationView.arity()];
+        public PQuery wrapSymbolViewIdentityArguments(AnySymbolView symbolView) {
+                var identity = new int[symbolView.arity()];
                 for (int i = 0; i < identity.length; i++) {
                         identity[i] = i;
                 }
-                return maybeWrapConstraint(relationView, identity);
+                return maybeWrapConstraint(symbolView, identity);
         }
         public WrappedCall maybeWrapConstraint(AbstractCallLiteral callLiteral, DnfClause clause) {
                 var arguments = callLiteral.getArguments();
@@ -112,8 +112,8 @@ class QueryWrapperFactory {
                 }
                 var argumentTuple = Tuples.flatTupleOf(arguments);
 
-                if (constraint instanceof RelationView<?> relationView) {
-                        new TypeConstraint(body, argumentTuple, getInputKey(relationView));
+                if (constraint instanceof SymbolView<?> view) {
+                        new TypeConstraint(body, argumentTuple, getInputKey(view));
                 } else if (constraint instanceof Dnf dnf) {
                         var calledPQuery = dnf2PQuery.translate(dnf);
                         new PositivePatternCall(body, argumentTuple, calledPQuery);
@@ -125,11 +125,11 @@ class QueryWrapperFactory {
                 return embeddedPQuery;
         }
 
-        public IInputKey getInputKey(AnyRelationView relationView) {
-                return view2WrapperMap.computeIfAbsent(relationView, RelationViewWrapper::new);
+        public IInputKey getInputKey(AnySymbolView symbolView) {
+                return view2WrapperMap.computeIfAbsent(symbolView, SymbolViewWrapper::new);
         }
 
-        public Map<AnyRelationView, IInputKey> getRelationViews() {
+        public Map<AnySymbolView, IInputKey> getSymbolViews() {
                 return Collections.unmodifiableMap(view2WrapperMap);
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RelationViewWrapper.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
index 02da932b..a777613e 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RelationViewWrapper.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
@@ -6,10 +6,10 @@
 package tools.refinery.store.query.viatra.internal.pquery;
 
 import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
-import tools.refinery.store.query.view.AnyRelationView;
+import tools.refinery.store.query.view.AnySymbolView;
 
-public class RelationViewWrapper extends BaseInputKeyWrapper<AnyRelationView> {
-        public RelationViewWrapper(AnyRelationView wrappedKey) {
+public class SymbolViewWrapper extends BaseInputKeyWrapper<AnySymbolView> {
+        public SymbolViewWrapper(AnySymbolView wrappedKey) {
                 super(wrappedKey);
         }