7 files changed, 149 insertions, 146 deletions

diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
index efc6146c..24aa52e2 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
@@ -4,7 +4,7 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
 import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.ModelQueryBuilder;
 
 import java.util.Collection;
@@ -23,25 +23,25 @@ public interface ViatraModelQueryBuilder extends ModelQueryBuilder {
         ViatraModelQueryBuilder searchBackend(IQueryBackendFactory queryBackendFactory);
 
         @Override
-        default ViatraModelQueryBuilder queries(DNF... queries) {
+        default ViatraModelQueryBuilder queries(Dnf... queries) {
                 ModelQueryBuilder.super.queries(queries);
                 return this;
         }
 
         @Override
-        default ViatraModelQueryBuilder queries(Collection<DNF> queries) {
+        default ViatraModelQueryBuilder queries(Collection<Dnf> queries) {
                 ModelQueryBuilder.super.queries(queries);
                 return this;
         }
 
         @Override
-        ViatraModelQueryBuilder query(DNF query);
+        ViatraModelQueryBuilder query(Dnf query);
 
-        ViatraModelQueryBuilder query(DNF query, QueryEvaluationHint queryEvaluationHint);
+        ViatraModelQueryBuilder query(Dnf query, QueryEvaluationHint queryEvaluationHint);
 
-        ViatraModelQueryBuilder computeHint(Function<DNF, QueryEvaluationHint> computeHint);
+        ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint);
 
-        ViatraModelQueryBuilder hint(DNF dnf, QueryEvaluationHint queryEvaluationHint);
+        ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint);
 
         @Override
         ViatraModelQueryStoreAdapter createStoreAdapter(ModelStore store);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
index 039f46fa..e5d8e2f6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
@@ -7,7 +7,7 @@ import org.eclipse.viatra.query.runtime.internal.apiimpl.ViatraQueryEngineImpl;
 import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackend;
 import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.ResultSet;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 
@@ -27,7 +27,7 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter {
         private final ViatraQueryEngineImpl queryEngine;
         private final MethodHandle setUpdatePropagationDelayedHandle;
         private final MethodHandle getQueryBackendsHandle;
-        private final Map<DNF, ResultSet> resultSets;
+        private final Map<Dnf, ResultSet> resultSets;
         private boolean pendingChanges;
 
         ViatraModelQueryAdapterImpl(Model model, ViatraModelQueryStoreAdapterImpl storeAdapter) {
@@ -95,7 +95,7 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter {
         }
 
         @Override
-        public ResultSet getResultSet(DNF query) {
+        public ResultSet getResultSet(Dnf query) {
                 var resultSet = resultSets.get(query);
                 if (resultSet == null) {
                         throw new IllegalArgumentException("No matcher for query %s in model".formatted(query.name()));
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
index 9f1e55b1..af20033a 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
@@ -9,9 +9,9 @@ import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory;
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.viatra.ViatraModelQueryBuilder;
-import tools.refinery.store.query.viatra.internal.pquery.DNF2PQuery;
+import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery;
 import tools.refinery.store.query.viatra.internal.pquery.RawPatternMatcher;
 
 import java.util.Collections;
@@ -21,8 +21,8 @@ import java.util.function.Function;
 
 public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder implements ViatraModelQueryBuilder {
         private ViatraQueryEngineOptions.Builder engineOptionsBuilder;
-        private final DNF2PQuery dnf2PQuery = new DNF2PQuery();
-        private final Map<DNF, IQuerySpecification<RawPatternMatcher>> querySpecifications = new LinkedHashMap<>();
+        private final Dnf2PQuery dnf2PQuery = new Dnf2PQuery();
+        private final Map<Dnf, IQuerySpecification<RawPatternMatcher>> querySpecifications = new LinkedHashMap<>();
 
         public ViatraModelQueryBuilderImpl(ModelStoreBuilder storeBuilder) {
                 super(storeBuilder);
@@ -63,7 +63,7 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder imp
         }
 
         @Override
-        public ViatraModelQueryBuilder query(DNF query) {
+        public ViatraModelQueryBuilder query(Dnf query) {
                 if (querySpecifications.containsKey(query)) {
                         throw new IllegalArgumentException("%s was already added to the query engine".formatted(query.name()));
                 }
@@ -73,20 +73,20 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder imp
         }
 
         @Override
-        public ViatraModelQueryBuilder query(DNF query, QueryEvaluationHint queryEvaluationHint) {
+        public ViatraModelQueryBuilder query(Dnf query, QueryEvaluationHint queryEvaluationHint) {
                 query(query);
                 hint(query, queryEvaluationHint);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder computeHint(Function<DNF, QueryEvaluationHint> computeHint) {
+        public ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
                 dnf2PQuery.setComputeHint(computeHint);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder hint(DNF dnf, QueryEvaluationHint queryEvaluationHint) {
+        public ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint) {
                 var pQuery = dnf2PQuery.getAlreadyTranslated(dnf);
                 if (pQuery == null) {
                         throw new IllegalArgumentException(
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
index 394e407e..8323118b 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
@@ -5,7 +5,7 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
 import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.viatra.ViatraModelQueryStoreAdapter;
 import tools.refinery.store.query.viatra.internal.pquery.RawPatternMatcher;
 import tools.refinery.store.query.view.AnyRelationView;
@@ -17,11 +17,11 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
         private final ModelStore store;
         private final ViatraQueryEngineOptions engineOptions;
         private final Map<AnyRelationView, IInputKey> inputKeys;
-        private final Map<DNF, IQuerySpecification<RawPatternMatcher>> querySpecifications;
+        private final Map<Dnf, IQuerySpecification<RawPatternMatcher>> querySpecifications;
 
         ViatraModelQueryStoreAdapterImpl(ModelStore store, ViatraQueryEngineOptions engineOptions,
                                                                          Map<AnyRelationView, IInputKey> inputKeys,
-                                                                         Map<DNF, IQuerySpecification<RawPatternMatcher>> querySpecifications) {
+                                                                         Map<Dnf, IQuerySpecification<RawPatternMatcher>> querySpecifications) {
                 this.store = store;
                 this.engineOptions = engineOptions;
                 this.inputKeys = inputKeys;
@@ -42,11 +42,11 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
         }
 
         @Override
-        public Collection<DNF> getQueries() {
+        public Collection<Dnf> getQueries() {
                 return querySpecifications.keySet();
         }
 
-        Map<DNF, IQuerySpecification<RawPatternMatcher>> getQuerySpecifications() {
+        Map<Dnf, IQuerySpecification<RawPatternMatcher>> getQuerySpecifications() {
                 return querySpecifications;
         }
 
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 60f1bcae..02e26bde 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
@@ -17,38 +17,38 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import tools.refinery.store.query.DNF;
-import tools.refinery.store.query.DNFAnd;
-import tools.refinery.store.query.DNFUtils;
+import tools.refinery.store.query.Dnf;
+import tools.refinery.store.query.DnfClause;
+import tools.refinery.store.query.DnfUtils;
 import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.atom.*;
+import tools.refinery.store.query.literal.*;
 import tools.refinery.store.query.view.AnyRelationView;
 
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public class DNF2PQuery {
+public class Dnf2PQuery {
         private static final Object P_CONSTRAINT_LOCK = new Object();
 
-        private final Set<DNF> translating = new LinkedHashSet<>();
+        private final Set<Dnf> translating = new LinkedHashSet<>();
 
-        private final Map<DNF, RawPQuery> dnf2PQueryMap = new HashMap<>();
+        private final Map<Dnf, RawPQuery> dnf2PQueryMap = new HashMap<>();
 
         private final Map<AnyRelationView, RelationViewWrapper> view2WrapperMap = new LinkedHashMap<>();
 
         private final Map<AnyRelationView, RawPQuery> view2EmbeddedMap = new HashMap<>();
 
-        private Function<DNF, QueryEvaluationHint> computeHint = dnf -> new QueryEvaluationHint(null,
+        private Function<Dnf, QueryEvaluationHint> computeHint = dnf -> new QueryEvaluationHint(null,
                         QueryEvaluationHint.BackendRequirement.UNSPECIFIED);
 
-        public void setComputeHint(Function<DNF, QueryEvaluationHint> computeHint) {
+        public void setComputeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
                 this.computeHint = computeHint;
         }
 
-        public RawPQuery translate(DNF dnfQuery) {
+        public RawPQuery translate(Dnf dnfQuery) {
                 if (translating.contains(dnfQuery)) {
-                        var path = translating.stream().map(DNF::name).collect(Collectors.joining(" -> "));
+                        var path = translating.stream().map(Dnf::name).collect(Collectors.joining(" -> "));
                         throw new IllegalStateException("Circular reference %s -> %s detected".formatted(path,
                                         dnfQuery.name()));
                 }
@@ -71,11 +71,11 @@ public class DNF2PQuery {
                 return Collections.unmodifiableMap(view2WrapperMap);
         }
 
-        public RawPQuery getAlreadyTranslated(DNF dnfQuery) {
+        public RawPQuery getAlreadyTranslated(Dnf dnfQuery) {
                 return dnf2PQueryMap.get(dnfQuery);
         }
 
-        private RawPQuery doTranslate(DNF dnfQuery) {
+        private RawPQuery doTranslate(Dnf dnfQuery) {
                 var pQuery = new RawPQuery(dnfQuery.getUniqueName());
                 pQuery.setEvaluationHints(computeHint.apply(dnfQuery));
 
@@ -103,9 +103,9 @@ public class DNF2PQuery {
 
                 // The constructor of {@link org.eclipse.viatra.query.runtime.matchers.psystem.BasePConstraint} mutates
                 // global static state (<code>nextID</code>) without locking. Therefore, we need to synchronize before creating
-                // any query constraints to avoid a data race.
+                // any query literals to avoid a data race.
                 synchronized (P_CONSTRAINT_LOCK) {
-                        for (DNFAnd clause : dnfQuery.getClauses()) {
+                        for (DnfClause clause : dnfQuery.getClauses()) {
                                 PBody body = new PBody(pQuery);
                                 List<ExportedParameter> symbolicParameters = new ArrayList<>();
                                 for (var param : dnfQuery.getParameters()) {
@@ -114,8 +114,8 @@ public class DNF2PQuery {
                                 }
                                 body.setSymbolicParameters(symbolicParameters);
                                 pQuery.addBody(body);
-                                for (DNFAtom constraint : clause.constraints()) {
-                                        translateDNFAtom(constraint, body);
+                                for (Literal literal : clause.literals()) {
+                                        translateLiteral(literal, body);
                                 }
                         }
                 }
@@ -123,34 +123,34 @@ public class DNF2PQuery {
                 return pQuery;
         }
 
-        private void translateDNFAtom(DNFAtom constraint, PBody body) {
-                if (constraint instanceof EquivalenceAtom equivalenceAtom) {
-                        translateEquivalenceAtom(equivalenceAtom, body);
-                } else if (constraint instanceof RelationViewAtom relationViewAtom) {
-                        translateRelationViewAtom(relationViewAtom, body);
-                } else if (constraint instanceof DNFCallAtom callAtom) {
-                        translateCallAtom(callAtom, body);
-                } else if (constraint instanceof ConstantAtom constantAtom) {
-                        translateConstantAtom(constantAtom, body);
+        private void translateLiteral(Literal literal, PBody body) {
+                if (literal instanceof EquivalenceLiteral equivalenceLiteral) {
+                        translateEquivalenceLiteral(equivalenceLiteral, body);
+                } else if (literal instanceof RelationViewLiteral relationViewLiteral) {
+                        translateRelationViewLiteral(relationViewLiteral, body);
+                } else if (literal instanceof DnfCallLiteral dnfCallLiteral) {
+                        translateDnfCallLiteral(dnfCallLiteral, body);
+                } else if (literal instanceof ConstantLiteral constantLiteral) {
+                        translateConstantLiteral(constantLiteral, body);
                 } else {
-                        throw new IllegalArgumentException("Unknown constraint: " + constraint.toString());
+                        throw new IllegalArgumentException("Unknown literal: " + literal.toString());
                 }
         }
 
-        private void translateEquivalenceAtom(EquivalenceAtom equivalence, PBody body) {
-                PVariable varSource = body.getOrCreateVariableByName(equivalence.left().getUniqueName());
-                PVariable varTarget = body.getOrCreateVariableByName(equivalence.right().getUniqueName());
-                if (equivalence.positive()) {
+        private void translateEquivalenceLiteral(EquivalenceLiteral equivalenceLiteral, PBody body) {
+                PVariable varSource = body.getOrCreateVariableByName(equivalenceLiteral.left().getUniqueName());
+                PVariable varTarget = body.getOrCreateVariableByName(equivalenceLiteral.right().getUniqueName());
+                if (equivalenceLiteral.positive()) {
                         new Equality(body, varSource, varTarget);
                 } else {
                         new Inequality(body, varSource, varTarget);
                 }
         }
 
-        private void translateRelationViewAtom(RelationViewAtom relationViewAtom, PBody body) {
-                var substitution = translateSubstitution(relationViewAtom.getSubstitution(), body);
-                var polarity = relationViewAtom.getPolarity();
-                var relationView = relationViewAtom.getTarget();
+        private void translateRelationViewLiteral(RelationViewLiteral relationViewLiteral, PBody body) {
+                var substitution = translateSubstitution(relationViewLiteral.getSubstitution(), body);
+                var polarity = relationViewLiteral.getPolarity();
+                var relationView = relationViewLiteral.getTarget();
                 if (polarity == CallPolarity.POSITIVE) {
                         new TypeConstraint(body, substitution, wrapView(relationView));
                 } else {
@@ -178,7 +178,7 @@ public class DNF2PQuery {
         }
 
         private RawPQuery doTranslateEmbeddedRelationViewPQuery(AnyRelationView relationView) {
-                var embeddedPQuery = new RawPQuery(DNFUtils.generateUniqueName(relationView.name()), PVisibility.EMBEDDED);
+                var embeddedPQuery = new RawPQuery(DnfUtils.generateUniqueName(relationView.name()), PVisibility.EMBEDDED);
                 var body = new PBody(embeddedPQuery);
                 int arity = relationView.arity();
                 var parameters = new ArrayList<PParameter>(arity);
@@ -204,10 +204,10 @@ public class DNF2PQuery {
                 return view2WrapperMap.computeIfAbsent(relationView, RelationViewWrapper::new);
         }
 
-        private void translateCallAtom(DNFCallAtom callAtom, PBody body) {
-                var variablesTuple = translateSubstitution(callAtom.getSubstitution(), body);
-                var translatedReferred = translate(callAtom.getTarget());
-                var polarity = callAtom.getPolarity();
+        private void translateDnfCallLiteral(DnfCallLiteral dnfCallLiteral, PBody body) {
+                var variablesTuple = translateSubstitution(dnfCallLiteral.getSubstitution(), body);
+                var translatedReferred = translate(dnfCallLiteral.getTarget());
+                var polarity = dnfCallLiteral.getPolarity();
                 switch (polarity) {
                 case POSITIVE -> new PositivePatternCall(body, variablesTuple, translatedReferred);
                 case TRANSITIVE -> new BinaryTransitiveClosure(body, variablesTuple, translatedReferred);
@@ -216,8 +216,8 @@ public class DNF2PQuery {
                 }
         }
 
-        private void translateConstantAtom(ConstantAtom constantAtom, PBody body) {
-                var variable = body.getOrCreateVariableByName(constantAtom.variable().getUniqueName());
-                new ConstantValue(body, variable, constantAtom.nodeId());
+        private void translateConstantLiteral(ConstantLiteral constantLiteral, PBody body) {
+                var variable = body.getOrCreateVariableByName(constantLiteral.variable().getUniqueName());
+                new ConstantValue(body, variable, constantLiteral.nodeId());
         }
 }
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 6a37b54a..471fdfc9 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
@@ -2,10 +2,13 @@ package tools.refinery.store.query.viatra;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.ModelQuery;
 import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.atom.*;
+import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.literal.DnfCallLiteral;
+import tools.refinery.store.query.literal.EquivalenceLiteral;
+import tools.refinery.store.query.literal.RelationViewLiteral;
 import tools.refinery.store.query.view.FilteredRelationView;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
@@ -27,9 +30,9 @@ class QueryTest {
                 var personView = new KeyOnlyRelationView<>(person);
 
                 var p1 = new Variable("p1");
-                var predicate = DNF.builder("TypeConstraint")
+                var predicate = Dnf.builder("TypeConstraint")
                                 .parameters(p1)
-                                .clause(new RelationViewAtom(personView, p1))
+                                .clause(new RelationViewLiteral(personView, p1))
                                 .build();
 
                 var store = ModelStore.builder()
@@ -64,12 +67,12 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("RelationConstraint")
+                var predicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -111,13 +114,13 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("RelationConstraint")
+                var predicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2),
-                                                new RelationViewAtom(friendMustView, p2, p1)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2),
+                                                new RelationViewLiteral(friendMustView, p2, p1)
                                 )
                                 .build();
 
@@ -166,12 +169,12 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("RelationConstraint")
+                var predicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -213,17 +216,17 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("Or")
+                var predicate = Dnf.builder("Or")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .clause(
-                                                new RelationViewAtom(animalView, p1),
-                                                new RelationViewAtom(animalView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(animalView, p1),
+                                                new RelationViewLiteral(animalView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -263,12 +266,12 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("Equality")
+                var predicate = Dnf.builder("Equality")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new EquivalenceAtom(p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new EquivalenceLiteral(p1, p2)
                                 )
                                 .build();
 
@@ -302,14 +305,14 @@ class QueryTest {
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
                 var p3 = new Variable("p3");
-                var predicate = DNF.builder("Inequality")
+                var predicate = Dnf.builder("Inequality")
                                 .parameters(p1, p2, p3)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p3),
-                                                new RelationViewAtom(friendMustView, p2, p3),
-                                                new EquivalenceAtom(false, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p3),
+                                                new RelationViewLiteral(friendMustView, p2, p3),
+                                                new EquivalenceLiteral(false, p1, p2)
                                 )
                                 .build();
 
@@ -346,23 +349,23 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var friendPredicate = DNF.builder("RelationConstraint")
+                var friendPredicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
                 var p3 = new Variable("p3");
                 var p4 = new Variable("p4");
-                var predicate = DNF.builder("PositivePatternCall")
+                var predicate = Dnf.builder("PositivePatternCall")
                                 .parameters(p3, p4)
                                 .clause(
-                                                new RelationViewAtom(personView, p3),
-                                                new RelationViewAtom(personView, p4),
-                                                new DNFCallAtom(friendPredicate, p3, p4)
+                                                new RelationViewLiteral(personView, p3),
+                                                new RelationViewLiteral(personView, p4),
+                                                new DnfCallLiteral(friendPredicate, p3, p4)
                                 )
                                 .build();
 
@@ -399,12 +402,12 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("NegativePatternCall")
+                var predicate = Dnf.builder("NegativePatternCall")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(false, friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(false, friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -441,23 +444,23 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var friendPredicate = DNF.builder("RelationConstraint")
+                var friendPredicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
                 var p3 = new Variable("p3");
                 var p4 = new Variable("p4");
-                var predicate = DNF.builder("NegativePatternCall")
+                var predicate = Dnf.builder("NegativePatternCall")
                                 .parameters(p3, p4)
                                 .clause(
-                                                new RelationViewAtom(personView, p3),
-                                                new RelationViewAtom(personView, p4),
-                                                new DNFCallAtom(false, friendPredicate, p3, p4)
+                                                new RelationViewLiteral(personView, p3),
+                                                new RelationViewLiteral(personView, p4),
+                                                new DnfCallLiteral(false, friendPredicate, p3, p4)
                                 )
                                 .build();
 
@@ -495,11 +498,11 @@ class QueryTest {
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
 
-                var predicate = DNF.builder("Count")
+                var predicate = Dnf.builder("Count")
                                 .parameters(p1)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(false, friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(false, friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -536,20 +539,20 @@ class QueryTest {
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
 
-                var called = DNF.builder("Called")
+                var called = Dnf.builder("Called")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
-                var predicate = DNF.builder("Count")
+                var predicate = Dnf.builder("Count")
                                 .parameters(p1)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new DNFCallAtom(false, called, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new DnfCallLiteral(false, called, p1, p2)
                                 )
                                 .build();
 
@@ -585,12 +588,12 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var predicate = DNF.builder("TransitivePatternCall")
+                var predicate = Dnf.builder("TransitivePatternCall")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(CallPolarity.TRANSITIVE, friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(CallPolarity.TRANSITIVE, friendMustView, p1, p2)
                                 )
                                 .build();
 
@@ -626,23 +629,23 @@ class QueryTest {
 
                 var p1 = new Variable("p1");
                 var p2 = new Variable("p2");
-                var friendPredicate = DNF.builder("RelationConstraint")
+                var friendPredicate = Dnf.builder("RelationConstraint")
                                 .parameters(p1, p2)
                                 .clause(
-                                                new RelationViewAtom(personView, p1),
-                                                new RelationViewAtom(personView, p2),
-                                                new RelationViewAtom(friendMustView, p1, p2)
+                                                new RelationViewLiteral(personView, p1),
+                                                new RelationViewLiteral(personView, p2),
+                                                new RelationViewLiteral(friendMustView, p1, p2)
                                 )
                                 .build();
 
                 var p3 = new Variable("p3");
                 var p4 = new Variable("p4");
-                var predicate = DNF.builder("TransitivePatternCall")
+                var predicate = Dnf.builder("TransitivePatternCall")
                                 .parameters(p3, p4)
                                 .clause(
-                                                new RelationViewAtom(personView, p3),
-                                                new RelationViewAtom(personView, p4),
-                                                new DNFCallAtom(CallPolarity.TRANSITIVE, friendPredicate, p3, p4)
+                                                new RelationViewLiteral(personView, p3),
+                                                new RelationViewLiteral(personView, p4),
+                                                new DnfCallLiteral(CallPolarity.TRANSITIVE, friendPredicate, p3, p4)
                                 )
                                 .build();
 
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 98995339..99b942d2 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
@@ -2,10 +2,10 @@ package tools.refinery.store.query.viatra;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.DNF;
+import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.ModelQuery;
 import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.atom.RelationViewAtom;
+import tools.refinery.store.query.literal.RelationViewLiteral;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
@@ -20,9 +20,9 @@ class QueryTransactionTest {
                 var personView = new KeyOnlyRelationView<>(person);
 
                 var p1 = new Variable("p1");
-                var predicate = DNF.builder("TypeConstraint")
+                var predicate = Dnf.builder("TypeConstraint")
                                 .parameters(p1)
-                                .clause(new RelationViewAtom(personView, p1))
+                                .clause(new RelationViewLiteral(personView, p1))
                                 .build();
 
                 var store = ModelStore.builder()