chore: remove VIATRA branding

Rename VIATRA subprojects to Refinery Interpreter to avoid interfering with
Eclipse Foundation trademarks.

Uses refering to a specific (historical) version of VIATRA were kept to avoid
ambiguity.

609 files changed, 7730 insertions, 7651 deletions

diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/interpreter-library.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/interpreter-library.gradle.kts
new file mode 100644
index 00000000..ae30ff1b
--- /dev/null
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/interpreter-library.gradle.kts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.gradle
+
+import tools.refinery.gradle.utils.SonarPropertiesUtils
+
+plugins {
+        id("maven-publish")
+        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.sonarqube")
+}
+
+property("tools.refinery.interpreter.group")?.let { group = it }
+property("tools.refinery.interpreter.version")?.let { version = it }
+
+tasks {
+        withType(Jar::class) {
+                // Make sure we include external project notices.
+                from(layout.projectDirectory.file("about.html"))
+                from(layout.projectDirectory.file("NOTICE.md"))
+        }
+}
+
+sonarqube.properties {
+        // Code copied from the VIATRA project is maintained by the VIATRA contributors.
+        // Our own modifications are verified by tests in our own subprojects.
+        // Therefore, we disable coverage checking for vendor subprojects.
+        SonarPropertiesUtils.addToList(properties, "sonar.coverage.exclusions", "src/main/**")
+}
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/skip-coverage.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/skip-coverage.gradle.kts
deleted file mode 100644
index 4b843742..00000000
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/skip-coverage.gradle.kts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.gradle
-
-import tools.refinery.gradle.utils.SonarPropertiesUtils
-
-plugins {
-        id("tools.refinery.gradle.sonarqube")
-}
-
-sonarqube.properties {
-        SonarPropertiesUtils.addToList(properties, "sonar.coverage.exclusions", "src/main/**")
-}
diff --git a/gradle.properties b/gradle.properties
index 41b2ee91..59f53d4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,7 @@ org.gradle.parallel=true
 systemProp.sonar.projectKey=graphs4value_refinery
 systemProp.sonar.organization=graphs4value
 systemProp.sonar.host.url=https://sonarcloud.io
+tools.refinery.interpreter.group=tools.refinery.interpreter
+# Follow the VIATRA incubation versioning scheme to avoid breaking SemVer.
+tools.refinery.interpreter.version=0.28.0-SNAPSHOT
 version=0.0.0-SNAPSHOT
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 49eec202..0a9d4ca5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,6 +8,10 @@ rootProject.name = "refinery"
 
 include(
                 "frontend",
+                "interpreter",
+                "interpreter-localsearch",
+                "interpreter-rete",
+                "interpreter-rete-recipes",
                 "language",
                 "language-ide",
                 "language-model",
@@ -17,13 +21,9 @@ include(
                 "store-dse",
                 "store-dse-visualization",
                 "store-query",
-                "store-query-viatra",
+                "store-query-interpreter",
                 "store-reasoning",
                 "store-reasoning-scope",
-                "viatra-runtime",
-                "viatra-runtime-localsearch",
-                "viatra-runtime-rete",
-                "viatra-runtime-rete-recipes",
 )
 
 for (project in rootProject.children) {
diff --git a/subprojects/store-query-viatra/NOTICE.md b/subprojects/interpreter-localsearch/NOTICE.md
index 7c21726a..94c1d803 100644
--- a/subprojects/store-query-viatra/NOTICE.md
+++ b/subprojects/interpreter-localsearch/NOTICE.md
@@ -5,11 +5,18 @@
   SPDX-License-Identifier: EPL-2.0
 -->
 
-This module contains source code from the [Eclipse VIATRA project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
+This module contains source code from the [Eclipse VIATRA&trade; project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
 
-We reproduce the [accompanying notices](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+Eclipse&reg;, VIATRA&trade; and &lsquo;Eclipse VIATRA&trade;&rsquo; are trademarks of Eclipse Foundation, Inc.
 
-# Notices for Eclipse VIATRA
+To comply with the [Eclipse Foundation Trademark Usage Policy](https://www.eclipse.org/legal/logo_guidelines.php), we replaced the Eclipse VIATRA&trade; branding in this repository with the name _Refinery Interpreter_, since the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/) does not grant trademark usage rights to derived projects.
+_Refinery Interpreter_ is not endorsed or sponsored by Eclipse Foundation, Inc. or any other organizations using the Eclipse VIATRA&trade; trademark.
+
+We publish our modifications to Eclipse VIATRA&trade; for use within the Refinery framework under the name _Refinery Interpreter_. When not using _Refinery Interpreter_ directly in the Refinery framework, users are strongly encouraged to rely on [Eclipse VIATRA&trade;](https://eclipse.dev/viatra/) instead. In particular, _Refinery Interpreter_ does not provide any API stability guarantees that are provided by Eclipse VIATRA&trade;.
+
+We reproduce the [accompanying notices of Eclipse VIATRA&trade;](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+
+# Notices for Eclipse VIATRA&trade;
 
 This content is produced and maintained by the Eclipse VIATRA project.
 
diff --git a/subprojects/viatra-runtime-localsearch/about.html b/subprojects/interpreter-localsearch/about.html
index d1d5593a..d1d5593a 100644
--- a/subprojects/viatra-runtime-localsearch/about.html
+++ b/subprojects/interpreter-localsearch/about.html
diff --git a/subprojects/interpreter-localsearch/build.gradle.kts b/subprojects/interpreter-localsearch/build.gradle.kts
new file mode 100644
index 00000000..dae92c6c
--- /dev/null
+++ b/subprojects/interpreter-localsearch/build.gradle.kts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.interpreter-library")
+}
+
+dependencies {
+        implementation(project(":refinery-interpreter"))
+        implementation(libs.slf4j.log4j)
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/ExecutionLoggerAdapter.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/ExecutionLoggerAdapter.java
index bfb76d9a..bbfa2f4e 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/ExecutionLoggerAdapter.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/ExecutionLoggerAdapter.java
@@ -6,13 +6,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch;
+package tools.refinery.interpreter.localsearch;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
-import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+import tools.refinery.interpreter.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.interpreter.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.plan.SearchPlan;
 
 import java.util.Optional;
 import java.util.function.Consumer;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/MatchingFrame.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/MatchingFrame.java
index bdbc663c..6a597c19 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/MatchingFrame.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/MatchingFrame.java
@@ -7,11 +7,11 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.localsearch;
+package tools.refinery.interpreter.localsearch;
 
-import tools.refinery.viatra.runtime.matchers.tuple.IModifiableTuple;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileTuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.tuple.IModifiableTuple;
+import tools.refinery.interpreter.matchers.tuple.VolatileTuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/exceptions/LocalSearchException.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/exceptions/LocalSearchException.java
index c239e766..46bffb1f 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/exceptions/LocalSearchException.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/exceptions/LocalSearchException.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.exceptions;
+package tools.refinery.interpreter.localsearch.exceptions;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 /**
  * @author Zoltan Ujhelyi, Akos Horvath
- * 
+ *
  */
-public class LocalSearchException extends ViatraQueryRuntimeException {
+public class LocalSearchException extends InterpreterRuntimeException {
 
     private static final long serialVersionUID = -2585896573351435974L;
 
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/CallWithAdornment.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/CallWithAdornment.java
index 0cabeb97..e3906ccd 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/CallWithAdornment.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/CallWithAdornment.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * Immutable data that represents the role of a pattern call within an LS query plan.
- *  
- * <p> The call is expressed as the {@link PConstraint} {@link #call} (implementing {@link IQueryReference}), 
- * while the stored {@link #adornment} records the way it will be used within a search plan (specifically, 
+ *
+ * <p> The call is expressed as the {@link PConstraint} {@link #call} (implementing {@link IQueryReference}),
+ * while the stored {@link #adornment} records the way it will be used within a search plan (specifically,
  * pattern parameters within the adornment will have their values known at the point of evaluating the constraint).
- * 
- * 
+ *
+ *
  * @author Gabor Bergmann
  * @since 2.1
  */
@@ -43,12 +43,12 @@ public class CallWithAdornment {
     public Set<PParameter> getAdornment() {
         return adornment;
     }
-    
-    
+
+
     public PQuery getReferredQuery() {
         return call.getReferredQuery();
     }
-    
+
     public MatcherReference getMatcherReference() {
         return new MatcherReference(getReferredQuery(), adornment);
     }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdaptable.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ILocalSearchAdaptable.java
index f4b28ed0..9cec930f 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdaptable.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ILocalSearchAdaptable.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import java.util.List;
 
@@ -26,4 +26,4 @@ public interface ILocalSearchAdaptable {
 
     void addAdapters(List<ILocalSearchAdapter> adapter);
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdapter.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ILocalSearchAdapter.java
index df64b5f1..088bbcba 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdapter.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ILocalSearchAdapter.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import java.util.Optional;
 
-import tools.refinery.viatra.runtime.localsearch.ExecutionLoggerAdapter;
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
-import tools.refinery.viatra.runtime.localsearch.profiler.LocalSearchProfilerAdapter;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.profiler.LocalSearchProfilerAdapter;
+import tools.refinery.interpreter.localsearch.ExecutionLoggerAdapter;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.plan.SearchPlan;
 
 
 /**
@@ -26,7 +26,7 @@ import tools.refinery.viatra.runtime.localsearch.profiler.LocalSearchProfilerAda
  * it is not recommended to provide implementations outside of VIATRA. If necessary, have a look at the built-in
  * adapters that should fulfill most cases in the meantime. See bugs https://bugs.eclipse.org/bugs/show_bug.cgi?id=535101
  * and https://bugs.eclipse.org/bugs/show_bug.cgi?id=535102 for details.
- * 
+ *
  * @author Marton Bur
  * @see ExecutionLoggerAdapter
  * @see LocalSearchProfilerAdapter
@@ -35,16 +35,16 @@ import tools.refinery.viatra.runtime.localsearch.profiler.LocalSearchProfilerAda
 public interface ILocalSearchAdapter {
 
     /**
-     * 
+     *
      * @since 1.2
      */
     default void adapterRegistered(ILocalSearchAdaptable adaptable) {};
     /**
-     * 
+     *
      * @since 1.2
      */
     default void adapterUnregistered(ILocalSearchAdaptable adaptable) {};
-    
+
     /**
      * Callback method to indicate the start of a matching process
      *
@@ -57,7 +57,7 @@ public interface ILocalSearchAdapter {
      * </p>
      * <strong>WARNING</strong>: It is not guaranteed that this method will be called;
      * it is possible that a match process will end after a match is found and no other matches are accessed.
-     * 
+     *
      * @param lsMatcher the local search matcher that finished
      * @since 2.0
      */
@@ -65,16 +65,16 @@ public interface ILocalSearchAdapter {
 
     /**
      * Callback method to indicate switching to a new plan during the execution of a pattern matching
-     * 
+     *
      * @param oldPlan the plan that is finished. Value is null when the first plan is starting.
      * @param newPlan the plan that will begin execution
      * @since 2.0
      */
     default void planChanged(Optional<SearchPlan> oldPlan, Optional<SearchPlan> newPlan) {};
-    
+
     /**
      * Callback method to indicate the selection of an operation to execute
-     * 
+     *
      * @param plan the current plan executor
      * @param frame the current matching frame
      * @param isBacktrack if true, the selected operation was reached via backtracking
@@ -84,7 +84,7 @@ public interface ILocalSearchAdapter {
 
     /**
      * Callback method to indicate that an operation is executed
-     * 
+     *
      * @param plan the current plan
      * @param frame the current matching frame
      * @param isSuccessful if true, the operation executed successfully, or false if the execution failed and backtracking will happen
@@ -94,24 +94,24 @@ public interface ILocalSearchAdapter {
 
     /**
      * Callback that is used to indicate that a match has been found
-     * 
+     *
      * @param plan the search plan executor that found the match
-     * @param frame the frame that holds the substitutions of the variables that match 
+     * @param frame the frame that holds the substitutions of the variables that match
      * @since 2.0
      */
     default void matchFound(SearchPlan plan, MatchingFrame frame) {};
     /**
      * Callback that is used to indicate that the previously reported match has been found as a duplicate, thus will be ignored from the match results.
-     * 
+     *
      * @param plan the search plan executor that found the match
-     * @param frame the frame that holds the substitutions of the variables that match 
+     * @param frame the frame that holds the substitutions of the variables that match
      * @since 2.0
      */
     default void duplicateMatchFound(MatchingFrame frame) {};
 
     /**
      * Callback method to indicate that a search plan is initialized in an executor with the given frame and starting operation
-     * 
+     *
      * @param searchPlan
      * @param frame
      * @since 2.0
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ISearchContext.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ISearchContext.java
index 71aa4aac..1ac2fa53 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ISearchContext.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/ISearchContext.java
@@ -6,17 +6,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.IAdornmentProvider;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.util.ICache;
-import tools.refinery.viatra.runtime.matchers.util.IProvider;
+import tools.refinery.interpreter.localsearch.matcher.integration.IAdornmentProvider;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.util.ICache;
+import tools.refinery.interpreter.matchers.util.IProvider;
 
 import java.util.Collections;
 
@@ -40,7 +40,7 @@ public interface ISearchContext {
     /**
      * Returns a matcher for a selected query specification.
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      * @since 1.5
      */
     IQueryResultProvider getMatcher(CallWithAdornment dependency);
@@ -86,7 +86,7 @@ public interface ISearchContext {
         }
 
         /**
-         * @throws ViatraQueryRuntimeException
+         * @throws InterpreterRuntimeException
          * @since 2.1
          */
         @Override
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/LocalSearchMatcher.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/LocalSearchMatcher.java
index e31d7b5c..e26d08c7 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/LocalSearchMatcher.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/LocalSearchMatcher.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -23,16 +23,16 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanExecutor;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.plan.IPlanDescriptor;
+import tools.refinery.interpreter.localsearch.plan.SearchPlan;
+import tools.refinery.interpreter.localsearch.plan.SearchPlanExecutor;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * @author Zoltan Ujhelyi
@@ -50,22 +50,22 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
     public List<SearchPlanExecutor> getPlan() {
         return plan;
     }
-    
+
     @Override
     public List<ILocalSearchAdapter> getAdapters() {
         return new ArrayList<>(adapters);
     }
-    
+
     private abstract class PlanExecutionIterator implements Iterator<Tuple> {
 
         protected final Iterator<SearchPlanExecutor> planIterator;
-        
+
         protected SearchPlanExecutor currentPlan;
         protected MatchingFrame frame;
         protected final Set<ITuple> matchSet;
-        protected VolatileModifiableMaskedTuple parametersOfFrameView; 
+        protected VolatileModifiableMaskedTuple parametersOfFrameView;
         private boolean isNextMatchCalculated;
-        
+
         public PlanExecutionIterator(final Iterator<SearchPlanExecutor> planIterator) {
             this.planIterator = planIterator;
             isNextMatchCalculated = false;
@@ -77,17 +77,17 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
                 currentPlan.removeAdapters(adapters);
             }
             boolean validPlanSelected = false;
-            
+
             SearchPlanExecutor nextPlan = null;
-            
+
             while (!validPlanSelected && planIterator.hasNext()) {
                 nextPlan = planIterator.next();
                 nextPlan.addAdapters(adapters);
                 nextPlan.resetPlan();
-                
+
                 validPlanSelected = initializeMatchingFrame(nextPlan);
             }
-            
+
             if (validPlanSelected) {
                 for (ILocalSearchAdapter adapter : adapters) {
                     adapter.planChanged(Optional.ofNullable(currentPlan).map(SearchPlanExecutor::getSearchPlan),
@@ -113,7 +113,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
             }
             return foundMatch;
         }
-        
+
         @Override
         public boolean hasNext() {
             if (isNextMatchCalculated) {
@@ -123,7 +123,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
                 return false;
             }
             boolean foundMatch = findNextNewMatchInCurrentPlan();
-            
+
             while (!foundMatch && planIterator.hasNext()) {
                 foundMatch = selectNextPlan() && findNextNewMatchInCurrentPlan();
             }
@@ -149,15 +149,15 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
     }
 
     private class PlanExecutionIteratorWithArrayParameters extends PlanExecutionIterator {
-        
+
         private final Object[] parameterValues;
-        
+
         public PlanExecutionIteratorWithArrayParameters(Iterator<SearchPlanExecutor> planIterator, final Object[] parameterValues) {
             super(planIterator);
             this.parameterValues = parameterValues;
             selectNextPlan();
         }
-        
+
         protected boolean initializeMatchingFrame(SearchPlanExecutor nextPlan) {
             frame = new MatchingFrame(nextPlan.getVariableMapping().size());
             parametersOfFrameView = new VolatileModifiableMaskedTuple(frame, nextPlan.getParameterMask());
@@ -175,22 +175,22 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
                     // If oldValue is not null but equal to newValue, the setting can be ignored
                 }
             }
-            
+
             return true;
         }
     }
     private class PlanExecutionIteratorWithTupleParameters extends PlanExecutionIterator {
-        
+
         private final ITuple parameterValues;
         private final TupleMask parameterSeedMask;
-        
+
         public PlanExecutionIteratorWithTupleParameters(Iterator<SearchPlanExecutor> planIterator, final TupleMask parameterSeedMask, final ITuple parameterValues) {
             super(planIterator);
             this.parameterSeedMask = parameterSeedMask;
             this.parameterValues = parameterValues;
             selectNextPlan();
         }
-        
+
         protected boolean initializeMatchingFrame(SearchPlanExecutor nextPlan) {
             frame = new MatchingFrame(nextPlan.getVariableMapping().size());
             parametersOfFrameView = new VolatileModifiableMaskedTuple(frame, nextPlan.getParameterMask());
@@ -209,7 +209,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
                     // If oldValue is not null but equal to newValue, the setting can be ignored
                 }
             }
-            
+
             return true;
         }
     }
@@ -223,7 +223,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
         this.plan = plan.stream().map(p -> new SearchPlanExecutor(p, searchContext)).collect(Collectors.toList());
         this.adapters = new LinkedList<>();
     }
-    
+
     @Override
     public void addAdapter(ILocalSearchAdapter adapter) {
         this.adapters.add(adapter);
@@ -235,7 +235,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
         this.adapters.remove(adapter);
         adapter.adapterUnregistered(this);
     }
-    
+
     @Override
     public void addAdapters(List<ILocalSearchAdapter> adapters) {
         this.adapters.addAll(adapters);
@@ -251,7 +251,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
             adapter.adapterUnregistered(this);
         }
     }
-    
+
     public int getParameterCount() {
         return planDescriptor.getQuery().getParameters().size();
     }
@@ -271,7 +271,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,
                 Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.DISTINCT), false);
     }
-    
+
     /**
      * @since 2.0
      */
@@ -282,7 +282,7 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,
                 Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.DISTINCT), false);
     }
-    
+
     /**
      * Returns the query specification this matcher used as source for the implementation
      * @return never null
@@ -290,8 +290,8 @@ public final class LocalSearchMatcher implements ILocalSearchAdaptable {
     public PQuery getQuerySpecification() {
         return planDescriptor.getQuery();
     }
-    
-    
+
+
     /**
      * @since 1.5
      */
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/MatcherReference.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/MatcherReference.java
index 6bf25192..8e1bec63 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/MatcherReference.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/MatcherReference.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher;
+package tools.refinery.interpreter.localsearch.matcher;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 public class MatcherReference {
     final PQuery query;
     final Set<PParameter> adornment;
-    
+
     /**
      * Hints that can override the callee's own hints. This field is intentionally left out from hashCode and equals
      */
     final QueryEvaluationHint hints;
-        
+
     /**
      * @since 1.4
      */
@@ -32,11 +32,11 @@ public class MatcherReference {
         this.adornment = adornment;
         this.hints = hints;
     }
-    
+
     public MatcherReference(PQuery query, Set<PParameter> adornment){
         this(query, adornment, null);
     }
-    
+
     public PQuery getQuery() {
         return query;
     }
@@ -47,7 +47,7 @@ public class MatcherReference {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        
+
         result = prime * result + ((adornment == null) ? 0 : adornment.hashCode());
         result = prime * result + ((query == null) ? 0 : query.hashCode());
         return result;
@@ -73,7 +73,7 @@ public class MatcherReference {
             return false;
         return true;
     }
-    
+
     /**
      * @return the hints to override the called reference's own hints with. Can be null.
      * @since 1.4
@@ -81,7 +81,7 @@ public class MatcherReference {
     public QueryEvaluationHint getHints() {
         return hints;
     }
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -93,5 +93,5 @@ public class MatcherReference {
         sb.append(")");
         return sb.toString();
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java
index 1ae24d2d..44214f05 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -27,41 +27,41 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
-import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.context.IndexingService;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.localsearch.exceptions.LocalSearchException;
+import tools.refinery.interpreter.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.interpreter.localsearch.matcher.CallWithAdornment;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.localsearch.plan.IPlanDescriptor;
+import tools.refinery.interpreter.localsearch.plan.IPlanProvider;
+import tools.refinery.interpreter.localsearch.plan.SearchPlan;
+import tools.refinery.interpreter.localsearch.plan.SearchPlanForBody;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.IUpdateable;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryHintOption;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.context.IndexingService;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQueries;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 /**
  * @author Zoltan Ujhelyi
@@ -69,7 +69,7 @@ import tools.refinery.viatra.runtime.matchers.util.Accuracy;
  *
  */
 public abstract class AbstractLocalSearchResultProvider implements IQueryResultProvider {
-    
+
     protected final LocalSearchBackend backend;
     protected final IQueryBackendContext backendContext;
     protected final IQueryRuntimeContext runtimeContext;
@@ -77,7 +77,7 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
     protected final QueryEvaluationHint userHints;
     protected final Map<PQuery, LocalSearchHints> hintCache = new HashMap<>();
     protected final IPlanProvider planProvider;
-    private static final String PLAN_CACHE_KEY = AbstractLocalSearchResultProvider.class.getName() + "#planCache"; 
+    private static final String PLAN_CACHE_KEY = AbstractLocalSearchResultProvider.class.getName() + "#planCache";
     private final Map<MatcherReference, IPlanDescriptor> planCache;
     protected final ISearchContext searchContext;
     /**
@@ -102,9 +102,9 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
         this.searchContext = new ISearchContext.SearchContext(backendContext, backend.getCache(), resultProviderRequestor);
         this.planCache = backend.getCache().getValue(PLAN_CACHE_KEY, Map.class, HashMap::new);
     }
-    
+
     protected abstract IOperationCompiler getOperationCompiler(IQueryBackendContext backendContext, LocalSearchHints configuration);
-    
+
     private IQueryRuntimeContext getRuntimeContext() {
         return backend.getRuntimeContext();
     }
@@ -121,26 +121,26 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
         if (planCache.containsKey(key)){
             return planCache.get(key);
         } else {
-            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler, 
+            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler,
                     resultProviderRequestor, configuration, key);
             planCache.put(key, plan);
             return plan;
         }
     }
-    
+
     private IPlanDescriptor getOrCreatePlan(MatcherReference key, IPlanProvider planProvider) {
         if (planCache.containsKey(key)){
             return planCache.get(key);
         } else {
             LocalSearchHints configuration = overrideDefaultHints(key.getQuery());
             IOperationCompiler compiler = getOperationCompiler(backendContext, configuration);
-            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler, 
+            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler,
                     resultProviderRequestor, configuration, key);
             planCache.put(key, plan);
             return plan;
         }
     }
-    
+
     private LocalSearchHints overrideDefaultHints(PQuery pQuery) {
         if (hintCache.containsKey(pQuery)) {
             return hintCache.get(pQuery);
@@ -152,9 +152,9 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
         }
     }
 
-    /** 
-     * Combine with {@link QueryHintOption#getValueOrDefault(QueryEvaluationHint)} to access 
-     * hint settings not covered by {@link LocalSearchHints} 
+    /**
+     * Combine with {@link QueryHintOption#getValueOrDefault(QueryEvaluationHint)} to access
+     * hint settings not covered by {@link LocalSearchHints}
      */
     private QueryEvaluationHint computeOverridingHints(PQuery pQuery) {
         return backendContext.getHintProvider().getQueryEvaluationHint(pQuery).overrideBy(userHints);
@@ -219,13 +219,13 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
      * This method is called before planning start to allow indexing. It is important to note that this method is called
      * inside a coalesceTraversals block, meaning (1) it is safe to add multiple registration requests as necessary, but
      * (2) no value or statistics is available from the index.
-     * 
-     * @throws ViatraQueryRuntimeException
+     *
+     * @throws InterpreterRuntimeException
      */
     protected void indexInitializationBeforePlanning() {
         // By default, no indexing is necessary
     }
-    
+
     /**
      * Collects and indexes all types _directly_ referred by the PQuery {@link #query}. Types indirect
      * @param requiredIndexingServices
@@ -235,21 +235,21 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
                 inputKey -> runtimeContext.ensureIndexed(inputKey, requiredIndexingServices)
         );
     }
-    
+
     private Set<IQueryReference> getDirectDependencies() {
         IFlattenCallPredicate flattenPredicate = overrideDefaultHints(query).getFlattenCallPredicate();
         Queue<PQuery> queue = new LinkedList<>();
         Set<PQuery> visited = new HashSet<>();
         Set<IQueryReference> result = new HashSet<>();
         queue.add(query);
-        
+
         while(!queue.isEmpty()){
             PQuery next = queue.poll();
             visited.add(next);
             for(PBody body : next.getDisjunctBodies().getBodies()){
                 for (IQueryReference call : body.getConstraintsOfType(IQueryReference.class)) {
-                    if (call instanceof PositivePatternCall && 
-                            flattenPredicate.shouldFlatten((PositivePatternCall) call)) 
+                    if (call instanceof PositivePatternCall &&
+                            flattenPredicate.shouldFlatten((PositivePatternCall) call))
                     {
                         PQuery dep = ((PositivePatternCall) call).getReferredQuery();
                         if (!visited.contains(dep)){
@@ -267,15 +267,15 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
     private LocalSearchMatcher initializeMatcher(Object[] parameters) {
         return newLocalSearchMatcher(parameters);
     }
-    
+
     private LocalSearchMatcher initializeMatcher(TupleMask parameterSeedMask) {
         return newLocalSearchMatcher(parameterSeedMask.transformUnique(query.getParameters()));
 
     }
 
-    
+
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public LocalSearchMatcher newLocalSearchMatcher(ITuple parameters) {
         final Set<PParameter> adornment = new HashSet<>();
@@ -284,12 +284,12 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
                 adornment.add(query.getParameters().get(i));
             }
         }
-        
+
         return newLocalSearchMatcher(adornment);
     }
-    
+
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public LocalSearchMatcher newLocalSearchMatcher(Object[] parameters) {
         final Set<PParameter> adornment = new HashSet<>();
@@ -298,13 +298,13 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
                 adornment.add(query.getParameters().get(i));
             }
         }
-    
+
         return newLocalSearchMatcher(adornment);
     }
 
     private LocalSearchMatcher newLocalSearchMatcher(final Set<PParameter> adornment) {
         final MatcherReference reference = new MatcherReference(query, adornment, userHints);
-        
+
         IPlanDescriptor plan = getOrCreatePlan(reference, planProvider);
         if (overrideDefaultHints(reference.getQuery()).isUseBase()){
             try {
@@ -313,7 +313,7 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
                 throw new LocalSearchException("Could not index keys", e);
             }
         }
-        
+
         LocalSearchMatcher matcher = createMatcher(plan, searchContext);
         matcher.addAdapters(backend.getAdapters());
         return matcher;
@@ -322,7 +322,7 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
     private void indexKeys(final Iterable<IInputKey> keys) throws InvocationTargetException {
         final IQueryRuntimeContext qrc = getRuntimeContext();
         qrc.coalesceTraversals(new Callable<Void>() {
-    
+
             @Override
             public Void call() throws Exception {
                 for(IInputKey key : keys){
@@ -365,61 +365,61 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
         // Count returns long; casting to int - in case of integer overflow casting will throw the exception
         return (int) matcher.streamMatches(parameters).count();
     }
-    
+
     @Override
     public int countMatches(TupleMask parameterSeedMask, ITuple parameters) {
         final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
         // Count returns long; casting to int - in case of integer overflow casting will throw the exception
         return (int) matcher.streamMatches(parameterSeedMask, parameters).count();
     }
-        
+
     private static final double ESTIMATE_CEILING = Long.MAX_VALUE / 16.0;
-    
+
     @Override
     public Optional<Long> estimateCardinality(TupleMask groupMask, Accuracy requiredAccuracy) {
         if (Accuracy.BEST_UPPER_BOUND.atLeastAsPreciseAs(requiredAccuracy)) { // approximate using parameter types
             final List<PParameter> parameters = query.getParameters();
             final Map<Set<Integer>, Set<Integer>> dependencies = backendContext.getQueryAnalyzer()
                     .getProjectedFunctionalDependencies(query, false);
-            
+
             List<Integer> projectionIndices = groupMask.getIndicesAsList();
-            
-            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies, 
+
+            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies,
                     projectionIndices,
                     Collections.emptySet() /* No parameters with fixed value */).map(Double::longValue);
-        }        
+        }
         else return Optional.empty();
     }
-    
+
     @Override
     public Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy) {
-        if (Accuracy.BEST_UPPER_BOUND.atLeastAsPreciseAs(requiredAccuracy)) { // approximate using parameter types            
+        if (Accuracy.BEST_UPPER_BOUND.atLeastAsPreciseAs(requiredAccuracy)) { // approximate using parameter types
             final List<PParameter> parameters = query.getParameters();
             final Map<Set<Integer>, Set<Integer>> dependencies = backendContext.getQueryAnalyzer()
                     .getProjectedFunctionalDependencies(query, false);
-            
+
             // all parameters used for the estimation - determinized order
-            final List<Integer> allParameterIndices = 
+            final List<Integer> allParameterIndices =
                     IntStream.range(0, parameters.size()).boxed().collect(Collectors.toList());
-            
+
             // some free parameters are functionally determined by bound parameters
             final Set<Integer> boundOrImplied = FunctionalDependencyHelper.closureOf(groupMask.getIndicesAsList(),
                     dependencies);
-            
-            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies, 
+
+            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies,
                     allParameterIndices,
                     boundOrImplied);
         }
         else return Optional.empty();
     }
-    
+
     /**
      * @since 2.1
      * @noreference This method is not intended to be referenced by clients.
      */
     public double estimateCost(TupleMask inputBindingMask) {
         // TODO this is currently an abstract cost, not really a branching factor
-        
+
         HashSet<PParameter> adornment = new HashSet<>(inputBindingMask.transform(query.getParameters()));
         final MatcherReference reference = new MatcherReference(query, adornment, userHints);
         IPlanDescriptor plan = getOrCreatePlan(reference, planProvider);
@@ -431,32 +431,32 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
      * Approximates using parameter types
      */
     private Optional<Double> estimateParameterCombinations(
-            Accuracy requiredAccuracy, 
+            Accuracy requiredAccuracy,
             final List<PParameter> parameters,
             final Map<Set<Integer>, Set<Integer>> functionalDependencies,
-            final Collection<Integer> parameterIndicesToEstimate, 
-            final Set<Integer> otherDeterminingIndices) 
+            final Collection<Integer> parameterIndicesToEstimate,
+            final Set<Integer> otherDeterminingIndices)
     {
         // keep order deterministic
         LinkedHashSet<Integer> freeParameterIndices = new LinkedHashSet<>(parameterIndicesToEstimate);
-        
+
         // determining indices are bound
         freeParameterIndices.removeAll(otherDeterminingIndices);
-        
+
         // some free parameters are functionally determined by other free parameters
         for (Integer candidateForRemoval : new ArrayList<>(freeParameterIndices)) {
             List<Integer> others = Stream.concat(
-                    otherDeterminingIndices.stream(), 
+                    otherDeterminingIndices.stream(),
                     freeParameterIndices.stream().filter(index -> !Objects.equals(index, candidateForRemoval))
             ).collect(Collectors.toList());
             Set<Integer> othersClosure = FunctionalDependencyHelper.closureOf(others, functionalDependencies);
-            if (othersClosure.contains(candidateForRemoval)) { 
+            if (othersClosure.contains(candidateForRemoval)) {
                 // other parameters functionally determine this mone, does not count towards estimate
                 freeParameterIndices.remove(candidateForRemoval);
             }
         }
-        
-        
+
+
         Optional<Double> result = Optional.of(1.0);
         // TODO this is currently works with declared types only. For better results, information from
         // the Type inferrer should be included in the PSystem
@@ -466,20 +466,20 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
                 result = result.flatMap(accumulator ->
                 runtimeContext.estimateCardinality(type, TupleMask.identity(1), requiredAccuracy).map(multiplier ->
                     Math.min(accumulator * multiplier, ESTIMATE_CEILING /* avoid overflow */)
-                ));                    
+                ));
             }
         }
         // TODO better approximate cardinality based on plan, branching factors, etc.
         return result;
     }
-    
+
 
     @Override
     public Stream<Tuple> getAllMatches(Object[] parameters) {
         final LocalSearchMatcher matcher = initializeMatcher(parameters);
         return matcher.streamMatches(parameters);
     }
-    
+
     @Override
     public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters) {
         final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
@@ -508,20 +508,20 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
         LocalSearchHints configuration = overrideDefaultHints(query);
         return configuration;
     }
-    
+
     /**
      * Forgets all stored plans in this result provider. If no plans are stored, nothing happens.
-     * 
+     *
      * @since 2.0
      * @noreference This method is not intended to be referenced by clients; it should only used by {@link LocalSearchBackend}.
      */
     public void forgetAllPlans() {
         planCache.clear();
     }
-    
+
     /**
      * Returns a search plan for a given adornment if exists
-     * 
+     *
      * @return a search plan for the pattern with the given adornment, or null if none exists
      * @since 2.0
      * @noreference This method is not intended to be referenced by clients; it should only used by {@link LocalSearchBackend}.
@@ -529,4 +529,4 @@ public abstract class AbstractLocalSearchResultProvider implements IQueryResultP
     public IPlanDescriptor getSearchPlan(Set<PParameter> adornment) {
         return planCache.get(new MatcherReference(query, adornment));
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AllValidAdornments.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/AllValidAdornments.java
index f801163e..146b53c5 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AllValidAdornments.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/AllValidAdornments.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.interpreter.matchers.psystem.queries.PQueries;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 
 /**
  * This implementation calculates all valid adornments for the given query, respecting the parameter direction constraints.
- * 
+ *
  * @author Grill Balázs
  * @since 1.5
  */
@@ -28,8 +28,8 @@ public class AllValidAdornments implements IAdornmentProvider {
 
     @Override
     public Iterable<Set<PParameter>> getAdornments(PQuery query) {
-        final Set<PParameter> ins = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.IN)).collect(Collectors.toSet()); 
-        Set<PParameter> inouts = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.INOUT)).collect(Collectors.toSet()); 
+        final Set<PParameter> ins = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.IN)).collect(Collectors.toSet());
+        Set<PParameter> inouts = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.INOUT)).collect(Collectors.toSet());
         Set<? extends Set<PParameter>> possibleInouts = Sets.powerSet(inouts);
         return possibleInouts.stream().map(input -> Sets.union(ins, input)).collect(Collectors.toSet());
     }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenDisjunctive.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/DontFlattenDisjunctive.java
index bf1b61b5..55fa53d2 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenDisjunctive.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/DontFlattenDisjunctive.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IFlattenCallPredicate;
 
 /**
  * Forbids flattening of patterns that have more than one body.
- * 
+ *
  * @since 2.1
 
  * @author Gabor Bergmann
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java
index 1b918528..fd0e9456 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint.BackendRequirement;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint.BackendRequirement;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IFlattenCallPredicate;
 
 /**
- * This implementation forbids flattening of patterns marked to be executed with a caching / incremental backend. 
- * This makes is possible for the user to configure hybrid matching via using 
+ * This implementation forbids flattening of patterns marked to be executed with a caching / incremental backend.
+ * This makes is possible for the user to configure hybrid matching via using
  * the 'search' and 'incremental keywords in the pattern definition file.
- * 
+ *
  * @since 1.5
  *
  */
@@ -27,7 +27,7 @@ public class DontFlattenIncrementalPredicate implements IFlattenCallPredicate {
     public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
         QueryEvaluationHint evaluationHints = positivePatternCall.getReferredQuery().getEvaluationHints();
         if (evaluationHints == null) return true;
-        
+
         BackendRequirement backendRequirementType = evaluationHints.getQueryBackendRequirementType();
         switch(backendRequirementType) {
         case DEFAULT_CACHING:
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/GenericLocalSearchResultProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/GenericLocalSearchResultProvider.java
index ed6c1e5f..c4758053 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/GenericLocalSearchResultProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/GenericLocalSearchResultProvider.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.GenericOperationCompiler;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IndexingService;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.localsearch.planner.compiler.GenericOperationCompiler;
+import tools.refinery.interpreter.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.interpreter.localsearch.plan.IPlanProvider;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IndexingService;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * @author Zoltan Ujhelyi
@@ -25,7 +25,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
 public class GenericLocalSearchResultProvider extends AbstractLocalSearchResultProvider {
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public GenericLocalSearchResultProvider(LocalSearchBackend backend, IQueryBackendContext context, PQuery query,
             IPlanProvider planProvider, QueryEvaluationHint userHints) {
@@ -35,14 +35,14 @@ public class GenericLocalSearchResultProvider extends AbstractLocalSearchResultP
     @Override
     protected void indexInitializationBeforePlanning() {
         super.indexInitializationBeforePlanning();
-        
+
         indexReferredTypesOfQuery(query, IndexingService.INSTANCES);
         indexReferredTypesOfQuery(query, IndexingService.STATISTICS);
     }
 
     @Override
     protected IOperationCompiler getOperationCompiler(IQueryBackendContext backendContext,
-            LocalSearchHints configuration) {
+                                                      LocalSearchHints configuration) {
         return new GenericOperationCompiler(runtimeContext);
     }
 
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/IAdornmentProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/IAdornmentProvider.java
index 86058be0..ebb65f57 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/IAdornmentProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/IAdornmentProvider.java
@@ -3,33 +3,33 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint.BackendRequirement;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint.BackendRequirement;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * An adornment provider is used to define the adornments the pattern matcher should prepare for.
- *  
- * <p>A default implementation is available in {@link AllValidAdornments} that describes all 
- * adornments fulfilling the parameter direction declarations; 
+ *
+ * <p>A default implementation is available in {@link AllValidAdornments} that describes all
+ * adornments fulfilling the parameter direction declarations;
  * another default option (with better performance but restricted applicability) is {@link LazyPlanningAdornments}.
- * 
+ *
  * <br><br>
- * 
+ *
  * Users may implement this interface to limit the number of prepared plans based on some runtime information:
- * 
+ *
  * <pre>
  * class SomeAdornments{
- * 
+ *
  *     public Iterable&lt;Set&lt;{@link PParameter}>> getAdornments({@link PQuery} query){
  *         if (SomeGeneratedQuerySpecification.instance().getInternalQueryRepresentation().equals(query)){
  *             return Collections.singleton(Sets.filter(Sets.newHashSet(query.getParameters()), new Predicate<PParameter>() {
@@ -44,10 +44,10 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
  *         // Returning an empty iterable is safe for unknown queries
  *         return Collections.emptySet();
  *     }
- * 
+ *
  * }
  * </pre>
- * 
+ *
  * @author Grill Balázs
  * @since 1.5
  *
@@ -58,15 +58,15 @@ public interface IAdornmentProvider {
      * The bound parameter sets
      */
     public Iterable<Set<PParameter>> getAdornments(PQuery query);
-    
+
     /**
      * @return a simple hint that only overrides the adornment provider
      * @since 2.1
      */
     public static QueryEvaluationHint toHint(IAdornmentProvider adornmentProvider) {
         return new QueryEvaluationHint(
-                Collections.singletonMap(LocalSearchHintOptions.ADORNMENT_PROVIDER, adornmentProvider), 
+                Collections.singletonMap(LocalSearchHintOptions.ADORNMENT_PROVIDER, adornmentProvider),
                 BackendRequirement.UNSPECIFIED);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LazyPlanningAdornments.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LazyPlanningAdornments.java
index 30b3689f..db3bee60 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LazyPlanningAdornments.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LazyPlanningAdornments.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
- * This adornment provider does not trigger the preparation of any plans. 
+ * This adornment provider does not trigger the preparation of any plans.
  * Actual query plans will be computed on demand, when the first actual match request is made with a given adornment.
- * 
- * <p> Caution: this is a safe default adornment provider for {@link GenericLocalSearchResultProvider} only; 
- * do not use for the EMF-specific LS backend. 
- * 
- * <p> The benefits is in execution time: query planning costs for adornments are postponed until first usage 
- * or even entirely avoided (when adornment is never used in practice).  
- * However, query evaluation time may become less predictable, as the first matcher call (with a given adornment) 
- * will include the planning cost. 
- * For benchmarking or other purposes where this is not desirable, use an adornment provider that demands plan precomputation for all necessary adornments. 
- * 
+ *
+ * <p> Caution: this is a safe default adornment provider for {@link GenericLocalSearchResultProvider} only;
+ * do not use for the EMF-specific LS backend.
+ *
+ * <p> The benefits is in execution time: query planning costs for adornments are postponed until first usage
+ * or even entirely avoided (when adornment is never used in practice).
+ * However, query evaluation time may become less predictable, as the first matcher call (with a given adornment)
+ * will include the planning cost.
+ * For benchmarking or other purposes where this is not desirable, use an adornment provider that demands plan precomputation for all necessary adornments.
+ *
  * @author Gabor Bergmann
  * @since 2.1
  *
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchBackend.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchBackend.java
index ae51e2b0..de34ae00 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchBackend.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchBackend.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -19,26 +19,26 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
-import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
-import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
-import tools.refinery.viatra.runtime.localsearch.plan.SimplePlanProvider;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.ICache;
-import tools.refinery.viatra.runtime.matchers.util.PurgableCache;
+import tools.refinery.interpreter.localsearch.exceptions.LocalSearchException;
+import tools.refinery.interpreter.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.interpreter.localsearch.plan.IPlanDescriptor;
+import tools.refinery.interpreter.localsearch.plan.IPlanProvider;
+import tools.refinery.interpreter.localsearch.plan.SimplePlanProvider;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.ICache;
+import tools.refinery.interpreter.matchers.util.PurgableCache;
 
 /**
  * @author Marton Bur, Zoltan Ujhelyi
@@ -49,12 +49,12 @@ public abstract class LocalSearchBackend implements IQueryBackend {
     IQueryBackendContext context;
     IPlanProvider planProvider;
     private final Set<ILocalSearchAdapter> adapters = new HashSet<>();
-    
+
     private final PurgableCache generalCache;
-    
+
     private final Map<PQuery, List<AbstractLocalSearchResultProvider>> resultProviderCache = CollectionsFactory.createMap();
-    
-    
+
+
     /**
      * @since 1.5
      */
@@ -67,20 +67,20 @@ public abstract class LocalSearchBackend implements IQueryBackend {
 
     @Override
     public void flushUpdates() {
-        
+
     }
-    
+
     @Override
     public IQueryResultProvider getResultProvider(PQuery query) {
         return getResultProvider(query, null);
     }
-    
+
     /**
      * @since 1.4
      */
     @Override
     public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint hints) {
-        
+
         final QueryEvaluationHint callHints = getHintProvider().getQueryEvaluationHint(query).overrideBy(hints);
         IMatcherCapability requestedCapability = context.getRequiredMatcherCapability(query, callHints);
         for(AbstractLocalSearchResultProvider existingResultProvider : resultProviderCache.getOrDefault(query, Collections.emptyList())){
@@ -88,39 +88,39 @@ public abstract class LocalSearchBackend implements IQueryBackend {
                 return existingResultProvider;
             }
         }
-        
+
         AbstractLocalSearchResultProvider resultProvider = initializeResultProvider(query, hints);
         resultProviderCache.computeIfAbsent(query, k->new ArrayList<>()).add(resultProvider);
         resultProvider.prepare();
         return resultProvider;
     }
-    
+
     /**
      * Returns a requestor that this backend uses while processing pattern calls <i>from</i> this query.
      * @noreference This method is not intended to be referenced by clients.
      * @since 2.1
      */
     public ResultProviderRequestor getResultProviderRequestor(PQuery query, QueryEvaluationHint userHints) {
-        QueryEvaluationHint hintOnQuery = 
+        QueryEvaluationHint hintOnQuery =
                 context.getHintProvider().getQueryEvaluationHint(query).overrideBy(userHints);
         LocalSearchHints defaultsApplied = LocalSearchHints.getDefaultOverriddenBy(hintOnQuery);
 
-        return new ResultProviderRequestor(this, 
-                context.getResultProviderAccess(), 
-                context.getHintProvider(), 
-                defaultsApplied.getCallDelegationStrategy(), 
-                userHints, 
+        return new ResultProviderRequestor(this,
+                context.getResultProviderAccess(),
+                context.getHintProvider(),
+                defaultsApplied.getCallDelegationStrategy(),
+                userHints,
                 /* no global overrides */ null);
     }
-    
+
     /**
-     * @throws ViatraQueryRuntimeException 
+     * @throws InterpreterRuntimeException
      * @since 1.7
      */
     protected abstract AbstractLocalSearchResultProvider initializeResultProvider(PQuery query, QueryEvaluationHint hints);
-    
+
     @Override
-    public void dispose() {  
+    public void dispose() {
         resultProviderCache.clear();
         generalCache.purge();
     }
@@ -144,8 +144,8 @@ public abstract class LocalSearchBackend implements IQueryBackend {
     public IQueryRuntimeContext getRuntimeContext() {
         return context.getRuntimeContext();
     }
-    
-    
+
+
     /**
      * @since 1.5
      */
@@ -160,21 +160,21 @@ public abstract class LocalSearchBackend implements IQueryBackend {
     public IQueryBackendHintProvider getHintProvider() {
         return context.getHintProvider();
     }
-    
+
     /**
      * @since 1.5
      */
     public void addAdapter(ILocalSearchAdapter adapter){
         adapters.add(adapter);
     }
-    
+
     /**
      * @since 1.5
      */
     public void removeAdapter(ILocalSearchAdapter adapter){
         adapters.remove(adapter);
     }
-    
+
     /**
      * Return a copy of the current adapters
      * @since 1.7
@@ -182,14 +182,14 @@ public abstract class LocalSearchBackend implements IQueryBackend {
     public List<ILocalSearchAdapter> getAdapters() {
         return new ArrayList<>(adapters);
     }
-    
+
     /**
      * @since 1.5
      */
     public IQueryBackendContext getBackendContext() {
         return context;
     }
-    
+
     /**
      * Returns the internal cache of the backend
      * @since 1.7
@@ -198,40 +198,40 @@ public abstract class LocalSearchBackend implements IQueryBackend {
     public ICache getCache() {
         return generalCache;
     }
-    
+
     /**
      * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
      * necessary. The new plans created are the same that would be created by executing prepare on the given query
      * definitions.
-     * 
+     *
      * @since 2.0
      */
     public void recomputePlans(PQuery... queries) {
         recomputePlans(Arrays.stream(queries).flatMap(query -> resultProviderCache.getOrDefault(query, Collections.emptyList()).stream()));
     }
-    
+
     /**
      * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
      * necessary The new plans created are the same that would be created by executing prepare on the given query
      * definitions.
-     * 
+     *
      * @since 2.0
      */
     public void recomputePlans(Collection<PQuery> queries) {
         recomputePlans(queries.stream().flatMap(query -> resultProviderCache.getOrDefault(query, Collections.emptyList()).stream()));
     }
-    
+
     /**
      * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
      * necessary The new plans created are the same that would be created by executing prepare on the given query
      * definitions.
-     * 
+     *
      * @since 2.0
      */
     public void recomputePlans() {
         recomputePlans(resultProviderCache.values().stream().flatMap(List::stream));
     }
-    
+
     private void recomputePlans(Stream<AbstractLocalSearchResultProvider> resultProviders) {
         try {
             context.getRuntimeContext().coalesceTraversals(() -> {
@@ -245,10 +245,10 @@ public abstract class LocalSearchBackend implements IQueryBackend {
             throw new LocalSearchException("Error while rebuilding plans: " + e.getMessage(), e);
         }
     }
-    
+
     /**
      * Returns a search plan for a given query and adornment if such plan is already calculated.
-     * 
+     *
      * @return a previously calculated search plan for the given query and adornment, or null if no such plan exists
      * @since 2.0
      */
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java
index 1dd08f98..4bdf0de4 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * @author Marton Bur, Zoltan Ujhelyi
@@ -21,29 +21,29 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
  *
  */
 public enum LocalSearchGenericBackendFactory implements IQueryBackendFactory {
-    
+
     INSTANCE;
-    
+
     /**
      * @since 1.5
      */
     @Override
     public IQueryBackend create(IQueryBackendContext context) {
         return new LocalSearchBackend(context) {
-            
+
             @Override
             protected AbstractLocalSearchResultProvider initializeResultProvider(PQuery query, QueryEvaluationHint hints) {
                 return new GenericLocalSearchResultProvider(this, context, query, planProvider, hints);
             }
-            
+
             @Override
             public IQueryBackendFactory getFactory() {
                 return INSTANCE;
             }
-            
+
         };
     }
-    
+
     @Override
     public Class<? extends IQueryBackend> getBackendClass() {
         return LocalSearchBackend.class;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java
index ea422d91..cfa310f7 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactoryProvider;
 
 /**
  * @since 2.0
  */
 public class LocalSearchGenericBackendFactoryProvider implements IQueryBackendFactoryProvider {
-    
+
     @Override
     public IQueryBackendFactory getFactory() {
         return LocalSearchGenericBackendFactory.INSTANCE;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHintOptions.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchHintOptions.java
index 43462204..534d6c04 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHintOptions.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchHintOptions.java
@@ -3,66 +3,66 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
-import tools.refinery.viatra.runtime.matchers.backend.ICallDelegationStrategy;
-import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.interpreter.localsearch.planner.cost.ICostFunction;
+import tools.refinery.interpreter.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
+import tools.refinery.interpreter.matchers.backend.ICallDelegationStrategy;
+import tools.refinery.interpreter.matchers.backend.QueryHintOption;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IFlattenCallPredicate;
 
 /**
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.5
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public final class LocalSearchHintOptions {
-    
+
     private LocalSearchHintOptions() {
         // Private constructor for utility class
     }
-    
-    public static final QueryHintOption<Boolean> USE_BASE_INDEX = 
+
+    public static final QueryHintOption<Boolean> USE_BASE_INDEX =
             hintOption("USE_BASE_INDEX", true);
-    
+
     // This key can be used to influence the core planner algorithm
-    public static final QueryHintOption<Integer> PLANNER_TABLE_ROW_COUNT = 
+    public static final QueryHintOption<Integer> PLANNER_TABLE_ROW_COUNT =
             hintOption("PLANNER_TABLE_ROW_COUNT", 4);
     /**
      * Cost function to be used by the planner. Must implement {@link ICostFunction}
      * @since 1.4
      */
-    public static final QueryHintOption<ICostFunction> PLANNER_COST_FUNCTION = 
+    public static final QueryHintOption<ICostFunction> PLANNER_COST_FUNCTION =
             hintOption("PLANNER_COST_FUNCTION", new IndexerBasedConstraintCostFunction());
     /**
      * Predicate to decide whether to flatten specific positive pattern calls {@link IFlattenCallPredicate}
      * @since 1.4
      */
-    public static final QueryHintOption<IFlattenCallPredicate> FLATTEN_CALL_PREDICATE = 
+    public static final QueryHintOption<IFlattenCallPredicate> FLATTEN_CALL_PREDICATE =
             hintOption("FLATTEN_CALL_PREDICATE", new DontFlattenDisjunctive());
     /**
-     * Strategy to decide how hints (most importantly, backend selection) propagate across pattern calls. 
+     * Strategy to decide how hints (most importantly, backend selection) propagate across pattern calls.
      * Must implement {@link ICallDelegationStrategy}.
      * @since 2.1
      */
-    public static final QueryHintOption<ICallDelegationStrategy> CALL_DELEGATION_STRATEGY = 
+    public static final QueryHintOption<ICallDelegationStrategy> CALL_DELEGATION_STRATEGY =
             hintOption("CALL_DELEGATION_STRATEGY", ICallDelegationStrategy.FULL_BACKEND_ADHESION);
-    
+
     /**
-     * A provider of expected adornments {@link IAdornmentProvider}. 
-     * 
-     * The safe default is {@link AllValidAdornments}; 
-     * however, the generic backend variant may safely use {@link LazyPlanningAdornments} instead. 
-     * 
+     * A provider of expected adornments {@link IAdornmentProvider}.
+     *
+     * The safe default is {@link AllValidAdornments};
+     * however, the generic backend variant may safely use {@link LazyPlanningAdornments} instead.
+     *
      * @since 1.5
      */
-    public static final QueryHintOption<IAdornmentProvider> ADORNMENT_PROVIDER = 
+    public static final QueryHintOption<IAdornmentProvider> ADORNMENT_PROVIDER =
             hintOption("ADORNMENT_PROVIDER", new AllValidAdornments());
-    
+
     // internal helper for conciseness
     private static <T, V extends T> QueryHintOption<T> hintOption(String hintKeyLocalName, V defaultValue) {
         return new QueryHintOption<>(LocalSearchHintOptions.class, hintKeyLocalName, defaultValue);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchHints.java
index 5f3895be..5ccae128 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/matcher/integration/LocalSearchHints.java
@@ -6,22 +6,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+package tools.refinery.interpreter.localsearch.matcher.integration;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
-import tools.refinery.viatra.runtime.matchers.backend.*;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IRewriterTraceCollector;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollector;
+import tools.refinery.interpreter.localsearch.planner.cost.ICostFunction;
+import tools.refinery.interpreter.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
+import tools.refinery.interpreter.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
+import tools.refinery.interpreter.matchers.backend.*;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IRewriterTraceCollector;
+import tools.refinery.interpreter.matchers.psystem.rewriters.NopTraceCollector;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.*;
-import static tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions.normalizationTraceCollector;
+import static tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHintOptions.*;
+import static tools.refinery.interpreter.matchers.backend.CommonQueryHintOptions.normalizationTraceCollector;
 
 /**
  * Type safe builder and extractor for Local search specific hints
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/CheckOperationExecutor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/CheckOperationExecutor.java
index 295ac110..cd66efbd 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/CheckOperationExecutor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/CheckOperationExecutor.java
@@ -3,22 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
 
 /**
  * Abstract base class for search operations that check only the already set variables.
- * 
+ *
  * @noextend This class is not intended to be subclassed by clients.
  * @since 2.0
  */
-public abstract class CheckOperationExecutor implements ISearchOperationExecutor {
+public abstract class CheckOperationExecutor implements ISearchOperation.ISearchOperationExecutor {
 
     /**
      * The executed field ensures that the second call of the check always returns false, resulting in a quick
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ExtendOperationExecutor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/ExtendOperationExecutor.java
index a72c30dd..ecf2952c 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ExtendOperationExecutor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/ExtendOperationExecutor.java
@@ -7,11 +7,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
 
 import java.util.Iterator;
 
@@ -21,7 +20,7 @@ import java.util.Iterator;
  * @noextend This class is not intended to be subclassed by clients.
  * @since 2.0
  */
-public abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
+public abstract class ExtendOperationExecutor<T> implements ISearchOperation.ISearchOperationExecutor {
 
     private Iterator<? extends T> it;
 
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IIteratingSearchOperation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/IIteratingSearchOperation.java
index 6fee0097..85f0b6ac 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IIteratingSearchOperation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/IIteratingSearchOperation.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IInputKey;
 
 /**
  * Denotes a {@link ISearchOperation} which involves iterating over an instances of an {@link IInputKey}
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -23,5 +23,5 @@ public interface IIteratingSearchOperation extends ISearchOperation{
      * Get the {@link IInputKey} which instances this operation iterates upon.
      */
     public IInputKey getIteratedInputKey();
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IPatternMatcherOperation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/IPatternMatcherOperation.java
index d8106329..f4a0f468 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IPatternMatcherOperation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/IPatternMatcherOperation.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
 
 /**
  * Marker interface for pattern matcher call operations, such as positive and negative pattern calls or match aggregators.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  */
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ISearchOperation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/ISearchOperation.java
index eb6243ed..61519723 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ISearchOperation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/ISearchOperation.java
@@ -3,75 +3,75 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 /**
  * Represents a search operation executable by the LS engine. It is expected that an operation can be shared among
  * multiple LS matchers, but the created executors are not.
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public interface ISearchOperation {
 
     /**
      * Initializes a new operation executor for the given operation. Repeated calls must return different executor
      * instances.
-     * 
+     *
      * @since 2.0
      */
     public ISearchOperationExecutor createExecutor();
-    
+
     /**
-     * 
+     *
      * @since 2.0
      *
      */
     public interface ISearchOperationExecutor {
-        
+
         /**
          * Returns the stateless operation this executor was initialized from
          */
         ISearchOperation getOperation();
-        
+
         /**
          * During the execution of the corresponding plan, the onInitialize callback is evaluated before the execution of
          * the operation may begin. Operations may use this method to initialize its internal data structures.
-         * 
-         * @throws ViatraQueryRuntimeException
+         *
+         * @throws InterpreterRuntimeException
          */
         void onInitialize(MatchingFrame frame, ISearchContext context);
-    
+
         /**
          * After the execution of the operation failed and {@link #execute(MatchingFrame, ISearchContext)} returns false, the onBacktrack
          * callback is evaluated. Operations may use this method to clean up any temporary structures, and make the
          * operation ready for a new execution.
-         * 
-         * @throws ViatraQueryRuntimeException
+         *
+         * @throws InterpreterRuntimeException
          */
         void onBacktrack(MatchingFrame frame, ISearchContext context);
-    
+
         /**
-         * 
+         *
          * @param frame
          * @param context
          * @return true if successful, or false if backtracking needed
-         * @throws ViatraQueryRuntimeException
+         * @throws InterpreterRuntimeException
          */
         boolean execute(MatchingFrame frame, ISearchContext context);
     }
     /**
-     * 
+     *
      * @return the ordered list of the variable numbers that are affected by the search operation
      */
     List<Integer> getVariablePositions();
@@ -81,7 +81,7 @@ public interface ISearchOperation {
      * parameter function. It is expected that the provided function does return a non-null value for each variable
      * index that is returned by {@link #getVariablePositions()}; otherwise a {@link NullPointerException} will be
      * thrown during the calculation of the string.
-     * 
+     *
      * @since 2.0
      */
     String toString(Function<Integer, String> variableMapping);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/MatchingFrameValueProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/MatchingFrameValueProvider.java
index 38f62129..b7a0dba0 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/MatchingFrameValueProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/MatchingFrameValueProvider.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations;
+package tools.refinery.interpreter.localsearch.operations;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
- * 
- * 
+ *
+ *
  * @author Zoltan Ujhelyi
  *
  */
 public class MatchingFrameValueProvider implements IValueProvider {
-    
+
     final Map<String, Integer> nameMap;
     final MatchingFrame frame;
-    
+
     public MatchingFrameValueProvider(MatchingFrame frame, Map<String, Integer> nameMap) {
         super();
         this.frame = frame;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/AggregatorCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/AggregatorCheck.java
index 4d631635..440028ce 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/AggregatorCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/AggregatorCheck.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.Collections;
 import java.util.List;
@@ -14,20 +14,20 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * Calculates the aggregated value of a column based on the given {@link AggregatorConstraint}
- * 
+ *
  * @author Balázs Grill
  * @since 1.4
  * @noextend This class is not intended to be subclassed by clients.
@@ -35,15 +35,15 @@ import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTupl
 public class AggregatorCheck implements ISearchOperation, IPatternMatcherOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         public Executor() {
             super();
             this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         public void onInitialize(MatchingFrame frame, ISearchContext context) {
             super.onInitialize(frame, context);
@@ -67,17 +67,17 @@ public class AggregatorCheck implements ISearchOperation, IPatternMatcherOperati
                     .map(match -> (Domain) match.get(aggregatedColumn));
             return operator.aggregateStream(valueStream);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return AggregatorCheck.this;
         }
     }
-    
+
     private final int position;
     private final AggregatorConstraint aggregator;
     private final CallInformation information;
-    
+
     /**
      * @since 1.7
      */
@@ -97,12 +97,12 @@ public class AggregatorCheck implements ISearchOperation, IPatternMatcherOperati
     public List<Integer> getVariablePositions() {
         return Collections.singletonList(position);
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     "+variableMapping.apply(position)+" = " + aggregator.getAggregator().getOperator().getName() + " find " + information.toString(variableMapping);
@@ -112,5 +112,5 @@ public class AggregatorCheck implements ISearchOperation, IPatternMatcherOperati
     public CallInformation getCallInformation() {
         return information;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/BinaryTransitiveClosureCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/BinaryTransitiveClosureCheck.java
index 8f818542..078d0722 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/BinaryTransitiveClosureCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/BinaryTransitiveClosureCheck.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,28 +17,28 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Checking for a transitive closure expressed as a local search pattern matcher. The matched pattern must have two
  * parameters of the same model type.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
- * 
+ *
  */
 public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternMatcherOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         @Override
         public void onInitialize(MatchingFrame frame, ISearchContext context) {
             super.onInitialize(frame, context);
@@ -51,7 +51,7 @@ public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternM
             if (checkReflexive(frame)) {
                 return true;
             }
-            
+
             Object targetValue = frame.get(targetPosition);
             Queue<Object> sourcesToEvaluate = new LinkedList<>();
             sourcesToEvaluate.add(frame.get(sourcePosition));
@@ -72,29 +72,29 @@ public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternM
             }
             return false;
         }
-        
+
         protected boolean checkReflexive(MatchingFrame frame) {
             return reflexive && Objects.equals(frame.get(sourcePosition), frame.get(targetPosition));
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return BinaryTransitiveClosureCheck.this;
         }
     }
-    
-    private final CallInformation information; 
+
+    private final CallInformation information;
     private IQueryResultProvider matcher;
     private final int sourcePosition;
     private final int targetPosition;
     private final boolean reflexive;
-    
+
     /**
      * The source position will be matched in the called pattern to the first parameter; while target to the second.
      * </p>
      * <strong>NOTE</strong>: the reflexive check call does not include the parameter type checks; appropriate type checks should be
      * added as necessary by the operation compiler.
-     * 
+     *
      * @since 2.0
      */
     public BinaryTransitiveClosureCheck(CallInformation information, int sourcePosition, int targetPosition, boolean reflexive) {
@@ -104,7 +104,7 @@ public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternM
         this.information = information;
         this.reflexive = reflexive;
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor();
@@ -114,7 +114,7 @@ public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternM
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         String c = information.toString(variableMapping);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckConstant.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CheckConstant.java
index 4ce48af0..4c39db6a 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckConstant.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CheckConstant.java
@@ -3,42 +3,42 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
 
 /**
  * This operation handles constants in search plans by checking if a variable is bound to a certain constant value. Such
  * operations should be executed as early as possible during plan execution.
- * 
+ *
  * @author Marton Bur
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class CheckConstant implements ISearchOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             return frame.get(position).equals(value);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return CheckConstant.this;
         }
     }
-    
+
     private int position;
     private Object value;
 
@@ -56,15 +56,15 @@ public class CheckConstant implements ISearchOperation {
     public List<Integer> getVariablePositions() {
         return Collections.singletonList(position);
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     constant "+variableMapping.apply(position)+"='"+value+"'";
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckPositivePatternCall.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CheckPositivePatternCall.java
index 5f9b688a..8d9ae0e2 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckPositivePatternCall.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CheckPositivePatternCall.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * @author Grill Balázs
@@ -28,10 +28,10 @@ import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTupl
 public class CheckPositivePatternCall implements ISearchOperation, IPatternMatcherOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         public Executor() {
             super();
             this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
@@ -43,21 +43,21 @@ public class CheckPositivePatternCall implements ISearchOperation, IPatternMatch
             maskedTuple.updateTuple(frame);
             matcher = context.getMatcher(information.getCallWithAdornment());
         }
-        
+
         /**
          * @since 1.5
          */
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             return matcher.hasMatch(information.getParameterMask(), maskedTuple);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return CheckPositivePatternCall.this;
         }
     }
-    
-    private final CallInformation information; 
+
+    private final CallInformation information;
 
 
     /**
@@ -66,7 +66,7 @@ public class CheckPositivePatternCall implements ISearchOperation, IPatternMatch
     public CheckPositivePatternCall(CallInformation information) {
         super();
         this.information = information;
-        
+
     }
 
     @Override
@@ -78,12 +78,12 @@ public class CheckPositivePatternCall implements ISearchOperation, IPatternMatch
     public List<Integer> getVariablePositions() {
         return information.getVariablePositions();
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     find "+information.toString(variableMapping);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CountCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CountCheck.java
index d74c1c6f..c8e77a70 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CountCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/CountCheck.java
@@ -3,63 +3,63 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * Calculates the count of matches for a called matcher
- * 
+ *
  * @author Zoltan Ujhelyi
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class CountCheck implements ISearchOperation, IPatternMatcherOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         public Executor() {
             maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         public void onInitialize(MatchingFrame frame, ISearchContext context) {
             super.onInitialize(frame, context);
             maskedTuple.updateTuple(frame);
             matcher = context.getMatcher(information.getCallWithAdornment());
         }
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             int count = matcher.countMatches(information.getParameterMask(), maskedTuple);
             return ((Integer)frame.getValue(position)) == count;
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return CountCheck.this;
         }
     }
-    
+
     private final int position;
     private final CallInformation information;
-    
+
     /**
      * @since 1.7
      */
@@ -79,12 +79,12 @@ public class CountCheck implements ISearchOperation, IPatternMatcherOperation {
     public List<Integer> getVariablePositions() {
         return Collections.singletonList(position);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     "+variableMapping.apply(position)+" = count find "+ information.toString(variableMapping);
     }
-    
+
     @Override
     public CallInformation getCallInformation() {
         return information;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/ExpressionCheck.java
index fc9efdca..5e34a7a7 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/ExpressionCheck.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
 
 /**
  * @author Zoltan Ujhelyi
@@ -27,7 +27,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
 public class ExpressionCheck implements ISearchOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             try {
@@ -38,13 +38,13 @@ public class ExpressionCheck implements ISearchOperation {
                 return false;
             }
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExpressionCheck.this;
         }
     }
-    
+
     IExpressionEvaluator evaluator;
     Map<String, Integer> nameMap;
 
@@ -64,15 +64,15 @@ public class ExpressionCheck implements ISearchOperation {
         // XXX not sure if this is the correct implementation to get the affected variable indicies
         return new ArrayList<>(nameMap.values());
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     expression "+evaluator.getShortDescription();
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionEvalCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/ExpressionEvalCheck.java
index 5b1bca10..f4b6f903 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionEvalCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/ExpressionEvalCheck.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,12 +14,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
 
 /**
  * @author Grill Balázs
@@ -29,7 +29,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
 public class ExpressionEvalCheck implements ISearchOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             try {
@@ -46,22 +46,22 @@ public class ExpressionEvalCheck implements ISearchOperation {
             }
             return false;
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExpressionEvalCheck.this;
         }
     }
-    
+
     private final int outputPosition;
     private final IExpressionEvaluator evaluator;
     private final Map<String, Integer> nameMap;
     private final boolean unwind;
-    
+
     public ExpressionEvalCheck(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, int position) {
         this(evaluator, nameMap, false, position);
     }
-    
+
     /**
      * @since 2.7
      */
@@ -87,7 +87,7 @@ public class ExpressionEvalCheck implements ISearchOperation {
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     "+variableMapping.apply(outputPosition)+" = expression "+evaluator.getShortDescription();
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/InequalityCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/InequalityCheck.java
index 3f30c3c4..4383d5a7 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/InequalityCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/InequalityCheck.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.exceptions.LocalSearchException;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
 
 /**
  * @author Zoltan Ujhelyi
@@ -25,7 +25,7 @@ import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
 public class InequalityCheck implements ISearchOperation {
 
     private class Executor extends CheckOperationExecutor {
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             Object source = frame.getValue(sourceLocation);
@@ -38,13 +38,13 @@ public class InequalityCheck implements ISearchOperation {
             }
             return !source.equals(target);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return InequalityCheck.this;
         }
     }
-    
+
     int sourceLocation;
     int targetLocation;
 
@@ -53,17 +53,17 @@ public class InequalityCheck implements ISearchOperation {
         this.sourceLocation = sourceLocation;
         this.targetLocation = targetLocation;
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor();
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     "+variableMapping.apply(sourceLocation)+" != "+variableMapping.apply(targetLocation);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/NACOperation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/NACOperation.java
index 3759e1d1..0921678e 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/NACOperation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/check/NACOperation.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.check;
+package tools.refinery.interpreter.localsearch.operations.check;
 
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * @author Zoltan Ujhelyi
@@ -29,29 +29,29 @@ public class NACOperation implements ISearchOperation, IPatternMatcherOperation
     private class Executor extends CheckOperationExecutor {
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         private Executor() {
             this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         public void onInitialize(MatchingFrame frame, ISearchContext context) {
             super.onInitialize(frame, context);
             maskedTuple.updateTuple(frame);
             matcher = context.getMatcher(information.getCallWithAdornment());
         }
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             return !matcher.hasMatch(information.getParameterMask(), maskedTuple);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return NACOperation.this;
         }
     }
-    
+
     private final CallInformation information;
 
     /**
@@ -61,22 +61,22 @@ public class NACOperation implements ISearchOperation, IPatternMatcherOperation
         super();
         this.information = information;
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor();
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     neg find "+information.toString(variableMapping);
     }
-    
+
     @Override
     public List<Integer> getVariablePositions() {
         return information.getVariablePositions();
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/AggregatorExtend.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/AggregatorExtend.java
index c2e75b7a..19d0a41d 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/AggregatorExtend.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/AggregatorExtend.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -15,19 +15,19 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * Calculates the aggregated value of a column based on the given {@link AggregatorConstraint}
- * 
+ *
  * @author Balázs Grill
  * @since 1.4
  */
@@ -37,21 +37,21 @@ public class AggregatorExtend  implements ISearchOperation, IPatternMatcherOpera
 
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         public Executor(int position) {
             super(position);
             this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
             matcher = context.getMatcher(information.getCallWithAdornment());
             Object aggregate = aggregate(aggregator.getAggregator().getOperator(), aggregator.getAggregatedColumn());
             return aggregate == null ? Collections.emptyIterator() : Collections.singletonList(aggregate).iterator();
-            
+
         }
-        
+
         @SuppressWarnings("unchecked")
         private <Domain, Accumulator, AggregateResult> AggregateResult aggregate(
                 IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator, int aggregatedColumn) {
@@ -59,17 +59,17 @@ public class AggregatorExtend  implements ISearchOperation, IPatternMatcherOpera
                     .map(match -> (Domain) match.get(aggregatedColumn));
             return operator.aggregateStream(valueStream);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return AggregatorExtend.this;
         }
     }
-    
+
     private final AggregatorConstraint aggregator;
-    private final CallInformation information; 
+    private final CallInformation information;
     private final int position;
-    
+
     /**
      * @since 1.7
      */
@@ -78,7 +78,7 @@ public class AggregatorExtend  implements ISearchOperation, IPatternMatcherOpera
         this.information = information;
         this.position = position;
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor(position);
@@ -88,17 +88,17 @@ public class AggregatorExtend  implements ISearchOperation, IPatternMatcherOpera
     public List<Integer> getVariablePositions() {
         return Arrays.asList(position);
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    -"+variableMapping.apply(position)+" = " + aggregator.getAggregator().getOperator().getName()+" find " + information.toString(variableMapping);
     }
-    
+
     @Override
     public CallInformation getCallInformation() {
         return information;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/CountOperation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/CountOperation.java
index 08ecc8d6..1451f92d 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/CountOperation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/CountOperation.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * Calculates the count of matches for a called matcher
- * 
+ *
  * @author Zoltan Ujhelyi
  */
 public class CountOperation implements ISearchOperation, IPatternMatcherOperation{
@@ -31,28 +31,28 @@ public class CountOperation implements ISearchOperation, IPatternMatcherOperatio
     private class Executor extends SingleValueExtendOperationExecutor<Integer>  {
         private final VolatileModifiableMaskedTuple maskedTuple;
         private IQueryResultProvider matcher;
-        
+
         public Executor(int position) {
             super(position);
             maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         public Iterator<Integer> getIterator(MatchingFrame frame, ISearchContext context) {
             matcher = context.getMatcher(information.getCallWithAdornment());
             maskedTuple.updateTuple(frame);
             return Collections.singletonList(matcher.countMatches(information.getParameterMask(), maskedTuple)).iterator();
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return CountOperation.this;
         }
     }
-    
+
     private final CallInformation information;
-    private final int position; 
-    
+    private final int position;
+
     /**
      * @since 1.7
      */
@@ -75,12 +75,12 @@ public class CountOperation implements ISearchOperation, IPatternMatcherOperatio
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    -"+variableMapping.apply(position)+" = count find " + information.toString(variableMapping);
     }
-    
+
     @Override
     public CallInformation getCallInformation() {
         return information;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExpressionEval.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExpressionEval.java
index 7186f4ac..bdd16265 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExpressionEval.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExpressionEval.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,17 +16,17 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
 
 /**
  * Calculates the result of an expression and stores it inside a variable for future reference.
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public class ExpressionEval implements ISearchOperation {
 
@@ -35,7 +35,7 @@ public class ExpressionEval implements ISearchOperation {
         public Executor(int position) {
             super(position);
         }
-        
+
         @Override
         public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
             try {
@@ -52,13 +52,13 @@ public class ExpressionEval implements ISearchOperation {
                 return Collections.emptyIterator();
             }
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExpressionEval.this;
         }
     }
-    
+
     private final IExpressionEvaluator evaluator;
     private final boolean unwind;
     private final Map<String, Integer> nameMap;
@@ -67,7 +67,7 @@ public class ExpressionEval implements ISearchOperation {
     public ExpressionEval(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, int position) {
         this(evaluator, nameMap, false, position);
     }
-    
+
     /**
      * @since 2.7
      */
@@ -77,17 +77,17 @@ public class ExpressionEval implements ISearchOperation {
         this.unwind = unwind;
         this.position = position;
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    -"+variableMapping.apply(position)+" = expression "+evaluator.getShortDescription();
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor(position);
@@ -100,5 +100,5 @@ public class ExpressionEval implements ISearchOperation {
         variables.addAll(nameMap.values());
         return variables;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java
index 1250e84e..ae6bc30c 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,21 +17,21 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Checking for a transitive closure expressed as a local search pattern matcher. The matched pattern must have two
  * parameters of the same model type.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
- * 
+ *
  */
 public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation, IPatternMatcherOperation {
 
@@ -40,7 +40,7 @@ public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation,
         public Executor(int position) {
             super(position);
         }
-        
+
         @Override
         public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
             // Note: second parameter is NOT bound during execution, but the first is
@@ -70,25 +70,25 @@ public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation,
 
             return targetsFound.iterator();
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExtendBinaryTransitiveClosure.this;
         }
     }
-    
+
     /**
      * Calculates the transitive closure of a pattern match in a forward direction (first parameter bound, second
      * unbound).
      * </p>
-     * <strong>Note</strong>: In case the call is reflexive, it is expected that the bound parameter already matches the universe type of the call. 
-     * 
+     * <strong>Note</strong>: In case the call is reflexive, it is expected that the bound parameter already matches the universe type of the call.
+     *
      * @since 1.7
      */
     public static class Forward extends ExtendBinaryTransitiveClosure {
 
         private Object[] seedFrame = new Object[2];
-        
+
         /**
          * @since 2.0
          */
@@ -112,7 +112,7 @@ public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation,
      * bound)
      * </p>
      * <strong>Note</strong>: In case the call is reflexive, it is expected that the bound parameter already matches the universe type of the call.
-     * 
+     *
      * @since 2.0
      */
     public static class Backward extends ExtendBinaryTransitiveClosure {
@@ -160,12 +160,12 @@ public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation,
     public ISearchOperationExecutor createExecutor() {
         return new Executor(targetPosition);
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         String c = information.toString(variableMapping);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendConstant.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendConstant.java
index 455236f3..69221662 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendConstant.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendConstant.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,14 +14,14 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
 
 /**
  * This operation handles constants in search plans by binding a variable to a constant value. Such operations should be
  * executed as early as possible during plan execution.
- * 
+ *
  * @author Marton Bur
  *
  */
@@ -37,13 +37,13 @@ public class ExtendConstant implements ISearchOperation {
         public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
             return Collections.singletonList(value).iterator();
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExtendConstant.this;
         }
     }
-    
+
     private final Object value;
     private final int position;
 
@@ -61,15 +61,15 @@ public class ExtendConstant implements ISearchOperation {
     public List<Integer> getVariablePositions() {
         return Arrays.asList(position);
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    constant -"+variableMapping.apply(position)+"='"+value+"'";
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendPositivePatternCall.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendPositivePatternCall.java
index 690a3241..b0bd2dcf 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendPositivePatternCall.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/ExtendPositivePatternCall.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ExtendOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.VolatileModifiableMaskedTuple;
 
 /**
  * @author Grill Balázs
@@ -32,25 +32,25 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
 
     private class Executor extends ExtendOperationExecutor<Tuple> {
         private final VolatileModifiableMaskedTuple maskedTuple;
-        
+
         public Executor() {
             maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-        
+
         @Override
         protected Iterator<? extends Tuple> getIterator(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
             IQueryResultProvider matcher = context.getMatcher(information.getCallWithAdornment());
             return matcher.getAllMatches(information.getParameterMask(), maskedTuple).iterator();
         }
-        
+
         /**
          * @since 2.0
          */
         @Override
         protected boolean fillInValue(Tuple result, MatchingFrame frame, ISearchContext context) {
             TupleMask mask = information.getFullFrameMask();
-            // The first loop clears out the elements from a possible previous iteration 
+            // The first loop clears out the elements from a possible previous iteration
             for(int i : information.getFreeParameterIndices()) {
                 mask.set(frame, i, null);
             }
@@ -58,7 +58,7 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
                 Object oldValue = mask.getValue(frame, i);
                 Object valueToFill = result.get(i);
                 if (oldValue != null && !oldValue.equals(valueToFill)){
-                    // If the inverse map contains more than one values for the same key, it means that these arguments are unified by the caller. 
+                    // If the inverse map contains more than one values for the same key, it means that these arguments are unified by the caller.
                     // In this case if the callee assigns different values the frame shall be dropped
                     return false;
                 }
@@ -66,31 +66,31 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
             }
             return true;
         }
-        
+
         @Override
         protected void cleanup(MatchingFrame frame, ISearchContext context) {
             TupleMask mask = information.getFullFrameMask();
             for(int i : information.getFreeParameterIndices()){
                 mask.set(frame, i, null);
             }
-            
+
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return ExtendPositivePatternCall.this;
         }
     }
-    
-    private final CallInformation information; 
-    
+
+    private final CallInformation information;
+
     /**
      * @since 1.7
      */
     public ExtendPositivePatternCall(CallInformation information) {
        this.information = information;
     }
-    
+
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor();
@@ -100,17 +100,17 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
     public List<Integer> getVariablePositions() {
         return information.getVariablePositions();
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend find " + information.toString(variableMapping);
     }
-    
+
     @Override
     public CallInformation getCallInformation() {
         return information;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/SingleValueExtendOperationExecutor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/SingleValueExtendOperationExecutor.java
index a04ffcca..31b4c294 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/SingleValueExtendOperationExecutor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/extend/SingleValueExtendOperationExecutor.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.extend;
+package tools.refinery.interpreter.localsearch.operations.extend;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ExtendOperationExecutor;
 
 /**
  * @since 2.0
@@ -18,7 +18,7 @@ import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecu
  */
 public abstract class SingleValueExtendOperationExecutor<T> extends ExtendOperationExecutor<T> {
     protected int position;
-    
+
     /**
      * @param position the frame position all values are to be added
      */
@@ -37,4 +37,4 @@ public abstract class SingleValueExtendOperationExecutor<T> extends ExtendOperat
     protected final void cleanup(MatchingFrame frame, ISearchContext context) {
         frame.setValue(position, null);
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeCheck.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeCheck.java
index 2b189c57..b9a10524 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeCheck.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeCheck.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.generic;
+package tools.refinery.interpreter.localsearch.operations.generic;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,15 +14,15 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * @author Zoltan Ujhelyi
@@ -30,20 +30,20 @@ import tools.refinery.viatra.runtime.matchers.util.Preconditions;
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class GenericTypeCheck implements ISearchOperation, IIteratingSearchOperation {
-    
+
     private class Executor extends CheckOperationExecutor {
         private VolatileMaskedTuple maskedTuple;
-        
+
         private Executor() {
             this.maskedTuple = new VolatileMaskedTuple(callMask);
         }
-        
+
         @Override
         protected boolean check(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
             return context.getRuntimeContext().containsTuple(type, maskedTuple);
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return GenericTypeCheck.this;
@@ -81,7 +81,7 @@ public class GenericTypeCheck implements ISearchOperation, IIteratingSearchOpera
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "check     " + type.getPrettyPrintableName() + "("
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtend.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeExtend.java
index dfc3e9ad..79db98aa 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtend.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeExtend.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.generic;
+package tools.refinery.interpreter.localsearch.operations.generic;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,16 +17,16 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
-import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ExtendOperationExecutor;
+import tools.refinery.interpreter.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * @author Zoltan Ujhelyi
@@ -37,11 +37,11 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
 
     private class Executor extends ExtendOperationExecutor<Tuple> {
         private final VolatileMaskedTuple maskedTuple;
-        
+
         public Executor() {
             this.maskedTuple = new VolatileMaskedTuple(callMask);
         }
-        
+
         @Override
         protected Iterator<? extends Tuple> getIterator(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
@@ -73,13 +73,13 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
                 frame.setValue(position, null);
             }
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return GenericTypeExtend.this;
         }
     }
-    
+
     private final IInputKey type;
     private final int[] positions;
     private final List<Integer> positionList;
@@ -88,7 +88,7 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
     private final TupleMask callMask;
 
     /**
-     * 
+     *
      * @param type
      *            the type to execute the extend operation on
      * @param positions
@@ -127,12 +127,12 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
     public List<Integer> getVariablePositions() {
         return positionList;
     }
-    
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    " + type.getPrettyPrintableName() + "("
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtendSingleValue.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeExtendSingleValue.java
index 45e4fd0e..f381e00d 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtendSingleValue.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/generic/GenericTypeExtendSingleValue.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.generic;
+package tools.refinery.interpreter.localsearch.operations.generic;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,15 +16,15 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.SingleValueExtendOperationExecutor;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.extend.SingleValueExtendOperationExecutor;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * @author Zoltan Ujhelyi
@@ -34,9 +34,9 @@ import tools.refinery.viatra.runtime.matchers.util.Preconditions;
 public class GenericTypeExtendSingleValue implements IIteratingSearchOperation {
 
     private class Executor extends  SingleValueExtendOperationExecutor<Object> {
-        
+
         private final VolatileMaskedTuple maskedTuple;
-        
+
         public Executor(int position) {
             super(position);
             this.maskedTuple = new VolatileMaskedTuple(callMask);
@@ -47,13 +47,13 @@ public class GenericTypeExtendSingleValue implements IIteratingSearchOperation {
             maskedTuple.updateTuple(frame);
             return context.getRuntimeContext().enumerateValues(type, indexerMask, maskedTuple).iterator();
         }
-        
+
         @Override
         public ISearchOperation getOperation() {
             return GenericTypeExtendSingleValue.this;
         }
     }
-    
+
     private final IInputKey type;
     private final List<Integer> positionList;
     private final TupleMask indexerMask;
@@ -61,7 +61,7 @@ public class GenericTypeExtendSingleValue implements IIteratingSearchOperation {
     private final int unboundVariableIndex;
 
     /**
-     * 
+     *
      * @param type
      *            the type to execute the extend operation on
      * @param positions
@@ -102,7 +102,7 @@ public class GenericTypeExtendSingleValue implements IIteratingSearchOperation {
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     @Override
     public String toString(Function<Integer, String> variableMapping) {
         return "extend    " + type.getPrettyPrintableName() + "("
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/util/CallInformation.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/util/CallInformation.java
index b141a7b0..6241b33f 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/util/CallInformation.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/operations/util/CallInformation.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.operations.util;
+package tools.refinery.interpreter.localsearch.operations.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,58 +17,58 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternCallBasedDeferred;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.localsearch.matcher.CallWithAdornment;
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.PatternCallBasedDeferred;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
  * This class stores a precompiled version of call-related metadata and masks for local search operations
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  */
 public final class CallInformation {
 
-    private final TupleMask fullFrameMask;   
-    private final TupleMask thinFrameMask;   
+    private final TupleMask fullFrameMask;
+    private final TupleMask thinFrameMask;
     private final TupleMask parameterMask;
     private final int[] freeParameterIndices;
-    
+
     private final Map<PParameter, Integer> mapping = new HashMap<>();
     private final Set<PParameter> adornment = new HashSet<>();
     private final PQuery referredQuery;
     private final MatcherReference matcherReference;
     private final IQueryReference call;
     private CallWithAdornment callWithAdornment;
-    
+
     public static CallInformation create(PatternCallBasedDeferred constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
         return new CallInformation(constraint.getActualParametersTuple(), constraint, bindings, variableMapping);
     }
-    
+
     public static CallInformation create(PositivePatternCall pCall, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
         return new CallInformation(pCall.getVariablesTuple(), pCall, bindings, variableMapping);
     }
-    
+
     public static CallInformation create(BinaryTransitiveClosure constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
         return new CallInformation(constraint.getVariablesTuple(), constraint, bindings, variableMapping);
     }
-    
+
     /**
      * @since 2.0
      */
     public static CallInformation create(BinaryReflexiveTransitiveClosure constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
         return new CallInformation(constraint.getVariablesTuple(), constraint, bindings, variableMapping);
     }
-    
+
     private CallInformation(Tuple actualParameters, IQueryReference call, final Set<Integer> bindings,
             Map<PVariable, Integer> variableMapping) {
         this.call = call;
@@ -87,10 +87,10 @@ public final class CallInformation {
                 adornment.add(symbolicParameter);
             }
         }
-        
+
         thinFrameMask = TupleMask.fromSelectedIndices(variableMapping.size(), parameterMaskIndices);
         fullFrameMask = TupleMask.fromSelectedIndices(variableMapping.size(), fullParameterMaskIndices);
-        
+
         // This second iteration is necessary as we don't know beforehand the number of bound parameters
         int[] boundParameterIndices = new int[adornment.size()];
         int boundIndex = 0;
@@ -110,38 +110,38 @@ public final class CallInformation {
         matcherReference = callWithAdornment.getMatcherReference();
     }
 
-    /** 
+    /**
      * Returns a mask describing how the bound variables of a Matching Frame are mapped to parameter indexes
      */
     public TupleMask getThinFrameMask() {
         return thinFrameMask;
     }
-    
-    /** 
+
+    /**
      * Returns a mask describing how all variables of a Matching Frame are mapped to parameter indexes
      */
     public TupleMask getFullFrameMask() {
         return fullFrameMask;
     }
-    
+
     /**
      * Returns a mask describing the adornment the called pattern uses
      */
     public TupleMask getParameterMask() {
         return parameterMask;
     }
-    
+
     public MatcherReference getReference() {
         return matcherReference;
     }
-    
+
     /**
      * @since 2.1
      */
     public IQueryReference getCall() {
         return call;
     }
-    
+
     /**
      * @since 2.1
      */
@@ -155,7 +155,7 @@ public final class CallInformation {
     public int[] getFreeParameterIndices() {
         return freeParameterIndices;
     }
-    
+
     public List<Integer> getVariablePositions() {
         List<Integer> variables = new ArrayList<>(mapping.size());
         for(PParameter p : referredQuery.getParameters()){
@@ -163,14 +163,14 @@ public final class CallInformation {
         }
         return variables;
     }
-    
-    
-    
+
+
+
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-    
+
     /**
      * @since 2.0
      */
@@ -181,6 +181,6 @@ public final class CallInformation {
                         .collect(Collectors.joining(","))
                 + ")";
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanDescriptor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/IPlanDescriptor.java
index 987996c9..a855b0b0 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanDescriptor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/IPlanDescriptor.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
+package tools.refinery.interpreter.localsearch.plan;
 
 import java.util.Collection;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * Denotes an executable plan
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -28,22 +28,22 @@ public interface IPlanDescriptor {
      * The query which this plan implements
      */
     public PQuery getQuery();
-    
+
     /**
      * The executable search plans for each body in the query
      * @since 2.0
      */
     public Collection<SearchPlanForBody> getPlan();
-    
+
     /**
      * The set of parameters this plan assumes to be bound
      */
     public Set<PParameter> getAdornment();
-    
+
     /**
      * The collection of {@link IInputKey}s which needs to be iterated during the execution of this plan. For optimal
      * performance, instances of these keys might be indexed.
      */
     public Set<IInputKey> getIteratedKeys();
-    
+
 }
diff --git a/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/IPlanProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/IPlanProvider.java
new file mode 100644
index 00000000..d7112bcc
--- /dev/null
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/IPlanProvider.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.interpreter.localsearch.plan;
+
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.interpreter.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ * @noreference This interface is not intended to be referenced by clients.
+ */
+public interface IPlanProvider {
+
+    /**
+     * @throws InterpreterRuntimeException
+     * @since 2.1
+     */
+    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler,
+                                   ResultProviderRequestor resultProviderRequestor,
+                                   LocalSearchHints configuration, MatcherReference key);
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/PlanDescriptor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/PlanDescriptor.java
index a5565546..f4196032 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/PlanDescriptor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/PlanDescriptor.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
+package tools.refinery.interpreter.localsearch.plan;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,11 +16,11 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * @author Grill Balázs
@@ -33,7 +33,7 @@ public class PlanDescriptor implements IPlanDescriptor {
     private final List<SearchPlanForBody> plan;
     private final Set<PParameter> adornment;
     private Set<IInputKey> iteratedKeys = null;
-    
+
     public PlanDescriptor(PQuery pquery, Collection<SearchPlanForBody> plan, Set<PParameter> adornment) {
         this.pquery = pquery;
         this.plan = new ArrayList<>(plan);
@@ -70,7 +70,7 @@ public class PlanDescriptor implements IPlanDescriptor {
         }
         return iteratedKeys;
     }
-    
+
     @Override
     public String toString() {
         return new StringBuilder().append("Plan for ").append(pquery.getFullyQualifiedName()).append("(")
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlan.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlan.java
index 3159f707..1cbdd92d 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlan.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlan.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
+package tools.refinery.interpreter.localsearch.plan;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,16 +15,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
  * A SearchPlan stores a collection of SearchPlanOperations for a fixed order of variables.
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public class SearchPlan {
 
@@ -32,7 +32,7 @@ public class SearchPlan {
     private final Map<Integer, PVariable> variableMapping;
     private final TupleMask parameterMask;
     private final PBody body;
-    
+
     /**
      * @since 2.0
      */
@@ -75,18 +75,18 @@ public class SearchPlan {
     public TupleMask getParameterMask() {
         return parameterMask;
     }
-    
+
     /**
      * @since 2.0
      */
     public PBody getSourceBody() {
         return body;
     }
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-            
+
         sb.append("{\n");
         for(ISearchOperation operation : this.getOperations()){
             sb.append("\t");
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanExecutor.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlanExecutor.java
index 4a4e2450..60c2e023 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanExecutor.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlanExecutor.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
- package tools.refinery.viatra.runtime.localsearch.plan;
+ package tools.refinery.interpreter.localsearch.plan;
 
 
 import java.util.Collections;
@@ -17,17 +17,16 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
-import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdaptable;
-import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
-import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.exceptions.LocalSearchException;
+import tools.refinery.interpreter.localsearch.matcher.ILocalSearchAdaptable;
+import tools.refinery.interpreter.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.interpreter.localsearch.matcher.ISearchContext;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * A search plan executor is used to execute {@link SearchPlan} instances.
@@ -36,7 +35,7 @@ import tools.refinery.viatra.runtime.matchers.util.Preconditions;
 public class SearchPlanExecutor implements ILocalSearchAdaptable {
 
     private int currentOperation;
-    private final List<ISearchOperationExecutor> operations;
+    private final List<ISearchOperation.ISearchOperationExecutor> operations;
     private final SearchPlan plan;
     private final ISearchContext context;
     private final List<ILocalSearchAdapter> adapters = new CopyOnWriteArrayList<>();
@@ -51,11 +50,11 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
     public int getCurrentOperation() {
         return currentOperation;
     }
-    
+
     public SearchPlan getSearchPlan() {
         return plan;
     }
-    
+
     /**
      * @since 1.7
      */
@@ -92,12 +91,12 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
         operations = plan.getOperations().stream().map(ISearchOperation::createExecutor).collect(Collectors.toList());
         this.currentOperation = -1;
     }
-   
+
 
     private void init(MatchingFrame frame) {
         if (currentOperation == -1) {
             currentOperation++;
-            ISearchOperationExecutor operation = operations.get(currentOperation);
+            ISearchOperation.ISearchOperationExecutor operation = operations.get(currentOperation);
             if (!adapters.isEmpty()){
                 for (ILocalSearchAdapter adapter : adapters) {
                     adapter.executorInitializing(plan, frame);
@@ -121,7 +120,7 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
     }
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public boolean execute(MatchingFrame frame) {
         int upperBound = operations.size() - 1;
@@ -133,12 +132,12 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
                 currentOperation++;
                 operationSelected(frame, currentOperation, false);
                 if (currentOperation <= upperBound) {
-                    ISearchOperationExecutor operation = operations.get(currentOperation);
+                    ISearchOperation.ISearchOperationExecutor operation = operations.get(currentOperation);
                     operation.onInitialize(frame, context);
                 }
             } else {
                 operationExecuted(frame, currentOperation, false);
-                ISearchOperationExecutor operation = operations.get(currentOperation);
+                ISearchOperation.ISearchOperationExecutor operation = operations.get(currentOperation);
                 operation.onBacktrack(frame, context);
                 currentOperation--;
                 operationSelected(frame, currentOperation, true);
@@ -152,17 +151,17 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
         }
         return matchFound;
     }
-    
+
     public void resetPlan() {
         currentOperation = -1;
     }
-    
+
     public void printDebugInformation() {
         for (int i = 0; i < operations.size(); i++) {
             Logger.getRootLogger().debug("[" + i + "]\t" + operations.get(i).toString());
         }
     }
-    
+
     private void operationExecuted(MatchingFrame frame, int operationIndex, boolean isSuccessful) {
         if (!adapters.isEmpty()){
             for (ILocalSearchAdapter adapter : adapters) {
@@ -170,7 +169,7 @@ public class SearchPlanExecutor implements ILocalSearchAdaptable {
             }
         }
     }
-    
+
     private void operationSelected(MatchingFrame frame, int operationIndex, boolean isBacktrack) {
         if (!adapters.isEmpty() && operationIndex >= 0 && operationIndex < operations.size()){
             for (ILocalSearchAdapter adapter : adapters) {
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanForBody.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlanForBody.java
index e0300da4..6910df26 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanForBody.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SearchPlanForBody.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
+package tools.refinery.interpreter.localsearch.plan;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,12 +15,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.localsearch.matcher.CallWithAdornment;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
  * This class is responsible for storing the results of the planner and operation compiler for a selected body.
@@ -37,7 +37,7 @@ public class SearchPlanForBody {
     private final Collection<CallWithAdornment> dependencies;
     private final double cost;
     private final Object internalRepresentation;
-    
+
     /**
      * @since 2.1
      */
@@ -57,7 +57,7 @@ public class SearchPlanForBody {
         }
         this.compiledOperations = new ArrayList<>(compiledOperations.size()+1);
         this.compiledOperations.addAll(compiledOperations);
-        
+
         this.dependencies = new ArrayList<>(dependencies);
     }
 
@@ -80,15 +80,15 @@ public class SearchPlanForBody {
     public SubPlan getPlan() {
         return plan;
     }
-    
+
     public Collection<CallWithAdornment> getDependencies() {
         return dependencies;
     }
-    
+
     public TupleMask calculateParameterMask() {
         return TupleMask.fromSelectedIndices(variableKeys.size(), parameterKeys);
     }
-    
+
     @Override
     public String toString() {
         return compiledOperations.stream().map(Object::toString).collect(Collectors.joining("\n"));
@@ -108,8 +108,8 @@ public class SearchPlanForBody {
     public Object getInternalRepresentation() {
         return internalRepresentation;
     }
-    
-    
-    
-    
+
+
+
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SimplePlanProvider.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SimplePlanProvider.java
index ed31bcb0..ae6beae9 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SimplePlanProvider.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/plan/SimplePlanProvider.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
+package tools.refinery.interpreter.localsearch.plan;
 
 import java.util.Collection;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
-import tools.refinery.viatra.runtime.localsearch.planner.LocalSearchPlanner;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.interpreter.localsearch.planner.LocalSearchPlanner;
+import tools.refinery.interpreter.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
 
 /**
  * A plan provider implementation which caches previously calculated plans to avoid re-planning for the same adornment
- * 
+ *
  * @author Grill Balázs
  * @since 1.7
  *
@@ -28,20 +28,20 @@ import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
 public class SimplePlanProvider implements IPlanProvider {
 
     private final Logger logger;
-    
+
     public SimplePlanProvider(Logger logger) {
         this.logger = logger;
     }
-    
+
     @Override
-    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler, 
-            final ResultProviderRequestor resultRequestor,
-            final LocalSearchHints configuration, MatcherReference key) {
-        
+    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler,
+                                   final ResultProviderRequestor resultRequestor,
+                                   final LocalSearchHints configuration, MatcherReference key) {
+
         LocalSearchPlanner planner = new LocalSearchPlanner(backend, compiler, logger, configuration, resultRequestor);
-        
+
         Collection<SearchPlanForBody> plansForBodies = planner.plan(key.getQuery(), key.getAdornment());
-      
+
         IPlanDescriptor plan = new PlanDescriptor(key.getQuery(), plansForBodies, key.getAdornment());
         return plan;
     }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ILocalSearchPlanner.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/ILocalSearchPlanner.java
index dfd9a3c8..a50eed8c 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ILocalSearchPlanner.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/ILocalSearchPlanner.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.Collection;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.localsearch.plan.SearchPlanForBody;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * @author Zoltan Ujhelyi
@@ -25,14 +25,14 @@ public interface ILocalSearchPlanner {
     /**
      * Creates executable plans for the provided query. It is required to call one of the
      * <code>initializePlanner()</code> methods before calling this method.
-     * 
+     *
      * @param querySpec
      * @param boundParameters
      *            a set of bound parameters
      * @return a mapping between ISearchOperation list and a mapping, that holds a PVariable-Integer mapping for the
      *         list of ISearchOperations
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     Collection<SearchPlanForBody> plan(PQuery querySpec, Set<PParameter> boundParameters);
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ISearchPlanCodeGenerator.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/ISearchPlanCodeGenerator.java
index 72218337..0c2f85c7 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ISearchPlanCodeGenerator.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/ISearchPlanCodeGenerator.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.List;
 
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
 
 /**
  * @author Marton Bur
@@ -19,5 +19,5 @@ import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
 public interface ISearchPlanCodeGenerator {
 
     void compile(List<List<ISearchOperation>> plans);
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchPlanner.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/LocalSearchPlanner.java
index f44be655..38c64d4c 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchPlanner.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/LocalSearchPlanner.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,26 +17,26 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PBodyNormalizer;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PDisjunctionRewriter;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PDisjunctionRewriterCacher;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PQueryFlattener;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.interpreter.localsearch.plan.SearchPlanForBody;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.rewriters.PBodyNormalizer;
+import tools.refinery.interpreter.matchers.psystem.rewriters.PDisjunctionRewriter;
+import tools.refinery.interpreter.matchers.psystem.rewriters.PDisjunctionRewriterCacher;
+import tools.refinery.interpreter.matchers.psystem.rewriters.PQueryFlattener;
 
 /**
- * 
+ *
  * @author Marton Bur
  * @noreference This class is not intended to be referenced by clients.
  */
@@ -50,13 +50,13 @@ public class LocalSearchPlanner implements ILocalSearchPlanner {
     private final IOperationCompiler operationCompiler;
     private final IQueryBackendContext context;
     private final ResultProviderRequestor resultRequestor;
-    
+
     /**
-     * @param resultRequestor 
+     * @param resultRequestor
      * @since 1.7
      */
-    public LocalSearchPlanner(IQueryBackendContext backendContext, IOperationCompiler compiler, Logger logger, 
-            final LocalSearchHints configuration, ResultProviderRequestor resultRequestor) 
+    public LocalSearchPlanner(IQueryBackendContext backendContext, IOperationCompiler compiler, Logger logger,
+            final LocalSearchHints configuration, ResultProviderRequestor resultRequestor)
     {
 
         this.runtimeContext = backendContext.getRuntimeContext();
@@ -72,7 +72,7 @@ public class LocalSearchPlanner implements ILocalSearchPlanner {
          * negatively.
          */
         PBodyNormalizer normalizer = new PBodyNormalizer(runtimeContext.getMetaContext()) {
-            
+
             @Override
             protected boolean shouldCalculateImpliedTypes(PQuery query) {
                 return false;
@@ -88,7 +88,7 @@ public class LocalSearchPlanner implements ILocalSearchPlanner {
     /**
      * Creates executable plans for the provided query. It is required to call one of the
      * <code>initializePlanner()</code> methods before calling this method.
-     * 
+     *
      * @param querySpec
      * @param boundParameters
      *            a set of bound parameters
@@ -115,7 +115,7 @@ public class LocalSearchPlanner implements ILocalSearchPlanner {
             // Store the variable mappings for the plans for debug purposes (traceability information)
             SearchPlanForBody compiledPlan = new SearchPlanForBody(normalizedBody,
                     operationCompiler.getVariableMappings(), plan, compiledOperations,
-                    operationCompiler.getDependencies(), 
+                    operationCompiler.getDependencies(),
                     searchPlanInternal, searchPlanInternal.getCost());
 
             plansForBodies.add(compiledPlan);
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchRuntimeBasedStrategy.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/LocalSearchRuntimeBasedStrategy.java
index 1bebe37e..e66c2d42 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchRuntimeBasedStrategy.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/LocalSearchRuntimeBasedStrategy.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,36 +16,36 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
-import tools.refinery.viatra.runtime.localsearch.planner.util.OperationCostComparator;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+import tools.refinery.interpreter.localsearch.planner.cost.ICostFunction;
+import tools.refinery.interpreter.localsearch.planner.util.OperationCostComparator;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlanFactory;
+import tools.refinery.interpreter.matchers.planning.operations.PApply;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.planning.operations.PStart;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 /**
  * This class contains the logic for local search plan calculation based on costs of the operations.
  * Its name refers to the fact that the strategy tries to use as much information as available about
- * the model on which the matching is initiated. When no runtime info is available, it falls back to 
+ * the model on which the matching is initiated. When no runtime info is available, it falls back to
  * the information available from the metamodel durint operation cost calculation.
- * 
- * The implementation is based on the paper "Gergely Varró, Frederik Deckwerth, Martin Wieber, and Andy Schürr: 
- * An algorithm for generating model-sensitive search plans for pattern matching on EMF models" 
+ *
+ * The implementation is based on the paper "Gergely Varró, Frederik Deckwerth, Martin Wieber, and Andy Schürr:
+ * An algorithm for generating model-sensitive search plans for pattern matching on EMF models"
  * (DOI: 10.1007/s10270-013-0372-2)
- * 
+ *
  * @author Marton Bur
  * @noreference This class is not intended to be referenced by clients.
  */
 public class LocalSearchRuntimeBasedStrategy {
-    
+
     private final OperationCostComparator infoComparator = new OperationCostComparator();
 
 
@@ -55,7 +55,7 @@ public class LocalSearchRuntimeBasedStrategy {
     protected SubPlan convertPlan(Set<PVariable> initialBoundVariables, PlanState searchPlan) {
         PBody pBody;
         pBody = searchPlan.getAssociatedPBody();
-        
+
         // Create a starting plan
         SubPlanFactory subPlanFactory = new SubPlanFactory(pBody);
 
@@ -88,12 +88,12 @@ public class LocalSearchRuntimeBasedStrategy {
         final ICostFunction costFunction = configuration.getCostFunction();
         PConstraintInfoInferrer pConstraintInfoInferrer = new PConstraintInfoInferrer(
                 configuration.isUseBase(), context, resultProviderRequestor, costFunction::apply);
-        
+
         // Create mask infos
         Set<PConstraint> constraintSet = pBody.getConstraints();
-        List<PConstraintInfo> constraintInfos = 
+        List<PConstraintInfo> constraintInfos =
                 pConstraintInfoInferrer.createPConstraintInfos(constraintSet);
-        
+
         // Calculate the characteristic function
         // The characteristic function tells whether a given adornment is backward reachable from the (B)* state, where
         // each variable is bound.
@@ -112,7 +112,7 @@ public class LocalSearchRuntimeBasedStrategy {
         List<PConstraintInfo> allPotentialCheckInfos = new ArrayList<>();
         Map<PVariable, List<PConstraintInfo>> checkOpsByVariables = new HashMap<>();
         Map<PVariable, Collection<PConstraintInfo>> extendOpsByBoundVariables = new HashMap<>();
-        
+
         for (PConstraintInfo op : allMaskInfos) {
             if (op.getFreeVariables().isEmpty()) { // CHECK
                 allPotentialCheckInfos.add(op);
@@ -124,15 +124,15 @@ public class LocalSearchRuntimeBasedStrategy {
             }
         }
         // For CHECKs only, we must start from lists that are ordered by the cost of the constraint application
-        Collections.sort(allPotentialCheckInfos, infoComparator);  // costs are eagerly needed for check ops          
+        Collections.sort(allPotentialCheckInfos, infoComparator);  // costs are eagerly needed for check ops
         for (PConstraintInfo op : allPotentialCheckInfos) {
             for (PVariable variable : op.getBoundVariables()) {
                 checkOpsByVariables.computeIfAbsent(variable, v -> new ArrayList<>()).add(op);
             }
         }
-        // costs are not needed for extend ops until they are first applied (TODO make cost computaiton on demand) 
-        
-        
+        // costs are not needed for extend ops until they are first applied (TODO make cost computaiton on demand)
+
+
         // rename for better understanding
         Set<PVariable> boundVariables = initialBoundVariables;
         Set<PVariable> freeVariables = Sets.difference(pBody.getUniqueVariables(), initialBoundVariables);
@@ -144,12 +144,12 @@ public class LocalSearchRuntimeBasedStrategy {
 
         // Set initial state: begin with an empty operation list
         PlanState initialState = new PlanState(pBody, boundVariables);
-        
+
         // Initial state creation, categorizes all operations; add present checks to operationsList
         initialState.updateExtends(allPotentialExtendInfos);
         initialState.applyChecks(allPotentialCheckInfos);
         stateTable.get(n).add(0, initialState);
-        
+
         // stateTable.get(0) will contain the states with adornment B*
         for (int i = n; i > 0; i--) {
             for (int j = 0; j < k && j < stateTable.get(i).size(); j++) {
@@ -160,19 +160,19 @@ public class LocalSearchRuntimeBasedStrategy {
                     PlanState newState = calculateNextState(currentState, constraintInfo);
                     // also eagerly perform any CHECK operations that become applicable (extends still deferred)
                     newState.applyChecksBasedOnDelta(checkOpsByVariables);
-                    
+
                     if(currentState.getBoundVariables().size() == newState.getBoundVariables().size()){
                         // This means no variable binding was done, go on with the next constraint info
                         continue;
                     }
                     int i2 = variableCount - newState.getBoundVariables().size();
-                    
+
                     List<Integer> newIndices = determineIndices(stateTable, i2, newState, k);
                     int a = newIndices.get(0);
                     int c = newIndices.get(1);
 
                     if (checkInsertCondition(stateTable.get(i2), newState, reachableBoundVariableSets, a, c, k)) {
-                        updateExtends(newState, currentState, extendOpsByBoundVariables); // preprocess next steps 
+                        updateExtends(newState, currentState, extendOpsByBoundVariables); // preprocess next steps
                         insert(stateTable,i2, newState, a, c, k);
                     }
                 }
@@ -199,14 +199,14 @@ public class LocalSearchRuntimeBasedStrategy {
         }
     }
 
-    private void updateExtends(PlanState newState, PlanState currentState,  
-            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables) 
+    private void updateExtends(PlanState newState, PlanState currentState,
+            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables)
     {
         List<PConstraintInfo> presentExtends = currentState.getPresentExtends();
 
         // Recategorize operations
         newState.updateExtendsBasedOnDelta(presentExtends, extendOpsByBoundVariables);
-        
+
         return;
     }
 
@@ -253,5 +253,5 @@ public class LocalSearchRuntimeBasedStrategy {
         return reachableBoundVariableSets;
     }
 
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintCategory.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintCategory.java
index b98dd12e..2f5d8d1f 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintCategory.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintCategory.java
@@ -3,38 +3,38 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 
 /**
- * Expresses the state of a PConstraint application 
+ * Expresses the state of a PConstraint application
  * condition with respect to a given adornment.
- * 
+ *
  * @author Marton Bur
  * @noreference This enum is not intended to be referenced by clients.
  */
 public enum PConstraintCategory {
     /*
-     * During plan creation an operation is considered a past 
+     * During plan creation an operation is considered a past
      * operation, if an already bound variable is free in the
      * mask of the operation.
-     * (Mask of the operation: the required binding state of 
+     * (Mask of the operation: the required binding state of
      * the affected variables)
      */
-    PAST, 
+    PAST,
     /*
-     * The binding states of the variables in the operation 
-     * mask correspond to the current binding states of the 
+     * The binding states of the variables in the operation
+     * mask correspond to the current binding states of the
      * variables in the search plan
      */
-    PRESENT, 
+    PRESENT,
     /*
-     * There is at least one bound variable in the mask of 
-     * a future operation that is still free at the current 
-     * state of the plan. Also, a future operation can't be 
+     * There is at least one bound variable in the mask of
+     * a future operation that is still free at the current
+     * state of the plan. Also, a future operation can't be
      * PAST.
      */
     FUTURE;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfo.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintInfo.java
index c2c76ef2..6c42c180 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfo.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintInfo.java
@@ -1,32 +1,32 @@
-/** 
+/**
  * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Danil Varro
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-
-/** 
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+
+/**
  * Wraps a PConstraint together with information required for the planner. Currently contains information about the expected binding state of
  * the affected variables also called application condition, and the cost of the enforcement, based on the meta and/or the runtime context.
- *  
+ *
  * @author Marton Bur
  * @noreference This class is not intended to be referenced by clients.
  */
@@ -43,9 +43,9 @@ public class PConstraintInfo implements IConstraintEvaluationContext {
 
     private Double cost;
     private Function<IConstraintEvaluationContext, Double> costFunction;
-    
 
-    /** 
+
+    /**
      * Instantiates the wrapper
      * @param constraintfor which the information is added and stored
      * @param boundMaskVariables the bound variables in the operation mask
@@ -56,7 +56,7 @@ public class PConstraintInfo implements IConstraintEvaluationContext {
      * @param context the query backend context
      */
     public PConstraintInfo(PConstraint constraint, Set<PVariable> boundMaskVariables, Set<PVariable> freeMaskVariables,
-        Set<PConstraintInfo> sameWithDifferentBindings, 
+        Set<PConstraintInfo> sameWithDifferentBindings,
         IQueryBackendContext context,
         ResultProviderRequestor resultRequestor,
         Function<IConstraintEvaluationContext, Double> costFunction) {
@@ -72,7 +72,7 @@ public class PConstraintInfo implements IConstraintEvaluationContext {
 
         this.cost = null; // cost will be computed lazily (esp. important for pattern calls)
     }
-    
+
     @Override
     public IQueryRuntimeContext getRuntimeContext() {
         return runtimeContext;
@@ -133,7 +133,7 @@ public class PConstraintInfo implements IConstraintEvaluationContext {
     public IQueryResultProviderAccess resultProviderAccess() {
         return resultProviderAccess;
     }
-    
+
     @Override
     public ResultProviderRequestor resultProviderRequestor() {
         return resultRequestor;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfoInferrer.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintInfoInferrer.java
index eeac07ce..db9fcd8e 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfoInferrer.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PConstraintInfoInferrer.java
@@ -6,23 +6,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
-
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.AbstractTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+package tools.refinery.interpreter.localsearch.planner;
+
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.*;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.AbstractTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 import java.util.*;
 import java.util.function.Function;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PlanState.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PlanState.java
index e93b07bc..b3dd5290 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PlanState.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/PlanState.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner;
+package tools.refinery.interpreter.localsearch.planner;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,19 +17,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.planner.util.OperationCostComparator;
-import tools.refinery.viatra.runtime.matchers.algorithms.OrderedIterableMerge;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.interpreter.localsearch.planner.util.OperationCostComparator;
+import tools.refinery.interpreter.matchers.algorithms.OrderedIterableMerge;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
 
 /**
  * This class represents the state of the plan during planning.
- * 
- * <p> A PlanState represents a sequence of operations (operationsList) and caches the computed cost 
- * for this operation sequence. The list and the cost are initialized in the constructor. 
+ *
+ * <p> A PlanState represents a sequence of operations (operationsList) and caches the computed cost
+ * for this operation sequence. The list and the cost are initialized in the constructor.
  * However, #categorizeChecks() also updates the operations list (by suffixing checks)
- * 
+ *
  * @author Marton Bur
  * @noreference This class is not intended to be referenced by clients.
  */
@@ -40,7 +40,7 @@ public class PlanState {
     private final Set<PVariable> boundVariables;
     private final Collection<PVariable> deltaVariables; /* bound since ancestor plan */
     private final Set<PConstraint> enforcedConstraints;
-    
+
     private double cummulativeProduct;
     private double cost;
 
@@ -48,7 +48,7 @@ public class PlanState {
 
     /*
      * For a short explanation of past, present and future operations,
-     * see class 
+     * see class
      */
     private List<PConstraintInfo> presentExtends;
 
@@ -57,36 +57,36 @@ public class PlanState {
      */
     public PlanState(PBody pBody, Set<PVariable> boundVariables) {
 
-        this(pBody, new ArrayList<>(), boundVariables, boundVariables /* also the delta */, 
+        this(pBody, new ArrayList<>(), boundVariables, boundVariables /* also the delta */,
                 0.0 /* initial cost */, 1.0 /*initial branch count */);
     }
-    
+
     public PlanState cloneWithApplied(PConstraintInfo op) {
         // Create operation list based on the current state
-        ArrayList<PConstraintInfo> newOperationsList =  
+        ArrayList<PConstraintInfo> newOperationsList =
                 // pre-reserve excess capacity for later addition of CHECK ops
                 new ArrayList<>(pBody.getConstraints().size());
         newOperationsList.addAll(this.getOperations());
         newOperationsList.add(op);
-        
+
         // Bind the variables of the op
         Collection<PVariable> deltaVariables = op.getFreeVariables();
         Set<PVariable> allBoundVariables =
-                // pre-reserve exact capacity as variables are known 
+                // pre-reserve exact capacity as variables are known
                 // (will not be affected by adding CHECK ops later)
                 new HashSet<>(this.getBoundVariables().size() + deltaVariables.size());
         allBoundVariables.addAll(this.getBoundVariables());
         allBoundVariables.addAll(deltaVariables);
-        
+
         PlanState newState = new PlanState(getAssociatedPBody(), newOperationsList, allBoundVariables, deltaVariables,
                 cost, cummulativeProduct);
         newState.accountNewOperation(op);
         return newState;
     }
 
-    private PlanState(PBody pBody, List<PConstraintInfo> operationsList, 
-            Set<PVariable> boundVariables, Collection<PVariable> deltaVariables, 
-            double cost, double cummulativeProduct) 
+    private PlanState(PBody pBody, List<PConstraintInfo> operationsList,
+            Set<PVariable> boundVariables, Collection<PVariable> deltaVariables,
+            double cost, double cummulativeProduct)
     {
         this.pBody = pBody;
         this.operationsList = operationsList;
@@ -118,18 +118,18 @@ public class PlanState {
     }
 
     /**
-     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded), 
-     * immediately applicable ones (saved as presently viable extends), 
+     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded),
+     * immediately applicable ones (saved as presently viable extends),
      * and not yet applicable ones (discarded).
-     * 
-     * @param allPotentialExtendInfos all other extends that may be applicable 
+     *
+     * @param allPotentialExtendInfos all other extends that may be applicable
      * to this plan state now or in the future;
      * MUST consist of "extend" constraint applications only (at least one free variable)
      */
     public void updateExtends(Iterable<PConstraintInfo> allPotentialExtendInfos) {
         presentExtends = new ArrayList<>();
-        
-        
+
+
         // categorize future/present extend constraint infos
         for (PConstraintInfo op : allPotentialExtendInfos) {
             updateExtendInternal(op);
@@ -137,25 +137,25 @@ public class PlanState {
     }
 
     /**
-     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded), 
+     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded),
      * immediately applicable ones (saved as presently viable extends),
      * and not yet applicable ones (discarded).
-     * 
+     *
      * @param extendOpsByBoundVariables all EXTEND operations indexed by affected <i>bound</i> variables
      * MUST consist of "extend" constraint applications only (at least one free variable)
      */
     public void updateExtendsBasedOnDelta(
-            Iterable<PConstraintInfo> previousPresentExtends, 
-            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables) 
+            Iterable<PConstraintInfo> previousPresentExtends,
+            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables)
     {
         presentExtends = new ArrayList<>();
         if (operationsList.isEmpty())
-            throw new IllegalStateException("Not applicable as starting step");     
-        
+            throw new IllegalStateException("Not applicable as starting step");
+
         for (PConstraintInfo extend: previousPresentExtends) {
             updateExtendInternal(extend);
         }
-        
+
         Set<PConstraintInfo> affectedExtends = new HashSet<>();
         for (PVariable variable : deltaVariables) {
             // only those check ops may become applicable that have an affected variable in the delta
@@ -168,43 +168,43 @@ public class PlanState {
             updateExtendInternal(extend);
         }
     }
-    
+
     private void updateExtendInternal(PConstraintInfo op) {
         if(!enforcedConstraints.contains(op.getConstraint())) {
-            categorizeExtend(op);                
+            categorizeExtend(op);
         }
     }
-    
+
     /**
-     * Check operations that newly became applicable (see {@link #getDeltaVariables()}) 
+     * Check operations that newly became applicable (see {@link #getDeltaVariables()})
      * are appended to operations lists.
-     * 
+     *
      * <p> Will never discover degenerate checks (of PConstraints with zero variables),
      * so must not use on initial state.
-     * 
+     *
      * @param allPotentialCheckInfos all CHECK operations
-     * MUST consist of "check" constraint applications only (no free variables) 
+     * MUST consist of "check" constraint applications only (no free variables)
      * and must be iterable in decreasing order of cost
-     * 
-     * 
+     *
+     *
      */
     public void applyChecks(List<PConstraintInfo> allPotentialCheckInfos) {
-        applyChecksInternal(allPotentialCheckInfos);        
+        applyChecksInternal(allPotentialCheckInfos);
     }
- 
+
     /**
      * Immediately applicable checks are appended to operations lists.
-     * 
+     *
      * @param checkOpsByVariables all CHECK operations indexed by affected variables
-     * MUST consist of "check" constraint applications only (no free variables) 
+     * MUST consist of "check" constraint applications only (no free variables)
      * and each bucket must be iterable in decreasing order of cost
      */
     public void applyChecksBasedOnDelta(Map<PVariable, List<PConstraintInfo>> checkOpsByVariables) {
         if (operationsList.isEmpty())
-            throw new IllegalStateException("Not applicable as starting step");     
-        
+            throw new IllegalStateException("Not applicable as starting step");
+
         Iterable<PConstraintInfo> affectedChecks = Collections.emptyList();
-        
+
         for (PVariable variable : deltaVariables) {
             // only those check ops may become applicable that have an affected variable in the delta
             List<PConstraintInfo> checksForVariable = checkOpsByVariables.get(variable);
@@ -212,7 +212,7 @@ public class PlanState {
                 affectedChecks = OrderedIterableMerge.mergeUniques(affectedChecks, checksForVariable, infoComparator);
             }
         }
-        
+
         // checks retain their order, no re-sorting needed
         applyChecksInternal(affectedChecks);
     }
@@ -220,10 +220,10 @@ public class PlanState {
     private void applyChecksInternal(Iterable<PConstraintInfo> checks) {
         for (PConstraintInfo checkInfo : checks) {
             if (this.boundVariables.containsAll(checkInfo.getBoundVariables()) &&
-                    !enforcedConstraints.contains(checkInfo.getConstraint())) 
+                    !enforcedConstraints.contains(checkInfo.getConstraint()))
             {
                 operationsList.add(checkInfo);
-                accountNewOperation(checkInfo);                    
+                accountNewOperation(checkInfo);
             }
         }
     }
@@ -258,7 +258,7 @@ public class PlanState {
         return cost;
     }
 
-    
+
     /**
      * @return cumulative branching factor
      * @since 2.1
@@ -272,12 +272,12 @@ public class PlanState {
     }
 
     /**
-     * Contains only those variables that are added by the newest extend 
+     * Contains only those variables that are added by the newest extend
      * (or the initially bound ones if no extend yet)
      */
     public Collection<PVariable> getDeltaVariables() {
         return deltaVariables;
     }
 
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/AbstractOperationCompiler.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/AbstractOperationCompiler.java
index 73312dc9..aaa6414c 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/AbstractOperationCompiler.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/AbstractOperationCompiler.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+package tools.refinery.interpreter.localsearch.planner.compiler;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,49 +17,49 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.check.AggregatorCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.BinaryTransitiveClosureCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.CheckConstant;
-import tools.refinery.viatra.runtime.localsearch.operations.check.CheckPositivePatternCall;
-import tools.refinery.viatra.runtime.localsearch.operations.check.CountCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.ExpressionCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.ExpressionEvalCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.InequalityCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.check.NACOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.AggregatorExtend;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.CountOperation;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.ExpressionEval;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendBinaryTransitiveClosure;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendConstant;
-import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendPositivePatternCall;
-import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
-import tools.refinery.viatra.runtime.localsearch.planner.util.CompilerHelper;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
-import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.operations.util.CallInformation;
+import tools.refinery.interpreter.localsearch.matcher.CallWithAdornment;
+import tools.refinery.interpreter.localsearch.operations.check.AggregatorCheck;
+import tools.refinery.interpreter.localsearch.operations.check.BinaryTransitiveClosureCheck;
+import tools.refinery.interpreter.localsearch.operations.check.CheckConstant;
+import tools.refinery.interpreter.localsearch.operations.check.CheckPositivePatternCall;
+import tools.refinery.interpreter.localsearch.operations.check.CountCheck;
+import tools.refinery.interpreter.localsearch.operations.check.ExpressionCheck;
+import tools.refinery.interpreter.localsearch.operations.check.ExpressionEvalCheck;
+import tools.refinery.interpreter.localsearch.operations.check.InequalityCheck;
+import tools.refinery.interpreter.localsearch.operations.check.NACOperation;
+import tools.refinery.interpreter.localsearch.operations.extend.AggregatorExtend;
+import tools.refinery.interpreter.localsearch.operations.extend.CountOperation;
+import tools.refinery.interpreter.localsearch.operations.extend.ExpressionEval;
+import tools.refinery.interpreter.localsearch.operations.extend.ExtendBinaryTransitiveClosure;
+import tools.refinery.interpreter.localsearch.operations.extend.ExtendConstant;
+import tools.refinery.interpreter.localsearch.operations.extend.ExtendPositivePatternCall;
+import tools.refinery.interpreter.localsearch.planner.util.CompilerHelper;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.operations.PApply;
+import tools.refinery.interpreter.matchers.planning.operations.POperation;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.planning.operations.PStart;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.PatternMatchCounter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
 
 /**
  * @author Zoltan Ujhelyi
@@ -67,27 +67,27 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
  *
  */
 public abstract class AbstractOperationCompiler implements IOperationCompiler {
-    
+
     protected static final String UNSUPPORTED_TYPE_MESSAGE = "Unsupported type: ";
 
     protected abstract void createExtend(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     protected abstract void createCheck(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     protected abstract void createCheck(TypeFilterConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
 
     /**
      * @since 2.0
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     protected abstract void createUnaryTypeCheck(IInputKey type, int position);
-    
+
     protected List<ISearchOperation> operations;
     protected Set<CallWithAdornment> dependencies = new HashSet<>();
     protected Map<PConstraint, Set<Integer>> variableBindings;
@@ -100,34 +100,34 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
 
     /**
      * Compiles a plan of <code>POperation</code>s to a list of type <code>List&ltISearchOperation></code>
-     * 
+     *
      * @param plan
      * @param boundParameters
      * @return an ordered list of POperations that make up the compiled search plan
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     @Override
     public List<ISearchOperation> compile(SubPlan plan, Set<PParameter> boundParameters) {
-    
+
         variableMappings = CompilerHelper.createVariableMapping(plan);
         variableBindings = CompilerHelper.cacheVariableBindings(plan, variableMappings, boundParameters);
-    
+
         operations = new ArrayList<>();
-    
+
         List<POperation> operationList = CompilerHelper.createOperationsList(plan);
         for (POperation pOperation : operationList) {
             compile(pOperation, variableMappings);
         }
-    
+
         return operations;
     }
 
     private void compile(POperation pOperation, Map<PVariable, Integer> variableMapping) {
-    
+
         if (pOperation instanceof PApply) {
             PApply pApply = (PApply) pOperation;
             PConstraint pConstraint = pApply.getPConstraint();
-           
+
             if (isCheck(pConstraint, variableMapping)) {
                 // check
                 createCheckDispatcher(pConstraint, variableMapping);
@@ -135,7 +135,7 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
                 // extend
                 createExtendDispatcher(pConstraint, variableMapping);
             }
-    
+
         } else if (pOperation instanceof PStart) {
             // nop
         } else if (pOperation instanceof PProject) {
@@ -143,16 +143,16 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
         } else {
             throw new QueryProcessingException("PStart, PApply or PProject was expected, received: " + pOperation.getClass(), null,"Unexpected POperation type", null);
         }
-    
+
     }
 
     private void createCheckDispatcher(PConstraint pConstraint, Map<PVariable, Integer> variableMapping) {
-        
-        
+
+
         // DeferredPConstraint subclasses
-    
+
         // Equalities are normalized
-    
+
         if (pConstraint instanceof Inequality) {
             createCheck((Inequality) pConstraint, variableMapping);
         } else if (pConstraint instanceof PositivePatternCall){
@@ -170,9 +170,9 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
         } else if (pConstraint instanceof ExportedParameter) {
             // Nothing to do here
         } else
-        
+
         // EnumerablePConstraint subclasses
-    
+
         if (pConstraint instanceof BinaryTransitiveClosure) {
             createCheck((BinaryTransitiveClosure) pConstraint, variableMapping);
         } else if (pConstraint instanceof BinaryReflexiveTransitiveClosure) {
@@ -185,13 +185,13 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
             String msg = "Unsupported Check constraint: "+pConstraint.toString();
             throw new QueryProcessingException(msg, null, msg, null);
         }
-    
+
     }
-    
+
     protected void createExtendDispatcher(PConstraint pConstraint, Map<PVariable, Integer> variableMapping) {
-    
+
         // DeferredPConstraint subclasses
-        
+
         // Equalities are normalized
         if (pConstraint instanceof PositivePatternCall) {
             createExtend((PositivePatternCall)pConstraint, variableMapping);
@@ -204,9 +204,9 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
         } else if (pConstraint instanceof ExportedParameter) {
             // ExportedParameters are compiled to NOP
         } else
-        
+
         // EnumerablePConstraint subclasses
-    
+
         if (pConstraint instanceof ConstantValue) {
             createExtend((ConstantValue) pConstraint, variableMapping);
         } else if (pConstraint instanceof TypeConstraint) {
@@ -220,7 +220,7 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
             throw new QueryProcessingException(msg, null, msg, null);
         }
     }
-    
+
     private boolean isCheck(PConstraint pConstraint, final Map<PVariable, Integer> variableMapping) {
         if (pConstraint instanceof NegativePatternCall){
             return true;
@@ -284,20 +284,20 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
     protected void createCheck(BinaryTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
         int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
         int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
-        
+
         //The second parameter is NOT bound during execution!
         CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, Stream.of(sourcePosition).collect(Collectors.toSet()));
         operations.add(new BinaryTransitiveClosureCheck(information, sourcePosition, targetPosition, false));
         dependencies.add(information.getCallWithAdornment());
     }
-    
+
     /**
      * @since 2.0
      */
     protected void createCheck(BinaryReflexiveTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
         int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
         int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
-        
+
         //The second parameter is NOT bound during execution!
         CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, Stream.of(sourcePosition).collect(Collectors.toSet()));
         createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), sourcePosition);
@@ -309,12 +309,12 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
         // Fill unbound variables with null; simply copy all variables. Unbound variables will be null anyway
         Iterable<String> inputParameterNames = expressionEvaluation.getEvaluator().getInputParameterNames();
         Map<String, Integer> nameMap = new HashMap<>();
-        
+
         for (String pVariableName : inputParameterNames) {
             PVariable pVariable = expressionEvaluation.getPSystem().getVariableByNameChecked(pVariableName);
             nameMap.put(pVariableName, variableMapping.get(pVariable));
         }
-        
+
         // output variable can be null; if null it is an ExpressionCheck
         if(expressionEvaluation.getOutputVariable() == null){
             operations.add(new ExpressionCheck(expressionEvaluation.getEvaluator(), nameMap));
@@ -348,44 +348,44 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
     protected void createExtend(BinaryTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
         int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
         int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
-        
+
         boolean sourceBound = variableBindings.get(binaryTransitiveClosure).contains(sourcePosition);
         boolean targetBound = variableBindings.get(binaryTransitiveClosure).contains(targetPosition);
-        
+
         CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, variableBindings.get(binaryTransitiveClosure));
-        
+
         if (sourceBound && !targetBound) {
             operations.add(new ExtendBinaryTransitiveClosure.Forward(information, sourcePosition, targetPosition, false));
-            dependencies.add(information.getCallWithAdornment());            
+            dependencies.add(information.getCallWithAdornment());
         } else if (!sourceBound && targetBound) {
             operations.add(new ExtendBinaryTransitiveClosure.Backward(information, sourcePosition, targetPosition, false));
-            dependencies.add(information.getCallWithAdornment());                        
+            dependencies.add(information.getCallWithAdornment());
         } else {
             String msg = "Binary transitive closure not supported with two unbound parameters";
             throw new QueryProcessingException(msg, null, msg, binaryTransitiveClosure.getPSystem().getPattern());
         }
     }
-    
+
     /**
      * @since 2.0
      */
     protected void createExtend(BinaryReflexiveTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
         int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
         int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
-        
+
         boolean sourceBound = variableBindings.get(binaryTransitiveClosure).contains(sourcePosition);
         boolean targetBound = variableBindings.get(binaryTransitiveClosure).contains(targetPosition);
-        
+
         CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, variableBindings.get(binaryTransitiveClosure));
-        
+
         if (sourceBound && !targetBound) {
             createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), sourcePosition);
             operations.add(new ExtendBinaryTransitiveClosure.Forward(information, sourcePosition, targetPosition, true));
-            dependencies.add(information.getCallWithAdornment());            
+            dependencies.add(information.getCallWithAdornment());
         } else if (!sourceBound && targetBound) {
             createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), targetPosition);
             operations.add(new ExtendBinaryTransitiveClosure.Backward(information, sourcePosition, targetPosition, true));
-            dependencies.add(information.getCallWithAdornment());                        
+            dependencies.add(information.getCallWithAdornment());
         } else {
             String msg = "Binary reflective transitive closure not supported with two unbound parameters";
             throw new QueryProcessingException(msg, null, msg, binaryTransitiveClosure.getPSystem().getPattern());
@@ -394,19 +394,19 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
 
     protected void createExtend(ConstantValue constant, Map<PVariable, Integer> variableMapping) {
         int position = variableMapping.get(constant.getVariablesTuple().get(0));
-        operations.add(new ExtendConstant(position, constant.getSupplierKey()));        
+        operations.add(new ExtendConstant(position, constant.getSupplierKey()));
     }
 
     protected void createExtend(ExpressionEvaluation expressionEvaluation, Map<PVariable, Integer> variableMapping) {
         // Fill unbound variables with null; simply copy all variables. Unbound variables will be null anyway
         Iterable<String> inputParameterNames = expressionEvaluation.getEvaluator().getInputParameterNames();
         Map<String, Integer> nameMap = new HashMap<>();
-        
+
         for (String pVariableName : inputParameterNames) {
             PVariable pVariable = expressionEvaluation.getPSystem().getVariableByNameChecked(pVariableName);
             nameMap.put(pVariableName, variableMapping.get(pVariable));
         }
-        
+
         // output variable can be null; if null it is an ExpressionCheck
         if(expressionEvaluation.getOutputVariable() == null){
             operations.add(new ExpressionCheck(expressionEvaluation.getEvaluator(), nameMap));
@@ -426,5 +426,5 @@ public abstract class AbstractOperationCompiler implements IOperationCompiler {
         operations.add(new CountOperation(information, variableMapping.get(patternMatchCounter.getResultVariable())));
         dependencies.add(information.getCallWithAdornment());
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/GenericOperationCompiler.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/GenericOperationCompiler.java
index d86982e9..82e63ba8 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/GenericOperationCompiler.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/GenericOperationCompiler.java
@@ -7,18 +7,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+package tools.refinery.interpreter.localsearch.planner.compiler;
 
-import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeCheck;
-import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeExtend;
-import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeExtendSingleValue;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.localsearch.operations.generic.GenericTypeCheck;
+import tools.refinery.interpreter.localsearch.operations.generic.GenericTypeExtend;
+import tools.refinery.interpreter.localsearch.operations.generic.GenericTypeExtendSingleValue;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/IOperationCompiler.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/IOperationCompiler.java
index 625a7eb2..aee26cc9 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/IOperationCompiler.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/compiler/IOperationCompiler.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+package tools.refinery.interpreter.localsearch.planner.compiler;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.matcher.CallWithAdornment;
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
 
 /**
  * An operation compiler is responsible for creating executable search plans from the subplan structure.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  *
@@ -31,11 +31,11 @@ public interface IOperationCompiler {
 
     /**
      * Compiles a plan of <code>POperation</code>s to a list of type <code>List&ltISearchOperation></code>
-     * 
+     *
      * @param plan
      * @param boundParameters
      * @return an ordered list of POperations that make up the compiled search plan
-     * @throws ViatraQueryRuntimeException 
+     * @throws InterpreterRuntimeException
      */
     List<ISearchOperation> compile(SubPlan plan, Set<PParameter> boundParameters);
 
@@ -50,4 +50,4 @@ public interface IOperationCompiler {
      */
     Map<PVariable, Integer> getVariableMappings();
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/IConstraintEvaluationContext.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/IConstraintEvaluationContext.java
index 9b44612b..11195fff 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/IConstraintEvaluationContext.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/IConstraintEvaluationContext.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.cost;
+package tools.refinery.interpreter.localsearch.planner.cost;
 
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.backend.ResultProviderRequestor;
+import tools.refinery.interpreter.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 import java.util.Collection;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
 
 /**
  * This interface denotes the evaluation context of a constraint, intended for cost estimation. Provides access to information
  * on which the cost function can base its calculation.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  * @noimplement
@@ -40,24 +40,24 @@ public interface IConstraintEvaluationContext {
      * Bound variables at the time of evaluating the constraint
      */
     public Collection<PVariable> getBoundVariables();
-    
+
     public IQueryRuntimeContext getRuntimeContext();
-    
+
     /**
      * @since 1.5
      */
     public QueryAnalyzer getQueryAnalyzer();
-    
+
     /**
      * @deprecated use {@link #resultProviderRequestor()}
      * @since 1.5
      */
     @Deprecated
     public IQueryResultProviderAccess resultProviderAccess();
-    
+
     /**
      * @since 2.1
      */
     public ResultProviderRequestor resultProviderRequestor();
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/ICostFunction.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/ICostFunction.java
index 4d9d0708..717c7787 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/ICostFunction.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/ICostFunction.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.cost;
+package tools.refinery.interpreter.localsearch.planner.cost;
 
 /**
  * Common interface for cost function implementation
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -18,5 +18,5 @@ package tools.refinery.viatra.runtime.localsearch.planner.cost;
 public interface ICostFunction{
 
     public double apply(IConstraintEvaluationContext input);
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java
index df9292f0..cb859f62 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+package tools.refinery.interpreter.localsearch.planner.cost.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,25 +14,26 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * This cost function is intended to be used on hybrid configuration, with the strict restriction than any
  * non-flattened positive pattern call is executed with Rete engine. This implementation provides the exact number
  * of matches by invoking the result provider for the called pattern.
- * 
- * @deprecated {@link StatisticsBasedConstraintCostFunction} should use {@link IQueryResultProvider#estimateCardinality(tools.refinery.viatra.runtime.matchers.tuple.TupleMask, org.eclipse.viatra.query.runtime.matchers.util.Accuracy)} 
+ *
+ * @deprecated {@link StatisticsBasedConstraintCostFunction} should use {@link IQueryResultProvider#estimateCardinality(TupleMask, org.eclipse.viatra.query.runtime.matchers.util.Accuracy)}
  */
 @Deprecated
 public class HybridMatcherConstraintCostFunction extends IndexerBasedConstraintCostFunction {
-    
+
     @Override
     protected double _calculateCost(PositivePatternCall patternCall, IConstraintEvaluationContext context) {
         // Determine local constant constraints which is used to filter results
@@ -48,7 +49,7 @@ public class HybridMatcherConstraintCostFunction extends IndexerBasedConstraintC
                 }
             }
         }
-        
+
         // Determine filter
         Object[] filter = new Object[variables.getSize()];
         for(int i=0; i < variables.getSize(); i++){
@@ -66,19 +67,19 @@ public class HybridMatcherConstraintCostFunction extends IndexerBasedConstraintC
 
         IQueryResultProvider resultProvider = context.resultProviderRequestor().requestResultProvider(patternCall, null);
         Map<Tuple, Integer> aggregatedCounts = new HashMap<>();
-        
+
         // Iterate over all matches and count together matches that has equal values on
         // aggregateKeys positions. The cost of the pattern call is considered to be the
         // Maximum of these counted values
-        
+
         int result = 0;
         // NOTE: a stream is not an iterable (cannot be iterated more than once), so to use it in a for-loop
         // it has to be wrapped; in the following line a lambda is used to implement Iterable#iterator()
         for (Tuple match : (Iterable<Tuple>) () -> resultProvider.getAllMatches(filter).iterator()) {
             Tuple extracted = Tuples.flatTupleOf(aggregateKeys.stream().map(match::get).toArray());
-            int count = (aggregatedCounts.containsKey(extracted)) 
+            int count = (aggregatedCounts.containsKey(extracted))
                 ? aggregatedCounts.get(extracted) + 1
-                : 1;                
+                : 1;
             aggregatedCounts.put(extracted, count);
             if (result < count) {
                 result = count;
@@ -87,5 +88,5 @@ public class HybridMatcherConstraintCostFunction extends IndexerBasedConstraintC
 
         return result;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java
index 9e2c8680..33d34ed8 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java
@@ -1,33 +1,33 @@
-/** 
+/**
  * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+package tools.refinery.interpreter.localsearch.planner.cost.impl;
 
 import java.util.Optional;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 /**
  * Cost function which calculates cost based on the cardinality of items in the runtime model, provided by the base indexer
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  */
 public class IndexerBasedConstraintCostFunction extends StatisticsBasedConstraintCostFunction {
-    
-    
-    
+
+
+
 
     /**
-     * 
+     *
      */
     public IndexerBasedConstraintCostFunction() {
         super();
@@ -45,5 +45,5 @@ public class IndexerBasedConstraintCostFunction extends StatisticsBasedConstrain
     public Optional<Long> projectionSize(IConstraintEvaluationContext input, IInputKey supplierKey, TupleMask groupMask, Accuracy requiredAccuracy) {
         return input.getRuntimeContext().estimateCardinality(supplierKey, groupMask, requiredAccuracy);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java
index 873be31d..200b2902 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+package tools.refinery.interpreter.localsearch.planner.cost.impl;
 
-import static tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper.min;
+import static tools.refinery.interpreter.matchers.planning.helpers.StatisticsHelper.min;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,41 +19,41 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.AbstractLocalSearchResultProvider;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.localsearch.matcher.integration.AbstractLocalSearchResultProvider;
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.localsearch.planner.cost.ICostFunction;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.PatternMatchCounter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * Cost function which calculates cost based on the cardinality of items in the runtime model
- * 
- * <p> To provide custom statistics, override 
- *  {@link #projectionSize(IConstraintEvaluationContext, IInputKey, TupleMask, Accuracy)} 
+ *
+ * <p> To provide custom statistics, override
+ *  {@link #projectionSize(IConstraintEvaluationContext, IInputKey, TupleMask, Accuracy)}
  *  and {@link #bucketSize(IQueryReference, IConstraintEvaluationContext, TupleMask)}.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  */
@@ -61,7 +61,7 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
     protected static final double MAX_COST = 250.0;
 
     protected static final double DEFAULT_COST = StatisticsBasedConstraintCostFunction.MAX_COST - 100.0;
-        
+
     /**
      * @since 2.1
      */
@@ -74,10 +74,10 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
      * @since 2.7
      */
     public static final double EVAL_UNWIND_EXTENSION_FACTOR = 3.0;
-    
+
     private final double inverseNavigationPenalty;
-    
-    
+
+
     /**
      * @since 2.1
      */
@@ -96,7 +96,7 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
     public long countTuples(final IConstraintEvaluationContext input, final IInputKey supplierKey) {
         return projectionSize(input, supplierKey, TupleMask.identity(supplierKey.getArity()), Accuracy.EXACT_COUNT).orElse(-1L);
     }
-    
+
     /**
      * Override this to provide custom statistics on edge/node counts.
      * New implementors shall implement this instead of {@link #countTuples(IConstraintEvaluationContext, IInputKey)}
@@ -119,12 +119,12 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
         if (resultProvider instanceof AbstractLocalSearchResultProvider) {
             double estimatedCost = ((AbstractLocalSearchResultProvider) resultProvider).estimateCost(projMask);
             return Optional.of(estimatedCost);
-        } else {            
+        } else {
             return resultProvider.estimateAverageBucketSize(projMask, Accuracy.APPROXIMATION);
         }
     }
-   
-    
+
+
 
     @Override
     public double apply(final IConstraintEvaluationContext input) {
@@ -163,7 +163,7 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
         }
     }
 
-    
+
     /**
      * @deprecated use/implement {@link #calculateBinaryCost(IInputKey, PVariable, PVariable, boolean, IConstraintEvaluationContext)} instead
      */
@@ -173,16 +173,16 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
             final IConstraintEvaluationContext input) {
         throw new UnsupportedOperationException();
     }
-    
+
     /**
      * @since 2.1
      */
     protected double calculateBinaryCost(final IInputKey supplierKey, final PVariable srcVariable,
-            final PVariable dstVariable, final boolean isInverse, 
+            final PVariable dstVariable, final boolean isInverse,
             final IConstraintEvaluationContext input) {
         final Collection<PVariable> freeMaskVariables = input.getFreeVariables();
         final PConstraint constraint = input.getConstraint();
-        
+
 //        IQueryMetaContext metaContext = input.getRuntimeContext().getMetaContext();
 //        Collection<InputKeyImplication> implications = metaContext.getImplications(supplierKey);
 
@@ -195,55 +195,55 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
                     srcUpper.map(Long::doubleValue).orElse(DEFAULT_COST)
                     *
                     dstUpper.map(Long::doubleValue).orElse(DEFAULT_COST)
-            );      
+            );
             return branchCount;
-            
+
         } else {
-            
+
             Optional<Long> srcLower  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(0, 2),   Accuracy.APPROXIMATION);
             Optional<Long> dstLower  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(1, 2),   Accuracy.APPROXIMATION);
-            
+
             List<Optional<Long>> nodeLower = Arrays.asList(srcLower, dstLower);
             List<Optional<Long>> nodeUpper = Arrays.asList(srcUpper, dstUpper);
-            
+
             int from = isInverse ? 1 : 0;
             int to   = isInverse ? 0 : 1;
-            
+
             Optional<Double> costEstimate = Optional.empty();
-            
+
             if (!freeMaskVariables.contains(srcVariable) && !freeMaskVariables.contains(dstVariable)) {
                 // both variables bound, this is a simple check
                 costEstimate = min(costEstimate, 0.9);
             } // TODO use bucket size estimation in the runtime context
-            costEstimate = min(costEstimate, 
-                edgeUpper.flatMap(edges -> 
+            costEstimate = min(costEstimate,
+                edgeUpper.flatMap(edges ->
                 nodeLower.get(from).map(fromNodes ->
                     // amortize edges over start nodes
                     (fromNodes == 0) ? 0.0 : (((double) edges) / fromNodes)
             )));
             if (navigatesThroughFunctionalDependencyInverse(input, constraint)) {
-                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes -> 
+                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes ->
                         nodeLower.get(from).map(fromNodes ->
                         // due to a reverse functional dependency, the destination count is an upper bound for the edge count
                         (fromNodes == 0) ? 0.0 : ((double) toNodes) / fromNodes
                     )));
             }
             if (! edgeUpper.isPresent()) {
-                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes -> 
+                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes ->
                         nodeLower.get(from).map(fromNodes ->
                         // If count is 0, no such element exists in the model, so there will be no branching
-                        // TODO rethink, why dstNodeCount / srcNodeCount instead of dstNodeCount? 
+                        // TODO rethink, why dstNodeCount / srcNodeCount instead of dstNodeCount?
                         // The universally valid bound would be something like sparseEdgeEstimate = dstNodeCount + 1.0
-                        // If we assume sparseness, we can reduce it by a SPARSENESS_FACTOR (e.g. 0.1). 
+                        // If we assume sparseness, we can reduce it by a SPARSENESS_FACTOR (e.g. 0.1).
                         // Alternatively, discount dstNodeCount * srcNodeCount on a SPARSENESS_EXPONENT (e.g 0.75) and then amortize over srcNodeCount.
                         fromNodes != 0 ? Math.max(1.0, ((double) toNodes) / fromNodes) : 1.0
                     )));
-            } 
+            }
             if (navigatesThroughFunctionalDependency(input, constraint)) {
                 // At most one destination value
-                costEstimate = min(costEstimate, 1.0); 
+                costEstimate = min(costEstimate, 1.0);
             }
-            
+
             return costEstimate.orElse(DEFAULT_COST);
 
         }
@@ -275,7 +275,7 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
                 functionalDependencies);
         return ((impliedVariables != null) && impliedVariables.containsAll(determined));
     }
-    
+
     protected double calculateUnaryConstraintCost(final TypeConstraint constraint,
             final IConstraintEvaluationContext input) {
         PVariable variable = (PVariable) constraint.getVariablesTuple().get(0);
@@ -304,8 +304,8 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
             if (input.getBoundVariables().contains(variable)) boundPositions.add(i);
         }
         TupleMask projMask = TupleMask.fromSelectedIndices(parameters.size(), boundPositions);
-        
-        return bucketSize(patternCall, input, projMask).orElse(DEFAULT_COST);        
+
+        return bucketSize(patternCall, input, projMask).orElse(DEFAULT_COST);
     }
 
 
@@ -320,51 +320,51 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
                 : 1.0;
         return _calculateCost((PConstraint) evaluation, input) * multiplier;
     }
-    
+
     /**
      * @since 1.7
      */
     protected double _calculateCost(final Inequality inequality, final IConstraintEvaluationContext input) {
         return _calculateCost((PConstraint)inequality, input);
     }
-    
+
     /**
      * @since 1.7
      */
     protected double _calculateCost(final AggregatorConstraint aggregator, final IConstraintEvaluationContext input) {
         return _calculateCost((PConstraint)aggregator, input);
     }
-    
+
     /**
      * @since 1.7
      */
     protected double _calculateCost(final NegativePatternCall call, final IConstraintEvaluationContext input) {
         return _calculateCost((PConstraint)call, input);
     }
-    
+
     /**
      * @since 1.7
      */
     protected double _calculateCost(final PatternMatchCounter counter, final IConstraintEvaluationContext input) {
         return _calculateCost((PConstraint)counter, input);
     }
-    
+
     /**
      * @since 1.7
      */
     protected double _calculateCost(final BinaryTransitiveClosure closure, final IConstraintEvaluationContext input) {
-        // if (input.getFreeVariables().size() == 1) return 3.0; 
+        // if (input.getFreeVariables().size() == 1) return 3.0;
         return StatisticsBasedConstraintCostFunction.DEFAULT_COST;
     }
-    
+
     /**
      * @since 2.0
      */
     protected double _calculateCost(final BinaryReflexiveTransitiveClosure closure, final IConstraintEvaluationContext input) {
-        // if (input.getFreeVariables().size() == 1) return 3.0; 
+        // if (input.getFreeVariables().size() == 1) return 3.0;
         return StatisticsBasedConstraintCostFunction.DEFAULT_COST;
     }
-    
+
     /**
      * Default cost calculation strategy
      */
@@ -377,7 +377,7 @@ public abstract class StatisticsBasedConstraintCostFunction implements ICostFunc
     }
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public double calculateCost(final PConstraint constraint, final IConstraintEvaluationContext input) {
         Preconditions.checkArgument(constraint != null, "Set constraint value correctly");
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java
index a517af25..50168130 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java
@@ -3,39 +3,39 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+package tools.refinery.interpreter.localsearch.planner.cost.impl;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.localsearch.planner.cost.ICostFunction;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
 
 /**
  * This class can be used to calculate cost of application of a constraint with a given adornment.
- * 
+ *
  * For now the logic is based on the following principles:
- * 
+ *
  * <li>The transitive closures, NACs and count finds are the most expensive operations
- * 
+ *
  * <li>The number of free variables increase the cost
- * 
+ *
  * <li>If all the variables of a constraint are free, then its cost equals to twice the number of its parameter
  * variables. This solves the problem of unnecessary iteration over instances at the beginning of a plan (thus causing
  * very long run times when executing the plan) by applying constraints based on structural features as soon as
  * possible.
- * 
+ *
  * <br>
- * 
+ *
  * @author Marton Bur
  * @since 1.4
  *
@@ -49,7 +49,7 @@ public class VariableBindingBasedCostFunction implements ICostFunction {
     private static int nacCost = MAX - 100;
     private static int aggregatorCost = MAX - 200;
     private static int constantCost = 0;
-    
+
     @Override
     public double apply(IConstraintEvaluationContext input) {
         PConstraint constraint = input.getConstraint();
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/CompilerHelper.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/util/CompilerHelper.java
index 9b4e9ea5..3e2e2a60 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/CompilerHelper.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/util/CompilerHelper.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.util;
+package tools.refinery.interpreter.localsearch.planner.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,29 +16,29 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
-import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.operations.PApply;
+import tools.refinery.interpreter.matchers.planning.operations.POperation;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
 
 /**
- * 
+ *
  * Helper methods for compiling SubPlans
- * 
+ *
  * @author Marton Bur
  *
  */
 public class CompilerHelper {
 
     private CompilerHelper() {/*Utility class constructor*/}
-    
+
     private static boolean isUserSpecified(PVariable var) {
-        return !var.isVirtual() && !var.getName().startsWith("_"); 
+        return !var.isVirtual() && !var.getName().startsWith("_");
     }
-    
+
     public static Map<PVariable, Integer> createVariableMapping(SubPlan plan) {
         Map<PVariable, Integer> variableMapping = new HashMap<>();
 
@@ -90,7 +90,7 @@ public class CompilerHelper {
                 PConstraint pConstraint = ((PApply) operation).getPConstraint();
                 Set<Integer> boundVariableIndices = getParametersBoundByParentPlan(variableMappings, subPlan);
                 boundVariableIndices.addAll(externallyBoundVariables);
-                
+
                 variableBindings.put(pConstraint, boundVariableIndices);
             }
         }
@@ -157,7 +157,7 @@ public class CompilerHelper {
 
     /**
      * Transforms the index of a parameter into the index of a variable of the normalized body.
-     * 
+     *
      * @param plan
      *            the SubPlan containing the original body and its parameters
      * @param variableMappings
@@ -172,7 +172,7 @@ public class CompilerHelper {
         for (ExportedParameter constraint : plan.getBody().getSymbolicParameters()) {
             parameterMapping.put(constraint.getPatternParameter(), constraint.getParameterVariable());
         }
-        
+
         Set<Integer> variableIndices = new HashSet<>();
         for (PParameter parameter : parameters) {
             PVariable parameterVariable = parameterMapping.get(parameter);
@@ -188,7 +188,7 @@ public class CompilerHelper {
 
     /**
      * Extracts the operations from a SubPlan into a list of POperations in the order of execution
-     * 
+     *
      * @param plan
      *            the SubPlan from wich the POperations should be extracted
      * @return list of POperations extracted from the <code>plan</code>
@@ -201,9 +201,9 @@ public class CompilerHelper {
             plan = parentPlan;
         }
         operationsList.add(plan.getOperation());
-        
+
         Collections.reverse(operationsList);
-        return operationsList; 
+        return operationsList;
     }
 
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/OperationCostComparator.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/util/OperationCostComparator.java
index 58f4fc41..27cf79f2 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/OperationCostComparator.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/planner/util/OperationCostComparator.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.planner.util;
+package tools.refinery.interpreter.localsearch.planner.util;
 
 import java.util.Comparator;
 
-import tools.refinery.viatra.runtime.localsearch.planner.PConstraintInfo;
+import tools.refinery.interpreter.localsearch.planner.PConstraintInfo;
 
 /**
  * @author Marton Bur
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/profiler/LocalSearchProfilerAdapter.java b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/profiler/LocalSearchProfilerAdapter.java
index 8c50c694..a866f976 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/profiler/LocalSearchProfilerAdapter.java
+++ b/subprojects/interpreter-localsearch/src/main/java/tools/refinery/interpreter/localsearch/profiler/LocalSearchProfilerAdapter.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.profiler;
+package tools.refinery.interpreter.localsearch.profiler;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
-import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
-import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
-import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanExecutor;
+import tools.refinery.interpreter.localsearch.operations.ISearchOperation;
+import tools.refinery.interpreter.localsearch.MatchingFrame;
+import tools.refinery.interpreter.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.interpreter.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.interpreter.localsearch.matcher.MatcherReference;
+import tools.refinery.interpreter.localsearch.plan.SearchPlan;
+import tools.refinery.interpreter.localsearch.plan.SearchPlanExecutor;
 
 /**
  * This is a simple {@link ILocalSearchAdapter} which capable of counting
- * each search operation execution then printing it in human readably form 
+ * each search operation execution then printing it in human readably form
  * (along with the executed plans) using {@link #toString()}
  * @author Grill Balázs
  * @since 1.5
@@ -32,7 +32,7 @@ import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanExecutor;
 public class LocalSearchProfilerAdapter implements ILocalSearchAdapter {
 
     private final Map<MatcherReference, List<SearchPlan>> planReference = new HashMap<>();
-    
+
     private final Map<ISearchOperation, Integer> successfulOperationCounts = new HashMap<>();
     private final Map<ISearchOperation, Integer> failedOperationCounts = new HashMap<>();
 
@@ -46,8 +46,8 @@ public class LocalSearchProfilerAdapter implements ILocalSearchAdapter {
     @Override
     public void operationExecuted(SearchPlan plan, ISearchOperation operation, MatchingFrame frame, boolean isSuccessful) {
         Map<ISearchOperation, Integer> counts = isSuccessful ? successfulOperationCounts : failedOperationCounts;
-        counts.merge(operation, 
-                /*no previous entry*/1, 
+        counts.merge(operation,
+                /*no previous entry*/1,
                 /*increase previous value*/(oldValue, v) -> oldValue + 1);
     }
 
@@ -57,9 +57,9 @@ public class LocalSearchProfilerAdapter implements ILocalSearchAdapter {
         for (java.util.Map.Entry<MatcherReference, List<SearchPlan>> entry: planReference.entrySet()){
             sb.append(entry.getKey());
             sb.append("\n");
-            
+
             sb.append(entry.getValue());
-            
+
             List<SearchPlan> bodies = entry.getValue();
             sb.append("{\n");
             for(int i=0;i<bodies.size();i++){
@@ -79,5 +79,5 @@ public class LocalSearchProfilerAdapter implements ILocalSearchAdapter {
         }
         return sb.toString();
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF b/subprojects/interpreter-rete-recipes/META-INF/MANIFEST.MF
index c732af46..c732af46 100644
--- a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF
+++ b/subprojects/interpreter-rete-recipes/META-INF/MANIFEST.MF
diff --git a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF.license b/subprojects/interpreter-rete-recipes/META-INF/MANIFEST.MF.license
index 03d1d42b..03d1d42b 100644
--- a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF.license
+++ b/subprojects/interpreter-rete-recipes/META-INF/MANIFEST.MF.license
diff --git a/subprojects/interpreter-rete-recipes/NOTICE.md b/subprojects/interpreter-rete-recipes/NOTICE.md
new file mode 100644
index 00000000..94c1d803
--- /dev/null
+++ b/subprojects/interpreter-rete-recipes/NOTICE.md
@@ -0,0 +1,94 @@
+<!--
+  Copyright (c) 2018-2019, Zoltan Ujhelyi, IncQuery Labs Ltd.
+  Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+
+This module contains source code from the [Eclipse VIATRA&trade; project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
+
+Eclipse&reg;, VIATRA&trade; and &lsquo;Eclipse VIATRA&trade;&rsquo; are trademarks of Eclipse Foundation, Inc.
+
+To comply with the [Eclipse Foundation Trademark Usage Policy](https://www.eclipse.org/legal/logo_guidelines.php), we replaced the Eclipse VIATRA&trade; branding in this repository with the name _Refinery Interpreter_, since the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/) does not grant trademark usage rights to derived projects.
+_Refinery Interpreter_ is not endorsed or sponsored by Eclipse Foundation, Inc. or any other organizations using the Eclipse VIATRA&trade; trademark.
+
+We publish our modifications to Eclipse VIATRA&trade; for use within the Refinery framework under the name _Refinery Interpreter_. When not using _Refinery Interpreter_ directly in the Refinery framework, users are strongly encouraged to rely on [Eclipse VIATRA&trade;](https://eclipse.dev/viatra/) instead. In particular, _Refinery Interpreter_ does not provide any API stability guarantees that are provided by Eclipse VIATRA&trade;.
+
+We reproduce the [accompanying notices of Eclipse VIATRA&trade;](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+
+# Notices for Eclipse VIATRA&trade;
+
+This content is produced and maintained by the Eclipse VIATRA project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.viatra
+
+## Trademarks
+
+Eclipse VIATRA, and VIATRA are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-v20.html.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.modelobfuscator.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.examples.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra2.vpm.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR Runtime only: (3.2)
+
+* License: New BSD license
+
+Apache Commons Language Library (2.1)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License 2.0
+
+Guava (10.0.1)
+
+* License: Apache License, 2.0
+
+Guice (2.0)
+
+* License: Apache License, 2.0
+
+guice-multibindings (3.0.0)
+
+* License: Apache License, 2.0
+
+log4j (1.2.15)
+
+* License: Apache License 2.0
+
+LPG Java Runtime (lpgjavaruntime.jar) (1.1)
+
+* License: Eclipse Public License
+
+mockito (1.9.5)
+
+* License: Apache License, 2.0, New BSD license, MIT license
diff --git a/subprojects/viatra-runtime-rete-recipes/about.html b/subprojects/interpreter-rete-recipes/about.html
index d1d5593a..d1d5593a 100644
--- a/subprojects/viatra-runtime-rete-recipes/about.html
+++ b/subprojects/interpreter-rete-recipes/about.html
diff --git a/subprojects/viatra-runtime-rete-recipes/build.gradle.kts b/subprojects/interpreter-rete-recipes/build.gradle.kts
index b0d0139a..1b892e4e 100644
--- a/subprojects/viatra-runtime-rete-recipes/build.gradle.kts
+++ b/subprojects/interpreter-rete-recipes/build.gradle.kts
@@ -7,17 +7,13 @@
 import tools.refinery.gradle.utils.SonarPropertiesUtils
 
 plugins {
-        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.interpreter-library")
         id("tools.refinery.gradle.mwe2")
         id("tools.refinery.gradle.sonarqube")
-        // Vendor code from Eclipse VIATRA is maintained by the VIATRA project,
-        // so we don't need to keep track of coverage ourselves.
-        // Our own modifications are covered by tests in the `store-query-viatra` subproject.
-        id("tools.refinery.gradle.skip-coverage")
 }
 
 dependencies {
-        api(project(":refinery-viatra-runtime"))
+        api(project(":refinery-interpreter"))
         api(libs.ecore)
         mwe2(libs.ecore.codegen)
         mwe2(libs.mwe.utils)
@@ -37,7 +33,7 @@ tasks {
         val generateEPackage by registering(JavaExec::class) {
                 mainClass.set("org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher")
                 classpath(configurations.mwe2)
-                inputs.file("src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2")
+                inputs.file("src/main/java/tools/refinery/interpreter/rete/recipes/GenerateReteRecipes.mwe2")
                 inputs.file("src/main/resources/model/recipes.ecore")
                 inputs.file("src/main/resources/model/rete-recipes.genmodel")
                 outputs.file("build.properties")
@@ -45,7 +41,7 @@ tasks {
                 outputs.file("plugin.xml")
                 outputs.file("plugin.properties")
                 outputs.dir("src/main/emf-gen")
-                args("src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2",
+                args("src/main/java/tools/refinery/interpreter/rete/recipes/GenerateReteRecipes.mwe2",
                                 "-p", "rootPath=/$projectDir")
         }
 
diff --git a/subprojects/viatra-runtime-rete-recipes/build.properties b/subprojects/interpreter-rete-recipes/build.properties
index 97e4d6bd..97e4d6bd 100644
--- a/subprojects/viatra-runtime-rete-recipes/build.properties
+++ b/subprojects/interpreter-rete-recipes/build.properties
diff --git a/subprojects/viatra-runtime-rete-recipes/plugin.properties b/subprojects/interpreter-rete-recipes/plugin.properties
index 43a7236d..43a7236d 100644
--- a/subprojects/viatra-runtime-rete-recipes/plugin.properties
+++ b/subprojects/interpreter-rete-recipes/plugin.properties
diff --git a/subprojects/viatra-runtime-rete-recipes/plugin.xml b/subprojects/interpreter-rete-recipes/plugin.xml
index e4917f5d..3106788c 100644
--- a/subprojects/viatra-runtime-rete-recipes/plugin.xml
+++ b/subprojects/interpreter-rete-recipes/plugin.xml
@@ -6,7 +6,7 @@
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v. 2.0 which is available at
  http://www.eclipse.org/legal/epl-v20.html.
- 
+
  SPDX-License-Identifier: EPL-2.0
 -->
 
@@ -15,8 +15,8 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated rete-recipes -->
       <package
-            uri="https://refinery.tools/emf/2023/ViatraReteRecipes"
-            class="tools.refinery.viatra.runtime.rete.recipes.RecipesPackage"
+            uri="https://refinery.tools/emf/2023/InterpreterReteRecipes"
+            class="tools.refinery.interpreter.rete.recipes.RecipesPackage"
             genModel="src/main/resources/model/rete-recipes.genmodel"/>
    </extension>
 
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2 b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/GenerateReteRecipes.mwe2
index 424cc9f5..324d93a5 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2
+++ b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/GenerateReteRecipes.mwe2
@@ -8,7 +8,7 @@ module tools.refinery.viatra.runtime.rete.recipes.GenerateReteRecipes
 Workflow {
         bean = org.eclipse.emf.mwe.utils.StandaloneSetup {
                 projectMapping = {
-                        projectName = "tools.refinery.refinery-viatra-runtime-rete-recipes"
+                        projectName = "tools.refinery.refinery-interpreter-rete-recipes"
                         path = "."
                 }
         }
@@ -19,7 +19,7 @@ Workflow {
 
         component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
                 generateCustomClasses = false
-                genModel = "platform:/resource/tools.refinery.refinery-viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel"
-                srcPath = "platform:/resource/tools.refinery.refinery-viatra-runtime-rete-recipes/src/main/emf-gen"
+                genModel = "platform:/resource/tools.refinery.refinery-interpreter-rete-recipes/src/main/resources/model/rete-recipes.genmodel"
+                srcPath = "platform:/resource/tools.refinery.refinery-interpreter-rete-recipes/src/main/emf-gen"
         }
 }
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipeRecognizer.java b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/helper/RecipeRecognizer.java
index 2c252593..ed551b6e 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipeRecognizer.java
+++ b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/helper/RecipeRecognizer.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.recipes.helper;
+package tools.refinery.interpreter.rete.recipes.helper;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EAttribute;
@@ -14,9 +14,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.rete.recipes.RecipesPackage;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.rete.recipes.RecipesPackage;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipesHelper.java b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/helper/RecipesHelper.java
index 3070fcf5..763989ea 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipesHelper.java
+++ b/subprojects/interpreter-rete-recipes/src/main/java/tools/refinery/interpreter/rete/recipes/helper/RecipesHelper.java
@@ -6,10 +6,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.recipes.helper;
+package tools.refinery.interpreter.rete.recipes.helper;
 
 import org.eclipse.emf.common.util.EList;
-import tools.refinery.viatra.runtime.rete.recipes.*;
+import tools.refinery.interpreter.rete.recipes.*;
 
 import java.util.Collection;
 
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore b/subprojects/interpreter-rete-recipes/src/main/resources/model/recipes.ecore
index 4eda701e..a4617833 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore
+++ b/subprojects/interpreter-rete-recipes/src/main/resources/model/recipes.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="recipes" nsURI="https://refinery.tools/emf/2023/ViatraReteRecipes"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="recipes" nsURI="https://refinery.tools/emf/2023/InterpreterReteRecipes"
     nsPrefix="recipes">
   <eClassifiers xsi:type="ecore:EClass" name="ReteRecipe">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -48,7 +48,7 @@
       eSuperTypes="#//ReteNodeRecipe">
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
+        <details key="body" value="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parents" upperBound="-1"
@@ -95,7 +95,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="mask" eType="#//Mask" containment="true"
@@ -200,7 +200,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
       </eAnnotations>
     </eOperations>
   </eClassifiers>
@@ -221,7 +221,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="mask" eType="#//Mask" containment="true"
@@ -234,7 +234,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ExpressionEnforcerRecipe" abstract="true"
       eSuperTypes="#//AlphaRecipe">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="type RuntimeExpressionEvaluator wraps tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator&#xA;class RuntimeExpressionDefinition extends ExpressionDefinition {&#xA;&#x9;RuntimeExpressionEvaluator evaluator&#xA;}"/>
+      <details key="documentation" value="type RuntimeExpressionEvaluator wraps psystem.matchers.tools.refinery.interpreter.IExpressionEvaluator&#xA;class RuntimeExpressionDefinition extends ExpressionDefinition {&#xA;&#x9;RuntimeExpressionEvaluator evaluator&#xA;}"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//ExpressionDefinition"
         containment="true" resolveProxies="false">
@@ -256,7 +256,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
       </eAnnotations>
     </eOperations>
   </eClassifiers>
@@ -266,7 +266,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="unwinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -282,7 +282,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//ProjectionIndexerRecipe"
@@ -299,7 +299,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.interpreter.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="rightParentComplementaryMask"
@@ -312,7 +312,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
       </eAnnotations>
     </eOperations>
   </eClassifiers>
@@ -340,7 +340,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="SingleColumnAggregatorRecipe" eSuperTypes="#//AlphaRecipe #//RederivableNodeRecipe">
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="multisetAggregationOperator"
@@ -349,14 +349,14 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="groupByMask" lowerBound="1"
         eType="#//Mask" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="AggregationOperator" instanceTypeName="tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator&lt;?, ?, ?>"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="AggregationOperator" instanceTypeName="tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator&lt;?, ?, ?>"/>
   <eClassifiers xsi:type="ecore:EClass" name="DiscriminatorDispatcherRecipe" eSuperTypes="#//SingleParentNodeRecipe">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Node that sends tuples off to different buckets (attached as children) based on the value of a given column."/>
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminationColumnIndex"
@@ -368,7 +368,7 @@
     </eAnnotations>
     <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+        <details key="body" value="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
       </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="bucketKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
@@ -396,5 +396,5 @@
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectivity" eType="#//Connectivity"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Connectivity" instanceClassName="tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.Connectivity"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="Connectivity" instanceClassName="tools.refinery.interpreter.matchers.psystem.basicenumerables.Connectivity"/>
 </ecore:EPackage>
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore.license b/subprojects/interpreter-rete-recipes/src/main/resources/model/recipes.ecore.license
index 03d1d42b..03d1d42b 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore.license
+++ b/subprojects/interpreter-rete-recipes/src/main/resources/model/recipes.ecore.license
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel b/subprojects/interpreter-rete-recipes/src/main/resources/model/rete-recipes.genmodel
index 6b44fde6..89ff6e3a 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel
+++ b/subprojects/interpreter-rete-recipes/src/main/resources/model/rete-recipes.genmodel
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro&#xA;Copyright (c) 2023 The Refinery Authors &lt;https://refinery.tools>&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License v. 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-v20.html.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
-    modelDirectory="/tools.refinery.refinery-viatra-runtime-rete-recipes/src/main/emf-gen"
-    modelPluginID="viatra-runtime-rete-recipes" runtimeJar="true" forceOverwrite="true"
+    modelDirectory="/tools.refinery.refinery-interpreter-rete-recipes/src/main/emf-gen"
+    modelPluginID="tools.refinery.refinery-interpreter-rete-recipes" runtimeJar="true" forceOverwrite="true"
     modelName="Rete-recipes" updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
     complianceLevel="7.0" language="en" operationReflection="true">
@@ -21,7 +21,7 @@
   <foreignModel>recipes.ecore</foreignModel>
   <modelPluginVariables>org.eclipse.xtext.xbase.lib</modelPluginVariables>
   <modelPluginVariables>org.eclipse.emf.ecore.xcore.lib</modelPluginVariables>
-  <genPackages prefix="Recipes" basePackage="tools.refinery.viatra.runtime.rete" disposableProviderFactory="true"
+  <genPackages prefix="Recipes" basePackage="tools.refinery.interpreter.rete" disposableProviderFactory="true"
       ecorePackage="recipes.ecore#/">
     <genDataTypes ecoreDataType="recipes.ecore#//Index"/>
     <genDataTypes ecoreDataType="recipes.ecore#//AggregationOperator"/>
@@ -41,7 +41,7 @@
     <genClasses image="false" ecoreClass="recipes.ecore#//MultiParentNodeRecipe">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference recipes.ecore#//MultiParentNodeRecipe/parents"/>
       <genOperations ecoreOperation="recipes.ecore#//MultiParentNodeRecipe/getArity"
-          body="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
+          body="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//MonotonicityInfo">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//MonotonicityInfo/coreMask"/>
@@ -57,7 +57,7 @@
     </genClasses>
     <genClasses image="false" ecoreClass="recipes.ecore#//IndexerRecipe">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//IndexerRecipe/mask"/>
-      <genOperations ecoreOperation="recipes.ecore#//IndexerRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
+      <genOperations ecoreOperation="recipes.ecore#//IndexerRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//ProjectionIndexerRecipe"/>
     <genClasses ecoreClass="recipes.ecore#//AggregatorIndexerRecipe"/>
@@ -88,7 +88,7 @@
           body="return 2;"/>
     </genClasses>
     <genClasses image="false" ecoreClass="recipes.ecore#//FilterRecipe">
-      <genOperations ecoreOperation="recipes.ecore#//FilterRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      <genOperations ecoreOperation="recipes.ecore#//FilterRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//InequalityFilterRecipe">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InequalityFilterRecipe/subject"/>
@@ -100,7 +100,7 @@
     <genClasses ecoreClass="recipes.ecore#//TransparentRecipe"/>
     <genClasses ecoreClass="recipes.ecore#//TrimmerRecipe">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//TrimmerRecipe/mask"/>
-      <genOperations ecoreOperation="recipes.ecore#//TrimmerRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
+      <genOperations ecoreOperation="recipes.ecore#//TrimmerRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//ExpressionDefinition">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ExpressionDefinition/evaluator"/>
@@ -111,25 +111,25 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ExpressionEnforcerRecipe/cacheOutput"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//CheckRecipe">
-      <genOperations ecoreOperation="recipes.ecore#//CheckRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      <genOperations ecoreOperation="recipes.ecore#//CheckRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//EvalRecipe">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//EvalRecipe/unwinding"/>
-      <genOperations ecoreOperation="recipes.ecore#//EvalRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
+      <genOperations ecoreOperation="recipes.ecore#//EvalRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
     </genClasses>
     <genClasses image="false" ecoreClass="recipes.ecore#//IndexerBasedAggregatorRecipe">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//IndexerBasedAggregatorRecipe/parent"/>
       <genOperations ecoreOperation="recipes.ecore#//IndexerBasedAggregatorRecipe/getArity"
-          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
+          body="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//CountAggregatorRecipe"/>
     <genClasses ecoreClass="recipes.ecore#//JoinRecipe">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//JoinRecipe/rightParentComplementaryMask"/>
-      <genOperations ecoreOperation="recipes.ecore#//JoinRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
+      <genOperations ecoreOperation="recipes.ecore#//JoinRecipe/getArity" body="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.interpreter.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.interpreter.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
     </genClasses>
     <genClasses image="false" ecoreClass="recipes.ecore#//ExistenceJoinRecipe">
       <genOperations ecoreOperation="recipes.ecore#//ExistenceJoinRecipe/getArity"
-          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
+          body="&lt;%tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//SemiJoinRecipe"/>
     <genClasses ecoreClass="recipes.ecore#//AntiJoinRecipe"/>
@@ -143,17 +143,17 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//SingleColumnAggregatorRecipe/aggregableIndex"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//SingleColumnAggregatorRecipe/groupByMask"/>
       <genOperations ecoreOperation="recipes.ecore#//SingleColumnAggregatorRecipe/getArity"
-          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
+          body="&lt;%tools.refinery.interpreter.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//DiscriminatorDispatcherRecipe">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//DiscriminatorDispatcherRecipe/discriminationColumnIndex"/>
       <genOperations ecoreOperation="recipes.ecore#//DiscriminatorDispatcherRecipe/getArity"
-          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+          body="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
     </genClasses>
     <genClasses ecoreClass="recipes.ecore#//DiscriminatorBucketRecipe">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//DiscriminatorBucketRecipe/bucketKey"/>
       <genOperations ecoreOperation="recipes.ecore#//DiscriminatorBucketRecipe/getArity"
-          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+          body="&lt;%tools.refinery.interpreter.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
     </genClasses>
     <genClasses image="false" ecoreClass="recipes.ecore#//RederivableNodeRecipe">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//RederivableNodeRecipe/deleteRederiveEvaluation"/>
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license b/subprojects/interpreter-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license
index 03d1d42b..03d1d42b 100644
--- a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license
+++ b/subprojects/interpreter-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license
diff --git a/subprojects/interpreter-rete/NOTICE.md b/subprojects/interpreter-rete/NOTICE.md
new file mode 100644
index 00000000..94c1d803
--- /dev/null
+++ b/subprojects/interpreter-rete/NOTICE.md
@@ -0,0 +1,94 @@
+<!--
+  Copyright (c) 2018-2019, Zoltan Ujhelyi, IncQuery Labs Ltd.
+  Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+
+This module contains source code from the [Eclipse VIATRA&trade; project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
+
+Eclipse&reg;, VIATRA&trade; and &lsquo;Eclipse VIATRA&trade;&rsquo; are trademarks of Eclipse Foundation, Inc.
+
+To comply with the [Eclipse Foundation Trademark Usage Policy](https://www.eclipse.org/legal/logo_guidelines.php), we replaced the Eclipse VIATRA&trade; branding in this repository with the name _Refinery Interpreter_, since the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/) does not grant trademark usage rights to derived projects.
+_Refinery Interpreter_ is not endorsed or sponsored by Eclipse Foundation, Inc. or any other organizations using the Eclipse VIATRA&trade; trademark.
+
+We publish our modifications to Eclipse VIATRA&trade; for use within the Refinery framework under the name _Refinery Interpreter_. When not using _Refinery Interpreter_ directly in the Refinery framework, users are strongly encouraged to rely on [Eclipse VIATRA&trade;](https://eclipse.dev/viatra/) instead. In particular, _Refinery Interpreter_ does not provide any API stability guarantees that are provided by Eclipse VIATRA&trade;.
+
+We reproduce the [accompanying notices of Eclipse VIATRA&trade;](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+
+# Notices for Eclipse VIATRA&trade;
+
+This content is produced and maintained by the Eclipse VIATRA project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.viatra
+
+## Trademarks
+
+Eclipse VIATRA, and VIATRA are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-v20.html.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.modelobfuscator.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.examples.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra2.vpm.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR Runtime only: (3.2)
+
+* License: New BSD license
+
+Apache Commons Language Library (2.1)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License 2.0
+
+Guava (10.0.1)
+
+* License: Apache License, 2.0
+
+Guice (2.0)
+
+* License: Apache License, 2.0
+
+guice-multibindings (3.0.0)
+
+* License: Apache License, 2.0
+
+log4j (1.2.15)
+
+* License: Apache License 2.0
+
+LPG Java Runtime (lpgjavaruntime.jar) (1.1)
+
+* License: Eclipse Public License
+
+mockito (1.9.5)
+
+* License: Apache License, 2.0, New BSD license, MIT license
diff --git a/subprojects/viatra-runtime-rete/about.html b/subprojects/interpreter-rete/about.html
index d1d5593a..d1d5593a 100644
--- a/subprojects/viatra-runtime-rete/about.html
+++ b/subprojects/interpreter-rete/about.html
diff --git a/subprojects/interpreter-rete/build.gradle.kts b/subprojects/interpreter-rete/build.gradle.kts
new file mode 100644
index 00000000..978e668c
--- /dev/null
+++ b/subprojects/interpreter-rete/build.gradle.kts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.interpreter-library")
+}
+
+dependencies {
+        implementation(project(":refinery-interpreter"))
+        implementation(project(":refinery-interpreter-rete-recipes"))
+        implementation(libs.slf4j.log4j)
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/AbstractColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/AbstractColumnAggregatorNode.java
index 2588bde1..3cf3f642 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/AbstractColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/AbstractColumnAggregatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -14,22 +14,22 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.StandardIndexer;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.single.SingleInputNode;
 
 /**
  * Groups incoming tuples by the given mask, and aggregates values at a specific index in each group.
@@ -37,7 +37,7 @@ import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
  * Direct children are not supported, use via outer join indexers instead.
  * <p>
  * There are both timeless and timely implementations.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.2
  *
@@ -79,7 +79,7 @@ public abstract class AbstractColumnAggregatorNode<Domain, Accumulator, Aggregat
 
     /**
      * Creates a new column aggregator node.
-     * 
+     *
      * @param reteContainer
      *            the RETE container of the node
      * @param operator
@@ -109,7 +109,7 @@ public abstract class AbstractColumnAggregatorNode<Domain, Accumulator, Aggregat
 
     /**
      * Creates a new column aggregator node.
-     * 
+     *
      * @param reteContainer
      *            the RETE container of the node
      * @param operator
@@ -228,10 +228,10 @@ public abstract class AbstractColumnAggregatorNode<Domain, Accumulator, Aggregat
     /**
      * A special non-iterable index that retrieves the aggregated, packed result (signature+aggregate) for the original
      * signature.
-     * 
+     *
      * @author Gabor Bergmann
      * @author Tamas Szabo
-     * 
+     *
      */
     protected class AggregatorOuterIndexer extends StandardIndexer {
 
@@ -333,7 +333,7 @@ public abstract class AbstractColumnAggregatorNode<Domain, Accumulator, Aggregat
      * A special non-iterable index that checks a suspected aggregate value for a given signature. The signature for
      * this index is the original 'group by' masked tuple, with the suspected result inserted at position
      * resultPositionInSignature.
-     * 
+     *
      * @author Gabor Bergmann
      * @author Tamas Szabo
      *
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/ColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/ColumnAggregatorNode.java
index 4480aed8..b1a25807 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/ColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/ColumnAggregatorNode.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
-import tools.refinery.viatra.runtime.rete.network.RederivableNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timeless.RecursiveCommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMailbox;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.network.PosetAwareReceiver;
+import tools.refinery.interpreter.rete.network.RederivableNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timeless.RecursiveCommunicationGroup;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.PosetAwareMailbox;
 
 /**
  * Timeless implementation of the column aggregator node.
@@ -34,7 +34,7 @@ import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMai
  * The node is capable of operating in the delete and re-derive mode. In this mode, it is also possible to equip the
  * node with an {@link IPosetComparator} to identify monotone changes; thus, ensuring that a fix-point can be reached
  * during the evaluation.
- * 
+ *
  * @author Gabor Bergmann
  * @author Tamas Szabo
  * @since 1.4
@@ -70,7 +70,7 @@ public class ColumnAggregatorNode<Domain, Accumulator, AggregateResult>
 
     /**
      * Creates a new column aggregator node.
-     * 
+     *
      * @param reteContainer
      *            the RETE container of the node
      * @param operator
@@ -100,7 +100,7 @@ public class ColumnAggregatorNode<Domain, Accumulator, AggregateResult>
 
     /**
      * Creates a new column aggregator node.
-     * 
+     *
      * @param reteContainer
      *            the RETE container of the node
      * @param operator
@@ -293,7 +293,7 @@ public class ColumnAggregatorNode<Domain, Accumulator, AggregateResult>
 
     /**
      * Returns true if the accumulator was stored, false otherwise.
-     * 
+     *
      * @since 1.6
      */
     protected boolean storeIfNotNeutral(final Tuple key, final Accumulator accumulator,
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/CountNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/CountNode.java
index 7c98de0d..644bef4a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/CountNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/CountNode.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.Collection;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.rete.network.ReteContainer;
 
 /**
  * An aggregation node that simply counts the number of tuples conforming to the signature.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.4
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedMap.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/GroupedMap.java
index 3c7850de..4e4ac62d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedMap.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/GroupedMap.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * An optimized {@link Map} implementation where each key is produced by joining together a group tuple and some other
  * object (via left inheritance). Only a select few {@link Map} operations are supported. This collection is
  * unmodifiable.
- * 
+ *
  * Operations on this map assume that client queries also obey the contract that keys are constructed from a group tuple
  * and an additional object.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -117,4 +117,4 @@ public class GroupedMap<GroupedKeyType, ValueType> implements Map<Tuple, ValueTy
                 });
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedSet.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/GroupedSet.java
index 65561e53..b2700084 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedSet.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/GroupedSet.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -17,7 +17,7 @@ import java.util.function.BiFunction;
  * An optimized {@link Set} implementation where each contained value is produced by combining together a grouping value
  * and some other (key) object. The way of combining together these two values is specified by the closure passed to the
  * constructor. Only a select few {@link Set} operations are supported. This collection is unmodifiable.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -111,4 +111,4 @@ public class GroupedSet<GroupingValueType, GroupedKeyType, WholeKeyType> impleme
         throw new UnsupportedOperationException();
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/IAggregatorNode.java
index 6c286364..1d30cfce 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/IAggregatorNode.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
-import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.Indexer;
 
 /**
  * Expresses that aggregators expose specialized non-enumerable indexers for outer joining.
  * @author Gabor Bergmann
  *
  * @since 1.4
- * 
+ *
  */
 public interface IAggregatorNode {
 
@@ -23,4 +23,4 @@ public interface IAggregatorNode {
 
     Indexer getAggregatorOuterIdentityIndexer(int resultPositionInSignature);
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IndexerBasedAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/IndexerBasedAggregatorNode.java
index d9a94a82..e689c0eb 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IndexerBasedAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/IndexerBasedAggregatorNode.java
@@ -3,39 +3,39 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.aggregation;
+package tools.refinery.interpreter.rete.aggregation;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.DefaultIndexerListener;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.DefaultIndexerListener;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.index.StandardIndexer;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
  * A special node depending on a projection indexer to aggregate tuple groups with the same projection. Only propagates
  * the aggregates of non-empty groups. Use the outer indexers to circumvent.
  * <p>
- * This node cannot be used in recursive differential dataflow evaluation. 
- * 
+ * This node cannot be used in recursive differential dataflow evaluation.
+ *
  * @author Gabor Bergmann
  * @since 1.4
  */
@@ -57,7 +57,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
         this.me = this;
         mainAggregates = CollectionsFactory.createMap();
     }
-    
+
     @Override
     public void networkStructureChanged() {
         if (this.reteContainer.isTimelyEvaluation() && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
@@ -65,7 +65,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
         }
         super.networkStructureChanged();
     }
-    
+
     /**
      * @param projection
      *            the projection indexer whose tuple groups should be aggregated
@@ -73,7 +73,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
     public void initializeWith(ProjectionIndexer projection) {
         this.projection = projection;
         this.sourceWidth = projection.getMask().indices.length;
-        
+
         for (Tuple signature : projection.getSignatures()) {
             mainAggregates.put(signature, aggregateGroup(signature, projection.get(signature)));
         }
@@ -90,7 +90,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
      */
     public abstract Object aggregateGroup(Tuple signature, Collection<Tuple> group);
 
-    
+
     /**
      * Aggregates (reduces) a group of tuples, having access to the previous aggregated value (before the update) and
      * the update definition. Defaults to aggregateGroup(). Override to increase performance.
@@ -134,7 +134,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
             collector.add(packResult(aggregateEntry.getKey(), aggregateEntry.getValue()));
         }
     }
-    
+
     @Override
     public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
         // use all zero timestamps because this node cannot be used in recursive groups anyway
@@ -182,7 +182,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
         Object aggregate = mainAggregates.get(signature);
         return aggregate == null ? aggregateGroup(signature, null) : aggregate;
     }
-    
+
     @Override
     public void assignTraceInfo(TraceInfo traceInfo) {
         super.assignTraceInfo(traceInfo);
@@ -193,7 +193,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
     /**
      * A special non-iterable index that retrieves the aggregated, packed result (signature+aggregate) for the original
      * signature.
-     * 
+     *
      * @author Gabor Bergmann
      */
     class AggregatorOuterIndexer extends StandardIndexer {
@@ -224,7 +224,7 @@ public abstract class IndexerBasedAggregatorNode extends StandardNode implements
      * A special non-iterable index that checks a suspected aggregate value for a given signature. The signature for
      * this index is the original signature of the projection index, with the suspected result inserted at position
      * resultPositionInSignature.
-     * 
+     *
      * @author Gabor Bergmann
      */
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java
index 19e02f10..13cd9662 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java
@@ -6,18 +6,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
-
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.*;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+package tools.refinery.interpreter.rete.aggregation.timely;
+
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.*;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java
index cf2c2b2d..72e52f7e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
+package tools.refinery.interpreter.rete.aggregation.timely;
 
 import java.util.Collections;
 import java.util.Map;
@@ -14,20 +14,20 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.IDeltaBag;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.IDeltaBag;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
 
 /**
  * Faithful column aggregator with sequential aggregation architecture.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java
index 8fe9a4e9..89486f7d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
+package tools.refinery.interpreter.rete.aggregation.timely;
 
 import java.util.Collections;
 import java.util.Map;
@@ -14,23 +14,23 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
-import tools.refinery.viatra.runtime.rete.aggregation.AbstractColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.GroupedMap;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.timeline.Timelines;
+import tools.refinery.interpreter.rete.aggregation.AbstractColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.GroupedMap;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
 
 /**
  * Faithful timely implementation of the column aggregator node. Complete timelines (series of appearance &
@@ -40,7 +40,7 @@ import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
  * type parameter for that. <br>
  * <br>
  * This node supports recursive aggregation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -81,8 +81,8 @@ public abstract class FaithfulTimelyColumnAggregatorNode<Domain, Accumulator, Ag
     /**
      * Registers the given folding state for the specified timestamp and tuple. If there is already a state stored, the
      * two states will be merged together.
-     * 
-     * 
+     *
+     *
      */
     protected void addFoldingState(final Tuple group, final FoldingState state, final Timestamp timestamp) {
         // assert !state.delta.isEmpty();
@@ -244,4 +244,4 @@ public abstract class FaithfulTimelyColumnAggregatorNode<Domain, Accumulator, Ag
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java
index 733d2585..9f5c55eb 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
+package tools.refinery.interpreter.rete.aggregation.timely;
 
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
  * First-only column aggregator with parallel aggregation architecture.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java
index 79197aac..c90115c9 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
+package tools.refinery.interpreter.rete.aggregation.timely;
 
 import java.util.Objects;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
- * First-only column aggregator with sequential aggregation architecture. 
- * 
+ * First-only column aggregator with sequential aggregation architecture.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java
index 0c73000e..da076681 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.aggregation.timely;
+package tools.refinery.interpreter.rete.aggregation.timely;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -15,28 +15,28 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
-import tools.refinery.viatra.runtime.rete.aggregation.AbstractColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.GroupedMap;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.timeline.Timelines;
+import tools.refinery.interpreter.rete.aggregation.AbstractColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.GroupedMap;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
 
 /**
  * First-only timely implementation of the column aggregator node. Only timestamps of appearance are maintained for
- * tuples instead of complete timelines. 
+ * tuples instead of complete timelines.
  * <br><br>
  * Subclasses are responsible for implementing the aggregator architecture, and they must make use of the inner class {@link CumulativeAggregate}.
  * <br><br>
  * This node supports recursive aggregation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -119,10 +119,10 @@ public abstract class FirstOnlyTimelyColumnAggregatorNode<Domain, Accumulator, A
     }
 
     /**
-     * Returns the aggregation architecture-specific accumulator at the specified timestamp for the given group.   
+     * Returns the aggregation architecture-specific accumulator at the specified timestamp for the given group.
      */
     protected abstract Accumulator getAccumulator(final Tuple group, final Timestamp timestamp);
-    
+
     protected AggregateResult getResultRaw(final Tuple group, final Timestamp timestamp, final boolean lower) {
         final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
         if (entryMap == null) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/Disconnectable.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/Disconnectable.java
index 7bbf74ea..9e9992f8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/Disconnectable.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/Disconnectable.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.boundary;
+package tools.refinery.interpreter.rete.boundary;
 
 /**
  * For objects that connect a RETE implementation to the underlying model.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface Disconnectable {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputEnumeratorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ExternalInputEnumeratorNode.java
index 51f89b52..6ea60ac3 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputEnumeratorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ExternalInputEnumeratorNode.java
@@ -3,43 +3,43 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.boundary;
+package tools.refinery.interpreter.rete.boundary;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
-import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.matcher.ReteEngine;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.remote.Address;
 
 /**
  * An input node representing an enumerable extensional input relation and receiving external updates.
- * 
+ *
  * <p>
  * Contains those tuples that are in the extensional relation identified by the input key, and also conform to the
  * global seed (if any).
- * 
+ *
  * @author Bergmann Gabor
  *
  */
@@ -72,7 +72,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
     /**
      * Instantiates the {@link Mailbox} of this receiver. Subclasses may override this method to provide their own
      * mailbox implementation.
-     * 
+     *
      * @return the mailbox
      * @since 2.0
      */
@@ -119,7 +119,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
      */
     protected Iterable<Tuple> getTuplesInternal() {
         Iterable<Tuple> tuples = null;
-        
+
         if (context != null) { // if connected
             if (globalSeed == null) {
                 tuples = context.enumerateTuples(inputKey, TupleMask.empty(inputKey.getArity()),
@@ -129,7 +129,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
                 tuples = context.enumerateTuples(inputKey, mask, mask.transform(globalSeed));
             }
         }
-        
+
         return tuples;
     }
 
@@ -139,7 +139,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
         if (tuples != null) {
             for (final Tuple tuple : tuples) {
                 collector.add(tuple);
-            }            
+            }
         }
     }
 
@@ -149,7 +149,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
         if (tuples != null) {
             for (final Tuple tuple : tuples) {
                 collector.put(tuple, Timestamp.INSERT_AT_ZERO_TIMELINE);
-            }            
+            }
         }
     }
 
@@ -167,7 +167,7 @@ public class ExternalInputEnumeratorNode extends StandardNode
                 // just propagate the input
                 update(direction(isInsertion), update, Timestamp.ZERO);
             }
-            // if the the update method is called from within a delayed execution, 
+            // if the the update method is called from within a delayed execution,
             // the following invocation will be a no-op
             network.waitForReteTermination();
         }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputStatelessFilterNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ExternalInputStatelessFilterNode.java
index 57e06911..32054481 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputStatelessFilterNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ExternalInputStatelessFilterNode.java
@@ -3,29 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.boundary;
+package tools.refinery.interpreter.rete.boundary;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.single.FilterNode;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.rete.matcher.ReteEngine;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.single.FilterNode;
 
 /**
  * A filter node representing a (stateless, typically non-enumerable) extensional input relation.
- * 
+ *
  * <p> Contains those tuples of its parents, that (when transformed by a mask, if given) are present in the extensional relation identified by the input key.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public class ExternalInputStatelessFilterNode extends FilterNode implements Disconnectable {
-    
+
     IQueryRuntimeContext context = null;
     IInputKey inputKey;
     private InputConnector inputConnector;
@@ -36,31 +36,31 @@ public class ExternalInputStatelessFilterNode extends FilterNode implements Disc
         this.mask = mask;
         this.inputConnector = reteContainer.getNetwork().getInputConnector();
     }
-    
+
     @Override
     public boolean check(Tuple ps) {
-        if (mask != null) 
+        if (mask != null)
             ps = mask.transform(ps);
         return context.containsTuple(inputKey, ps);
     }
-    
-    
+
+
     public void connectThroughContext(ReteEngine engine, IInputKey inputKey) {
         this.inputKey = inputKey;
         setTag(inputKey);
-        
+
         final IQueryRuntimeContext context = engine.getRuntimeContext();
         if (!context.getMetaContext().isStateless(inputKey))
             throw new IllegalArgumentException(
-                    this.getClass().getSimpleName() + 
-                    " only applicable for stateless input keys; received instead " + 
+                    this.getClass().getSimpleName() +
+                    " only applicable for stateless input keys; received instead " +
                     inputKey);
-        
+
         this.context = context;
-        
+
         engine.addDisconnectable(this);
     }
-    
+
     @Override
     public void disconnect() {
         this.context = null;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/InputConnector.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/InputConnector.java
index c044850f..3aeaf9ec 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/InputConnector.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/InputConnector.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.boundary;
+package tools.refinery.interpreter.rete.boundary;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.recipes.InputFilterRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.InputRecipe;
-import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.recipes.InputFilterRecipe;
+import tools.refinery.interpreter.rete.recipes.InputRecipe;
+import tools.refinery.interpreter.rete.remote.Address;
 
 /**
  * A class responsible for connecting input nodes to the runtime context.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public final class InputConnector {
     Network network;
-    
+
     private Map<IInputKey, Map<Tuple, Address<ExternalInputEnumeratorNode>>> externalInputRoots = CollectionsFactory.createMap();
-    
+
 //    /*
 //     * arity:1 used as simple entity constraints label is the object representing the type null label means all entities
 //     * regardless of type (global supertype), if allowed
@@ -49,20 +49,20 @@ public final class InputConnector {
 //     * the type null label means all entities regardless of type if allowed (global supertype), if allowed
 //     */
 //    protected Map<Object, Address<? extends Tunnel>> binaryEdgeRoots = CollectionsFactory.getMap();
-//      
+//
 //    protected Address<? extends Tunnel> containmentRoot = null;
 //    protected Address<? extends Supplier> containmentTransitiveRoot = null;
 //    protected Address<? extends Tunnel> instantiationRoot = null;
 //    protected Address<? extends Supplier> instantiationTransitiveRoot = null;
 //    protected Address<? extends Tunnel> generalizationRoot = null;
 //    protected Address<? extends Supplier> generalizationTransitiveRoot = null;
-    
+
 
     public InputConnector(Network network) {
         super();
         this.network = network;
     }
-    
+
 
     public Network getNetwork() {
         return network;
@@ -74,7 +74,7 @@ public final class InputConnector {
      */
     public void connectInputFilter(InputFilterRecipe recipe, Node freshNode) {
         final ExternalInputStatelessFilterNode inputNode = (ExternalInputStatelessFilterNode)freshNode;
-        
+
         IInputKey inputKey = (IInputKey) recipe.getInputKey();
         inputNode.connectThroughContext(network.getEngine(), inputKey);
     }
@@ -85,23 +85,23 @@ public final class InputConnector {
      */
     public void connectInput(InputRecipe recipe, Node freshNode) {
         final ExternalInputEnumeratorNode inputNode = (ExternalInputEnumeratorNode)freshNode;
-        
+
         IInputKey inputKey = (IInputKey) recipe.getInputKey();
         Tuple seed = nopSeed(inputKey); // no preseeding as of now
         final Address<ExternalInputEnumeratorNode> freshAddress = Address.of(inputNode);
         externalInputRoots.computeIfAbsent(inputKey, k -> CollectionsFactory.createMap()).put(seed, freshAddress);
         inputNode.connectThroughContext(network.getEngine(), inputKey, seed);
-        
+
 //              final Address<Tunnel> freshAddress = Address.of((Tunnel)freshNode);
 //              if (recipe instanceof TypeInputRecipe) {
 //                      final Object typeKey = ((TypeInputRecipe) recipe).getTypeKey();
-//                      
+//
 //                      if (recipe instanceof UnaryInputRecipe) {
 //                              unaryRoots.put(typeKey, freshAddress);
 //                              new EntityFeeder(freshAddress, this, typeKey).feed();
 ////                    if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
 ////                        Collection<? extends Object> subTypes = context.enumerateDirectUnarySubtypes(typeObject);
-////            
+////
 ////                        for (Object subType : subTypes) {
 ////                            Address<? extends Tunnel> subRoot = accessUnaryRoot(subType);
 ////                            network.connectRemoteNodes(subRoot, tn, true);
@@ -120,12 +120,12 @@ public final class InputConnector {
 //                              //            }
 //                              //        }
 //                      }
-//                      
-//                      
+//
+//
 //              }
-        
+
     }
-        
+
 //    /**
 //     * fetches the entity Root node under specified label; returns null if it doesn't exist yet
 //     */
@@ -147,7 +147,7 @@ public final class InputConnector {
 //    public Collection<Address<? extends Tunnel>> getAllTernaryEdgeRoots() {
 //        return ternaryEdgeRoots.values();
 //    }
-//    
+//
 //    /**
 //     * fetches the reference Root node under specified label; returns null if it doesn't exist yet
 //     */
@@ -184,7 +184,7 @@ public final class InputConnector {
 //              return generalizationRoot;
 //      }
 
-    
+
     public Stream<Address<ExternalInputEnumeratorNode>> getAllExternalInputNodes() {
         return externalInputRoots.values().stream().flatMap(map -> map.values().stream());
     }
@@ -203,6 +203,6 @@ public final class InputConnector {
     Tuple nopSeed(IInputKey inputKey) {
         return Tuples.flatTupleOf(new Object[inputKey.getArity()]);
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ReteBoundary.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ReteBoundary.java
index fe9c795e..6be2aaea 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ReteBoundary.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/boundary/ReteBoundary.java
@@ -3,38 +3,38 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.boundary;
+package tools.refinery.interpreter.rete.boundary;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.matcher.ReteEngine;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.traceability.CompiledQuery;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
 
 /**
  * Responsible for the storage, maintenance and communication of the nodes of the network that are accessible form the
  * outside for various reasons.
  *
  * @author Gabor Bergmann
- * 
+ *
  * <p> TODO: should eventually be merged into {@link InputConnector} and deleted
  *
  */
@@ -340,9 +340,9 @@ public class ReteBoundary /*implements IPatternMatcherRuntimeContextListener*/ {
 
     /**
      * accesses the production node for specified pattern; builds pattern matcher if it doesn't exist yet
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
-    public synchronized RecipeTraceInfo accessProductionTrace(PQuery query) 
+    public synchronized RecipeTraceInfo accessProductionTrace(PQuery query)
     {
         final CompiledQuery compiled = engine.getCompiler().getCompiledForm(query);
         return compiled;
@@ -362,7 +362,7 @@ public class ReteBoundary /*implements IPatternMatcherRuntimeContextListener*/ {
     }
     /**
      * accesses the production node for specified pattern; builds pattern matcher if it doesn't exist yet
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public synchronized Address<? extends ProductionNode> accessProductionNode(PQuery query) {
         final RecipeTraceInfo productionTrace = accessProductionTrace(query);
@@ -451,11 +451,11 @@ public class ReteBoundary /*implements IPatternMatcherRuntimeContextListener*/ {
 
     // updaters for change notification
     // if the corresponding rete input isn't created yet, call is ignored
-    
+
     private static Direction direction(boolean isInsertion) {
         return isInsertion ? Direction.INSERT : Direction.DELETE;
     }
-    
+
 //    @Override
 //      public void updateUnary(boolean isInsertion, Object entity, Object typeObject) {
 //        Address<? extends Tunnel> root = inputConnector.getUnaryRoot(typeObject);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/RetePatternBuildException.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/RetePatternBuildException.java
index bd1b219e..592a343f 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/RetePatternBuildException.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/RetePatternBuildException.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction;
+package tools.refinery.interpreter.rete.construction;
 
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
 
 /**
  * A problem has occurred during the construction of the RETE net.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class RetePatternBuildException extends QueryProcessingException {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/BasicLinearLayout.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/basiclinear/BasicLinearLayout.java
index bd22e1a0..cfcc4ee0 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/BasicLinearLayout.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/basiclinear/BasicLinearLayout.java
@@ -3,49 +3,49 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction.basiclinear;
+package tools.refinery.interpreter.rete.construction.basiclinear;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
-import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlanFactory;
+import tools.refinery.interpreter.matchers.planning.helpers.BuildHelper;
+import tools.refinery.interpreter.matchers.planning.operations.PApply;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.planning.operations.PStart;
+import tools.refinery.interpreter.matchers.psystem.DeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.construction.RetePatternBuildException;
 
 /**
  * Basic layout that builds a linear RETE net based on a heuristic ordering of constraints.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class BasicLinearLayout implements IQueryPlannerStrategy {
 
     //SubPlanProcessor planProcessor = new SubPlanProcessor();
-    
+
     private IQueryBackendHintProvider hintProvider;
     private IQueryBackendContext bContext;
     /**
@@ -65,7 +65,7 @@ public class BasicLinearLayout implements IQueryPlannerStrategy {
         try {
             logger.debug(String.format(
                     "%s: patternbody build started for %s",
-                    getClass().getSimpleName(), 
+                    getClass().getSimpleName(),
                     query.getFullyQualifiedName()));
 
             // STARTING THE LINE
@@ -87,21 +87,21 @@ public class BasicLinearLayout implements IQueryPlannerStrategy {
                     }
                 }
                 // TODO integrate the check above in SubPlan / POperation??
-                
+
                 // replace incumbent plan with its child
-                plan = planFactory.createSubPlan(new PApply(pConstraint), plan);                        
+                plan = planFactory.createSubPlan(new PApply(pConstraint), plan);
             }
 
             // PROJECT TO PARAMETERS
             SubPlan finalPlan = planFactory.createSubPlan(new PProject(pSystem.getSymbolicParameterVariables()), plan);
-            
+
             // FINAL CHECK, whether all exported variables are present + all constraint satisfied
             BuildHelper.finalCheck(pSystem, finalPlan, context);
-            // TODO integrate the check above in SubPlan / POperation 
-            
+            // TODO integrate the check above in SubPlan / POperation
+
             logger.debug(String.format(
                     "%s: patternbody query plan concluded for %s as: %s",
-                    getClass().getSimpleName(), 
+                    getClass().getSimpleName(),
                     query.getFullyQualifiedName(),
                     finalPlan.toLongString()));
 
@@ -115,7 +115,7 @@ public class BasicLinearLayout implements IQueryPlannerStrategy {
 
     /**
      * Called when the constraint is not ready, but cannot be deferred further.
-     * 
+     *
      * @param plan
      * @throws RetePatternBuildException
      *             to indicate the error in detail.
@@ -131,7 +131,7 @@ public class BasicLinearLayout implements IQueryPlannerStrategy {
             raiseForeverDeferredError(constraint, plan, context);
         }
     }
-    
+
     private void raiseForeverDeferredError(Equality constraint, SubPlan plan, IQueryMetaContext context) {
         String[] args = { constraint.getWho().toString(), constraint.getWithWhom().toString() };
         String msg = "Cannot express equality of variables {1} and {2} if neither of them is deducable.";
@@ -166,6 +166,6 @@ public class BasicLinearLayout implements IQueryPlannerStrategy {
         String shortMsg = "Could not check all constraints due to undeducible variables";
         throw new RetePatternBuildException(msg, args, shortMsg, null);
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/OrderingHeuristics.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/basiclinear/OrderingHeuristics.java
index 2b4e8890..9dfb70f8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/OrderingHeuristics.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/basiclinear/OrderingHeuristics.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction.basiclinear;
+package tools.refinery.interpreter.rete.construction.basiclinear;
 
 import java.util.Comparator;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.util.OrderingCompareAgent;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.DeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.util.OrderingCompareAgent;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class OrderingHeuristics implements Comparator<PConstraint> {
     private SubPlan plan;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/CompilerHelper.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/CompilerHelper.java
index da2fb432..9df1f545 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/CompilerHelper.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/CompilerHelper.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+package tools.refinery.interpreter.rete.construction.plancompiler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,38 +21,38 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.recipes.EqualityFilterRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.IndexerBasedAggregatorRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.JoinRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.Mask;
-import tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo;
-import tools.refinery.viatra.runtime.rete.recipes.ProductionRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.RecipesFactory;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.SingleColumnAggregatorRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.TrimmerRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledSubPlan;
-import tools.refinery.viatra.runtime.rete.traceability.PlanningTrace;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
-import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+import tools.refinery.interpreter.rete.recipes.IndexerBasedAggregatorRecipe;
+import tools.refinery.interpreter.rete.recipes.MonotonicityInfo;
+import tools.refinery.interpreter.rete.recipes.ProjectionIndexerRecipe;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.helpers.TypeHelper;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.recipes.EqualityFilterRecipe;
+import tools.refinery.interpreter.rete.recipes.IndexerRecipe;
+import tools.refinery.interpreter.rete.recipes.JoinRecipe;
+import tools.refinery.interpreter.rete.recipes.Mask;
+import tools.refinery.interpreter.rete.recipes.ProductionRecipe;
+import tools.refinery.interpreter.rete.recipes.RecipesFactory;
+import tools.refinery.interpreter.rete.recipes.SingleColumnAggregatorRecipe;
+import tools.refinery.interpreter.rete.recipes.TrimmerRecipe;
+import tools.refinery.interpreter.rete.recipes.helper.RecipesHelper;
+import tools.refinery.interpreter.rete.traceability.CompiledQuery;
+import tools.refinery.interpreter.rete.traceability.CompiledSubPlan;
+import tools.refinery.interpreter.rete.traceability.PlanningTrace;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.rete.util.ReteHintOptions;
 
 /**
  * @author Bergmann Gabor
@@ -61,14 +61,14 @@ import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
 public class CompilerHelper {
 
     private CompilerHelper() {/*Utility class constructor*/}
-    
+
     static final RecipesFactory FACTORY = RecipesFactory.eINSTANCE;
 
     /**
      * Makes sure that all variables in the tuple are different so that it can be used as {@link CompiledSubPlan}. If a
      * variable occurs multiple times, equality checks are applied and then the results are trimmed so that duplicates
      * are hidden. If no manipulation is necessary, the original trace is returned.
-     * 
+     *
      * <p>
      * to be used whenever a constraint introduces new variables.
      */
@@ -114,7 +114,7 @@ public class CompilerHelper {
             // trim so that each variable occurs only once
             TrimmerRecipe trimmerRecipe = FACTORY.createTrimmerRecipe();
             trimmerRecipe.setParent(lastTrace.getRecipe());
-            trimmerRecipe.setMask(tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper
+            trimmerRecipe.setMask(RecipesHelper
                     .mask(constraintArity, trimIndices));
             return new PlanningTrace(plan, trimmedVariablesTuple, trimmerRecipe, lastTrace);
         }
@@ -213,8 +213,8 @@ public class CompilerHelper {
         }
         return computePosetInfo(keys, context);
     }
-    
-    
+
+
 
     /**
      * @since 1.6
@@ -255,21 +255,21 @@ public class CompilerHelper {
 
     /**
      * Creates a recipe for a production node and the corresponding trace.
-     * <p> PRE: in case this is a recursion cutoff point (see {@link RecursionCutoffPoint}) 
-     *  and bodyFinalTraces will be filled later, 
-     *  the object yielded now by bodyFinalTraces.values() must return up-to-date results later 
+     * <p> PRE: in case this is a recursion cutoff point (see {@link RecursionCutoffPoint})
+     *  and bodyFinalTraces will be filled later,
+     *  the object yielded now by bodyFinalTraces.values() must return up-to-date results later
      * @since 2.4
      */
     public static CompiledQuery makeQueryTrace(PQuery query, Map<PBody, RecipeTraceInfo> bodyFinalTraces,
-            Collection<ReteNodeRecipe> bodyFinalRecipes, QueryEvaluationHint hint, IQueryMetaContext context, 
+            Collection<ReteNodeRecipe> bodyFinalRecipes, QueryEvaluationHint hint, IQueryMetaContext context,
             boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyEvaluation) {
         ProductionRecipe recipe = ReteRecipeCompiler.FACTORY.createProductionRecipe();
 
         // temporary solution to support the deprecated option for now
         boolean deleteAndRederiveEvaluationDep = deleteAndRederiveEvaluation || ReteHintOptions.deleteRederiveEvaluation.getValueOrDefault(hint);
-        
+
         recipe.setDeleteRederiveEvaluation(deleteAndRederiveEvaluationDep);
-        
+
         if (deleteAndRederiveEvaluationDep || (timelyEvaluation != null)) {
             PosetTriplet triplet = computePosetInfo(query.getParameters(), context);
             if (triplet.comparator != null) {
@@ -294,9 +294,9 @@ public class CompilerHelper {
 
     /**
      * Calculated index mappings for a join, based on the common variables of the two parent subplans.
-     * 
+     *
      * @author Gabor Bergmann
-     * 
+     *
      */
     public static class JoinHelper {
         private TupleMask primaryMask;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/RecursionCutoffPoint.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/RecursionCutoffPoint.java
index 7d1e4d3a..24d001e8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/RecursionCutoffPoint.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/RecursionCutoffPoint.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+package tools.refinery.interpreter.rete.construction.plancompiler;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -14,24 +14,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.recipes.ProductionRecipe;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.recipes.ProductionRecipe;
+import tools.refinery.interpreter.rete.traceability.CompiledQuery;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
 
 /**
  * In a recursive query structure, query composition references can be cut off so that the remaining structure is DAG.
- * {@link RecursionCutoffPoint} represents one such cut off query composition. 
- * When the compilation of the recursive query finishes and the compiled form becomes available, 
+ * {@link RecursionCutoffPoint} represents one such cut off query composition.
+ * When the compilation of the recursive query finishes and the compiled form becomes available,
  *   the {@link RecursionCutoffPoint} has to be signaled to update parent traces and recipes of the recursive call.
- *  
+ *
  * @author Bergmann Gabor
- * @noreference This class is not intended to be referenced by clients 
+ * @noreference This class is not intended to be referenced by clients
  *
  */
 public class RecursionCutoffPoint {
@@ -39,7 +39,7 @@ public class RecursionCutoffPoint {
     final CompiledQuery compiledQuery;
     final ProductionRecipe recipe;
     final QueryEvaluationHint hint;
-    
+
     public RecursionCutoffPoint(PQuery query, QueryEvaluationHint hint, IQueryMetaContext context, boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyEvaluation) {
         super();
         this.hint = hint;
@@ -47,23 +47,23 @@ public class RecursionCutoffPoint {
         this.compiledQuery = CompilerHelper.makeQueryTrace(query, futureTraceMap, Collections.<ReteNodeRecipe>emptySet(), hint, context, deleteAndRederiveEvaluation, timelyEvaluation);
         this.recipe = (ProductionRecipe)compiledQuery.getRecipe();
         if (!compiledQuery.getParentRecipeTraces().isEmpty()) {
-            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has trace parents: %s", 
+            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has trace parents: %s",
                     compiledQuery.getQuery(),
                     prettyPrintParentRecipeTraces(compiledQuery.getParentRecipeTraces())));
         }
         if (!recipe.getParents().isEmpty()) {
-            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has recipe parents: %s", 
+            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has recipe parents: %s",
                     compiledQuery.getQuery(),
                     prettyPrintParentRecipeTraces(compiledQuery.getParentRecipeTraces())));
         }
     }
-    
-    
-    
+
+
+
     private String prettyPrintParentRecipeTraces(List<RecipeTraceInfo> trace) {
         return trace.stream().map(Object::toString).collect(Collectors.joining(", "));
     }
-    
+
     /**
      * Signals that compilation of the recursive query has terminated, culminating into the given compiled form.
      * The query composition that has been cut off will be connected now.
@@ -80,7 +80,7 @@ public class RecursionCutoffPoint {
     public ProductionRecipe getRecipe() {
         return recipe;
     }
-    
-    
+
+
 
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/ReteRecipeCompiler.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/ReteRecipeCompiler.java
index 5df3a971..f84eae0a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/ReteRecipeCompiler.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/plancompiler/ReteRecipeCompiler.java
@@ -7,43 +7,41 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+package tools.refinery.interpreter.rete.construction.plancompiler;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.context.IQueryCacheContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
-import tools.refinery.viatra.runtime.matchers.planning.operations.*;
-import tools.refinery.viatra.runtime.matchers.psystem.*;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.*;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper.JoinHelper;
-import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper.PosetTriplet;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.recipes.*;
-import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
-import tools.refinery.viatra.runtime.rete.traceability.*;
-import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.CommonQueryHintOptions;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.context.IQueryCacheContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.helpers.BuildHelper;
+import tools.refinery.interpreter.matchers.planning.operations.*;
+import tools.refinery.interpreter.matchers.psystem.*;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.*;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.*;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
+import tools.refinery.interpreter.matchers.psystem.rewriters.*;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.recipes.*;
+import tools.refinery.interpreter.rete.recipes.helper.RecipesHelper;
+import tools.refinery.interpreter.rete.traceability.*;
+import tools.refinery.interpreter.rete.util.ReteHintOptions;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -136,7 +134,7 @@ public class ReteRecipeCompiler {
 
     /**
      * Returns a {@link CompiledQuery} compiled from a query
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public CompiledQuery getCompiledForm(PQuery query) {
         CompiledQuery compiled = queryCompilerCache.get(query);
@@ -174,7 +172,7 @@ public class ReteRecipeCompiler {
 
     /**
      * Returns a {@link CompiledSubPlan} compiled from a query plan
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public CompiledSubPlan getCompiledForm(SubPlan plan) {
         CompiledSubPlan compiled = subPlanCompilerCache.get(plan);
@@ -187,7 +185,7 @@ public class ReteRecipeCompiler {
     }
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public SubPlan getPlan(PBody pBody) {
         // if the query is not marked as being compiled, initiate compilation
@@ -422,7 +420,7 @@ public class ReteRecipeCompiler {
         final PlanningTrace callTrace = referQuery(constraint.getReferredQuery(), plan,
                 constraint.getActualParametersTuple());
 
-        JoinHelper joinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        CompilerHelper.JoinHelper joinHelper = new CompilerHelper.JoinHelper(plan, parentCompiled, callTrace);
         final RecipeTraceInfo primaryIndexer = joinHelper.getPrimaryIndexer();
         final RecipeTraceInfo secondaryIndexer = joinHelper.getSecondaryIndexer();
 
@@ -440,7 +438,7 @@ public class ReteRecipeCompiler {
                 constraint.getActualParametersTuple());
 
         // hack: use some mask computations (+ the indexers) from a fake natural join against the called query
-        JoinHelper fakeJoinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        CompilerHelper.JoinHelper fakeJoinHelper = new CompilerHelper.JoinHelper(plan, parentCompiled, callTrace);
         final RecipeTraceInfo primaryIndexer = fakeJoinHelper.getPrimaryIndexer();
         final RecipeTraceInfo callProjectionIndexer = fakeJoinHelper.getSecondaryIndexer();
 
@@ -502,7 +500,7 @@ public class ReteRecipeCompiler {
                 constraint.getActualParametersTuple());
 
         // hack: use some mask computations (+ the indexers) from a fake natural join against the called query
-        JoinHelper fakeJoinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        CompilerHelper.JoinHelper fakeJoinHelper = new CompilerHelper.JoinHelper(plan, parentCompiled, callTrace);
         final RecipeTraceInfo primaryIndexer = fakeJoinHelper.getPrimaryIndexer();
         TupleMask callGroupMask = fakeJoinHelper.getSecondaryMask();
 
@@ -654,7 +652,7 @@ public class ReteRecipeCompiler {
         }
 
         // ELSE: ACTUAL JOIN
-        JoinHelper joinHelper = new JoinHelper(plan, leftCompiled, rightCompiled);
+        CompilerHelper.JoinHelper joinHelper = new CompilerHelper.JoinHelper(plan, leftCompiled, rightCompiled);
         return new CompiledSubPlan(plan, joinHelper.getNaturalJoinVariablesTuple(), joinHelper.getNaturalJoinRecipe(),
                 joinHelper.getPrimaryIndexer(), joinHelper.getSecondaryIndexer());
     }
@@ -720,7 +718,7 @@ public class ReteRecipeCompiler {
 
             recipe.setDeleteRederiveEvaluation(deleteAndRederiveEvaluationDep);
             if (deleteAndRederiveEvaluationDep || (this.timelyEvaluation != null)) {
-                PosetTriplet triplet = CompilerHelper.computePosetInfo(targetVariables, parentPlan.getBody(), metaContext);
+                CompilerHelper.PosetTriplet triplet = CompilerHelper.computePosetInfo(targetVariables, parentPlan.getBody(), metaContext);
 
                 if (triplet.comparator != null) {
                     MonotonicityInfo info = FACTORY.createMonotonicityInfo();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinCandidate.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/JoinCandidate.java
index 45350099..ae79b21a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinCandidate.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/JoinCandidate.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction.quasitree;
+package tools.refinery.interpreter.rete.construction.quasitree;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,32 +17,32 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PJoin;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlanFactory;
+import tools.refinery.interpreter.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.interpreter.matchers.planning.operations.PJoin;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 class JoinCandidate {
     private QueryAnalyzer analyzer;
-    
+
     SubPlan primary;
     SubPlan secondary;
-    
+
     Set<PVariable> varPrimary;
     Set<PVariable> varSecondary;
     Set<PVariable> varCommon;
-    
+
     List<PConstraint> consPrimary;
     List<PConstraint> consSecondary;
-    
+
 
     JoinCandidate(SubPlan primary, SubPlan secondary, QueryAnalyzer analyzer) {
         super();
@@ -54,15 +54,15 @@ class JoinCandidate {
         varSecondary = getSecondary().getVisibleVariables();
         varCommon = CollectionsFactory.createSet(varPrimary);
         varCommon.retainAll(varSecondary);
-        
+
         consPrimary = new ArrayList<PConstraint>(primary.getAllEnforcedConstraints());
         Collections.sort(consPrimary, TieBreaker.CONSTRAINT_COMPARATOR);
         consSecondary = new ArrayList<PConstraint>(secondary.getAllEnforcedConstraints());
         Collections.sort(consSecondary, TieBreaker.CONSTRAINT_COMPARATOR);
     }
-    
-    
-    
+
+
+
     /**
      * @return the a
      */
@@ -82,10 +82,10 @@ class JoinCandidate {
         if (isTrivial())
             return primary;
         if (isSubsumption())
-            return 
+            return
                 (consPrimary.size() > consSecondary.size()) ? primary : secondary;
-                            
-        
+
+
         // default case
         return factory.createSubPlan(new PJoin(), primary, secondary);
     }
@@ -108,7 +108,7 @@ class JoinCandidate {
     public Set<PVariable> getVarSecondary() {
         return varSecondary;
     }
-    
+
     /**
      * @return constraints of primary, sorted according to {@link TieBreaker#CONSTRAINT_COMPARATOR}.
      */
@@ -127,7 +127,7 @@ class JoinCandidate {
     public boolean isTrivial() {
         return getPrimary().equals(getSecondary());
     }
-    
+
     public boolean isSubsumption() {
         return consPrimary.containsAll(consSecondary) || consSecondary.containsAll(consPrimary);
     }
@@ -149,7 +149,7 @@ class JoinCandidate {
                     primary.getAllEnforcedConstraints().stream(),
                     secondary.getAllEnforcedConstraints().stream()
             ).collect(Collectors.toSet());
-            Map<Set<PVariable>, Set<PVariable>> dependencies = 
+            Map<Set<PVariable>, Set<PVariable>> dependencies =
                     analyzer.getFunctionalDependencies(union, false);
             // does varCommon determine either varPrimary or varSecondary?
             Set<PVariable> varCommonClosure = FunctionalDependencyHelper.closureOf(varCommon, dependencies);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinOrderingHeuristics.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/JoinOrderingHeuristics.java
index 0ea7c1d9..3278d72c 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinOrderingHeuristics.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/JoinOrderingHeuristics.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction.quasitree;
+package tools.refinery.interpreter.rete.construction.quasitree;
 
 import java.util.Comparator;
 
-import tools.refinery.viatra.runtime.rete.util.Options;
-import tools.refinery.viatra.runtime.rete.util.OrderingCompareAgent;
+import tools.refinery.interpreter.rete.util.Options;
+import tools.refinery.interpreter.rete.util.OrderingCompareAgent;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class JoinOrderingHeuristics implements Comparator<JoinCandidate> {
 
@@ -28,7 +28,7 @@ public class JoinOrderingHeuristics implements Comparator<JoinCandidate> {
                 swallowBoolean(true && consider(preferTrue(a.isTrivial(), b.isTrivial()))
                         && consider(preferTrue(a.isSubsumption(), b.isSubsumption()))
                         && consider(preferTrue(a.isCheckOnly(), b.isCheckOnly()))
-                        && consider( 
+                        && consider(
                                 Options.functionalDependencyOption == Options.FunctionalDependencyOption.OFF ?
                                 dontCare() :
                                 preferTrue(a.isHeath(), b.isHeath())
@@ -46,4 +46,4 @@ public class JoinOrderingHeuristics implements Comparator<JoinCandidate> {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/QuasiTreeLayout.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/QuasiTreeLayout.java
index 9b814376..85d1bdd8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/QuasiTreeLayout.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/QuasiTreeLayout.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.construction.quasitree;
+package tools.refinery.interpreter.rete.construction.quasitree;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,33 +16,33 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PEnumerate;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
-import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
-import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlanFactory;
+import tools.refinery.interpreter.matchers.planning.helpers.BuildHelper;
+import tools.refinery.interpreter.matchers.planning.operations.PApply;
+import tools.refinery.interpreter.matchers.planning.operations.PEnumerate;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.planning.operations.PStart;
+import tools.refinery.interpreter.matchers.psystem.DeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.rete.construction.RetePatternBuildException;
+import tools.refinery.interpreter.rete.util.ReteHintOptions;
 
 /**
  * Layout ideas: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=398763
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class QuasiTreeLayout implements IQueryPlannerStrategy {
 
@@ -88,25 +88,25 @@ public class QuasiTreeLayout implements IQueryPlannerStrategy {
             query = pSystem.getPattern();
             //this.compiler = compiler;
             //planProcessor.setCompiler(compiler);
-            
+
             hints = hintProvider.getQueryEvaluationHint(query);
         }
 
         /**
-         * @throws ViatraQueryRuntimeException
+         * @throws InterpreterRuntimeException
          */
         public SubPlan run() {
             try {
                 logger.debug(String.format(
                         "%s: patternbody build started for %s",
-                        getClass().getSimpleName(), 
+                        getClass().getSimpleName(),
                         query.getFullyQualifiedName()));
 
                 // PROCESS CONSTRAINTS
                 deferredConstraints = pSystem.getConstraintsOfType(DeferredPConstraint.class);
                 enumerableConstraints = pSystem.getConstraintsOfType(EnumerablePConstraint.class);
                 constantConstraints = pSystem.getConstraintsOfType(ConstantValue.class);
-                
+
                 for (EnumerablePConstraint enumerable : enumerableConstraints) {
                     SubPlan plan = planFactory.createSubPlan(new PEnumerate(enumerable));
                     admitSubPlan(plan);
@@ -130,14 +130,14 @@ public class QuasiTreeLayout implements IQueryPlannerStrategy {
                 // PROJECT TO PARAMETERS
                 SubPlan preFinalPlan = forefront.iterator().next();
                 SubPlan finalPlan = planFactory.createSubPlan(new PProject(pSystem.getSymbolicParameterVariables()), preFinalPlan);
-                
+
                 // FINAL CHECK, whether all exported variables are present + all constraint satisfied
                 BuildHelper.finalCheck(pSystem, finalPlan, context);
-                // TODO integrate the check above in SubPlan / POperation 
+                // TODO integrate the check above in SubPlan / POperation
 
                 logger.debug(String.format(
                         "%s: patternbody query plan concluded for %s as: %s",
-                        getClass().getSimpleName(), 
+                        getClass().getSimpleName(),
                         query.getFullyQualifiedName(),
                         finalPlan.toLongString()));
                return finalPlan;
@@ -169,7 +169,7 @@ public class QuasiTreeLayout implements IQueryPlannerStrategy {
                     if (!plan.getAllEnforcedConstraints().contains(constantConstraint) &&
                             plan.getVisibleVariables().containsAll(constantConstraint.getAffectedVariables())) {
                         plan = planFactory.createSubPlan(new PApply(constantConstraint), plan);
-                    }                    
+                    }
                 }
             }
             // are there any variables that will not be needed anymore and are worth trimming?
@@ -180,7 +180,7 @@ public class QuasiTreeLayout implements IQueryPlannerStrategy {
                 final SubPlan trimmed = BuildHelper.trimUnneccessaryVariables(
                         planFactory, plan, true, queryAnalyzer);
                 plan = trimmed;
-            }           
+            }
             // are there any checkable constraints?
             for (DeferredPConstraint deferred : deferredConstraints) {
                 if (!plan.getAllEnforcedConstraints().contains(deferred)) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/TieBreaker.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/TieBreaker.java
index 0b955922..7d015cd4 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/TieBreaker.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/construction/quasitree/TieBreaker.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.construction.quasitree;
+package tools.refinery.interpreter.rete.construction.quasitree;
 
 import java.util.Comparator;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.rete.util.LexicographicComparator;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.rete.util.LexicographicComparator;
 
 /**
  * Class providing comparators for breaking ties somewhat more deterministically.
@@ -19,12 +19,12 @@ import tools.refinery.viatra.runtime.rete.util.LexicographicComparator;
  *
  */
 public class TieBreaker {
-    
+
     private TieBreaker() {/*Utility class constructor*/}
-    
+
     public static final Comparator<PConstraint> CONSTRAINT_COMPARATOR = (arg0, arg1) -> arg0.getMonotonousID() - arg1.getMonotonousID();
-    
-    public static final Comparator<Iterable<? extends PConstraint>> CONSTRAINT_LIST_COMPARATOR = 
+
+    public static final Comparator<Iterable<? extends PConstraint>> CONSTRAINT_LIST_COMPARATOR =
             new LexicographicComparator<PConstraint>(CONSTRAINT_COMPARATOR);
 
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/AbstractEvaluatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/AbstractEvaluatorNode.java
index d32a0449..ba282fca 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/AbstractEvaluatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/AbstractEvaluatorNode.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
 import java.util.Iterator;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.single.SingleInputNode;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * @author Bergmann Gabor
  */
 public abstract class AbstractEvaluatorNode extends SingleInputNode implements IEvaluatorNode {
-    
+
     /**
      * @since 1.5
      */
@@ -35,7 +35,7 @@ public abstract class AbstractEvaluatorNode extends SingleInputNode implements I
         this.core = core;
         core.init(this);
     }
-    
+
     /**
      * @since 1.5
      */
@@ -43,7 +43,7 @@ public abstract class AbstractEvaluatorNode extends SingleInputNode implements I
     public ReteContainer getReteContainer() {
         return getContainer();
     }
-    
+
     /**
      * @since 1.5
      */
@@ -51,7 +51,7 @@ public abstract class AbstractEvaluatorNode extends SingleInputNode implements I
     public String prettyPrintTraceInfoPatternList() {
         return getTraceInfoPatternsEnumerated();
     }
-    
+
     /**
      * @since 2.4
      */
@@ -61,5 +61,5 @@ public abstract class AbstractEvaluatorNode extends SingleInputNode implements I
             propagateUpdate(direction, itr.next(), timestamp);
         }
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/EvaluatorCore.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/EvaluatorCore.java
index c45c6048..b695645e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/EvaluatorCore.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/EvaluatorCore.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -14,16 +14,16 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleValueProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleValueProvider;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 /**
  * An instance of this class performs the evaluation of Java expressions.
- * 
+ *
  * @author Bergmann Gabor
  * @author Tamas Szabo
  * @since 1.5
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/IEvaluatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/IEvaluatorNode.java
index 177433ab..129f5586 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/IEvaluatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/IEvaluatorNode.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.ReteContainer;
 
 /**
  * This interface is required for the communication between the evaluation core end the evaluator node.
@@ -20,6 +20,6 @@ public interface IEvaluatorNode {
     ReteContainer getReteContainer();
 
     String prettyPrintTraceInfoPatternList();
-    
+
 
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/MemorylessEvaluatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/MemorylessEvaluatorNode.java
index 8928645c..805272ed 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/MemorylessEvaluatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/MemorylessEvaluatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,12 +14,12 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * @author Bergmann Gabor
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/OutputCachingEvaluatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/OutputCachingEvaluatorNode.java
index 40a20c4e..653975ed 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/OutputCachingEvaluatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/OutputCachingEvaluatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -14,25 +14,25 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * An evaluator node that caches the evaluation result. This node is also capable of caching the timestamps associated
  * with the result tuples if it is used in recursive differential dataflow evaluation.
- * 
+ *
  * @author Bergmann Gabor
  * @author Tamas Szabo
  */
@@ -51,7 +51,7 @@ public class OutputCachingEvaluatorNode extends AbstractEvaluatorNode implements
     /**
      * Maps input tuples to timestamps. It is wrong to map evaluation result to timestamps because the different input
      * tuples may yield the same evaluation result. This field is null as long as this node is in a non-recursive group.
-     * 
+     *
      * @since 2.4
      */
     protected TimelyMemory<Timestamp> memory;
@@ -103,7 +103,7 @@ public class OutputCachingEvaluatorNode extends AbstractEvaluatorNode implements
                 && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
             if (this.memory == null) {
                 this.memory = new TimelyMemory<Timestamp>(reteContainer.isTimelyEvaluation() && reteContainer
-                        .getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+                        .getTimelyConfiguration().getTimelineRepresentation() == TimelyConfiguration.TimelineRepresentation.FAITHFUL);
             }
             return TIMELY;
         } else {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/RelationEvaluatorNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/RelationEvaluatorNode.java
index 68d277e8..640ac43b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/RelationEvaluatorNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/eval/RelationEvaluatorNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.eval;
+package tools.refinery.interpreter.rete.eval;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,27 +15,27 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.RelationEvaluation;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
-import tools.refinery.viatra.runtime.rete.misc.SimpleReceiver;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.AbstractUniquenessEnforcerNode;
+import tools.refinery.interpreter.rete.misc.SimpleReceiver;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.single.AbstractUniquenessEnforcerNode;
+import tools.refinery.interpreter.matchers.psystem.IRelationEvaluator;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.RelationEvaluation;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.timeline.Timelines;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.Supplier;
 
 /**
  * A node that operates in batch-style (see {@link Receiver#doesProcessUpdatesInBatch()} and evaluates arbitrary Java
  * logic represented by an {@link IRelationEvaluator} on the input relations. This is the backing computation node of a
  * {@link RelationEvaluation} constraint.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.8
  */
@@ -51,7 +51,7 @@ public class RelationEvaluatorNode extends StandardNode implements Supplier, Cle
         this.evaluator = evaluator;
         this.reteContainer.registerClearable(this);
     }
-    
+
     @Override
     public void clear() {
         this.cachedOutputs.clear();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DefaultIndexerListener.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/DefaultIndexerListener.java
index 6306a482..6ab37044 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DefaultIndexerListener.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/DefaultIndexerListener.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.lang.ref.WeakReference;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Node;
 
 public abstract class DefaultIndexerListener implements IndexerListener {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DualInputNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/DualInputNode.java
index 170ac460..c0529d8b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DualInputNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/DualInputNode.java
@@ -3,34 +3,33 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp.AllZeroMap;
-import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
-import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.util.Options;
 
 /**
  * Abstract superclass for nodes with two inputs that are matched against each other.
- * 
+ *
  * @author Gabor Bergmann
  */
 public abstract class DualInputNode extends StandardNode implements NetworkStructureChangeSensitiveNode {
@@ -50,7 +49,7 @@ public abstract class DualInputNode extends StandardNode implements NetworkStruc
 
     /**
      * @author Gabor Bergmann
-     * 
+     *
      */
     public enum Side {
         PRIMARY, SECONDARY, BOTH;
@@ -158,7 +157,7 @@ public abstract class DualInputNode extends StandardNode implements NetworkStruc
             this.reteContainer.getDelayedCommandQueue()
                     .add(new DelayedConnectCommand(this, receiver, this.reteContainer));
         }
-        
+
         // Given that connectToIndexers registers new dependencies, the networkStructureChanged() method will be called
         // by the CommunicationTracker, and the implementation of that method in turn will call refreshIndexerGroupCache() anyway.
         this.refreshIndexerGroupCache();
@@ -308,7 +307,7 @@ public abstract class DualInputNode extends StandardNode implements NetworkStruc
             if (tuples == null) {
                 return null;
             } else {
-                return new AllZeroMap<Tuple>((Set<Tuple>) tuples);
+                return new Timestamp.AllZeroMap<Tuple>((Set<Tuple>) tuples);
             }
         }
     }
@@ -320,7 +319,7 @@ public abstract class DualInputNode extends StandardNode implements NetworkStruc
 
         /**
          * Abstract handler for update event.
-         * 
+         *
          * @param side
          *            The side on which the event occurred.
          * @param direction
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ExistenceNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/ExistenceNode.java
index 275ff638..7400053d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ExistenceNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/ExistenceNode.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Propagates all substitutions arriving at the PRIMARY slot if and only if (a matching substitution on the SECONDARY is
  * present) xor (NEGATIVE).
- * 
+ *
  * The negative parameter specifies whether this node checks for existence or non-existence.
  * <p>
  * It is mandatory in differential dataflow evaluation that the secondary parent is in an upstream dependency component
  * (so that every secondary tuple comes with zero timestamp).
- * 
+ *
  * @author Gabor Bergmann
  */
 public class ExistenceNode extends DualInputNode {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/GenericProjectionIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/GenericProjectionIndexer.java
index 3de10def..db5a4f0d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/GenericProjectionIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/GenericProjectionIndexer.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * A generic Indexer capable of indexing along any valid TupleMask. Does not keep track of parents, because will not
  * ever pull parents.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class GenericProjectionIndexer extends IndexerWithMemory implements ProjectionIndexer {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IdentityIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IdentityIndexer.java
index 6c158f2c..ec98e70a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IdentityIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IdentityIndexer.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * Defines an abstract trivial indexer that identically projects the contents of some stateful node, and can therefore
  * save space. Can only exist in connection with a stateful store, and must be operated by another node (the active
  * node). Do not attach parents directly!
- * 
+ *
  * @author Gabor Bergmann
  * @noimplement Rely on the provided implementations
  * @noreference Use only via standard Node and Indexer interfaces
@@ -36,8 +36,8 @@ public abstract class IdentityIndexer extends SpecializedProjectionIndexer {
 
     protected abstract Collection<Tuple> getTuples();
 
-    public IdentityIndexer(ReteContainer reteContainer, int tupleWidth, Supplier parent, 
-            Node activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+    public IdentityIndexer(ReteContainer reteContainer, int tupleWidth, Supplier parent,
+                           Node activeNode, List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, TupleMask.identity(tupleWidth), parent, activeNode, sharedSubscriptionList);
     }
 
@@ -48,7 +48,7 @@ public abstract class IdentityIndexer extends SpecializedProjectionIndexer {
         } else
             return null;
     }
-    
+
     protected boolean contains(Tuple signature) {
         return getTuples().contains(signature);
     }
@@ -57,20 +57,20 @@ public abstract class IdentityIndexer extends SpecializedProjectionIndexer {
     public Collection<Tuple> getSignatures() {
         return getTuples();
     }
-    
+
     @Override
     public int getBucketCount() {
         return getTuples().size();
     }
-    
+
     @Override
     public Iterator<Tuple> iterator() {
         return getTuples().iterator();
     }
-    
+
     @Override
     public void propagateToListener(IndexerListener listener, Direction direction, Tuple updateElement, Timestamp timestamp) {
         listener.notifyIndexerUpdate(direction, updateElement, updateElement, true, timestamp);
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/Indexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/Indexer.java
index fc9d7781..200bdbc9 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/Indexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/Indexer.java
@@ -3,29 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * A node that indexes incoming Tuples by their signatures as specified by a TupleMask. Notifies listeners about such
  * update events through the IndexerListener.
- * 
+ *
  * Signature tuples are created by transforming the update tuples using the mask. Tuples stored with the same signature
  * are grouped together. The group or a reduction thereof is retrievable.
- * 
+ *
  * @author Gabor Bergmann
  */
 public interface Indexer extends Node {
@@ -44,7 +44,7 @@ public interface Indexer extends Node {
      *         modify!
      */
     public Collection<Tuple> get(Tuple signature);
-    
+
     /**
      * @since 2.4
      */
@@ -56,14 +56,14 @@ public interface Indexer extends Node {
      * This indexer will be updated whenever a Rete update is sent to the active node (or an equivalent time slot
      * allotted to it). The active node is typically the indexer itself, but it can be a different node such as its
      * parent.
-     * 
+     *
      * @return the active node that operates this indexer
      */
     public Node getActiveNode();
 
-    
+
     public Collection<IndexerListener> getListeners();
-    
+
     public void attachListener(IndexerListener listener);
 
     public void detachListener(IndexerListener listener);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerListener.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IndexerListener.java
index f52b6a06..b7a724ef 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerListener.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IndexerListener.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * A listener for update events concerning an Indexer.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface IndexerListener {
     /**
      * Notifies recipient that the indexer has just received an update. Contract: indexer already reflects the updated
      * state.
-     * 
+     *
      * @param direction
      *            the direction of the update.
      * @param updateElement
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerWithMemory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IndexerWithMemory.java
index a31562e9..75a72daf 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerWithMemory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IndexerWithMemory.java
@@ -3,36 +3,36 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.matchers.memories.MaskedTupleMemory;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
 
 /**
  * @author Gabor Bergmann
@@ -63,7 +63,7 @@ public abstract class IndexerWithMemory extends StandardIndexer
         final boolean isTimely = reteContainer.isTimelyEvaluation()
                 && reteContainer.getCommunicationTracker().isInRecursiveGroup(this);
         memory = MaskedTupleMemory.create(mask, MemoryType.SETS, this, isTimely, isTimely && reteContainer
-                .getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+                .getTimelyConfiguration().getTimelineRepresentation() == TimelyConfiguration.TimelineRepresentation.FAITHFUL);
         reteContainer.registerClearable(memory);
         mailbox = instantiateMailbox();
         reteContainer.registerClearable(mailbox);
@@ -89,7 +89,7 @@ public abstract class IndexerWithMemory extends StandardIndexer
         if (wasTimely != isTimely) {
             final MaskedTupleMemory<Timestamp> newMemory = MaskedTupleMemory.create(mask, MemoryType.SETS, this,
                     isTimely, isTimely && reteContainer.getTimelyConfiguration()
-                            .getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+                            .getTimelineRepresentation() == TimelyConfiguration.TimelineRepresentation.FAITHFUL);
             newMemory.initializeWith(this.memory, Timestamp.ZERO);
             memory.clear();
             memory = newMemory;
@@ -100,7 +100,7 @@ public abstract class IndexerWithMemory extends StandardIndexer
     /**
      * Instantiates the {@link Mailbox} of this receiver. Subclasses may override this method to provide their own
      * mailbox implementation.
-     * 
+     *
      * @return the mailbox
      * @since 2.0
      */
@@ -131,7 +131,7 @@ public abstract class IndexerWithMemory extends StandardIndexer
 
     /**
      * Refined version of update
-     * 
+     *
      * @since 2.4
      */
     protected abstract void update(final Direction direction, final Tuple updateElement, final Tuple signature,
@@ -281,4 +281,4 @@ public abstract class IndexerWithMemory extends StandardIndexer
 
     };
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IterableIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IterableIndexer.java
index d6f8ef05..553708a1 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IterableIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/IterableIndexer.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * An indexer that allows the iteration of all retrievable tuple groups (or reduced groups).
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface IterableIndexer extends Indexer, Iterable<Tuple> {
 
@@ -30,5 +30,5 @@ public interface IterableIndexer extends Indexer, Iterable<Tuple> {
      * @since 2.0
      */
     public int getBucketCount();
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/JoinNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/JoinNode.java
index 9a6a0de9..ab97b490 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/JoinNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/JoinNode.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class JoinNode extends DualInputNode {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryIdentityIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/MemoryIdentityIndexer.java
index 59b75c33..27bd68fe 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryIdentityIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/MemoryIdentityIndexer.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Defines a trivial indexer that identically projects the contents of a memory-equipped node, and can therefore save
  * space. Can only exist in connection with a memory, and must be operated by another node. Do not attach parents
  * directly!
- * 
+ *
  * @noimplement Rely on the provided implementations
  * @noreference Use only via standard Node and Indexer interfaces
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -42,7 +42,7 @@ public class MemoryIdentityIndexer extends IdentityIndexer {
      *            the parent node that owns the memory
      */
     public MemoryIdentityIndexer(ReteContainer reteContainer, int tupleWidth, Collection<Tuple> memory,
-            Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+                                 Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
         this.memory = memory;
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryNullIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/MemoryNullIndexer.java
index 204fe433..b6e55cca 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryNullIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/MemoryNullIndexer.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Defines a trivial indexer that projects the contents of a memory-equipped node to the empty tuple, and can therefore
  * save space. Can only exist in connection with a memory, and must be operated by another node. Do not attach parents
  * directly!
- * 
+ *
  * @author Gabor Bergmann
  * @noimplement Rely on the provided implementations
  * @noreference Use only via standard Node and Indexer interfaces
@@ -41,7 +41,7 @@ public class MemoryNullIndexer extends NullIndexer {
      *            the parent node that owns the memory
      */
     public MemoryNullIndexer(ReteContainer reteContainer, int tupleWidth, Collection<Tuple> memory,
-            Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+                             Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
         this.memory = memory;
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/NullIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/NullIndexer.java
index a875b29f..68bb8d2d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/NullIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/NullIndexer.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * Defines an abstract trivial indexer that projects the contents of some stateful node to the empty tuple, and can
  * therefore save space. Can only exist in connection with a stateful store, and must be operated by another node (the
  * active node). Do not attach parents directly!
- * 
+ *
  * @author Gabor Bergmann
  * @noimplement Rely on the provided implementations
  * @noreference Use only via standard Node and Indexer interfaces
@@ -42,7 +42,7 @@ public abstract class NullIndexer extends SpecializedProjectionIndexer {
     protected static final Collection<Tuple> emptySet = Collections.emptySet();
 
     public NullIndexer(ReteContainer reteContainer, int tupleWidth, Supplier parent, Node activeNode,
-            List<ListenerSubscription> sharedSubscriptionList) {
+                       List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, TupleMask.linear(0, tupleWidth), parent, activeNode, sharedSubscriptionList);
     }
 
@@ -85,4 +85,4 @@ public abstract class NullIndexer extends SpecializedProjectionIndexer {
         listener.notifyIndexerUpdate(direction, updateElement, nullSignature, radical, timestamp);
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/OnetimeIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/OnetimeIndexer.java
index fef84bb1..52e79130 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/OnetimeIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/OnetimeIndexer.java
@@ -3,18 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.rete.util.Options;
 
 /**
  * @author Gabor Bergmann Indexer whose lifetime last until the first get() DO NOT connect to nodes!
@@ -27,7 +28,7 @@ public class OnetimeIndexer extends GenericProjectionIndexer {
 
     @Override
     public Collection<Tuple> get(Tuple signature) {
-        if (tools.refinery.viatra.runtime.rete.util.Options.releaseOnetimeIndexers) {
+        if (Options.releaseOnetimeIndexers) {
             reteContainer.unregisterClearable(memory);
             reteContainer.unregisterNode(this);
         }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ProjectionIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/ProjectionIndexer.java
index 58e593d9..587ad3eb 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ProjectionIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/ProjectionIndexer.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 /**
  * An iterable indexer that receives updates from a node, and groups received tuples intact, i.e. it does not reduce
  * tuple groups.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface ProjectionIndexer extends IterableIndexer {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/SpecializedProjectionIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/SpecializedProjectionIndexer.java
index 9c647aa9..27ba3976 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/SpecializedProjectionIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/SpecializedProjectionIndexer.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * A specialized projection indexer that can be memory-less (relying on an external source of information).
- * 
+ *
  * <p>
  * All specialized projection indexers of a single node will share the same listener list, so that notification order is
  * maintained (see Bug 518434).
- * 
+ *
  * @author Gabor Bergmann
  * @noimplement Rely on the provided implementations
  * @noreference Use only via standard Node and Indexer interfaces
@@ -43,7 +43,7 @@ public abstract class SpecializedProjectionIndexer extends StandardIndexer imple
      * @since 1.7
      */
     public SpecializedProjectionIndexer(final ReteContainer reteContainer, final TupleMask mask, final Supplier parent,
-            final Node activeNode, final List<ListenerSubscription> subscriptions) {
+                                        final Node activeNode, final List<ListenerSubscription> subscriptions) {
         super(reteContainer, mask);
         this.parent = parent;
         this.activeNode = activeNode;
@@ -118,7 +118,7 @@ public abstract class SpecializedProjectionIndexer extends StandardIndexer imple
 
     /**
      * Infrastructure to share subscriptions between specialized indexers of the same parent node.
-     * 
+     *
      * @author Gabor Bergmann
      * @since 1.7
      */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/StandardIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/StandardIndexer.java
index 9847a8dd..36b58ac7 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/StandardIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/StandardIndexer.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.BaseNode;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.BaseNode;
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * An abstract standard implementation of the Indexer interface, providing common bookkeeping functionality.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class StandardIndexer extends BaseNode implements Indexer, NetworkStructureChangeSensitiveNode {
 
@@ -70,7 +70,7 @@ public abstract class StandardIndexer extends BaseNode implements Indexer, Netwo
         final IndexerListener proxy = this.getCommunicationTracker().proxifyIndexerListener(this, listener);
         // See Bug 518434
         // Must add to the first position, so that the later listeners are notified earlier.
-        // Thus if the beta node added as listener is also an indirect descendant of the same indexer on its opposite slot, 
+        // Thus if the beta node added as listener is also an indirect descendant of the same indexer on its opposite slot,
         // then the beta node is connected later than its ancestor's listener, therefore it will be notified earlier,
         // eliminating duplicate insertions and lost deletions that would result from fall-through update propagation
         this.originalListeners.add(0, listener);
@@ -91,7 +91,7 @@ public abstract class StandardIndexer extends BaseNode implements Indexer, Netwo
         this.proxyListeners.remove(listenerToRemove);
         this.getCommunicationTracker().unregisterDependency(this, listener.getOwner());
     }
-    
+
     @Override
     public void networkStructureChanged() {
         this.proxyListeners.clear();
@@ -114,7 +114,7 @@ public abstract class StandardIndexer extends BaseNode implements Indexer, Netwo
     protected String toStringCore() {
         return super.toStringCore() + "(" + parent + "/" + mask + ")";
     }
-    
+
     @Override
     public void assignTraceInfo(TraceInfo traceInfo) {
         super.assignTraceInfo(traceInfo);
@@ -123,5 +123,5 @@ public abstract class StandardIndexer extends BaseNode implements Indexer, Netwo
                 parent.acceptPropagatedTraceInfo(traceInfo);
     }
 
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/TransitiveClosureNodeIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/TransitiveClosureNodeIndexer.java
index 77202004..8b2a5270 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/TransitiveClosureNodeIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/TransitiveClosureNodeIndexer.java
@@ -6,28 +6,28 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.index;
+package tools.refinery.interpreter.rete.index;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
-import tools.refinery.viatra.runtime.matchers.tuple.MaskedTuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.single.TransitiveClosureNode;
+import tools.refinery.interpreter.rete.itc.alg.misc.Tuple;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.single.TransitiveClosureNode;
+import tools.refinery.interpreter.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.interpreter.matchers.tuple.MaskedTuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 // UNFINISHED, not used yet
 public class TransitiveClosureNodeIndexer extends StandardIndexer implements IterableIndexer {
     private TransitiveClosureNode tcNode;
     private IncSCCAlg<Object> tcAlg;
-    private Collection<Tuple> emptySet;
+    private Collection<tools.refinery.interpreter.matchers.tuple.Tuple> emptySet;
 
     public TransitiveClosureNodeIndexer(TupleMask mask, IncSCCAlg<Object> tcAlg, TransitiveClosureNode tcNode) {
         super(tcNode.getContainer(), mask);
@@ -38,13 +38,13 @@ public class TransitiveClosureNodeIndexer extends StandardIndexer implements Ite
     }
 
     @Override
-    public Collection<Tuple> get(Tuple signature) {
+    public Collection<tools.refinery.interpreter.matchers.tuple.Tuple> get(tools.refinery.interpreter.matchers.tuple.Tuple signature) {
         if (signature.getSize() == mask.sourceWidth) {
             if (mask.indices.length == 0) {
                 // mask ()/2
                 return getSignatures();
             } else if (mask.indices.length == 1) {
-                Set<Tuple> retSet = CollectionsFactory.createSet();
+                Set<tools.refinery.interpreter.matchers.tuple.Tuple> retSet = CollectionsFactory.createSet();
 
                 // mask (0)/2
                 if (mask.indices[0] == 0) {
@@ -67,14 +67,14 @@ public class TransitiveClosureNodeIndexer extends StandardIndexer implements Ite
                 if (mask.indices[0] == 0 && mask.indices[1] == 1) {
                     Object source = signature.get(0);
                     Object target = signature.get(1);
-                    Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
+                    tools.refinery.interpreter.matchers.tuple.Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
                     return (tcAlg.isReachable(source, target) ? Collections.singleton(singleton) : emptySet);
                 }
                 // mask (1,0)/2
                 if (mask.indices[0] == 1 && mask.indices[1] == 0) {
                     Object source = signature.get(1);
                     Object target = signature.get(0);
-                    Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
+                    tools.refinery.interpreter.matchers.tuple.Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
                     return (tcAlg.isReachable(source, target) ? Collections.singleton(singleton) : emptySet);
                 }
             }
@@ -88,19 +88,19 @@ public class TransitiveClosureNodeIndexer extends StandardIndexer implements Ite
     }
 
     @Override
-    public Collection<Tuple> getSignatures() {
+    public Collection<tools.refinery.interpreter.matchers.tuple.Tuple> getSignatures() {
         return asTupleCollection(tcAlg.getTcRelation());
     }
 
     @Override
-    public Iterator<Tuple> iterator() {
+    public Iterator<tools.refinery.interpreter.matchers.tuple.Tuple> iterator() {
         return asTupleCollection(tcAlg.getTcRelation()).iterator();
     }
 
-    private Collection<Tuple> asTupleCollection(
-            Collection<tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple<Object>> tuples) {
-        Set<Tuple> retSet = CollectionsFactory.createSet();
-        for (tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple<Object> tuple : tuples) {
+    private Collection<tools.refinery.interpreter.matchers.tuple.Tuple> asTupleCollection(
+            Collection<Tuple<Object>> tuples) {
+        Set<tools.refinery.interpreter.matchers.tuple.Tuple> retSet = CollectionsFactory.createSet();
+        for (Tuple<Object> tuple : tuples) {
             retSet.add(Tuples.staticArityFlatTupleOf(tuple.getSource(), tuple.getTarget()));
         }
         return retSet;
@@ -109,7 +109,7 @@ public class TransitiveClosureNodeIndexer extends StandardIndexer implements Ite
     /**
      * @since 2.4
      */
-    public void propagate(Direction direction, Tuple updateElement, boolean change) {
+    public void propagate(Direction direction, tools.refinery.interpreter.matchers.tuple.Tuple updateElement, boolean change) {
         propagate(direction, updateElement, new MaskedTuple(updateElement, mask), change, null);
     }
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryIdentityIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/timely/TimelyMemoryIdentityIndexer.java
index 4319ee29..962b3137 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryIdentityIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/timely/TimelyMemoryIdentityIndexer.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.index.timely;
+package tools.refinery.interpreter.rete.index.timely;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.IdentityIndexer;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.IdentityIndexer;
 
 public class TimelyMemoryIdentityIndexer extends IdentityIndexer {
 
     protected final TimelyMemory<Timestamp> memory;
 
     public TimelyMemoryIdentityIndexer(final ReteContainer reteContainer, final int tupleWidth,
-            final TimelyMemory<Timestamp> memory, final Supplier parent, final Receiver activeNode,
-            final List<ListenerSubscription> sharedSubscriptionList) {
+                                       final TimelyMemory<Timestamp> memory, final Supplier parent, final Receiver activeNode,
+                                       final List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
         this.memory = memory;
     }
@@ -42,7 +42,7 @@ public class TimelyMemoryIdentityIndexer extends IdentityIndexer {
             return null;
         }
     }
-    
+
     @Override
     protected Collection<Tuple> getTuples() {
         return this.memory.getTuplesAtInfinity();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryNullIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/timely/TimelyMemoryNullIndexer.java
index 0386b006..3ec8529b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryNullIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/index/timely/TimelyMemoryNullIndexer.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.index.timely;
+package tools.refinery.interpreter.rete.index.timely;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.NullIndexer;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.NullIndexer;
 
 public class TimelyMemoryNullIndexer extends NullIndexer {
 
     protected final TimelyMemory<Timestamp> memory;
 
     public TimelyMemoryNullIndexer(final ReteContainer reteContainer, final int tupleWidth,
-            final TimelyMemory<Timestamp> memory, final Supplier parent,
-            final Receiver activeNode, final List<ListenerSubscription> sharedSubscriptionList) {
+                                   final TimelyMemory<Timestamp> memory, final Supplier parent,
+                                   final Receiver activeNode, final List<ListenerSubscription> sharedSubscriptionList) {
         super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
         this.memory = memory;
     }
@@ -40,7 +40,7 @@ public class TimelyMemoryNullIndexer extends NullIndexer {
             return null;
         }
     }
-    
+
     @Override
     protected Collection<Tuple> getTuples() {
         return this.memory.getTuplesAtInfinity();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingAlg.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/counting/CountingAlg.java
index 199b44b1..7382498b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingAlg.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/counting/CountingAlg.java
@@ -7,22 +7,22 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.counting;
+package tools.refinery.interpreter.rete.itc.alg.counting;
 
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.DFSPathFinder;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.ITcRelation;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalWrapper;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.interpreter.rete.itc.alg.misc.DFSPathFinder;
+import tools.refinery.interpreter.rete.itc.alg.misc.IGraphPathFinder;
+import tools.refinery.interpreter.rete.itc.alg.misc.ITcRelation;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalWrapper;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphObserver;
+import tools.refinery.interpreter.rete.itc.igraph.ITcDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.ITcObserver;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
 
 /**
  * This class is the optimized implementation of the Counting algorithm.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingTcRelation.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/counting/CountingTcRelation.java
index 474c7461..790b37ef 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingTcRelation.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/counting/CountingTcRelation.java
@@ -7,20 +7,20 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.counting;
+package tools.refinery.interpreter.rete.itc.alg.counting;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.ITcRelation;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.interpreter.rete.itc.alg.misc.ITcRelation;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.IMultiLookup.ChangeGranularity;
 
 /**
  * Transitive closure relation implementation for the Counting algorithm.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/CountingListener.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/incscc/CountingListener.java
index 7d507d82..ca5c4769 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/CountingListener.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/incscc/CountingListener.java
@@ -6,10 +6,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.alg.incscc;
+package tools.refinery.interpreter.rete.itc.alg.incscc;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.interpreter.rete.itc.igraph.ITcObserver;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * @author Tamas Szabo
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/IncSCCAlg.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/incscc/IncSCCAlg.java
index 774e55eb..6956b401 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/IncSCCAlg.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/incscc/IncSCCAlg.java
@@ -7,23 +7,23 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.incscc;
-
-import tools.refinery.viatra.runtime.matchers.algorithms.UnionFind;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.rete.itc.alg.counting.CountingAlg;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.DFSPathFinder;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.GraphHelper;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs.BFS;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCCResult;
-import tools.refinery.viatra.runtime.rete.itc.alg.util.CollectionHelper;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.rete.itc.igraph.*;
+package tools.refinery.interpreter.rete.itc.alg.incscc;
+
+import tools.refinery.interpreter.matchers.algorithms.UnionFind;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.rete.itc.alg.counting.CountingAlg;
+import tools.refinery.interpreter.rete.itc.alg.misc.DFSPathFinder;
+import tools.refinery.interpreter.rete.itc.alg.misc.GraphHelper;
+import tools.refinery.interpreter.rete.itc.alg.misc.IGraphPathFinder;
+import tools.refinery.interpreter.rete.itc.alg.misc.Tuple;
+import tools.refinery.interpreter.rete.itc.alg.misc.bfs.BFS;
+import tools.refinery.interpreter.rete.itc.alg.misc.scc.SCC;
+import tools.refinery.interpreter.rete.itc.alg.misc.scc.SCCResult;
+import tools.refinery.interpreter.rete.itc.alg.util.CollectionHelper;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.igraph.*;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/DFSPathFinder.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/DFSPathFinder.java
index 2cec33a2..ea94653e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/DFSPathFinder.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/DFSPathFinder.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
 import java.util.ArrayList;
 import java.util.Deque;
@@ -16,9 +16,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.ITcDataSource;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
 
 /**
  * A depth-first search implementation of the {@link IGraphPathFinder}.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Edge.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/Edge.java
index 862c99b3..98646340 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Edge.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/Edge.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
 public class Edge<V> {
     private V source;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/GraphHelper.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/GraphHelper.java
index b79e4d45..9d1c3bcd 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/GraphHelper.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/GraphHelper.java
@@ -6,12 +6,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -35,7 +35,7 @@ public class GraphHelper {
      * @return the subgraph associated to the given nodes
      */
     public static <V> Graph<V> getSubGraph(Collection<V> nodesInSubGraph,
-            IBiDirectionalGraphDataSource<V> graphDataSource) {
+                                           IBiDirectionalGraphDataSource<V> graphDataSource) {
         Graph<V> g = new Graph<V>();
         if (nodesInSubGraph != null) {
             for (V node : nodesInSubGraph) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/IGraphPathFinder.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/IGraphPathFinder.java
index 624f9f7d..6f1544df 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/IGraphPathFinder.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/IGraphPathFinder.java
@@ -6,12 +6,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
 import java.util.Deque;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.ITcDataSource;
 
 /**
  * The path finder provides methods for retrieving paths in a graph between a source node and one or more target nodes.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/ITcRelation.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/ITcRelation.java
index 9fd85ae1..5b0c8d98 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/ITcRelation.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/ITcRelation.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
 import java.util.Set;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Tuple.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/Tuple.java
index 84c79dcf..0a74f932 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Tuple.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/Tuple.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+package tools.refinery.interpreter.rete.itc.alg.misc;
 
 public class Tuple<V> {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/bfs/BFS.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/bfs/BFS.java
index 22ce8962..ecd164c0 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/bfs/BFS.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/bfs/BFS.java
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs;
+package tools.refinery.interpreter.rete.itc.alg.misc.bfs;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/PKAlg.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/PKAlg.java
index 892d048e..0aaf8a0d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/PKAlg.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/PKAlg.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+package tools.refinery.interpreter.rete.itc.alg.misc.scc;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,10 +15,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalWrapper;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalWrapper;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphObserver;
 
 public class PKAlg<V> implements IGraphObserver<V> {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCC.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCC.java
index de070839..da145fb1 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCC.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCC.java
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+package tools.refinery.interpreter.rete.itc.alg.misc.scc;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCProperty.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCCProperty.java
index 51ee834e..727766fe 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCProperty.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCCProperty.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+package tools.refinery.interpreter.rete.itc.alg.misc.scc;
 
 public class SCCProperty {
     private int index;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCResult.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCCResult.java
index 2e511fd6..51edcca8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCResult.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/scc/SCCResult.java
@@ -7,12 +7,12 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+package tools.refinery.interpreter.rete.itc.alg.misc.scc;
 
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
 
 public class SCCResult<V> {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/topsort/TopologicalSorting.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/topsort/TopologicalSorting.java
index 89be6804..0a4351f0 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/topsort/TopologicalSorting.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/misc/topsort/TopologicalSorting.java
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort;
+package tools.refinery.interpreter.rete.itc.alg.misc.topsort;
 
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java
index 794dabc0..4d3ad759 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+package tools.refinery.interpreter.rete.itc.alg.representative;
 
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphObserver;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeObserver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/RepresentativeObserver.java
index 6b772fa8..7844f1c7 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeObserver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/RepresentativeObserver.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+package tools.refinery.interpreter.rete.itc.alg.representative;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 public interface RepresentativeObserver {
         void tupleChanged(Object node, Object representative, Direction direction);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java
index 0463301b..44afd73e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+package tools.refinery.interpreter.rete.itc.alg.representative;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.GraphHelper;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs.BFS;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.alg.misc.GraphHelper;
+import tools.refinery.interpreter.rete.itc.alg.misc.bfs.BFS;
+import tools.refinery.interpreter.rete.itc.alg.misc.scc.SCC;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java
index 704f0235..58227c44 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+package tools.refinery.interpreter.rete.itc.alg.representative;
 
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
 
 import java.util.ArrayDeque;
 import java.util.HashSet;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/util/CollectionHelper.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/util/CollectionHelper.java
index 6655be6d..4cb227d7 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/util/CollectionHelper.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/alg/util/CollectionHelper.java
@@ -6,9 +6,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.alg.util;
+package tools.refinery.interpreter.rete.itc.alg.util;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 import java.util.Set;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/DotGenerator.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/graphimpl/DotGenerator.java
index f7f6b5ed..b0998aa9 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/DotGenerator.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/graphimpl/DotGenerator.java
@@ -6,11 +6,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.itc.graphimpl;
+package tools.refinery.interpreter.rete.itc.graphimpl;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCCResult;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.interpreter.rete.itc.alg.misc.scc.SCC;
+import tools.refinery.interpreter.rete.itc.alg.misc.scc.SCCResult;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/Graph.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/graphimpl/Graph.java
index 91604cb2..1639fef4 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/Graph.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/graphimpl/Graph.java
@@ -7,15 +7,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.graphimpl;
-
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
-import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+package tools.refinery.interpreter.rete.itc.graphimpl;
+
+import tools.refinery.interpreter.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.IGraphObserver;
+import tools.refinery.interpreter.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
 
 import java.util.List;
 import java.util.Map;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalGraphDataSource.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IBiDirectionalGraphDataSource.java
index 4fcaa71f..8119e607 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalGraphDataSource.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IBiDirectionalGraphDataSource.java
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiset;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiset;
 
 /**
  * A bi-directional graph data source supports all operations that an {@link IGraphDataSource} does, but it
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalWrapper.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IBiDirectionalWrapper.java
index c4315ca2..5e3f6430 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalWrapper.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IBiDirectionalWrapper.java
@@ -7,14 +7,14 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
 
 /**
  * This class can be used to wrap an {@link IGraphDataSource} into an {@link IBiDirectionalGraphDataSource}. This class
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphDataSource.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IGraphDataSource.java
index 9159a692..615088ed 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphDataSource.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IGraphDataSource.java
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiset;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiset;
 
 import java.util.Set;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphObserver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IGraphObserver.java
index a282216d..fb1ddcbd 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphObserver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/IGraphObserver.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
 /**
  * Interface GraphObserver is used to observ the changes in a graph; edge and node insertion/deleteion.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcDataSource.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/ITcDataSource.java
index 5ede600f..c9b086d8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcDataSource.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/ITcDataSource.java
@@ -7,11 +7,11 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
+import tools.refinery.interpreter.rete.itc.alg.misc.IGraphPathFinder;
 
 /**
  * This interface defines those methods that a transitive reachability data source should provide.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcObserver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/ITcObserver.java
index 74e0cb75..97f855ad 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcObserver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/itc/igraph/ITcObserver.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.itc.igraph;
+package tools.refinery.interpreter.rete.itc.igraph;
 
 /**
  * Interface ITcObserver is used to observe the changes in a transitive closure relation; tuple insertion/deletion.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/DRedReteBackendFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/DRedReteBackendFactory.java
index 83e86fe6..1e0352eb 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/DRedReteBackendFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/DRedReteBackendFactory.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
 
 /**
  * A {@link ReteBackendFactory} implementation that creates {@link ReteEngine}s that use delete and re-derive
  * evaluation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.2
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/HintConfigurator.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/HintConfigurator.java
index a4fa4914..8e177303 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/HintConfigurator.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/HintConfigurator.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
- * A configurable hint provider that gathers hints for queries during runtime, and delegates defaults to an external hint provider. 
- * 
+ * A configurable hint provider that gathers hints for queries during runtime, and delegates defaults to an external hint provider.
+ *
  * @author Gabor Bergmann
  * @since 1.5
  */
 class HintConfigurator implements IQueryBackendHintProvider {
-    
+
     private IQueryBackendHintProvider defaultHintProvider;
     private Map<PQuery, QueryEvaluationHint> storedHints = new HashMap<PQuery, QueryEvaluationHint>();
 
@@ -34,7 +34,7 @@ class HintConfigurator implements IQueryBackendHintProvider {
     public QueryEvaluationHint getQueryEvaluationHint(PQuery query) {
         return defaultHintProvider.getQueryEvaluationHint(query).overrideBy(storedHints.get(query));
     }
-    
+
     public void storeHint(PQuery query, QueryEvaluationHint hint) {
         QueryEvaluationHint oldHint = storedHints.get(query);
         if (oldHint == null)
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/IncrementalMatcherCapability.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/IncrementalMatcherCapability.java
index 4c64a1a1..735634de 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/IncrementalMatcherCapability.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/IncrementalMatcherCapability.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
 
 /**
  * @author Grill Balázs
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteBackendFactory.java
index 347cabc4..f84bd592 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteBackendFactory.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.rete.construction.plancompiler.ReteRecipeCompiler;
-import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.interpreter.rete.construction.plancompiler.ReteRecipeCompiler;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.rete.util.Options;
 
 public class ReteBackendFactory implements IQueryBackendFactory {
     /**
@@ -97,4 +97,4 @@ public class ReteBackendFactory implements IQueryBackendFactory {
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactoryProvider.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteBackendFactoryProvider.java
index 98775ab3..91c50c80 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactoryProvider.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteBackendFactoryProvider.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactoryProvider;
 
 /**
  * @since 2.0
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteEngine.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteEngine.java
index 9bd499f4..aa793e11 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteEngine.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/ReteEngine.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -16,26 +16,26 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.boundary.Disconnectable;
-import tools.refinery.viatra.runtime.rete.boundary.ReteBoundary;
-import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
-import tools.refinery.viatra.runtime.rete.construction.plancompiler.ReteRecipeCompiler;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.NodeProvisioner;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.rete.boundary.Disconnectable;
+import tools.refinery.interpreter.rete.boundary.ReteBoundary;
+import tools.refinery.interpreter.rete.construction.RetePatternBuildException;
+import tools.refinery.interpreter.rete.construction.plancompiler.ReteRecipeCompiler;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.NodeProvisioner;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
 
 /**
  * @author Gabor Bergmann
@@ -46,7 +46,7 @@ public class ReteEngine implements IQueryBackend {
     protected Network reteNet;
     protected final int reteThreads;
     protected ReteBoundary boundary;
-    
+
     /**
      * @since 2.2
      */
@@ -69,7 +69,7 @@ public class ReteEngine implements IQueryBackend {
     protected final boolean parallelExecutionEnabled; // TRUE if model manipulation can go on
 
     private boolean disposedOrUninitialized = true;
-    
+
     private HintConfigurator hintConfigurator;
 
     /**
@@ -82,7 +82,7 @@ public class ReteEngine implements IQueryBackend {
     public ReteEngine(IQueryBackendContext context, int reteThreads) {
         this(context, reteThreads, false, null);
     }
-    
+
     /**
      * @since 2.4
      */
@@ -98,21 +98,21 @@ public class ReteEngine implements IQueryBackend {
         initEngine();
         this.compiler = null;
     }
-    
+
     /**
      * @since 1.6
      */
     public IQueryBackendContext getBackendContext() {
         return context;
     }
-    
+
     /**
      * @since 2.2
      */
     public boolean isDeleteAndRederiveEvaluation() {
         return this.deleteAndRederiveEvaluation;
     }
-    
+
     /**
      * @since 2.4
      */
@@ -128,9 +128,9 @@ public class ReteEngine implements IQueryBackend {
         this.disconnectables = new LinkedList<Disconnectable>();
         // this.caughtExceptions = new LinkedBlockingQueue<Throwable>();
 
-        
+
         this.hintConfigurator = new HintConfigurator(context.getHintProvider());
-        
+
         this.reteNet = new Network(reteThreads, this);
         this.boundary = new ReteBoundary(this); // prerequisite: network
 
@@ -143,7 +143,7 @@ public class ReteEngine implements IQueryBackend {
 //        this.traceListener = context.subscribePatternMatcherForTraceInfluences(this);
 
     }
-    
+
     @Override
     public void flushUpdates() {
         for (ReteContainer container : this.reteNet.getContainers()) {
@@ -168,7 +168,7 @@ public class ReteEngine implements IQueryBackend {
 
         this.reteNet = null;
         this.boundary = null;
-        
+
         this.hintConfigurator = null;
 
         // this.machineListener = new MachineListener(this); // prerequisite:
@@ -207,7 +207,7 @@ public class ReteEngine implements IQueryBackend {
      * @param query
      *            the pattern to be matched.
      * @return a patternmatcher object that can match occurences of the given pattern.
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      *             if construction fails.
      */
     public synchronized RetePatternMatcher accessMatcher(final PQuery query) {
@@ -230,13 +230,13 @@ public class ReteEngine implements IQueryBackend {
             });
             matcher = matchers.get(query);
         }
-        
+
         executeDelayedCommands();
 
         return matcher;
     }
 
-    
+
     /**
      * Constructs RETE pattern matchers for a collection of patterns, if they are not available yet. Model traversal
      * during the whole construction period is coalesced (which may have an effect on performance, depending on the
@@ -245,7 +245,7 @@ public class ReteEngine implements IQueryBackend {
      * @pre: builder is set.
      * @param specifications
      *            the patterns to be matched.
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      *             if construction fails.
      */
     public synchronized void buildMatchersCoalesced(final Collection<PQuery> specifications) {
@@ -269,9 +269,9 @@ public class ReteEngine implements IQueryBackend {
                     reteNet.getStructuralChangeLock().lock();
                 try {
                     try {
-                        result = runtimeContext.coalesceTraversals(() -> { 
-                            T innerResult = payload.call(); 
-                            this.executeDelayedCommands(); 
+                        result = runtimeContext.coalesceTraversals(() -> {
+                            T innerResult = payload.call();
+                            this.executeDelayedCommands();
                             return innerResult;
                         });
                     } catch (InvocationTargetException ex) {
@@ -360,7 +360,7 @@ public class ReteEngine implements IQueryBackend {
         NodeProvisioner nodeProvisioner = reteNet.getHeadContainer().getProvisioner();
         Indexer result = nodeProvisioner.peekProjectionIndexer(production, mask);
         if (result == null) {
-            result = constructionWrapper(() -> 
+            result = constructionWrapper(() ->
                 nodeProvisioner.accessProjectionIndexerOnetime(production, mask)
             );
         }
@@ -398,7 +398,7 @@ public class ReteEngine implements IQueryBackend {
             container.executeDelayedCommands();
         }
     }
-    
+
     /**
      * Waits until the pattern matcher is in a steady state and output can be retrieved.
      */
@@ -532,12 +532,12 @@ public class ReteEngine implements IQueryBackend {
             throw new IllegalStateException("Trying to use a Rete engine that has been disposed or has not yet been initialized.");
 
     }
-    
+
     @Override
     public IQueryResultProvider getResultProvider(PQuery query)  {
         return accessMatcher(query);
     }
-    
+
     /**
      * @since 1.4
      */
@@ -557,7 +557,7 @@ public class ReteEngine implements IQueryBackend {
     public void dispose() {
         killEngine();
     }
-    
+
     @Override
     public boolean isCaching() {
         return true;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/RetePatternMatcher.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/RetePatternMatcher.java
index 5f0f1892..5d04081c 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/RetePatternMatcher.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/RetePatternMatcher.java
@@ -8,27 +8,27 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.matcher;
-
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.single.CallbackNode;
-import tools.refinery.viatra.runtime.rete.single.TransformerNode;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+package tools.refinery.interpreter.rete.matcher;
+
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.IUpdateable;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Accuracy;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.IterableIndexer;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.single.CallbackNode;
+import tools.refinery.interpreter.rete.single.TransformerNode;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyConfiguration.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/TimelyConfiguration.java
index 876ddc99..cd9e4266 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyConfiguration.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/TimelyConfiguration.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
 /**
  * Configuration of timely evaluation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -35,25 +35,25 @@ public class TimelyConfiguration {
 
     public enum AggregatorArchitecture {
         /**
-         * Aggregands are copied over from lower timestamps to higher timestamps.  
+         * Aggregands are copied over from lower timestamps to higher timestamps.
          */
         PARALLEL,
-        
+
         /**
-         * Aggregands are only present at the timestamp where they are inserted at. 
-         * Only aggregate results are pushed towards higher timestamps during folding. 
+         * Aggregands are only present at the timestamp where they are inserted at.
+         * Only aggregate results are pushed towards higher timestamps during folding.
          */
         SEQUENTIAL
     }
 
     public enum TimelineRepresentation {
         /**
-         * Only the first moment (timestamp) of appearance is maintained per tuple.  
+         * Only the first moment (timestamp) of appearance is maintained per tuple.
          */
         FIRST_ONLY,
-        
+
         /**
-         * Complete timeline (series of appearance & disappearance) is maintained per tuple.  
+         * Complete timeline (series of appearance & disappearance) is maintained per tuple.
          */
         FAITHFUL
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyReteBackendFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/TimelyReteBackendFactory.java
index 2777f169..8e9151ac 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyReteBackendFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/matcher/TimelyReteBackendFactory.java
@@ -3,36 +3,34 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.matcher;
+package tools.refinery.interpreter.rete.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.AggregatorArchitecture;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
 
 /**
  * A {@link ReteBackendFactory} implementation that creates {@link ReteEngine}s that use non-scattered timely
  * evaluation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
 public class TimelyReteBackendFactory extends ReteBackendFactory {
 
     private final TimelyConfiguration configuration;
-    
+
     public static final TimelyReteBackendFactory FIRST_ONLY_SEQUENTIAL = new TimelyReteBackendFactory(
-            new TimelyConfiguration(TimelineRepresentation.FIRST_ONLY, AggregatorArchitecture.SEQUENTIAL));
+            new TimelyConfiguration(TimelyConfiguration.TimelineRepresentation.FIRST_ONLY, TimelyConfiguration.AggregatorArchitecture.SEQUENTIAL));
     public static final TimelyReteBackendFactory FIRST_ONLY_PARALLEL = new TimelyReteBackendFactory(
-            new TimelyConfiguration(TimelineRepresentation.FIRST_ONLY, AggregatorArchitecture.PARALLEL));
+            new TimelyConfiguration(TimelyConfiguration.TimelineRepresentation.FIRST_ONLY, TimelyConfiguration.AggregatorArchitecture.PARALLEL));
     public static final TimelyReteBackendFactory FAITHFUL_SEQUENTIAL = new TimelyReteBackendFactory(
-            new TimelyConfiguration(TimelineRepresentation.FAITHFUL, AggregatorArchitecture.SEQUENTIAL));
+            new TimelyConfiguration(TimelyConfiguration.TimelineRepresentation.FAITHFUL, TimelyConfiguration.AggregatorArchitecture.SEQUENTIAL));
     public static final TimelyReteBackendFactory FAITHFUL_PARALLEL = new TimelyReteBackendFactory(
-            new TimelyConfiguration(TimelineRepresentation.FAITHFUL, AggregatorArchitecture.PARALLEL));    
-    
+            new TimelyConfiguration(TimelyConfiguration.TimelineRepresentation.FAITHFUL, TimelyConfiguration.AggregatorArchitecture.PARALLEL));
+
     public TimelyReteBackendFactory(final TimelyConfiguration configuration) {
         this.configuration = configuration;
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/Bag.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/Bag.java
index 4aef0f96..db3c7c7e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/Bag.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/Bag.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.misc;
+package tools.refinery.interpreter.rete.misc;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  *         A bag is a container that tuples can be dumped into. Does NOT propagate updates! Optimized for small contents
  *         size OR positive updates only.
  */
@@ -39,5 +39,5 @@ public class Bag extends SimpleReceiver {
         else
             contents.remove(updateElement);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/ConstantNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/ConstantNode.java
index 980d3eee..acb807ea 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/ConstantNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/ConstantNode.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.misc;
+package tools.refinery.interpreter.rete.misc;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Node that always contains a single constant Tuple
- * 
+ *
  * @author Gabor Bergmann
  */
 public class ConstantNode extends StandardNode {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DefaultDeltaMonitor.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/DefaultDeltaMonitor.java
index efba3117..ff543936 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DefaultDeltaMonitor.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/DefaultDeltaMonitor.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.misc;
+package tools.refinery.interpreter.rete.misc;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Default configuration for DeltaMonitor.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class DefaultDeltaMonitor extends DeltaMonitor<Tuple> {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DeltaMonitor.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/DeltaMonitor.java
index 82b6ecda..b32499d4 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DeltaMonitor.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/DeltaMonitor.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.misc;
+package tools.refinery.interpreter.rete.misc;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * A monitoring object that connects to the rete network as a receiver to reflect changes since an arbitrary state
  * acknowledged by the client. Match tuples are represented by a type MatchType.
- * 
+ *
  * <p>
  * <b>Usage</b>. If a new matching is found, it appears in the matchFoundEvents collection, and disappears when that
  * particular matching cannot be found anymore. If the event of finding a match has been processed by the client, it can
@@ -29,17 +29,17 @@ import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
  * matchLostEvents collection, and disappear upon finding the same matching again. "Matching lost" events can also be
  * acknowledged by removing a Tuple from the collection. If the matching is found once again, it will return to
  * matchFoundEvents.
- * 
+ *
  * <p>
  * <b>Technical notes</b>. Does NOT propagate updates!
- * 
+ *
  * By overriding statelessConvert(), results can be stored to a MatchType. MatchType must provide equals() and
  * hashCode() reflecting its contents. The default implementation (DefaultDeltaMonitor) uses Tuple as MatchType.
- * 
+ *
  * By overriding statelessFilter(), some tuples can be filtered.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class DeltaMonitor<MatchType> extends SimpleReceiver implements Clearable {
 
@@ -73,7 +73,7 @@ public abstract class DeltaMonitor<MatchType> extends SimpleReceiver implements
 
     /**
      * Override this method to provide a lightweight, stateless filter on the tuples
-     * 
+     *
      * @param tuple
      *            the occurrence that is to be filtered
      * @return true if this tuple should be monitored, false if ignored
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/SimpleReceiver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/SimpleReceiver.java
index dcf9ae78..a6413490 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/SimpleReceiver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/misc/SimpleReceiver.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.misc;
+package tools.refinery.interpreter.rete.misc;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import tools.refinery.viatra.runtime.rete.network.BaseNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.BaseNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
 
 /**
  * @author Bergmann Gabor
- * 
+ *
  */
 public abstract class SimpleReceiver extends BaseNode implements Receiver {
 
@@ -31,7 +31,7 @@ public abstract class SimpleReceiver extends BaseNode implements Receiver {
      * @since 1.6
      */
     protected final Mailbox mailbox;
-    
+
     /**
      * @param reteContainer
      */
@@ -44,7 +44,7 @@ public abstract class SimpleReceiver extends BaseNode implements Receiver {
     /**
      * Instantiates the {@link Mailbox} of this receiver.
      * Subclasses may override this method to provide their own mailbox implementation.
-     * 
+     *
      * @return the mailbox
      * @since 2.0
      */
@@ -55,12 +55,12 @@ public abstract class SimpleReceiver extends BaseNode implements Receiver {
             return new BehaviorChangingMailbox(this, this.reteContainer);
         }
     }
-    
+
     @Override
     public Mailbox getMailbox() {
         return this.mailbox;
     }
-    
+
     @Override
     public void appendParent(Supplier supplier) {
         if (parent == null)
@@ -90,14 +90,14 @@ public abstract class SimpleReceiver extends BaseNode implements Receiver {
 
     /**
      * Disconnects this node from the network. Can be called publicly.
-     * 
+     *
      * @pre: child nodes, if any, must already be disconnected.
      */
     public void disconnectFromNetwork() {
         if (parent != null)
             reteContainer.disconnect(parent, this);
     }
-    
+
     @Override
     public void assignTraceInfo(TraceInfo traceInfo) {
         super.assignTraceInfo(traceInfo);
@@ -106,4 +106,4 @@ public abstract class SimpleReceiver extends BaseNode implements Receiver {
                 parent.acceptPropagatedTraceInfo(traceInfo);
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/BaseNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/BaseNode.java
index 2469d6bd..37022db6 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/BaseNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/BaseNode.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
-import tools.refinery.viatra.runtime.rete.traceability.PatternTraceInfo;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.traceability.PatternTraceInfo;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
 
 /**
  * Base implementation for a Rete node.
- * 
+ *
  * @author Bergmann Gabor
- * 
+ *
  */
 public abstract class BaseNode implements Node {
 
@@ -74,23 +74,23 @@ public abstract class BaseNode implements Node {
     public void setTag(Object tag) {
         this.tag = tag;
     }
-        
+
     @Override
     public Set<TraceInfo> getTraceInfos() {
         return Collections.unmodifiableSet(traceInfos);
     }
-    
+
     @Override
     public void assignTraceInfo(TraceInfo traceInfo) {
         traceInfos.add(traceInfo);
         traceInfo.assignNode(this);
     }
-    
+
     @Override
     public void acceptPropagatedTraceInfo(TraceInfo traceInfo) {
         assignTraceInfo(traceInfo);
     }
-    
+
     /**
      * Descendants should use this in e.g. logging
      */
@@ -105,4 +105,4 @@ public abstract class BaseNode implements Node {
         return patternNames.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ConnectionFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ConnectionFactory.java
index bd4d9bf2..c69757b6 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ConnectionFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ConnectionFactory.java
@@ -7,19 +7,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
-
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.aggregation.IndexerBasedAggregatorNode;
-import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
-import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
-import tools.refinery.viatra.runtime.rete.index.DualInputNode;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.recipes.*;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+package tools.refinery.interpreter.rete.network;
+
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.rete.aggregation.IndexerBasedAggregatorNode;
+import tools.refinery.interpreter.rete.boundary.InputConnector;
+import tools.refinery.interpreter.rete.eval.RelationEvaluatorNode;
+import tools.refinery.interpreter.rete.index.DualInputNode;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.IterableIndexer;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.recipes.*;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/IGroupable.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/IGroupable.java
index c22b06d8..cda84761 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/IGroupable.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/IGroupable.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
 
 /**
  * @author Gabor Bergmann
@@ -28,4 +28,4 @@ public interface IGroupable {
      */
     void setCurrentGroup(CommunicationGroup group);
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Network.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Network.java
index 61030ff2..04fd645f 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Network.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Network.java
@@ -7,17 +7,17 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
-
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
-import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
-import tools.refinery.viatra.runtime.rete.util.Options;
+package tools.refinery.interpreter.rete.network;
+
+import tools.refinery.interpreter.rete.boundary.InputConnector;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.matcher.ReteEngine;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.rete.util.Options;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NetworkStructureChangeSensitiveNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NetworkStructureChangeSensitiveNode.java
index c6ba34c4..51341424 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NetworkStructureChangeSensitiveNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NetworkStructureChangeSensitiveNode.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
 
 /**
  * {@link Node}s implementing this interface are sensitive to changes in the dependency graph maintained by the
@@ -16,7 +16,7 @@ import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTra
  * affected by changes to the dependency graph. Depending on whether this node is contained in a recursive group or not,
  * it may behave differently, and the {@link NetworkStructureChangeSensitiveNode#networkStructureChanged()} method can
  * be used to perform changes in behavior.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Node.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Node.java
index e8ab615a..e7faf374 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Node.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Node.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
 
 /**
  * A node of a rete network, should be uniquely identified by network and nodeId. NodeId can be requested by registering
  * at the Network on construction.
- * 
+ *
  * @author Gabor Bergmann
  */
 public interface Node {
@@ -40,12 +40,12 @@ public interface Node {
      * @return the tag of the node
      */
     Object getTag();
-    
+
     /**
      * @return unmodifiable view of the list of traceability infos assigned to this node
      */
     Set<TraceInfo> getTraceInfos();
-    
+
     /**
      * assigns new traceability info to this node
      */
@@ -54,7 +54,7 @@ public interface Node {
      * accepts traceability info propagated to this node
      */
     void acceptPropagatedTraceInfo(TraceInfo traceInfo);
-    
+
     default CommunicationTracker getCommunicationTracker() {
         return getContainer().getCommunicationTracker();
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NodeFactory.java
index 3e4ea4e0..301b757d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NodeFactory.java
@@ -7,42 +7,42 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EMap;
-import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
-import tools.refinery.viatra.runtime.rete.itc.alg.representative.StronglyConnectedComponentAlgorithm;
-import tools.refinery.viatra.runtime.rete.itc.alg.representative.WeaklyConnectedComponentAlgorithm;
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.rete.aggregation.ColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.CountNode;
-import tools.refinery.viatra.runtime.rete.aggregation.IAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FirstOnlyParallelTimelyColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.aggregation.timely.FirstOnlySequentialTimelyColumnAggregatorNode;
-import tools.refinery.viatra.runtime.rete.boundary.ExternalInputEnumeratorNode;
-import tools.refinery.viatra.runtime.rete.boundary.ExternalInputStatelessFilterNode;
-import tools.refinery.viatra.runtime.rete.eval.EvaluatorCore;
-import tools.refinery.viatra.runtime.rete.eval.MemorylessEvaluatorNode;
-import tools.refinery.viatra.runtime.rete.eval.OutputCachingEvaluatorNode;
-import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
-import tools.refinery.viatra.runtime.rete.index.ExistenceNode;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.JoinNode;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.AggregatorArchitecture;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.misc.ConstantNode;
-import tools.refinery.viatra.runtime.rete.recipes.*;
-import tools.refinery.viatra.runtime.rete.single.*;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.psystem.IRelationEvaluator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.rete.aggregation.ColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.CountNode;
+import tools.refinery.interpreter.rete.aggregation.IAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.timely.FirstOnlyParallelTimelyColumnAggregatorNode;
+import tools.refinery.interpreter.rete.aggregation.timely.FirstOnlySequentialTimelyColumnAggregatorNode;
+import tools.refinery.interpreter.rete.boundary.ExternalInputEnumeratorNode;
+import tools.refinery.interpreter.rete.boundary.ExternalInputStatelessFilterNode;
+import tools.refinery.interpreter.rete.eval.EvaluatorCore;
+import tools.refinery.interpreter.rete.eval.MemorylessEvaluatorNode;
+import tools.refinery.interpreter.rete.eval.OutputCachingEvaluatorNode;
+import tools.refinery.interpreter.rete.eval.RelationEvaluatorNode;
+import tools.refinery.interpreter.rete.index.ExistenceNode;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.JoinNode;
+import tools.refinery.interpreter.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
+import tools.refinery.interpreter.rete.itc.alg.representative.StronglyConnectedComponentAlgorithm;
+import tools.refinery.interpreter.rete.itc.alg.representative.WeaklyConnectedComponentAlgorithm;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration.AggregatorArchitecture;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.interpreter.rete.misc.ConstantNode;
+import tools.refinery.interpreter.rete.recipes.*;
+import tools.refinery.interpreter.rete.single.*;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
 
 import java.util.HashMap;
 import java.util.List;
@@ -66,7 +66,7 @@ class NodeFactory {
      * PRE: parent node must already be created
      */
     public Indexer createIndexer(ReteContainer reteContainer, IndexerRecipe recipe, Supplier parentNode,
-            TraceInfo... traces) {
+                                 TraceInfo... traces) {
 
         if (recipe instanceof ProjectionIndexerRecipe) {
             return parentNode.constructIndex(toMask(recipe.getMask()), traces);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeProvisioner.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NodeProvisioner.java
index 9121fc44..0a68f449 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeProvisioner.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/NodeProvisioner.java
@@ -7,29 +7,29 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
-
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
-import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.OnetimeIndexer;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
-import tools.refinery.viatra.runtime.rete.recipes.*;
-import tools.refinery.viatra.runtime.rete.recipes.helper.RecipeRecognizer;
-import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.remote.RemoteReceiver;
-import tools.refinery.viatra.runtime.rete.remote.RemoteSupplier;
-import tools.refinery.viatra.runtime.rete.traceability.ActiveNodeConflictTrace;
-import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
-import tools.refinery.viatra.runtime.rete.traceability.UserRequestTrace;
-import tools.refinery.viatra.runtime.rete.util.Options;
+package tools.refinery.interpreter.rete.network;
+
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.boundary.InputConnector;
+import tools.refinery.interpreter.rete.construction.plancompiler.CompilerHelper;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.OnetimeIndexer;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.interpreter.rete.recipes.*;
+import tools.refinery.interpreter.rete.recipes.helper.RecipeRecognizer;
+import tools.refinery.interpreter.rete.recipes.helper.RecipesHelper;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.remote.RemoteReceiver;
+import tools.refinery.interpreter.rete.remote.RemoteSupplier;
+import tools.refinery.interpreter.rete.traceability.ActiveNodeConflictTrace;
+import tools.refinery.interpreter.rete.traceability.RecipeTraceInfo;
+import tools.refinery.interpreter.rete.traceability.UserRequestTrace;
+import tools.refinery.interpreter.rete.util.Options;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/PosetAwareReceiver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/PosetAwareReceiver.java
index 1eaa18e7..7904eca5 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/PosetAwareReceiver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/PosetAwareReceiver.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * @author Tamas Szabo
@@ -20,20 +20,20 @@ import tools.refinery.viatra.runtime.matchers.util.Direction;
 public interface PosetAwareReceiver extends Receiver {
 
     public TupleMask getCoreMask();
-    
+
     public TupleMask getPosetMask();
-    
+
     public IPosetComparator getPosetComparator();
-    
+
     /**
-     * Updates the receiver with a newly found or lost partial matching also providing information 
-     * whether the update is a monotone change or not. 
-     * 
+     * Updates the receiver with a newly found or lost partial matching also providing information
+     * whether the update is a monotone change or not.
+     *
      * @param direction the direction of the update
-     * @param update the update tuple 
+     * @param update the update tuple
      * @param monotone true if the update is monotone, false otherwise
      * @since 2.4
      */
     public void updateWithPosetInfo(Direction direction, Tuple update, boolean monotone);
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ProductionNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ProductionNode.java
index 211194c0..2a167078 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ProductionNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ProductionNode.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Interface intended for nodes containing complete matches.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Receiver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Receiver.java
index 3dc9aad7..e033ebe5 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Receiver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Receiver.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 /**
  * ALL METHODS: FOR INTERNAL USE ONLY; ONLY INVOKE FROM {@link ReteContainer}
- * 
+ *
  * @author Gabor Bergmann
  * @noimplement This interface is not intended to be implemented by external clients.
  */
@@ -28,7 +28,7 @@ public interface Receiver extends Node {
 
     /**
      * Updates the receiver with a newly found or lost partial matching.
-     * 
+     *
      * @since 2.4
      */
     public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp);
@@ -38,7 +38,7 @@ public interface Receiver extends Node {
      * form (t, c) where t is an update tuple and c is the count. The count can also be negative, and it specifies how
      * many times the tuple t gets deleted or inserted. The default implementation of this method simply calls
      * {@link #update(Direction, Tuple, Timestamp)} individually for all updates.
-     * 
+     *
      * @since 2.8
      */
     public default void batchUpdate(final Collection<Map.Entry<Tuple, Integer>> updates, final Timestamp timestamp) {
@@ -61,7 +61,7 @@ public interface Receiver extends Node {
 
     /**
      * Returns the {@link Mailbox} of this receiver.
-     * 
+     *
      * @return the mailbox
      * @since 2.0
      */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/RederivableNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/RederivableNode.java
index cae78d37..6b7ba504 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/RederivableNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/RederivableNode.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 /**
- * A rederivable node can potentially re-derive tuples after the Rete network has finished the delivery of messages.  
- * 
+ * A rederivable node can potentially re-derive tuples after the Rete network has finished the delivery of messages.
+ *
  * @author Tamas Szabo
  * @since 1.6
  */
 public interface RederivableNode extends Node, IGroupable {
 
     /**
-     * The method is called by the {@link ReteContainer} to re-derive tuples after the normal messages have been 
-     * delivered and consumed. The re-derivation process may trigger the creation and delivery of further messages 
-     * and further re-derivation rounds.  
+     * The method is called by the {@link ReteContainer} to re-derive tuples after the normal messages have been
+     * delivered and consumed. The re-derivation process may trigger the creation and delivery of further messages
+     * and further re-derivation rounds.
      */
     public void rederiveOne();
-    
+
     /**
-     * Returns true if this node actually runs in DRed mode (not necessarily). 
-     * 
+     * Returns true if this node actually runs in DRed mode (not necessarily).
+     *
      * @return true if the node is operating in DRed mode
      * @since 2.0
      */
     public boolean isInDRedMode();
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReinitializedNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ReinitializedNode.java
index 09bff29e..959d09fe 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReinitializedNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ReinitializedNode.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 import java.util.Collection;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReteContainer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ReteContainer.java
index d058417f..b5c91d32 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReteContainer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/ReteContainer.java
@@ -8,30 +8,30 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.CancellationToken;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timeless.TimelessCommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyCommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.delayed.DelayedCommand;
-import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
-import tools.refinery.viatra.runtime.rete.network.delayed.DelayedDisconnectCommand;
-import tools.refinery.viatra.runtime.rete.remote.Address;
-import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
-import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
-import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.interpreter.rete.boundary.InputConnector;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timeless.TimelessCommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.timely.TimelyCommunicationTracker;
+import tools.refinery.interpreter.rete.network.delayed.DelayedCommand;
+import tools.refinery.interpreter.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.interpreter.rete.network.delayed.DelayedDisconnectCommand;
+import tools.refinery.interpreter.CancellationToken;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.remote.Address;
+import tools.refinery.interpreter.rete.single.SingleInputNode;
+import tools.refinery.interpreter.rete.single.TrimmerNode;
+import tools.refinery.interpreter.rete.util.Options;
 
 import java.util.*;
 import java.util.function.Function;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/StandardNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/StandardNode.java
index 7dc7c4bc..5a9a2644 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/StandardNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/StandardNode.java
@@ -8,17 +8,17 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.index.GenericProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.index.GenericProjectionIndexer;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Supplier.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Supplier.java
index 1917a7cf..83d05646 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Supplier.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Supplier.java
@@ -3,56 +3,56 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.single.TrimmerNode;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  *         A supplier is an object that can propagate insert or revoke events towards receivers.
  */
 public interface Supplier extends Node {
 
     /**
-     * Pulls the contents of this object in this particular moment into a target collection. 
-     * 
+     * Pulls the contents of this object in this particular moment into a target collection.
+     *
      * @param flush if true, flushing of messages is allowed during the pull, otherwise flushing is not allowed
      * @since 2.3
      */
     public void pullInto(Collection<Tuple> collector, boolean flush);
-    
+
     /**
      * @since 2.4
      */
     public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush);
-    
+
     /**
-     * Returns the contents of this object in this particular moment. 
+     * Returns the contents of this object in this particular moment.
      * For memoryless nodes, this may involve a costly recomputation of contents.
-     * 
+     *
      * The result is returned as a Set, even when it has multiplicities (at the output of {@link TrimmerNode}).
-     * 
+     *
      *  <p> Intended mainly for debug purposes; therefore flushing is performed only if explicitly requested
      *  During runtime, flushing may be preferred; see {@link ReteContainer#pullContents(Supplier)}
      * @since 2.3
      */
     public Set<Tuple> getPulledContents(boolean flush);
-    
+
     default public Set<Tuple> getPulledContents() {
         return getPulledContents(true);
     }
@@ -68,8 +68,8 @@ public interface Supplier extends Node {
     void removeChild(Receiver receiver);
 
     /**
-     * Instantiates (or reuses, depending on implementation) an index according to the given mask. 
-     * 
+     * Instantiates (or reuses, depending on implementation) an index according to the given mask.
+     *
      * Intended for internal use; clients should invoke through Library instead to enable reusing.
      */
     ProjectionIndexer constructIndex(TupleMask mask, TraceInfo... traces);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Tunnel.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Tunnel.java
index f238f47b..9dcb4b6e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Tunnel.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/Tunnel.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  *         A Tunnel is an interface into which elments can be instered and from which productions can be extracted.
  */
 public interface Tunnel extends Supplier, Receiver {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/UpdateMessage.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/UpdateMessage.java
index 1334a3a9..bd64cc9d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/UpdateMessage.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/UpdateMessage.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.network;
+package tools.refinery.interpreter.rete.network;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
 
 class UpdateMessage {
     public Receiver receiver;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationGroup.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/CommunicationGroup.java
index 8cedeb11..5d9ee3b4 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationGroup.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/CommunicationGroup.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
+package tools.refinery.interpreter.rete.network.communication;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
  * A communication group represents a set of nodes in the communication graph that form a strongly connected component.
- * 
+ *
  * @author Tamas Szabo
  * @since 1.6
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationTracker.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/CommunicationTracker.java
index 9c2fbb9a..2e8eb338 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationTracker.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/CommunicationTracker.java
@@ -6,24 +6,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
-
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.aggregation.IAggregatorNode;
-import tools.refinery.viatra.runtime.rete.boundary.ExternalInputEnumeratorNode;
-import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
-import tools.refinery.viatra.runtime.rete.index.*;
-import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.rete.network.*;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyIndexerListenerProxy;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyMailboxProxy;
-import tools.refinery.viatra.runtime.rete.network.mailbox.FallThroughCapableMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.single.TransitiveClosureNode;
-import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
+package tools.refinery.interpreter.rete.network.communication;
+
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.rete.aggregation.IAggregatorNode;
+import tools.refinery.interpreter.rete.boundary.ExternalInputEnumeratorNode;
+import tools.refinery.interpreter.rete.eval.RelationEvaluatorNode;
+import tools.refinery.interpreter.rete.index.*;
+import tools.refinery.interpreter.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.interpreter.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.network.*;
+import tools.refinery.interpreter.rete.network.communication.timely.TimelyIndexerListenerProxy;
+import tools.refinery.interpreter.rete.network.communication.timely.TimelyMailboxProxy;
+import tools.refinery.interpreter.rete.network.mailbox.FallThroughCapableMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.single.TransitiveClosureNode;
+import tools.refinery.interpreter.rete.single.TrimmerNode;
 
 import java.util.*;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/MessageSelector.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/MessageSelector.java
index e1a61693..2e8978b7 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/MessageSelector.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/MessageSelector.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
+package tools.refinery.interpreter.rete.network.communication;
 
 /**
- * Subclasses of this interface represent meta data of update messages in Rete. 
- * 
+ * Subclasses of this interface represent meta data of update messages in Rete.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
 public interface MessageSelector {
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/NodeComparator.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/NodeComparator.java
index 27779352..498191d8 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/NodeComparator.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/NodeComparator.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
+package tools.refinery.interpreter.rete.network.communication;
 
 import java.util.Comparator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Node;
 
 /**
  * @since 2.4
@@ -28,5 +28,5 @@ public class NodeComparator implements Comparator<Node> {
     public int compare(final Node left, final Node right) {
         return this.nodeMap.get(left) - this.nodeMap.get(right);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/PhasedSelector.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/PhasedSelector.java
index 41cd8cd3..1739494a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/PhasedSelector.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/PhasedSelector.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
+package tools.refinery.interpreter.rete.network.communication;
 
 /**
- * A default message selector that can be used to associate phases to messages. 
- * 
+ * A default message selector that can be used to associate phases to messages.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
 public enum PhasedSelector implements MessageSelector {
-    
+
     /**
      * No special distinguishing feature
      */
     DEFAULT,
-    
+
     /**
      * Inserts and delete-insert monotone change pairs
      */
     MONOTONE,
-    
+
     /**
      * Deletes
      */
     ANTI_MONOTONE
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/Timestamp.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/Timestamp.java
index a50a63a8..dbf4c6ee 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/Timestamp.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/Timestamp.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication;
+package tools.refinery.interpreter.rete.network.communication;
 
 import java.util.AbstractMap;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.timeline.Timelines;
 
 /**
  * A timestamp associated with update messages in timely evaluation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -46,7 +46,7 @@ public class Timestamp implements Comparable<Timestamp>, MessageSelector {
             return that;
         }
     }
-    
+
     /**
      * @since 2.4
      */
@@ -81,11 +81,11 @@ public class Timestamp implements Comparable<Timestamp>, MessageSelector {
     public String toString() {
         return Integer.toString(this.value);
     }
-    
+
     /**
      * A {@link Map} implementation that associates the zero timestamp with every key. There is no suppor for
      * {@link Map#entrySet()} due to performance reasons.
-     * 
+     *
      * @author Tamas Szabo
      */
     public static final class AllZeroMap<T> extends AbstractMap<T, Timeline<Timestamp>> {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/RecursiveCommunicationGroup.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/RecursiveCommunicationGroup.java
index d8260384..3c0feb7c 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/RecursiveCommunicationGroup.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/RecursiveCommunicationGroup.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+package tools.refinery.interpreter.rete.network.communication.timeless;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -15,19 +15,19 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.RederivableNode;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.RederivableNode;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.PhasedSelector;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
  * A communication group representing either a single node where the
- * node is a monotonicity aware one or a set of nodes that form an SCC. 
- * 
+ * node is a monotonicity aware one or a set of nodes that form an SCC.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -54,7 +54,7 @@ public class RecursiveCommunicationGroup extends CommunicationGroup {
     @Override
     public void deliverMessages() {
         this.currentlyDelivering = true;
-        
+
         // ANTI-MONOTONE PHASE
         while (!this.antiMonotoneMailboxes.isEmpty() || !this.defaultMailboxes.isEmpty()) {
             while (!this.antiMonotoneMailboxes.isEmpty()) {
@@ -89,7 +89,7 @@ public class RecursiveCommunicationGroup extends CommunicationGroup {
                 mailbox.deliverAll(PhasedSelector.DEFAULT);
             }
         }
-        
+
         this.currentlyDelivering = false;
     }
 
@@ -155,10 +155,10 @@ public class RecursiveCommunicationGroup extends CommunicationGroup {
         map.put(PhasedSelector.DEFAULT, defaultMailboxes);
         return Collections.unmodifiableMap(map);
     }
-    
+
     @Override
     public boolean isRecursive() {
         return true;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/SingletonCommunicationGroup.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/SingletonCommunicationGroup.java
index c51c7dbf..5b50f375 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/SingletonCommunicationGroup.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/SingletonCommunicationGroup.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+package tools.refinery.interpreter.rete.network.communication.timeless;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.PhasedSelector;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
  * A communication group containing only a single node with a single default
  * mailbox.
- * 
+ *
  * @author Tamas Szabo
  * @since 1.6
  */
 public class SingletonCommunicationGroup extends CommunicationGroup {
-    
+
     private Mailbox mailbox;
 
     /**
@@ -82,5 +82,5 @@ public class SingletonCommunicationGroup extends CommunicationGroup {
     public boolean isRecursive() {
         return false;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/TimelessCommunicationTracker.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/TimelessCommunicationTracker.java
index 1c18c1cd..77f40fc3 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/TimelessCommunicationTracker.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timeless/TimelessCommunicationTracker.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+package tools.refinery.interpreter.rete.network.communication.timeless;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.rete.index.DualInputNode;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.index.IndexerListener;
-import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.RederivableNode;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.index.DualInputNode;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.index.IndexerListener;
+import tools.refinery.interpreter.rete.index.IterableIndexer;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.RederivableNode;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
 
 /**
  * Timeless implementation of the communication tracker.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.2
  */
@@ -107,10 +107,10 @@ public class TimelessCommunicationTracker extends CommunicationTracker {
             }
         }
     }
-    
+
     @Override
     protected void postProcessGroup(final CommunicationGroup group) {
-        
+
     }
 
     /**
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/ResumableNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/ResumableNode.java
index 8097bd91..85b9809d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/ResumableNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/ResumableNode.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
-import tools.refinery.viatra.runtime.rete.network.IGroupable;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.IGroupable;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
- * {@link Node}s that implement this interface can resume folding of their states when instructed during timely evaluation. 
- * 
+ * {@link Node}s that implement this interface can resume folding of their states when instructed during timely evaluation.
+ *
  * @since 2.3
  * @author Tamas Szabo
  */
 public interface ResumableNode extends Node, IGroupable {
-    
+
     /**
      * When called, the folding of the state shall be resumed at the given timestamp. The resumable is expected to
      * do a folding step at the given timestamp only. Afterwards, folding shall be interrupted, even if there is more
@@ -32,5 +32,5 @@ public interface ResumableNode extends Node, IGroupable {
      * resumable.
      */
     public Timestamp getResumableTimestamp();
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationGroup.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyCommunicationGroup.java
index 0394d92c..e9523015 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationGroup.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyCommunicationGroup.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,19 +19,19 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
-import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.util.Options;
 
 /**
  * A timely communication group implementation. {@link TimelyMailbox}es and {@link LazyFoldingNode}s are ordered in the
  * increasing order of timestamps.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationTracker.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyCommunicationTracker.java
index 79179880..a0cdc701 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationTracker.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyCommunicationTracker.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
 import java.util.Collection;
 import java.util.List;
@@ -15,25 +15,25 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.rete.index.IndexerListener;
-import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
-import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.NodeComparator;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.single.DiscriminatorDispatcherNode;
+import tools.refinery.interpreter.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.rete.index.IndexerListener;
+import tools.refinery.interpreter.rete.index.SpecializedProjectionIndexer;
+import tools.refinery.interpreter.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
+import tools.refinery.interpreter.rete.index.StandardIndexer;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.NodeComparator;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.single.DiscriminatorDispatcherNode;
 
 /**
  * Timely (DDF) implementation of the {@link CommunicationTracker}.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyIndexerListenerProxy.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyIndexerListenerProxy.java
index e8fbf84e..07916270 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyIndexerListenerProxy.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyIndexerListenerProxy.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.rete.index.IndexerListener;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.rete.index.IndexerListener;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
- * A timely proxy for another {@link IndexerListener}, which performs some preprocessing 
- * on the differential timestamps before passing it on to the real recipient. 
+ * A timely proxy for another {@link IndexerListener}, which performs some preprocessing
+ * on the differential timestamps before passing it on to the real recipient.
  * <p>
- * These proxies are used on edges leading into {@link ProductionNode}s. Because {@link ProductionNode}s 
- * never ask back the indexer for its contents, there is no need to also apply the proxy on that direction. 
- * 
+ * These proxies are used on edges leading into {@link ProductionNode}s. Because {@link ProductionNode}s
+ * never ask back the indexer for its contents, there is no need to also apply the proxy on that direction.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -37,7 +37,7 @@ public class TimelyIndexerListenerProxy implements IndexerListener {
         this.wrapped = wrapped;
         this.preprocessor = preprocessor;
     }
-    
+
     public IndexerListener getWrappedIndexerListener() {
         return wrapped;
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyMailboxProxy.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyMailboxProxy.java
index 550bfbeb..56cec326 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyMailboxProxy.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimelyMailboxProxy.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
- * A timely proxy for another {@link Mailbox}, which performs some preprocessing 
- * on the differential timestamps before passing it on to the real recipient. 
- * 
+ * A timely proxy for another {@link Mailbox}, which performs some preprocessing
+ * on the differential timestamps before passing it on to the real recipient.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -34,7 +34,7 @@ public class TimelyMailboxProxy implements Mailbox {
         this.wrapped = wrapped;
         this.preprocessor = preprocessor;
     }
-    
+
     public Mailbox getWrappedMailbox() {
         return wrapped;
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimestampTransformation.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimestampTransformation.java
index 8929eb5c..e995f0cb 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimestampTransformation.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/communication/timely/TimestampTransformation.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.communication.timely;
+package tools.refinery.interpreter.rete.network.communication.timely;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
 
 /**
- * Values of this enum perform different kind of preprocessing on {@link Timestamp}s. 
- * This is used on edges leading in and out from {@link Node}s in recursive {@link TimelyCommunicationGroup}s. 
- * 
+ * Values of this enum perform different kind of preprocessing on {@link Timestamp}s.
+ * This is used on edges leading in and out from {@link Node}s in recursive {@link TimelyCommunicationGroup}s.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -25,7 +25,7 @@ public enum TimestampTransformation {
         public Timestamp process(final Timestamp timestamp) {
             return new Timestamp(timestamp.getValue() + 1);
         }
-        
+
         @Override
         public String toString() {
             return "INCREMENT";
@@ -36,7 +36,7 @@ public enum TimestampTransformation {
         public Timestamp process(final Timestamp timestamp) {
             return Timestamp.ZERO;
         }
-        
+
         @Override
         public String toString() {
             return "RESET";
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedCommand.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedCommand.java
index d6312671..eaf35f49 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedCommand.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedCommand.java
@@ -3,34 +3,34 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.delayed;
+package tools.refinery.interpreter.rete.network.delayed;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.Network;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.network.Network;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
 
 /**
  * Instances of this class are responsible for initializing a {@link Receiver} with the contents of a {@link Supplier}.
  * However, due to the dynamic nature of the Rete {@link Network} and to the fact that certain {@link Node}s in the
  * {@link Network} are sensitive to the shape of the {@link Network}, the commands must be delayed until the
  * construction of the {@link Network} has stabilized.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedConnectCommand.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedConnectCommand.java
index 1bfdbec6..00077f39 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedConnectCommand.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedConnectCommand.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.delayed;
+package tools.refinery.interpreter.rete.network.delayed;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
 
 public class DelayedConnectCommand extends DelayedCommand {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedDisconnectCommand.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedDisconnectCommand.java
index 5825a971..4b161388 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedDisconnectCommand.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/delayed/DelayedDisconnectCommand.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.delayed;
+package tools.refinery.interpreter.rete.network.delayed;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
 
 public class DelayedDisconnectCommand extends DelayedCommand {
 
     protected final boolean wasInSameSCC;
-    
+
     public DelayedDisconnectCommand(final Supplier supplier, final Receiver receiver, final ReteContainer container, final boolean wasInSameSCC) {
         super(supplier, receiver, Direction.DELETE, container);
         this.wasInSameSCC = wasInSameSCC;
     }
-    
+
     @Override
     protected boolean isTimestampAware() {
         return this.wasInSameSCC;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/DefaultMessageIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/DefaultMessageIndexer.java
index da9bc47e..bbc01f1a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/DefaultMessageIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/DefaultMessageIndexer.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.indexer;
+package tools.refinery.interpreter.rete.network.indexer;
 
 import java.util.Collections;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 /**
  * @author Tamas Szabo
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/GroupBasedMessageIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/GroupBasedMessageIndexer.java
index 80271252..1bbc863f 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/GroupBasedMessageIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/GroupBasedMessageIndexer.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.indexer;
+package tools.refinery.interpreter.rete.network.indexer;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 /**
  * @author Tamas Szabo
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/MessageIndexer.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/MessageIndexer.java
index 271aaa44..c7ef28a1 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/MessageIndexer.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/indexer/MessageIndexer.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.indexer;
+package tools.refinery.interpreter.rete.network.indexer;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Clearable;
 
 /**
- * A message indexer is used by {@link Mailbox}es to index their contents. 
- * 
+ * A message indexer is used by {@link Mailbox}es to index their contents.
+ *
  * @author Tamas Szabo
  * @since 2.0
  */
 public interface MessageIndexer extends Clearable {
-        
+
         public void insert(final Tuple update);
 
         public void delete(final Tuple update);
 
         public void update(final Tuple update, final int delta);
-        
+
         public boolean isEmpty();
-        
+
         public int getCount(final Tuple update);
 
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/AdaptableMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/AdaptableMailbox.java
index 99097f56..4abbe090 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/AdaptableMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/AdaptableMailbox.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox;
+package tools.refinery.interpreter.rete.network.mailbox;
 
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyMailboxProxy;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.timely.TimelyMailboxProxy;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
 
 /**
  * An adaptable mailbox can be wrapped by another mailbox to act in behalf of that. The significance of the adaptation
  * is that the adaptee will notify the {@link CommunicationTracker} about updates by promoting the adapter itself.
- * Adaptable mailboxes are used by the {@link BehaviorChangingMailbox}. 
- * 
- * Compare this with {@link TimelyMailboxProxy}. That one also wraps another mailbox in order to 
- * perform preprocessing on the messages sent to the original recipient. 
- * 
+ * Adaptable mailboxes are used by the {@link BehaviorChangingMailbox}.
+ *
+ * Compare this with {@link TimelyMailboxProxy}. That one also wraps another mailbox in order to
+ * perform preprocessing on the messages sent to the original recipient.
+ *
  * @author Tamas Szabo
  * @since 2.0
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/FallThroughCapableMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/FallThroughCapableMailbox.java
index 8797e254..14c6bc03 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/FallThroughCapableMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/FallThroughCapableMailbox.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox;
+package tools.refinery.interpreter.rete.network.mailbox;
 
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.Receiver;
 
 /**
  * A fall through capable mailbox can directly call the update method of its {@link Receiver} instead of using the
@@ -17,7 +17,7 @@ import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTra
  * otherwise it operates in the original behavior. The fall through operation is preferable whenever applicable because
  * it improves performance. The fall through flag is controlled by the {@link CommunicationTracker} based on the
  * receiver node type and network topology.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.2
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/Mailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/Mailbox.java
index 05005974..92da4735 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/Mailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/Mailbox.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox;
+package tools.refinery.interpreter.rete.network.mailbox;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.IGroupable;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.IGroupable;
+import tools.refinery.interpreter.rete.network.Receiver;
 
 /**
  * A mailbox is associated with every {@link Receiver}. Messages can be sent to a {@link Receiver} by posting them into
  * the mailbox. Different mailbox implementations may differ in the way how they deliver the posted messages.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.0
  *
@@ -29,7 +29,7 @@ public interface Mailbox extends Clearable, IGroupable {
 
     /**
      * Posts a new message to this mailbox.
-     * 
+     *
      * @param direction
      *            the direction of the update
      * @param update
@@ -41,28 +41,28 @@ public interface Mailbox extends Clearable, IGroupable {
     /**
      * Delivers all messages according to the given selector from this mailbox. The selector can also be null. In this case, no
      * special separation is expected between the messages.
-     * 
+     *
      * @param selector the message selector
      */
     public void deliverAll(final MessageSelector selector);
 
     /**
      * Returns the {@link Receiver} of this mailbox.
-     * 
+     *
      * @return the receiver
      */
     public Receiver getReceiver();
 
     /**
      * Returns the {@link CommunicationGroup} of the receiver of this mailbox.
-     * 
+     *
      * @return the communication group
      */
     public CommunicationGroup getCurrentGroup();
 
     /**
      * Sets the {@link CommunicationGroup} that the receiver of this mailbox is associated with.
-     * 
+     *
      * @param group
      *            the communication group
      */
@@ -70,7 +70,7 @@ public interface Mailbox extends Clearable, IGroupable {
 
     /**
      * Returns true if this mailbox is empty.
-     * 
+     *
      * @return
      */
     public boolean isEmpty();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/MessageIndexerFactory.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/MessageIndexerFactory.java
index 2c5255fb..faf517c3 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/MessageIndexerFactory.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/MessageIndexerFactory.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox;
+package tools.refinery.interpreter.rete.network.mailbox;
 
-import tools.refinery.viatra.runtime.rete.network.indexer.MessageIndexer;
+import tools.refinery.interpreter.rete.network.indexer.MessageIndexer;
 
 /**
  * A factory used to create message indexers for {@link Mailbox}es.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.0
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java
index 1e1ada71..31ee2842 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+package tools.refinery.interpreter.rete.network.mailbox.timeless;
 
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.indexer.MessageIndexer;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.MessageIndexerFactory;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.indexer.MessageIndexer;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.MessageIndexerFactory;
 
 /**
  * An abstract mailbox implementation that is capable of splitting update messages based on some form of monotonicity
  * (anti-monotone and monotone). The monotonicity is either defined by the less or equal operator of a poset or, it can
  * be the standard subset ordering among sets of tuples.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.0
  *
@@ -105,5 +105,5 @@ public abstract class AbstractUpdateSplittingMailbox<IndexerType extends Message
     public void setCurrentGroup(final CommunicationGroup group) {
         this.group = group;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/BehaviorChangingMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/BehaviorChangingMailbox.java
index fe822d7c..86a3f125 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/BehaviorChangingMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/BehaviorChangingMailbox.java
@@ -3,29 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
-
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timeless.TimelessCommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.FallThroughCapableMailbox;
+package tools.refinery.interpreter.rete.network.mailbox.timeless;
+
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timeless.TimelessCommunicationTracker;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.FallThroughCapableMailbox;
 
 /**
- * This mailbox changes its behavior based on the position of its {@link Receiver} in the network topology. 
+ * This mailbox changes its behavior based on the position of its {@link Receiver} in the network topology.
  * It either behaves as a {@link DefaultMailbox} or as an {@link UpdateSplittingMailbox}. The decision is made by the
  * {@link CommunicationTracker}, see {@link TimelessCommunicationTracker#postProcessNode(Node)} for more details.
- * 
+ *
  * @author Tamas Szabo
  */
 public class BehaviorChangingMailbox implements FallThroughCapableMailbox {
@@ -93,7 +93,7 @@ public class BehaviorChangingMailbox implements FallThroughCapableMailbox {
     public Receiver getReceiver() {
         return this.receiver;
     }
-    
+
     @Override
     public CommunicationGroup getCurrentGroup() {
         return this.group;
@@ -108,10 +108,10 @@ public class BehaviorChangingMailbox implements FallThroughCapableMailbox {
     public boolean isFallThrough() {
         return this.fallThrough;
     }
-    
+
     @Override
     public void setFallThrough(final boolean fallThrough) {
         this.fallThrough = fallThrough;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/DefaultMailbox.java
index baf7270f..5bb8386d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/DefaultMailbox.java
@@ -6,21 +6,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+package tools.refinery.interpreter.rete.network.mailbox.timeless;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.PhasedSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
  * Default mailbox implementation.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/PosetAwareMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/PosetAwareMailbox.java
index 50d19882..f83a77cf 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/PosetAwareMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/PosetAwareMailbox.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+package tools.refinery.interpreter.rete.network.mailbox.timeless;
 
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.indexer.GroupBasedMessageIndexer;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.PhasedSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.PosetAwareReceiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.indexer.GroupBasedMessageIndexer;
 
 /**
  * A monotonicity aware mailbox implementation. The mailbox uses an {@link IPosetComparator} to identify if a pair of
  * REVOKE - INSERT updates represent a monotone change pair. The mailbox is used by {@link PosetAwareReceiver}s.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.0
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/UpdateSplittingMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/UpdateSplittingMailbox.java
index afa155b2..8e85291f 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/UpdateSplittingMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timeless/UpdateSplittingMailbox.java
@@ -3,29 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+package tools.refinery.interpreter.rete.network.mailbox.timeless;
 
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.indexer.DefaultMessageIndexer;
-import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.PhasedSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.indexer.DefaultMessageIndexer;
+import tools.refinery.interpreter.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 /**
  * A mailbox implementation that splits updates messages according to the standard subset ordering into anti-monotonic
  * (deletions) and monotonic (insertions) updates.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.0
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timely/TimelyMailbox.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timely/TimelyMailbox.java
index bf3b8e14..09f8fb58 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timely/TimelyMailbox.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/network/mailbox/timely/TimelyMailbox.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.network.mailbox.timely;
+package tools.refinery.interpreter.rete.network.mailbox.timely;
 
 import java.util.Map;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.MessageSelector;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
 
 public class TimelyMailbox implements Mailbox {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/Address.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/Address.java
index 2fed3225..bed5bd6a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/Address.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/Address.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.remote;
+package tools.refinery.interpreter.rete.remote;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.network.ReteContainer;
 
 /**
  * Remote identifier of a node of type T.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class Address<T extends Node> {
     ReteContainer container;
@@ -35,7 +35,7 @@ public class Address<T extends Node> {
 
     /**
      * General constructor.
-     * 
+     *
      * @param container
      * @param nodeId
      */
@@ -47,7 +47,7 @@ public class Address<T extends Node> {
 
     /**
      * Local-only constructor. (use only for containers in the same VM!)
-     * 
+     *
      * @param node
      *            the node to address
      */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteReceiver.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/RemoteReceiver.java
index f7d267af..46bd7551 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteReceiver.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/RemoteReceiver.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.remote;
+package tools.refinery.interpreter.rete.remote;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.single.SingleInputNode;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * This node delivers updates to a remote recipient; no updates are propagated further in this network.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class RemoteReceiver extends SingleInputNode {
 
@@ -45,7 +45,7 @@ public class RemoteReceiver extends SingleInputNode {
     public void pullInto(Collection<Tuple> collector, boolean flush) {
         propagatePullInto(collector, flush);
     }
-    
+
     @Override
     public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
         throw new UnsupportedOperationException();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteSupplier.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/RemoteSupplier.java
index cbe4d177..759b1db5 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteSupplier.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/remote/RemoteSupplier.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.remote;
+package tools.refinery.interpreter.rete.remote;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.single.SingleInputNode;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * This node receives updates from a remote supplier; no local updates are expected.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class RemoteSupplier extends SingleInputNode {
 
@@ -45,7 +45,7 @@ public class RemoteSupplier extends SingleInputNode {
     public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
         throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
         propagateUpdate(direction, updateElement, timestamp);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/AbstractUniquenessEnforcerNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/AbstractUniquenessEnforcerNode.java
index e92ce63f..c55a294a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/AbstractUniquenessEnforcerNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/AbstractUniquenessEnforcerNode.java
@@ -3,34 +3,34 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.Tunnel;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
-import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.Tunnel;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
+import tools.refinery.interpreter.rete.util.Options;
 
 /**
  * Ensures that no identical copies get to the output. Only one replica of each pattern substitution may traverse this
  * node. There are both timeless and timely implementations.
- * 
+ *
  * @author Gabor Bergmann
  * @author Tamas Szabo
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -43,7 +43,7 @@ public abstract class AbstractUniquenessEnforcerNode extends StandardNode implem
     protected ProjectionIndexer memoryNullIndexer;
     protected ProjectionIndexer memoryIdentityIndexer;
     protected final int tupleWidth;
-    // MUST BE INSTANTIATED IN THE CONCRETE SUBCLASSES AFTER ALL FIELDS ARE SET 
+    // MUST BE INSTANTIATED IN THE CONCRETE SUBCLASSES AFTER ALL FIELDS ARE SET
     protected Mailbox mailbox;
     protected final TupleMask nullMask;
     protected final TupleMask identityMask;
@@ -64,7 +64,7 @@ public abstract class AbstractUniquenessEnforcerNode extends StandardNode implem
     public Mailbox getMailbox() {
         return this.mailbox;
     }
-    
+
     /**
      * @since 2.8
      */
@@ -135,4 +135,4 @@ public abstract class AbstractUniquenessEnforcerNode extends StandardNode implem
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/CallbackNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/CallbackNode.java
index c68036b5..f4e3ba0d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/CallbackNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/CallbackNode.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.rete.misc.SimpleReceiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.backend.IUpdateable;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.rete.misc.SimpleReceiver;
 
 /**
  * @author Bergmann Gabor
- * 
+ *
  */
 public class CallbackNode extends SimpleReceiver {
 
     IUpdateable updateable;
 
-    public CallbackNode(ReteContainer reteContainer, IUpdateable updateable) 
+    public CallbackNode(ReteContainer reteContainer, IUpdateable updateable)
     {
         super(reteContainer);
         this.updateable = updateable;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DefaultProductionNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DefaultProductionNode.java
index eca8bc17..e929b688 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DefaultProductionNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DefaultProductionNode.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.rete.traceability.CompiledQuery;
 
 /**
  * Default implementation of the Production node, based on UniquenessEnforcerNode
@@ -34,7 +34,7 @@ public class DefaultProductionNode extends UniquenessEnforcerNode implements Pro
      * @since 1.6
      */
     public DefaultProductionNode(final ReteContainer reteContainer, final Map<String, Integer> posMapping,
-            final boolean deleteRederiveEvaluation) {
+                                 final boolean deleteRederiveEvaluation) {
         this(reteContainer, posMapping, deleteRederiveEvaluation, null, null, null);
     }
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorBucketNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DiscriminatorBucketNode.java
index 803bab20..b08a7330 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorBucketNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DiscriminatorBucketNode.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
- * A bucket holds a filtered set of tuples of its parent {@link DiscriminatorDispatcherNode}. 
+ * A bucket holds a filtered set of tuples of its parent {@link DiscriminatorDispatcherNode}.
  * Exactly those that have the given bucket key at their discrimination column.
- * 
+ *
  * <p> During operation, tuple contents and bucket keys have already been wrapped using {@link IQueryRuntimeContext#wrapElement(Object)}
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.5
  */
@@ -47,7 +47,7 @@ public class DiscriminatorBucketNode extends SingleInputNode {
            getDispatcher().pullIntoFiltered(collector, bucketKey, flush);
        }
     }
-    
+
     @Override
     public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
         if (parent != null) {
@@ -63,23 +63,23 @@ public class DiscriminatorBucketNode extends SingleInputNode {
     public Object getBucketKey() {
         return bucketKey;
     }
-    
+
     @Override
     public void appendParent(Supplier supplier) {
         if (! (supplier instanceof DiscriminatorDispatcherNode))
             throw new IllegalArgumentException();
         super.appendParent(supplier);
     }
-    
+
     public DiscriminatorDispatcherNode getDispatcher() {
         return (DiscriminatorDispatcherNode) parent;
     }
-    
+
     @Override
     protected String toStringCore() {
-        return String.format("%s<%s=='%s'>", 
-                super.toStringCore(), 
-                (getDispatcher() == null) ? "?" : getDispatcher().getDiscriminationColumnIndex(), 
+        return String.format("%s<%s=='%s'>",
+                super.toStringCore(),
+                (getDispatcher() == null) ? "?" : getDispatcher().getDiscriminationColumnIndex(),
                 bucketKey);
     }
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorDispatcherNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DiscriminatorDispatcherNode.java
index a8e11fcd..65c73787 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorDispatcherNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/DiscriminatorDispatcherNode.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,24 +14,24 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.Receiver;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.Receiver;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Node that sends tuples off to different buckets (attached as children of type {@link DiscriminatorBucketNode}), based
  * on the value of a given column.
- * 
+ *
  * <p>
  * Tuple contents and bucket keys have already been wrapped using {@link IQueryRuntimeContext#wrapElement(Object)}
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.5
  */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/EqualityFilterNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/EqualityFilterNode.java
index 014c2016..67d12743 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/EqualityFilterNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/EqualityFilterNode.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 public class EqualityFilterNode extends FilterNode {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/FilterNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/FilterNode.java
index f66f1715..341df0f2 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/FilterNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/FilterNode.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * This node implements a simple filter. A stateless abstract check() predicate determines whether a matching is allowed
  * to pass.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class FilterNode extends SingleInputNode {
 
@@ -34,7 +34,7 @@ public abstract class FilterNode extends SingleInputNode {
 
     /**
      * Abstract filtering predicate. Expected to be stateless.
-     * 
+     *
      * @param ps
      *            the matching to be checked.
      * @return true if and only if the parameter matching is allowed to pass through this node.
@@ -49,7 +49,7 @@ public abstract class FilterNode extends SingleInputNode {
             }
         }
     }
-    
+
     @Override
     public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
         for (final Entry<Tuple, Timeline<Timestamp>> entry : this.reteContainer.pullPropagatedContentsWithTimestamp(this, flush).entrySet()) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/InequalityFilterNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/InequalityFilterNode.java
index 8dd3e949..4b7b5b78 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/InequalityFilterNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/InequalityFilterNode.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
  * This node filters patterns according to equalities and inequalities of elements. The 'subject' element is asserted to
  * be different from the elements given by the inequalityMask.
- * 
- * 
+ *
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class InequalityFilterNode extends FilterNode {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/RepresentativeElectionNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/RepresentativeElectionNode.java
index 95018c4f..75aa32ef 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/RepresentativeElectionNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/RepresentativeElectionNode.java
@@ -6,31 +6,31 @@
  * http://www.eclipse.org/legal/epl-v20.html.
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
-import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeObserver;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReinitializedNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReinitializedNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
+import tools.refinery.interpreter.rete.itc.alg.representative.RepresentativeObserver;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 import java.util.Collection;
 import java.util.Map;
 
 public class RepresentativeElectionNode extends SingleInputNode implements Clearable, RepresentativeObserver,
-                ReinitializedNode {
+        ReinitializedNode {
         private final RepresentativeElectionAlgorithm.Factory algorithmFactory;
         private Graph<Object> graph;
         private RepresentativeElectionAlgorithm algorithm;
 
         public RepresentativeElectionNode(ReteContainer reteContainer,
-                                                                          RepresentativeElectionAlgorithm.Factory algorithmFactory) {
+                                      RepresentativeElectionAlgorithm.Factory algorithmFactory) {
                 super(reteContainer);
                 this.algorithmFactory = algorithmFactory;
                 graph = new Graph<>();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/SingleInputNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/SingleInputNode.java
index 99fc45b2..3d44ddaa 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/SingleInputNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/SingleInputNode.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.StandardNode;
-import tools.refinery.viatra.runtime.rete.network.Supplier;
-import tools.refinery.viatra.runtime.rete.network.Tunnel;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.StandardNode;
+import tools.refinery.interpreter.rete.network.Supplier;
+import tools.refinery.interpreter.rete.network.Tunnel;
+import tools.refinery.interpreter.rete.network.communication.CommunicationTracker;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class SingleInputNode extends StandardNode implements Tunnel {
 
@@ -37,34 +37,34 @@ public abstract class SingleInputNode extends StandardNode implements Tunnel {
      * @since 1.6
      */
     protected Mailbox mailbox;
-    
+
     public SingleInputNode(ReteContainer reteContainer) {
         super(reteContainer);
         mailbox = instantiateMailbox();
         reteContainer.registerClearable(mailbox);
         parent = null;
     }
-    
+
     /**
      * Instantiates the {@link Mailbox} of this receiver.
      * Subclasses may override this method to provide their own mailbox implementation.
-     * 
+     *
      * @return the mailbox
      * @since 2.0
      */
     protected Mailbox instantiateMailbox() {
         if (this.reteContainer.isTimelyEvaluation()) {
             return new TimelyMailbox(this, this.reteContainer);
-        } else {            
+        } else {
             return new BehaviorChangingMailbox(this, this.reteContainer);
         }
     }
-    
+
     @Override
     public CommunicationTracker getCommunicationTracker() {
         return this.reteContainer.getCommunicationTracker();
     }
-    
+
     @Override
     public Mailbox getMailbox() {
         return this.mailbox;
@@ -97,7 +97,7 @@ public abstract class SingleInputNode extends StandardNode implements Tunnel {
             parent.pullInto(collector, flush);
         }
     }
-    
+
     /**
      * To be called by derived classes and ReteContainer.
      */
@@ -114,7 +114,7 @@ public abstract class SingleInputNode extends StandardNode implements Tunnel {
         else
             return Collections.singleton(parent);
     }
-    
+
     @Override
     public void assignTraceInfo(TraceInfo traceInfo) {
         super.assignTraceInfo(traceInfo);
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyProductionNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TimelyProductionNode.java
index 82640948..2c71da25 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyProductionNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TimelyProductionNode.java
@@ -3,19 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.ProductionNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
-import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.rete.network.ProductionNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.traceability.TraceInfo;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.rete.traceability.CompiledQuery;
+
 /**
  * Differential dataflow implementation of the Production node, based on {@link TimelyUniquenessEnforcerNode}.
  *
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyUniquenessEnforcerNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TimelyUniquenessEnforcerNode.java
index 4c4b4fc0..7a280d8e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyUniquenessEnforcerNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TimelyUniquenessEnforcerNode.java
@@ -3,36 +3,36 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.index.timely.TimelyMemoryIdentityIndexer;
-import tools.refinery.viatra.runtime.rete.index.timely.TimelyMemoryNullIndexer;
-import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.rete.matcher.TimelyConfiguration;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timely.ResumableNode;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
+import tools.refinery.interpreter.rete.index.timely.TimelyMemoryIdentityIndexer;
+import tools.refinery.interpreter.rete.index.timely.TimelyMemoryNullIndexer;
 
 /**
  * Timely uniqueness enforcer node implementation.
- * 
+ *
  * @author Tamas Szabo
  * @noinstantiate This class is not intended to be instantiated by clients.
  * @noextend This class is not intended to be subclassed by clients.
@@ -49,7 +49,7 @@ public class TimelyUniquenessEnforcerNode extends AbstractUniquenessEnforcerNode
     public TimelyUniquenessEnforcerNode(final ReteContainer container, final int tupleWidth) {
         super(container, tupleWidth);
         this.memory = new TimelyMemory<Timestamp>(
-                container.getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+                container.getTimelyConfiguration().getTimelineRepresentation() == TimelyConfiguration.TimelineRepresentation.FAITHFUL);
         container.registerClearable(this.memory);
         this.mailbox = instantiateMailbox();
         container.registerClearable(this.mailbox);
@@ -158,4 +158,4 @@ public class TimelyUniquenessEnforcerNode extends AbstractUniquenessEnforcerNode
         super.networkStructureChanged();
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransformerNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransformerNode.java
index 24750656..0cb17f7b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransformerNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransformerNode.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 public abstract class TransformerNode extends SingleInputNode {
 
@@ -33,7 +33,7 @@ public abstract class TransformerNode extends SingleInputNode {
             collector.add(transform(ps));
         }
     }
-    
+
     @Override
     public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
         for (final Entry<Tuple, Timeline<Timestamp>> entry : reteContainer.pullPropagatedContentsWithTimestamp(this, flush).entrySet()) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransitiveClosureNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransitiveClosureNode.java
index fdda4ef4..3034933d 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransitiveClosureNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransitiveClosureNode.java
@@ -6,22 +6,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.single;
-
-import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
-import tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple;
-import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
-import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
-import tools.refinery.viatra.runtime.rete.network.ReinitializedNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+package tools.refinery.interpreter.rete.single;
+
+import tools.refinery.interpreter.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.interpreter.rete.network.ReinitializedNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.interpreter.rete.itc.alg.misc.Tuple;
+import tools.refinery.interpreter.rete.itc.graphimpl.Graph;
+import tools.refinery.interpreter.rete.itc.igraph.ITcDataSource;
+import tools.refinery.interpreter.rete.itc.igraph.ITcObserver;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 import java.util.Collection;
 import java.util.Map;
@@ -72,10 +72,10 @@ public class TransitiveClosureNode extends SingleInputNode
      *            the initial collection of tuples
      */
         @Override
-    public void reinitializeWith(Collection<tools.refinery.viatra.runtime.matchers.tuple.Tuple> tuples) {
+    public void reinitializeWith(Collection<tools.refinery.interpreter.matchers.tuple.Tuple> tuples) {
         clear();
 
-        for (tools.refinery.viatra.runtime.matchers.tuple.Tuple t : tuples) {
+        for (tools.refinery.interpreter.matchers.tuple.Tuple t : tuples) {
             graphDataSource.insertNode(t.get(0));
             graphDataSource.insertNode(t.get(1));
             graphDataSource.insertEdge(t.get(0), t.get(1));
@@ -84,7 +84,7 @@ public class TransitiveClosureNode extends SingleInputNode
     }
 
     @Override
-    public void pullInto(final Collection<tools.refinery.viatra.runtime.matchers.tuple.Tuple> collector, final boolean flush) {
+    public void pullInto(final Collection<tools.refinery.interpreter.matchers.tuple.Tuple> collector, final boolean flush) {
         for (final Tuple<Object> tuple : ((IncSCCAlg<Object>) transitiveClosureAlgorithm).getTcRelation()) {
             collector.add(Tuples.staticArityFlatTupleOf(tuple.getSource(), tuple.getTarget()));
         }
@@ -92,7 +92,7 @@ public class TransitiveClosureNode extends SingleInputNode
 
     @Override
     public void pullIntoWithTimeline(
-            final Map<tools.refinery.viatra.runtime.matchers.tuple.Tuple, Timeline<Timestamp>> collector,
+            final Map<tools.refinery.interpreter.matchers.tuple.Tuple, Timeline<Timestamp>> collector,
             final boolean flush) {
         // use all zero timestamps because this node cannot be used in recursive groups anyway
         for (final Tuple<Object> tuple : ((IncSCCAlg<Object>) transitiveClosureAlgorithm).getTcRelation()) {
@@ -101,7 +101,7 @@ public class TransitiveClosureNode extends SingleInputNode
     }
 
     @Override
-    public void update(Direction direction, tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement,
+    public void update(Direction direction, tools.refinery.interpreter.matchers.tuple.Tuple updateElement,
             Timestamp timestamp) {
         if (updateElement.getSize() == 2) {
             Object source = updateElement.get(0);
@@ -134,13 +134,13 @@ public class TransitiveClosureNode extends SingleInputNode
 
     @Override
     public void tupleInserted(Object source, Object target) {
-        tools.refinery.viatra.runtime.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
+        tools.refinery.interpreter.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
         propagateUpdate(Direction.INSERT, tuple, Timestamp.ZERO);
     }
 
     @Override
     public void tupleDeleted(Object source, Object target) {
-        tools.refinery.viatra.runtime.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
+        tools.refinery.interpreter.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
         propagateUpdate(Direction.DELETE, tuple, Timestamp.ZERO);
     }
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransparentNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransparentNode.java
index 6c21a966..fb64ed88 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransparentNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TransparentNode.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Simply propagates everything. Might be used to join or fork.
- * 
+ *
  * @author Gabor Bergmann
  */
 public class TransparentNode extends SingleInputNode {
@@ -44,5 +44,5 @@ public class TransparentNode extends SingleInputNode {
     public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
         propagatePullIntoWithTimestamp(collector, flush);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TrimmerNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TrimmerNode.java
index 8a72138c..96e757e3 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TrimmerNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/TrimmerNode.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
  * Trims the matchings as specified by a mask.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class TrimmerNode extends TransformerNode {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/UniquenessEnforcerNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/UniquenessEnforcerNode.java
index 5bfde248..195e3537 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/UniquenessEnforcerNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/UniquenessEnforcerNode.java
@@ -3,35 +3,35 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.IMultiset;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.rete.index.MemoryIdentityIndexer;
-import tools.refinery.viatra.runtime.rete.index.MemoryNullIndexer;
-import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
-import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
-import tools.refinery.viatra.runtime.rete.network.RederivableNode;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
-import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
-import tools.refinery.viatra.runtime.rete.network.communication.timeless.RecursiveCommunicationGroup;
-import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
-import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMailbox;
+import tools.refinery.interpreter.rete.network.PosetAwareReceiver;
+import tools.refinery.interpreter.rete.network.RederivableNode;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.communication.CommunicationGroup;
+import tools.refinery.interpreter.rete.network.communication.Timestamp;
+import tools.refinery.interpreter.rete.network.communication.timeless.RecursiveCommunicationGroup;
+import tools.refinery.interpreter.rete.network.mailbox.Mailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.interpreter.rete.network.mailbox.timeless.PosetAwareMailbox;
+import tools.refinery.interpreter.matchers.context.IPosetComparator;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.IMultiset;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.rete.index.MemoryIdentityIndexer;
+import tools.refinery.interpreter.rete.index.MemoryNullIndexer;
+import tools.refinery.interpreter.rete.index.ProjectionIndexer;
 
 /**
  * Timeless uniqueness enforcer node implementation.
@@ -39,7 +39,7 @@ import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMai
  * The node is capable of operating in the delete and re-derive mode. In this mode, it is also possible to equip the
  * node with an {@link IPosetComparator} to identify monotone changes; thus, ensuring that a fix-point can be reached
  * during the evaluation.
- * 
+ *
  * @author Gabor Bergmann
  * @author Tamas Szabo
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -69,19 +69,19 @@ public class UniquenessEnforcerNode extends AbstractUniquenessEnforcerNode
 
     /**
      * OPTIONAL ELEMENT - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
-     * 
+     *
      * @since 1.6
      */
     protected final TupleMask coreMask;
     /**
      * OPTIONAL ELEMENTS - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
-     * 
+     *
      * @since 1.6
      */
     protected final TupleMask posetMask;
     /**
      * OPTIONAL ELEMENTS - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
-     * 
+     *
      * @since 1.6
      */
     protected final IPosetComparator posetComparator;
@@ -112,14 +112,14 @@ public class UniquenessEnforcerNode extends AbstractUniquenessEnforcerNode
         this.mailbox = instantiateMailbox();
         reteContainer.registerClearable(this.mailbox);
     }
-    
+
     @Override
     public void pullInto(final Collection<Tuple> collector, final boolean flush) {
         for (final Tuple tuple : this.memory.distinctValues()) {
             collector.add(tuple);
         }
     }
-    
+
     /**
      * @since 2.8
      */
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/ValueBinderFilterNode.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/ValueBinderFilterNode.java
index c641bf6e..6a56984c 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/ValueBinderFilterNode.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/single/ValueBinderFilterNode.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.single;
+package tools.refinery.interpreter.rete.single;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.interpreter.rete.network.ReteContainer;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * A filter node that keeps only those tuples that contain a certain value at a certain position.
- * 
+ *
  * @author Bergmann Gabor
- * 
+ *
  */
 public class ValueBinderFilterNode extends FilterNode {
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ActiveNodeConflictTrace.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/ActiveNodeConflictTrace.java
index 2055dfe8..30eac47b 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ActiveNodeConflictTrace.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/ActiveNodeConflictTrace.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 public class ActiveNodeConflictTrace extends RecipeTraceInfo { // TODO implement PatternTraceInfo
-    RecipeTraceInfo inactiveRecipeTrace;                
+    RecipeTraceInfo inactiveRecipeTrace;
     public ActiveNodeConflictTrace(ReteNodeRecipe recipe,
             RecipeTraceInfo parentRecipeTrace,
             RecipeTraceInfo inactiveRecipeTrace) {
@@ -21,4 +21,4 @@ public class ActiveNodeConflictTrace extends RecipeTraceInfo { // TODO implement
     public RecipeTraceInfo getInactiveRecipeTrace() {
         return inactiveRecipeTrace;
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledQuery.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/CompiledQuery.java
index b8c793c5..38665685 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledQuery.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/CompiledQuery.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 /**
  * Indicates that recipe expresses the finished match set of a query.
@@ -21,16 +21,16 @@ import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
  */
 public class CompiledQuery extends RecipeTraceInfo implements
         PatternTraceInfo {
-    
+
     private PQuery query;
     private final Map<PBody, ? extends RecipeTraceInfo> parentRecipeTracesPerBody;
-    
+
     /**
      * @since 1.6
      */
     public CompiledQuery(ReteNodeRecipe recipe,
-            Map<PBody, ? extends RecipeTraceInfo> parentRecipeTraces,
-            PQuery query) {
+                         Map<PBody, ? extends RecipeTraceInfo> parentRecipeTraces,
+                         PQuery query) {
         super(recipe, parentRecipeTraces.values());
         parentRecipeTracesPerBody = parentRecipeTraces;
         this.query = query;
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledSubPlan.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/CompiledSubPlan.java
index 572e943c..320b9d19 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledSubPlan.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/CompiledSubPlan.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -15,24 +15,24 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 /**
- * A trace marker associating a Rete recipe with a query SubPlan. 
- * 
+ * A trace marker associating a Rete recipe with a query SubPlan.
+ *
  * <p> The Rete node represented by the recipe is equivalent to the SubPlan.
  * <p> Invariant: each variable has at most one index associated with it in the tuple, i.e. no duplicates.
  */
 public class CompiledSubPlan extends PlanningTrace {
 
     public CompiledSubPlan(SubPlan subPlan, List<PVariable> variablesTuple,
-            ReteNodeRecipe recipe,
-            Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
+                           ReteNodeRecipe recipe,
+                           Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
         super(subPlan, variablesTuple, recipe, parentRecipeTraces);
-        
+
         // Make sure that each variable occurs only once
         Set<PVariable> variablesSet = new HashSet<PVariable>(variablesTuple);
         Preconditions.checkState(variablesSet.size() == variablesTuple.size(),
@@ -41,7 +41,7 @@ public class CompiledSubPlan extends PlanningTrace {
                         variablesTuple.stream().map(PVariable::getName).collect(Collectors.joining(",")),
                         subPlan.toShortString(), recipe));
     }
-    
+
     public CompiledSubPlan(SubPlan subPlan, List<PVariable> variablesTuple,
             ReteNodeRecipe recipe,
             RecipeTraceInfo... parentRecipeTraces) {
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ParameterProjectionTrace.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/ParameterProjectionTrace.java
index 8da1e314..d743608a 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ParameterProjectionTrace.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/ParameterProjectionTrace.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 /**
  * The recipe projects the finished results of a {@link PBody} onto the list of parameters.
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PatternTraceInfo.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/PatternTraceInfo.java
index fb7ef062..37a3b9ef 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PatternTraceInfo.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/PatternTraceInfo.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 /**
  * One kind of trace marker that merely establishes the pattern for which the node was built.
  * @author Bergmann Gabor
  */
 public interface PatternTraceInfo extends TraceInfo {
-    String getPatternName();            
-}
\ No newline at end of file
+    String getPatternName();
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PlanningTrace.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/PlanningTrace.java
index c1cc3a69..78f3941e 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PlanningTrace.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/PlanningTrace.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -14,14 +14,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 /**
- * A trace marker associating a Rete recipe with a query SubPlan. 
- * 
- * <p> The recipe may be an auxiliary node; 
+ * A trace marker associating a Rete recipe with a query SubPlan.
+ *
+ * <p> The recipe may be an auxiliary node;
  *   see {@link CompiledSubPlan} if it represents the entire SubPlan instead.
  */
 public class PlanningTrace extends RecipeTraceInfo implements PatternTraceInfo {
@@ -30,19 +30,19 @@ public class PlanningTrace extends RecipeTraceInfo implements PatternTraceInfo {
     protected List<PVariable> variablesTuple;
     protected Map<PVariable, Integer> posMapping;
 
-    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple, 
+    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple,
             ReteNodeRecipe recipe,
             Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
         super(recipe, parentRecipeTraces);
         this.subPlan = subPlan;
         this.variablesTuple = variablesTuple;
-        
+
         this.posMapping = new HashMap<PVariable, Integer>();
         for (int i = 0; i < variablesTuple.size(); ++i)
             posMapping.put(variablesTuple.get(i), i);
     }
 
-    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple, 
+    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple,
             ReteNodeRecipe recipe,
             RecipeTraceInfo... parentRecipeTraces) {
         this(subPlan, variablesTuple, recipe, Arrays.asList(parentRecipeTraces));
@@ -68,13 +68,13 @@ public class PlanningTrace extends RecipeTraceInfo implements PatternTraceInfo {
     /**
      * Returns a new clone that reinterprets the same compiled form
      *  as the compiled form of a (potentially different) subPlan.
-     * Useful e.g. if child plan turns out to be a no-op, or when promoting a {@link PlanningTrace} to {@link CompiledSubPlan}. 
+     * Useful e.g. if child plan turns out to be a no-op, or when promoting a {@link PlanningTrace} to {@link CompiledSubPlan}.
      */
     public CompiledSubPlan cloneFor(SubPlan newSubPlan) {
-        return new CompiledSubPlan(newSubPlan, 
-                getVariablesTuple(), 
-                getRecipe(), 
+        return new CompiledSubPlan(newSubPlan,
+                getVariablesTuple(),
+                getRecipe(),
                 getParentRecipeTracesForCloning());
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/RecipeTraceInfo.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/RecipeTraceInfo.java
index 8f610550..1f9d3d91 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/RecipeTraceInfo.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/RecipeTraceInfo.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,8 +14,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.rete.network.Node;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 /**
  * A trace marker that indicates the recipe for which the node was built.
@@ -33,24 +33,24 @@ public class RecipeTraceInfo implements TraceInfo {
      * @noreference This method is not intended to be referenced by clients.
      */
     public Collection<? extends RecipeTraceInfo> getParentRecipeTracesForCloning() {return parentRecipeTraces;}
-    @Override 
+    @Override
     public Node getNode() {return node;}
-    
+
     private Node node;
     ReteNodeRecipe recipe;
     ReteNodeRecipe shadowedRecipe;
     Collection<? extends RecipeTraceInfo> parentRecipeTraces;
-    
-    
+
+
     public RecipeTraceInfo(ReteNodeRecipe recipe, Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
         super();
         this.recipe = recipe;
-        this.parentRecipeTraces = parentRecipeTraces; //ParentTraceList.from(parentRecipeTraces); 
+        this.parentRecipeTraces = parentRecipeTraces; //ParentTraceList.from(parentRecipeTraces);
     }
     public RecipeTraceInfo(ReteNodeRecipe recipe, RecipeTraceInfo... parentRecipeTraces) {
         this(recipe, Arrays.asList(parentRecipeTraces));
     }
-    
+
     @Override
     public boolean propagateToIndexerParent() {return false;}
     @Override
@@ -59,9 +59,9 @@ public class RecipeTraceInfo implements TraceInfo {
     public boolean propagateFromStandardNodeToSupplierParent() {return false;}
     @Override
     public boolean propagateToProductionNodeParentAlso() {return false;}
-    @Override 
+    @Override
     public void assignNode(Node node) {this.node = node;}
-    
+
     /**
      * @param knownRecipe a known recipe that is equivalent to the current recipe
      */
@@ -69,13 +69,13 @@ public class RecipeTraceInfo implements TraceInfo {
         this.shadowedRecipe = this.recipe;
         this.recipe = knownRecipe;
     }
-    
+
     /**
      * Get original recipe shadowed by an equivalent
      */
     public ReteNodeRecipe getShadowedRecipe() {
         return shadowedRecipe;
     }
-    
-    
-}
\ No newline at end of file
+
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/TraceInfo.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/TraceInfo.java
index e1d440db..f7ce1933 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/TraceInfo.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/TraceInfo.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
-import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.interpreter.rete.network.Node;
 
 
 /**
- * Traces the node back to a purpose for which the node was built, 
+ * Traces the node back to a purpose for which the node was built,
  * to explain why the node is there and what it means.
  * @author Bergmann Gabor
  */
 public interface TraceInfo {
     boolean propagateToIndexerParent();
     boolean propagateFromIndexerToSupplierParent();
-    boolean propagateFromStandardNodeToSupplierParent();        
+    boolean propagateFromStandardNodeToSupplierParent();
     boolean propagateToProductionNodeParentAlso();
 
     void assignNode(Node node);
@@ -30,4 +30,4 @@ public interface TraceInfo {
 // * @return a tuple of correct size representing the semantics of each position.
 // * @post not null
 // */
-// Tuple getSemantics();
\ No newline at end of file
+// Tuple getSemantics();
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/UserRequestTrace.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/UserRequestTrace.java
index 11e4db32..2c163430 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/UserRequestTrace.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/traceability/UserRequestTrace.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.traceability;
+package tools.refinery.interpreter.rete.traceability;
 
 import java.util.Collection;
 
-import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.interpreter.rete.recipes.ReteNodeRecipe;
 
 //      private class AggregatorReferenceIndexTraceInfo extends RecipeTraceInfo {
-//              RecipeTraceInfo aggregatorNodeRecipeTrace;              
+//              RecipeTraceInfo aggregatorNodeRecipeTrace;
 //              public AggregatorReferenceIndexTraceInfo(ProjectionIndexerRecipe recipe,
 //                              RecipeTraceInfo parentRecipeTrace,
 //                              RecipeTraceInfo aggregatorNodeRecipeTrace) {
@@ -26,11 +26,11 @@ import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
 //      }
 public  class UserRequestTrace extends RecipeTraceInfo {
     public UserRequestTrace(ReteNodeRecipe recipe,
-            Collection<RecipeTraceInfo> parentRecipeTraces) {
+                            Collection<RecipeTraceInfo> parentRecipeTraces) {
         super(recipe, parentRecipeTraces);
     }
     public UserRequestTrace(ReteNodeRecipe recipe,
             RecipeTraceInfo... parentRecipeTraces) {
         super(recipe, parentRecipeTraces);
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/LexicographicComparator.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/LexicographicComparator.java
index 0efc50af..daf3bf63 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/LexicographicComparator.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/LexicographicComparator.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.util;
+package tools.refinery.interpreter.rete.util;
 
 import java.util.Comparator;
 import java.util.Iterator;
@@ -17,9 +17,9 @@ import java.util.Iterator;
  *
  */
 public class LexicographicComparator<T> implements Comparator<Iterable<? extends T>> {
-    
+
     final Comparator<T> elementComparator;
-    
+
     public LexicographicComparator(Comparator<T> elementComparator) {
         super();
         this.elementComparator = elementComparator;
@@ -29,7 +29,7 @@ public class LexicographicComparator<T> implements Comparator<Iterable<? extends
     public int compare(Iterable<? extends T> o1, Iterable<? extends T> o2) {
         Iterator<? extends T> it1 = o1.iterator();
         Iterator<? extends T> it2 = o2.iterator();
-        
+
         boolean has1, has2, bothHaveNext;
         do {
             has1 = it1.hasNext();
@@ -39,7 +39,7 @@ public class LexicographicComparator<T> implements Comparator<Iterable<? extends
                 T element1 = it1.next();
                 T element2 = it2.next();
                 int elementComparison = elementComparator.compare(element1, element2);
-                if (elementComparison != 0) 
+                if (elementComparison != 0)
                     return elementComparison;
             }
         } while (bothHaveNext);
@@ -47,7 +47,7 @@ public class LexicographicComparator<T> implements Comparator<Iterable<? extends
             return +1;
         } else if (!has1 && has2) {
             return -1;
-        } else /*if (!has1 && !has2)*/ { 
+        } else /*if (!has1 && !has2)*/ {
             return 0;
         }
     }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/Options.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/Options.java
index 96cc445f..e372f015 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/Options.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/Options.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.util;
+package tools.refinery.interpreter.rete.util;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
-import tools.refinery.viatra.runtime.rete.construction.basiclinear.BasicLinearLayout;
-import tools.refinery.viatra.runtime.rete.construction.quasitree.QuasiTreeLayout;
-import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyCommunicationGroup;
+import tools.refinery.interpreter.rete.construction.basiclinear.BasicLinearLayout;
+import tools.refinery.interpreter.rete.construction.quasitree.QuasiTreeLayout;
+import tools.refinery.interpreter.rete.network.communication.timely.TimelyCommunicationGroup;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.planning.IQueryPlannerStrategy;
 
 /**
  * Feature switches.
@@ -54,21 +54,21 @@ public class Options {
                                                     // bodies, 1 otherwise
 
     /**
-     * Enable for internal debugging of Rete communication scheme; 
+     * Enable for internal debugging of Rete communication scheme;
      *  catches cases where the topological sort is violated by a message sent "backwards"
      * @since 1.6
      */
     public static final boolean MONITOR_VIOLATION_OF_RETE_NODEGROUP_TOPOLOGICAL_SORTING = false;
-    
+
     /**
      * Enable for internal debugging of message delivery in {@link TimelyCommunicationGroup}s;
-     * catches cases when there is a violation of increasing timestamps during message delivery within a group.  
+     * catches cases when there is a violation of increasing timestamps during message delivery within a group.
      * @since 2.3
      */
     public static final boolean MONITOR_VIOLATION_OF_DIFFERENTIAL_DATAFLOW_TIMESTAMPS = false;
-    
+
     /**
-     * 
+     *
      * @author Gabor Bergmann
      * @noreference
      */
@@ -93,19 +93,19 @@ public class Options {
     public static final BuilderMethod builderMethod =
     // BuilderMethod.PSYSTEM_BASIC_LINEAR;
     BuilderMethod.PSYSTEM_QUASITREE;
-    
+
     public enum FunctionalDependencyOption {
         OFF,
         OPPORTUNISTIC
     }
-    public static final FunctionalDependencyOption functionalDependencyOption = 
+    public static final FunctionalDependencyOption functionalDependencyOption =
             FunctionalDependencyOption.OPPORTUNISTIC;
-    
+
     public enum PlanTrimOption {
         OFF,
         OPPORTUNISTIC
     }
-    public static final PlanTrimOption planTrimOption = 
+    public static final PlanTrimOption planTrimOption =
             PlanTrimOption.OPPORTUNISTIC;
 
 }
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/OrderingCompareAgent.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/OrderingCompareAgent.java
index 6d0d813a..20fd35dd 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/OrderingCompareAgent.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/OrderingCompareAgent.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.rete.util;
+package tools.refinery.interpreter.rete.util;
 
 import java.util.Comparator;
 
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/ReteHintOptions.java b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/ReteHintOptions.java
index 6e685253..42fcd406 100644
--- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/ReteHintOptions.java
+++ b/subprojects/interpreter-rete/src/main/java/tools/refinery/interpreter/rete/util/ReteHintOptions.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.rete.util;
+package tools.refinery.interpreter.rete.util;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
-import tools.refinery.viatra.runtime.rete.matcher.DRedReteBackendFactory;
+import tools.refinery.interpreter.rete.matcher.DRedReteBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryHintOption;
 
 /**
  * Provides key objects (of type {@link QueryHintOption}) for {@link QueryEvaluationHint}s.
@@ -20,39 +20,39 @@ import tools.refinery.viatra.runtime.rete.matcher.DRedReteBackendFactory;
 public final class ReteHintOptions {
 
     private ReteHintOptions() {/*Utility class constructor*/}
-    
-    public static final QueryHintOption<Boolean> useDiscriminatorDispatchersForConstantFiltering = 
+
+    public static final QueryHintOption<Boolean> useDiscriminatorDispatchersForConstantFiltering =
             hintOption("useDiscriminatorDispatchersForConstantFiltering", true);
-    
-    public static final QueryHintOption<Boolean> prioritizeConstantFiltering = 
+
+    public static final QueryHintOption<Boolean> prioritizeConstantFiltering =
             hintOption("prioritizeConstantFiltering", true);
 
-    public static final QueryHintOption<Boolean> cacheOutputOfEvaluatorsByDefault = 
+    public static final QueryHintOption<Boolean> cacheOutputOfEvaluatorsByDefault =
             hintOption("cacheOutputOfEvaluatorsByDefault", true);
-    
+
     /**
-     * The incremental query evaluator backend can evaluate recursive patterns. 
-     * However, by default, instance models that contain cycles are not supported with recursive queries 
-     * and can lead to incorrect query results. 
+     * The incremental query evaluator backend can evaluate recursive patterns.
+     * However, by default, instance models that contain cycles are not supported with recursive queries
+     * and can lead to incorrect query results.
      * Enabling Delete And Rederive (DRED) mode guarantees that recursive query evaluation leads to correct results in these cases as well.
-     *  
+     *
      * <p> As DRED may diminish the performance of incremental maintenance, it is not enabled by default.
      * @since 1.6
-     * @deprecated Use {@link DRedReteBackendFactory} instead of setting this option to true. 
+     * @deprecated Use {@link DRedReteBackendFactory} instead of setting this option to true.
      */
     @Deprecated
-    public static final QueryHintOption<Boolean> deleteRederiveEvaluation = 
+    public static final QueryHintOption<Boolean> deleteRederiveEvaluation =
             hintOption("deleteRederiveEvaluation", false);
-    
+
     /**
      * This hint allows the query planner to take advantage of "weakened alternative" suggestions of the meta context.
      * For instance, enumerable unary type constraints may be substituted with a simple type filtering where sufficient.
-     * 
+     *
      * @since 1.6
      */
     public static final QueryHintOption<Boolean> expandWeakenedAlternativeConstraints =
             hintOption("expandWeakenedAlternativeConstraints", true);
-   
+
     // internal helper for conciseness
     private static <T> QueryHintOption<T> hintOption(String hintKeyLocalName, T defaultValue) {
         return new QueryHintOption<>(ReteHintOptions.class, hintKeyLocalName, defaultValue);
diff --git a/subprojects/interpreter/NOTICE.md b/subprojects/interpreter/NOTICE.md
new file mode 100644
index 00000000..94c1d803
--- /dev/null
+++ b/subprojects/interpreter/NOTICE.md
@@ -0,0 +1,94 @@
+<!--
+  Copyright (c) 2018-2019, Zoltan Ujhelyi, IncQuery Labs Ltd.
+  Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+
+This module contains source code from the [Eclipse VIATRA&trade; project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
+
+Eclipse&reg;, VIATRA&trade; and &lsquo;Eclipse VIATRA&trade;&rsquo; are trademarks of Eclipse Foundation, Inc.
+
+To comply with the [Eclipse Foundation Trademark Usage Policy](https://www.eclipse.org/legal/logo_guidelines.php), we replaced the Eclipse VIATRA&trade; branding in this repository with the name _Refinery Interpreter_, since the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/) does not grant trademark usage rights to derived projects.
+_Refinery Interpreter_ is not endorsed or sponsored by Eclipse Foundation, Inc. or any other organizations using the Eclipse VIATRA&trade; trademark.
+
+We publish our modifications to Eclipse VIATRA&trade; for use within the Refinery framework under the name _Refinery Interpreter_. When not using _Refinery Interpreter_ directly in the Refinery framework, users are strongly encouraged to rely on [Eclipse VIATRA&trade;](https://eclipse.dev/viatra/) instead. In particular, _Refinery Interpreter_ does not provide any API stability guarantees that are provided by Eclipse VIATRA&trade;.
+
+We reproduce the [accompanying notices of Eclipse VIATRA&trade;](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+
+# Notices for Eclipse VIATRA&trade;
+
+This content is produced and maintained by the Eclipse VIATRA project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.viatra
+
+## Trademarks
+
+Eclipse VIATRA, and VIATRA are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-v20.html.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.modelobfuscator.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.examples.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra2.vpm.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR Runtime only: (3.2)
+
+* License: New BSD license
+
+Apache Commons Language Library (2.1)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License 2.0
+
+Guava (10.0.1)
+
+* License: Apache License, 2.0
+
+Guice (2.0)
+
+* License: Apache License, 2.0
+
+guice-multibindings (3.0.0)
+
+* License: Apache License, 2.0
+
+log4j (1.2.15)
+
+* License: Apache License 2.0
+
+LPG Java Runtime (lpgjavaruntime.jar) (1.1)
+
+* License: Eclipse Public License
+
+mockito (1.9.5)
+
+* License: Apache License, 2.0, New BSD license, MIT license
diff --git a/subprojects/viatra-runtime/about.html b/subprojects/interpreter/about.html
index d1d5593a..d1d5593a 100644
--- a/subprojects/viatra-runtime/about.html
+++ b/subprojects/interpreter/about.html
diff --git a/subprojects/interpreter/build.gradle.kts b/subprojects/interpreter/build.gradle.kts
new file mode 100644
index 00000000..0425cd2a
--- /dev/null
+++ b/subprojects/interpreter/build.gradle.kts
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.interpreter-library")
+}
+
+dependencies {
+        implementation(libs.slf4j.log4j)
+        // Code in this subproject inherits from Eclipse Collection implementation classes, so this can't be `runtimeOnly`.
+        implementation(libs.eclipseCollections)
+        implementation(libs.eclipseCollections.api)
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/CancellationToken.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/CancellationToken.java
index a2ae41e3..9de7700b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/CancellationToken.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/CancellationToken.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime;
+package tools.refinery.interpreter;
 
 @FunctionalInterface
 public interface CancellationToken {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/AdvancedViatraQueryEngine.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/AdvancedInterpreterEngine.java
index 32a3430d..5d0261d2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/AdvancedViatraQueryEngine.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/AdvancedInterpreterEngine.java
@@ -6,48 +6,49 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.internal.apiimpl.ViatraQueryEngineImpl;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.*;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.internal.apiimpl.InterpreterEngineImpl;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
 
 /**
- * Advanced interface to a VIATRA incremental evaluation engine.
+ * Advanced interface to a Refinery Interpreter incremental evaluation engine.
  *
  * <p>
- * You can create a new, private, unmanaged {@link AdvancedViatraQueryEngine} instance using
+ * You can create a new, private, unmanaged {@link AdvancedInterpreterEngine} instance using
  * {@link #createUnmanagedEngine(QueryScope)}. Additionally, you can access the advanced interface on any
- * {@link ViatraQueryEngine} by {@link AdvancedViatraQueryEngine#from(ViatraQueryEngine)}.
+ * {@link InterpreterEngine} by {@link AdvancedInterpreterEngine#from(InterpreterEngine)}.
  *
  * <p>
- * While the default interface {@link ViatraQueryEngine}, is suitable for most users, this advanced interface provides more
+ * While the default interface {@link InterpreterEngine}, is suitable for most users, this advanced interface provides more
  * control over the engine. The most important added functionality is the following:
  * <ul>
  * <li>You can have tighter control over the lifecycle of the engine, if you create a private, unmanaged engine
  * instance. For instance, a (non-managed) engine can be disposed in order to detach from the EMF model and stop
  * listening on update notifications. The indexes built previously in the engine can then be garbage collected, even if
  * the model itself is retained. Total lifecycle control is only available for private, unmanaged engines (created using
- * {@link #createUnmanagedEngine(QueryScope)}); a managed engine (obtained via {@link ViatraQueryEngine#on(QueryScope)}) is
+ * {@link #createUnmanagedEngine(QueryScope)}); a managed engine (obtained via {@link InterpreterEngine#on(QueryScope)}) is
  * shared among clients and can not be disposed or wiped.
  * <li>You can add and remove listeners to receive notification when the model or the match sets change.
  * <li>You can add and remove listeners to receive notification on engine lifecycle events, such as creation of new
  * matchers. For instance, if you explicitly share a private, unmanaged engine between multiple sites, you should
- * register a callback using {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client
+ * register a callback using {@link #addLifecycleListener(InterpreterEngineLifecycleListener)} to learn when another client
  * has called the destructive methods {@link #dispose()} or {@link #wipe()}.
  * </ul>
  *
  * @author Bergmann Gabor
  * @noextend This class is not intended to be subclassed by clients.
  */
-public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
+public abstract class AdvancedInterpreterEngine extends InterpreterEngine {
 
     /**
-     * Creates a new unmanaged VIATRA Query engine to evaluate queries over a given scope specified by an {@link QueryScope}.
+     * Creates a new unmanaged Refinery Interpreter engine to evaluate queries over a given scope specified by an
+         * {@link QueryScope}.
      *
      * <p> Repeated invocations will return different instances, so other clients are unable to independently access
      * and influence the returned engine. Note that unmanaged engines do not benefit from some performance improvements
@@ -56,7 +57,7 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      *
      * <p>
      * Client is responsible for the lifecycle of the returned engine, hence the usage of the advanced interface
-     * {@link AdvancedViatraQueryEngine}.
+     * {@link AdvancedInterpreterEngine}.
      *
      * <p>
      * The match set of any patterns will be incrementally refreshed upon updates from this scope.
@@ -67,12 +68,13 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * @return the advanced interface to a newly created unmanaged engine
      * @since 0.9
      */
-    public static AdvancedViatraQueryEngine createUnmanagedEngine(QueryScope scope) {
-        return new ViatraQueryEngineImpl(null, scope);
+    public static AdvancedInterpreterEngine createUnmanagedEngine(QueryScope scope) {
+        return new InterpreterEngineImpl(scope);
     }
 
     /**
-     * Creates a new unmanaged VIATRA Query engine to evaluate queries over a given scope specified by an {@link QueryScope}.
+     * Creates a new unmanaged Refinery Intepreter engine to evaluate queries over a given scope specified by an
+         * {@link QueryScope}.
      *
      * <p> Repeated invocations will return different instances, so other clients are unable to independently access
      * and influence the returned engine. Note that unmanaged engines do not benefit from some performance improvements
@@ -81,7 +83,7 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      *
      * <p>
      * Client is responsible for the lifecycle of the returned engine, hence the usage of the advanced interface
-     * {@link AdvancedViatraQueryEngine}.
+     * {@link AdvancedInterpreterEngine}.
      *
      * <p>
      * The match set of any patterns will be incrementally refreshed upon updates from this scope.
@@ -92,59 +94,55 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * @return the advanced interface to a newly created unmanaged engine
      * @since 1.4
      */
-    public static AdvancedViatraQueryEngine createUnmanagedEngine(QueryScope scope, ViatraQueryEngineOptions options) {
-        return new ViatraQueryEngineImpl(null, scope, options);
+    public static AdvancedInterpreterEngine createUnmanagedEngine(QueryScope scope, InterpreterEngineOptions options) {
+        return new InterpreterEngineImpl(scope, options);
     }
 
     /**
      * Provides access to a given existing engine through the advanced interface.
      *
-     * <p>
-     * Caveat: if the referenced engine is managed (i.e. created via {@link ViatraQueryEngine#on(QueryScope)}), the advanced
-     * methods {@link #dispose()} and {@link #wipe()} will not be allowed.
-     *
      * @param engine
      *            the engine to access using the advanced interface
      * @return a reference to the same engine conforming to the advanced interface
      */
-    public static AdvancedViatraQueryEngine from(ViatraQueryEngine engine) {
-        return (AdvancedViatraQueryEngine) engine;
+    public static AdvancedInterpreterEngine from(InterpreterEngine engine) {
+        return (AdvancedInterpreterEngine) engine;
     }
 
     /**
      * Add an engine lifecycle listener to this engine instance.
      *
      * @param listener
-     *            the {@link ViatraQueryEngineLifecycleListener} that should listen to lifecycle events from this engine
+     *            the {@link InterpreterEngineLifecycleListener} that should listen to lifecycle events from this engine
      */
-    public abstract void addLifecycleListener(ViatraQueryEngineLifecycleListener listener);
+    public abstract void addLifecycleListener(InterpreterEngineLifecycleListener listener);
 
     /**
      * Remove an existing lifecycle listener from this engine instance.
      *
      * @param listener
-     *            the {@link ViatraQueryEngineLifecycleListener} that should not listen to lifecycle events from this
+     *            the {@link InterpreterEngineLifecycleListener} that should not listen to lifecycle events from this
      *            engine anymore
      */
-    public abstract void removeLifecycleListener(ViatraQueryEngineLifecycleListener listener);
+    public abstract void removeLifecycleListener(InterpreterEngineLifecycleListener listener);
 
     /**
      * Add an model update event listener to this engine instance (that fires its callbacks according to its
      * notification level).
      *
      * @param listener
-     *            the {@link ViatraQueryModelUpdateListener} that should listen to model update events from this engine.
+     *            the {@link InterpreterModelUpdateListener} that should listen to model update events from this engine.
      */
-    public abstract void addModelUpdateListener(ViatraQueryModelUpdateListener listener);
+    public abstract void addModelUpdateListener(InterpreterModelUpdateListener listener);
 
     /**
      * Remove an existing model update event listener to this engine instance.
      *
      * @param listener
-     *            the {@link ViatraQueryModelUpdateListener} that should not listen to model update events from this engine
+     *            the {@link InterpreterModelUpdateListener} that should not listen to model update events from this engine
      *            anymore
      */
-    public abstract void removeModelUpdateListener(ViatraQueryModelUpdateListener listener);
+    public abstract void removeModelUpdateListener(InterpreterModelUpdateListener listener);
 
     /**
      * Registers low-level callbacks for match appearance and disappearance on this pattern matcher.
@@ -164,25 +162,25 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      *
      * @param fireNow
      *            if true, appearCallback will be immediately invoked on all current matches as a one-time effect. See
-     *            also {@link ViatraQueryMatcher#forEachMatch(IMatchProcessor)}.
+     *            also {@link InterpreterMatcher#forEachMatch(IMatchProcessor)}.
      * @param listener
      *            the listener that will be notified of each new match that appears or disappears, starting from now.
      * @param matcher
-     *            the {@link ViatraQueryMatcher} for which this listener should be active
+     *            the {@link InterpreterMatcher} for which this listener should be active
      */
-    public abstract <Match extends IPatternMatch> void addMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
-            IMatchUpdateListener<? super Match> listener, boolean fireNow);
+    public abstract <Match extends IPatternMatch> void addMatchUpdateListener(InterpreterMatcher<Match> matcher,
+                                                                                                                                                          IMatchUpdateListener<? super Match> listener, boolean fireNow);
 
     /**
      * Remove an existing match update event listener to this engine instance.
      *
      * @param matcher
-     *            the {@link ViatraQueryMatcher} for which this listener should not be active anymore
+     *            the {@link InterpreterMatcher} for which this listener should not be active anymore
      * @param listener
      *            the {@link IMatchUpdateListener} that should not receive the callbacks anymore
      */
-    public abstract <Match extends IPatternMatch> void removeMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
-            IMatchUpdateListener<? super Match> listener);
+    public abstract <Match extends IPatternMatch> void removeMatchUpdateListener(InterpreterMatcher<Match> matcher,
+                                                                                                                                                                 IMatchUpdateListener<? super Match> listener);
 
 
     /**
@@ -194,13 +192,13 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      *   Otherwise, the query evaluator is free to ignore any hints.
      *
      * <p> For stateful query backends (Rete), hints may be effective only the first time a matcher is created.
-     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query
+     * @param querySpecification a {@link IQuerySpecification} that describes a Refinery Interpreter query
      * @return a pattern matcher corresponding to the specification
      * @param optionalEvaluationHints additional / overriding options on query evaluation; passing null means default options associated with the query
-     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     * @throws InterpreterRuntimeException if the matcher could not be initialized
      * @since 0.9
      */
-    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+    public abstract <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getMatcher(
             IQuerySpecification<Matcher> querySpecification,
             QueryEvaluationHint optionalEvaluationHints);
 
@@ -215,42 +213,21 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * This is typically more efficient than traversing the model each time an individual pattern matcher is initialized on demand.
      * The performance benefit only manifests itself if the engine is not in wildcard mode.
      *
-     * @param queryGroup a {@link IQueryGroup} identifying a set of VIATRA queries
+     * @param queryGroup a {@link IQueryGroup} identifying a set of Refinery interpreter queries
      * @param optionalEvaluationHints additional / overriding options on query evaluation; passing null means default options associated with each query
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      *             if there was an error in preparing the engine
      * @since 0.9
      */
     public abstract void prepareGroup(IQueryGroup queryGroup, QueryEvaluationHint optionalEvaluationHints);
 
     /**
-     * Indicates whether the engine is managed, i.e. the default engine assigned to the given scope root by
-     * {@link ViatraQueryEngine#on(QueryScope)}.
-     *
-     * <p>
-     * If the engine is managed, there may be other clients using it, as all calls to
-     * {@link ViatraQueryEngine#on(QueryScope)} return the same managed engine instance for a given scope root. Therefore the
-     * destructive methods {@link #wipe()} and {@link #dispose()} are not allowed.
-     *
-     * <p>
-     * On the other hand, if the engine is unmanaged (i.e. a private instance created using
-     * {@link #createUnmanagedEngine(QueryScope)}), then {@link #wipe()} and {@link #dispose()} can be called. If you
-     * explicitly share a private, unmanaged engine between multiple sites, register a callback using
-     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called these
-     * destructive methods.
-     *
-     * @return true if the engine is managed, and therefore potentially shared with other clients querying the same EMF
-     *         model
-     */
-    public abstract boolean isManaged();
-
-    /**
      * Indicates whether the engine is in a tainted, inconsistent state due to some internal errors. If true, results
      * are no longer reliable; engine should be disposed.
      *
      * <p>
      * The engine is in a tainted state if any of its internal processes report back a fatal error. The
-     * {@link ViatraQueryEngineLifecycleListener} interface provides a callback method for entering the tainted state.
+     * {@link InterpreterEngineLifecycleListener} interface provides a callback method for entering the tainted state.
      *
      * @return the tainted state
      */
@@ -268,7 +245,7 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * Disallowed if the engine is managed (see {@link #isManaged()}), as there may be other clients using it.
      * <p>
      * If you explicitly share a private, unmanaged engine between multiple sites, register a callback using
-     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called this
+     * {@link #addLifecycleListener(InterpreterEngineLifecycleListener)} to learn when another client has called this
      * destructive method.
      *
      * @throws UnsupportedOperationException
@@ -288,7 +265,7 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * Disallowed if the engine is managed (see {@link #isManaged()}), as there may be other clients using it.
      * <p>
      * If you explicitly share a private, unmanaged engine between multiple sites, register a callback using
-     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called this
+     * {@link #addLifecycleListener(InterpreterEngineLifecycleListener)} to learn when another client has called this
      * destructive method.
      *
      * @throws UnsupportedOperationException
@@ -297,28 +274,28 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
     public abstract void dispose();
 
     /**
-     * Provides access to the selected query backend component of the VIATRA Query engine.
+     * Provides access to the selected query backend component of the Refinery Interpreter engine.
      * @noreference for internal use only
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public abstract IQueryBackend getQueryBackend(IQueryBackendFactory iQueryBackendFactory);
 
     /**
      * Access an existing pattern matcher based on a {@link IQuerySpecification}, and optional hints override.
-     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @param querySpecification a {@link IQuerySpecification} that describes a Refinery Interpreter query specification
      * @param optionalOverrideHints a {@link QueryEvaluationHint} that may override the pattern hints (can be null)
      * @return a pattern matcher corresponding to the specification, <code>null</code> if a matcher does not exist yet.
      * @since 1.4
      */
-    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalOverrideHints);
+    public abstract <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalOverrideHints);
 
     /**
-     * Returns the immutable {@link ViatraQueryEngineOptions} of the engine.
+     * Returns the immutable {@link InterpreterEngineOptions} of the engine.
      *
      * @return the engine options
      * @since 1.4
      */
-    public abstract ViatraQueryEngineOptions getEngineOptions();
+    public abstract InterpreterEngineOptions getEngineOptions();
 
     /**
      * Return the underlying result provider for the given matcher.
@@ -327,7 +304,7 @@ public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
      * @since 1.4
      * @noreference This method is considered internal API
      */
-    public abstract IQueryResultProvider getResultProviderOfMatcher(ViatraQueryMatcher<? extends IPatternMatch> matcher);
+    public abstract IQueryResultProvider getResultProviderOfMatcher(InterpreterMatcher<? extends IPatternMatch> matcher);
 
     /**
      * The given callable will be executed, and all update propagation in stateful query backends
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatch.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericPatternMatch.java
index b4de2b70..7d8aa0c2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatch.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericPatternMatch.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.Arrays;
 
-import tools.refinery.viatra.runtime.api.impl.BasePatternMatch;
+import tools.refinery.interpreter.api.impl.BasePatternMatch;
 
 /**
- * Generic signature object implementation. 
+ * Generic signature object implementation.
  *
  * See also the generated matcher and signature of the pattern, with pattern-specific API simplifications.
  *
@@ -101,11 +101,11 @@ public abstract class GenericPatternMatch extends BasePatternMatch {
     public GenericQuerySpecification<? extends GenericPatternMatcher> specification() {
         return specification;
     }
-    
+
     /**
-     * Returns an empty, mutable match. 
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
-     * 
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     *
      * @return the empty match
      */
     public static GenericPatternMatch newEmptyMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
@@ -113,9 +113,9 @@ public abstract class GenericPatternMatch extends BasePatternMatch {
     }
 
     /**
-     * Returns a mutable (partial) match. 
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
-     * 
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     *
      * @param parameters
      *            the fixed value of pattern parameters, or null if not bound.
      * @return the new, mutable (partial) match object.
@@ -125,11 +125,11 @@ public abstract class GenericPatternMatch extends BasePatternMatch {
     }
 
     /**
-     * Returns a new (partial) match. 
-     * This can be used e.g. to call the matcher with a partial match. 
-     * 
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     *
      * <p>The returned match will be immutable. Use {@link #newEmptyMatch(GenericQuerySpecification)} to obtain a mutable match object.
-     * 
+     *
      * @param parameters
      *            the fixed value of pattern parameters, or null if not bound.
      * @return the (partial) match object.
@@ -137,7 +137,7 @@ public abstract class GenericPatternMatch extends BasePatternMatch {
     public static GenericPatternMatch newMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object... parameters) {
         return new Immutable(specification, Arrays.copyOf(parameters, parameters.length));
     }
-    
+
     @Override
     public IPatternMatch toImmutable() {
         return isMutable() ? newMatch(specification, array) : this;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatcher.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericPatternMatcher.java
index 9a3fbb44..63e09900 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatcher.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericPatternMatcher.java
@@ -3,26 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
-import tools.refinery.viatra.runtime.api.impl.BaseMatcher;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.api.impl.BaseMatcher;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
- * This is a generic pattern matcher for any VIATRA pattern, with "interpretative" query execution.
- * To use the pattern matcher on a given model, obtain a {@link GenericQuerySpecification} first, then 
- * invoke e.g. {@link GenericQuerySpecification#getMatcher(ViatraQueryEngine)}.
- * in conjunction with {@link ViatraQueryEngine#on(tools.refinery.viatra.runtime.api.scope.QueryScope)}.
+ * This is a generic pattern matcher for any Refinery Interpreter pattern, with "interpretative" query execution.
+ * To use the pattern matcher on a given model, obtain a {@link GenericQuerySpecification} first, then
+ * invoke e.g. {@link GenericQuerySpecification#getMatcher(InterpreterEngine)}.
+ * in conjunction with {@link InterpreterEngine#on(QueryScope)}.
  * <p>
  * Whenever available, consider using the pattern-specific generated matcher API instead.
- * 
+ *
  * <p>
  * Matches of the pattern will be represented as {@link GenericPatternMatch}.
- * 
+ *
  * @author Bergmann Gábor
  * @see GenericPatternMatch
  * @see GenericMatchProcessor
@@ -30,7 +31,7 @@ import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
  * @since 0.9
  */
 public class GenericPatternMatcher extends BaseMatcher<GenericPatternMatch> {
-    
+
     /**
      * @since 1.4
      */
@@ -42,7 +43,7 @@ public class GenericPatternMatcher extends BaseMatcher<GenericPatternMatch> {
     public GenericPatternMatch arrayToMatch(Object[] parameters) {
         return GenericPatternMatch.newMatch(getSpecification(), parameters);
     }
-    
+
     @Override
     public GenericPatternMatch arrayToMatchMutable(Object[] parameters) {
         return GenericPatternMatch.newMutableMatch(getSpecification(), parameters);
@@ -52,7 +53,7 @@ public class GenericPatternMatcher extends BaseMatcher<GenericPatternMatch> {
     protected GenericPatternMatch tupleToMatch(Tuple t) {
         return new GenericPatternMatch.Immutable(getSpecification(), /*avoid re-cloning*/t.getElements());
     }
-    
+
     @SuppressWarnings("unchecked")
     @Override
     public GenericQuerySpecification<? extends GenericPatternMatcher> getSpecification() {
@@ -66,17 +67,17 @@ public class GenericPatternMatcher extends BaseMatcher<GenericPatternMatch> {
     static <Matcher extends GenericPatternMatcher> GenericPatternMatcher instantiate(GenericQuerySpecification<Matcher> querySpecification) {
         return new GenericPatternMatcher(querySpecification);
     }
-  
+
     /**
      * Internal method for {@link GenericQuerySpecification}
      * @noreference
      */
-    static <Matcher extends GenericPatternMatcher> GenericPatternMatcher instantiate(ViatraQueryEngine engine, GenericQuerySpecification<Matcher> querySpecification) {
+    static <Matcher extends GenericPatternMatcher> GenericPatternMatcher instantiate(InterpreterEngine engine, GenericQuerySpecification<Matcher> querySpecification) {
         // check if matcher already exists
         GenericPatternMatcher matcher = engine.getExistingMatcher(querySpecification);
         if (matcher == null) {
             matcher = engine.getMatcher(querySpecification);
-        }       
+        }
         return matcher;
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQueryGroup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericQueryGroup.java
index a5661bc9..8be570c5 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQueryGroup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericQueryGroup.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -14,14 +14,14 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.api.impl.BaseQueryGroup;
+import tools.refinery.interpreter.api.impl.BaseQueryGroup;
 
 /**
  * Generic implementation of {@link IQueryGroup}, covering an arbitrarily chosen set of patterns. Use the public
  * constructor or static GenericQueryGroup.of(...) methods to instantiate.
- * 
+ *
  * @author Mark Czotter
- * 
+ *
  */
 public class GenericQueryGroup extends BaseQueryGroup {
 
@@ -29,7 +29,7 @@ public class GenericQueryGroup extends BaseQueryGroup {
 
     /**
      * Creates a GenericQueryGroup object with a set of patterns.
-     * 
+     *
      * @param patterns
      */
     public GenericQueryGroup(Set<IQuerySpecification<?>> patterns) {
@@ -43,16 +43,16 @@ public class GenericQueryGroup extends BaseQueryGroup {
 
     /**
      * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
-     * 
+     *
      * @since 2.0
      */
     public static IQueryGroup of(Stream<IQuerySpecification<?>> querySpecifications) {
         return new GenericQueryGroup(querySpecifications.collect(Collectors.toSet()));
     }
-    
+
     /**
      * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
-     * 
+     *
      * @param querySpecifications
      */
     public static IQueryGroup of(Set<IQuerySpecification<?>> querySpecifications) {
@@ -61,7 +61,7 @@ public class GenericQueryGroup extends BaseQueryGroup {
 
     /**
      * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
-     * 
+     *
      * @param querySpecifications
      */
     public static IQueryGroup of(IQuerySpecification<?>... querySpecifications) {
@@ -70,7 +70,7 @@ public class GenericQueryGroup extends BaseQueryGroup {
 
     /**
      * Creates a generic {@link IQueryGroup} instance from other {@link IQueryGroup} objects (subgroups).
-     * 
+     *
      */
     public static IQueryGroup of(IQueryGroup... subGroups) {
         Set<IQuerySpecification<?>> patterns = new HashSet<IQuerySpecification<?>>();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQuerySpecification.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericQuerySpecification.java
index 5681ac19..47502a8c 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQuerySpecification.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/GenericQuerySpecification.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
-import tools.refinery.viatra.runtime.api.impl.BaseQuerySpecification;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+import tools.refinery.interpreter.api.impl.BaseQuerySpecification;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
 
 /**
- * This is a generic query specification for VIATRA pattern matchers, for "interpretative" query execution. 
- * Should be subclassed by query specification implementations specific to query languages.
+ * This is a generic query specification for Refinery Interpreter pattern matchers, for "interpretative" query
+ * execution. Should be subclassed by query specification implementations specific to query languages.
  *
  * <p>
  * When available, consider using the pattern-specific generated matcher API instead.
@@ -23,15 +23,14 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
  * <p>
  * The created matcher will be of type {@link GenericPatternMatcher}. Matches of the pattern will be represented as
  * {@link GenericPatternMatch}.
- * 
+ *
  * <p>
- * Note for overriding (if you have your own query language or ): 
- * Derived classes should use {@link #defaultInstantiate(ViatraQueryEngine)} for implementing 
- * {@link #instantiate(ViatraQueryEngine)} if they use {@link GenericPatternMatcher} proper.
+ * Note for overriding (if you have your own query language or ):
+ * Derived classes should use {@link #defaultInstantiate(InterpreterEngine)} for implementing
+ * {@link #instantiate(InterpreterEngine)} if they use {@link GenericPatternMatcher} proper.
  *
  * @see GenericPatternMatcher
  * @see GenericPatternMatch
- * @see GenericMatchProcessor
  * @author Bergmann Gábor
  * @noinstantiate This class is not intended to be instantiated by end-users.
  * @since 0.9
@@ -57,11 +56,11 @@ public abstract class GenericQuerySpecification<Matcher extends GenericPatternMa
     }
 
     /**
-     * Derived classes should use this implementation of {@link #instantiate(ViatraQueryEngine)} 
+     * Derived classes should use this implementation of {@link #instantiate(InterpreterEngine)}
      * if they use {@link GenericPatternMatcher} proper.
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
-    protected GenericPatternMatcher defaultInstantiate(ViatraQueryEngine engine) {
+    protected GenericPatternMatcher defaultInstantiate(InterpreterEngine engine) {
         return GenericPatternMatcher.instantiate(engine, this);
     }
 
@@ -73,4 +72,4 @@ public abstract class GenericQuerySpecification<Matcher extends GenericPatternMa
         return getInternalQueryRepresentation().getVisibility();
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IMatchUpdateListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IMatchUpdateListener.java
index 23c64537..3d71f947 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IMatchUpdateListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IMatchUpdateListener.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 /**
  * An interface for low-level notifications about match appearance and disappearance.
- * 
+ *
  * <p>
- * See {@link ViatraQueryMatcher#addCallbackOnMatchUpdate(IMatchUpdateListener, boolean)} for usage. Clients should
+ * See {@link InterpreterMatcher#addCallbackOnMatchUpdate(IMatchUpdateListener, boolean)} for usage. Clients should
  * consider using {@link MatchUpdateAdapter} or deriving their implementation from it.
- * 
+ *
  * @author Bergmann Gabor
- * 
+ *
  */
 public interface IMatchUpdateListener<Match extends IPatternMatch> {
     /**
      * Will be invoked on each new match that appears.
-     * 
+     *
      * @param match
      *            the match that has just appeared.
      */
@@ -29,7 +29,7 @@ public interface IMatchUpdateListener<Match extends IPatternMatch> {
 
     /**
      * Will be invoked on each existing match that disappears.
-     * 
+     *
      * @param match
      *            the match that has just disappeared.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IPatternMatch.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IPatternMatch.java
index be6467cc..6ea8e0db 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IPatternMatch.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IPatternMatch.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.List;
 
 /**
  * Generic interface for a single match of a pattern. Each instance is a (partial) substitution of pattern parameters,
  * essentially a parameter to value mapping.
- * 
+ *
  * <p>Can also represent a partial match; unsubstituted parameters are assigned to null. Pattern matchers must never return
  * a partial match, but they accept partial matches as method parameters.
- * 
+ *
  * @author Bergmann Gábor
  */
 public interface IPatternMatch extends Cloneable /* , Map<String, Object> */{
     /** @return the pattern for which this is a match. */
-    public IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> specification();
+    public IQuerySpecification<? extends InterpreterMatcher<? extends IPatternMatch>> specification();
 
     /** Identifies the name of the pattern for which this is a match. */
     public String patternName();
@@ -38,9 +38,9 @@ public interface IPatternMatch extends Cloneable /* , Map<String, Object> */{
 
     /**
      * Sets the parameter with the given name to the given value.
-     * 
+     *
      * <p> Works only if match is mutable. See {@link #isMutable()}.
-     * 
+     *
      * @returns true if successful, false if parameter name is invalid. May also fail and return false if the value type
      *          is incompatible.
      * @throws UnsupportedOperationException if match is not mutable.
@@ -49,9 +49,9 @@ public interface IPatternMatch extends Cloneable /* , Map<String, Object> */{
 
     /**
      * Sets the parameter at the given position to the given value.
-     * 
+     *
      * <p> Works only if match is mutable. See {@link #isMutable()}.
-     * 
+     *
      * @returns true if successful, false if position is invalid. May also fail and return false if the value type is
      *          incompatible.
      * @throws UnsupportedOperationException if match is not mutable.
@@ -59,47 +59,47 @@ public interface IPatternMatch extends Cloneable /* , Map<String, Object> */{
     public boolean set(int position, Object newValue);
 
     /**
-     * Returns whether the match object can be further modified after its creation. Setters work only if the match is mutable. 
-     * 
-     * <p>Matches computed by the pattern matchers are not mutable, so that the match set cannot be modified externally. 
-     * Partial matches used as matcher input, however, can be mutable; such match objects can be created using {@link ViatraQueryMatcher#newEmptyMatch()}. 
-     * 
+     * Returns whether the match object can be further modified after its creation. Setters work only if the match is mutable.
+     *
+     * <p>Matches computed by the pattern matchers are not mutable, so that the match set cannot be modified externally.
+     * Partial matches used as matcher input, however, can be mutable; such match objects can be created using {@link InterpreterMatcher#newEmptyMatch()}.
+     *
      * @return whether the match can be modified
      */
     public boolean isMutable();
-    
-    /** 
-     * Converts the match to an array representation, with each pattern parameter at their respective position. 
-     * In case of a partial match, unsubstituted parameters will be represented as null elements in the array. 
+
+    /**
+     * Converts the match to an array representation, with each pattern parameter at their respective position.
+     * In case of a partial match, unsubstituted parameters will be represented as null elements in the array.
      *
      * @return a newly constructed array containing each parameter substitution of the match in order.
      */
     public Object[] toArray();
-    
+
     /**
      * Takes an immutable snapshot of this match.
      * @return the match itself in case of immutable matches, an immutable copy in case of mutable ones.
      */
     public IPatternMatch toImmutable();
-    
+
     /** Prints the list of parameter-value pairs. */
     public String prettyPrint();
-    
+
     /**
      * Checks that this match is compatible with the given other match.
      * This is used for filtering the match set of a matcher.
-     * 
+     *
      * <p/> Two non-null matches are compatible if and only if:
      * <ul>
      *   <li>They share the same pattern.</li>
      *   <li>For each parameter, where they are set (non-null) in both matches,
      *    their values are equal.</li>
-     *   </li>  
+     *   </li>
      * </ul>
-     * 
+     *
      * <p/> Furthermore, all matches are considered compatible with
      *  null matches (e.g. empty filter).
-     * 
+     *
      * @param other
      * @return true, if this is compatible with other, or other is null
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQueryGroup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IQueryGroup.java
index a783f823..151d0723 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQueryGroup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IQueryGroup.java
@@ -3,40 +3,40 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.Set;
 
 /**
  * Generic interface for group of query specifications.
- * 
+ *
  * <p>It handles more than one patterns as a group, and provides functionality to initialize the matchers together (which
  * has performance benefits).
- * 
+ *
  * @author Mark Czotter
- * 
+ *
  */
 public interface IQueryGroup {
 
     /**
-     * Initializes matchers for the group of patterns within an {@link ViatraQueryEngine}. If some of the pattern matchers are already
+     * Initializes matchers for the group of patterns within an {@link InterpreterEngine}. If some of the pattern matchers are already
      * constructed in the engine, no task is performed for them.
-     * 
+     *
      * <p>
      * This preparation step has the advantage that it prepares pattern matchers for an arbitrary number of patterns in a
-     * single-pass traversal of the model. 
-     * This is typically more efficient than traversing the model each time an individual pattern matcher is initialized on demand. 
+     * single-pass traversal of the model.
+     * This is typically more efficient than traversing the model each time an individual pattern matcher is initialized on demand.
      * The performance benefit only manifests itself if the engine is not in wildcard mode.
-     * 
+     *
      * @param engine
-     *            the existing VIATRA Query engine in which the matchers will be created.
+     *            the existing Refinery Interpreter engine in which the matchers will be created.
      * @throws ViatraQueryRuntimeException
      *             if there was an error in preparing the engine
      */
-    public void prepare(ViatraQueryEngine engine);
+    public void prepare(InterpreterEngine engine);
 
     /**
      * Returns the currently assigned {@link IQuerySpecification}s.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQuerySpecification.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IQuerySpecification.java
index 326d2202..22861842 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQuerySpecification.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/IQuerySpecification.java
@@ -7,36 +7,36 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueryHeader;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQueryHeader;
 
 /**
- * API interface for a VIATRA query specification. Each query is associated with a pattern. Methods instantiate a matcher
- * of the pattern with various parameters.
+ * API interface for a Refinery Interpreter query specification. Each query is associated with a pattern. Methods
+ * instantiate a matcher of the pattern with various parameters.
  *
  * <p> As of 0.9.0, some internal details (mostly relevant for query evaluator backends) have been moved to {@link #getInternalQueryRepresentation()}.
  *
  * @author Bergmann Gábor
  *
  */
-public interface IQuerySpecification<Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> extends PQueryHeader {
+public interface IQuerySpecification<Matcher extends InterpreterMatcher<? extends IPatternMatch>> extends PQueryHeader {
 
     /**
-     * Initializes the pattern matcher within an existing {@link ViatraQueryEngine}. If the pattern matcher is already
+     * Initializes the pattern matcher within an existing {@link InterpreterEngine}. If the pattern matcher is already
      * constructed in the engine, only a lightweight reference is created.
      * <p>
      * The match set will be incrementally refreshed upon updates.
      *
      * @param engine
-     *            the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException
+     *            the existing Refinery Interpreter engine in which this matcher will be created.
+     * @throws InterpreterRuntimeException
      *             if an error occurs during pattern matcher creation
      */
-    public Matcher getMatcher(ViatraQueryEngine engine);
+    public Matcher getMatcher(InterpreterEngine engine);
 
 
     /**
@@ -76,8 +76,8 @@ public interface IQuerySpecification<Matcher extends ViatraQueryMatcher<? extend
 
     /**
      * Creates a new uninitialized matcher, which is not functional until an engine initializes it. Clients
-     * should not call this method, it is used by the {@link ViatraQueryEngine} instance to instantiate matchers.
-     * @throws ViatraQueryRuntimeException
+     * should not call this method, it is used by the {@link InterpreterEngine} instance to instantiate matchers.
+     * @throws InterpreterRuntimeException
      * @noreference This method is not intended to be referenced by clients.
      * @since 1.4
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngine.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngine.java
index 0f402b49..e4330783 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngine.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngine.java
@@ -8,11 +8,11 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
-import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.interpreter.api.scope.IBaseIndex;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 import java.util.Set;
 import java.util.function.Supplier;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  *
  * <p>
  * By default, ViatraQueryEngines do not need to be separately disposed; they will be garbage collected along with the model.
- * Advanced users: see {@link AdvancedViatraQueryEngine} if you want fine control over the lifecycle of an engine.
+ * Advanced users: see {@link AdvancedInterpreterEngine} if you want fine control over the lifecycle of an engine.
  *
  * <p>
  * Pattern matchers within this engine may be instantiated in the following ways:
@@ -43,63 +43,17 @@ import java.util.stream.Collectors;
  * @author Bergmann Gábor
  * @noextend This class is not intended to be subclassed by clients.
  */
-public abstract class ViatraQueryEngine {
-
-
-    /**
-     * Obtain a (managed) {@link ViatraQueryEngine} to evaluate queries over a given scope specified by an {@link QueryScope}.
-     *
-     * <p> For a given matcher scope, the same engine will be returned to any client.
-     * This facilitates the reuse of internal caches of the engine, greatly improving performance.
-     *
-     * <p> The lifecycle of this engine is centrally managed, and will not be disposed as long as the model is retained in memory.
-     * The engine will be garbage collected along with the model.
-     *
-     * <p>
-     * Advanced users: see {@link AdvancedViatraQueryEngine#createUnmanagedEngine(QueryScope)} to obtain a private,
-     * unmanaged engine that is not shared with other clients and allows tight control over its lifecycle.
-     *
-     * @param scope
-     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
-     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
-     * @return a (managed) {@link ViatraQueryEngine} instance
-     */
-    public static ViatraQueryEngine on(QueryScope scope) {
-        return ViatraQueryEngineManager.getInstance().getQueryEngine(scope);
-    }
-
-    /**
-     * Obtain a (managed) {@link ViatraQueryEngine} to evaluate queries over a given scope specified by an {@link QueryScope}.
-     *
-     * <p> For a given matcher scope, the same engine will be returned to any client.
-     * This facilitates the reuse of internal caches of the engine, greatly improving performance.
-     *
-     * <p> The lifecycle of this engine is centrally managed, and will not be disposed as long as the model is retained in memory.
-     * The engine will be garbage collected along with the model.
-     *
-     * <p>
-     * Advanced users: see {@link AdvancedViatraQueryEngine#createUnmanagedEngine(QueryScope)} to obtain a private,
-     * unmanaged engine that is not shared with other clients and allows tight control over its lifecycle.
-     *
-     * @param scope
-     *      the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
-     *      Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
-     * @return a (managed) {@link ViatraQueryEngine} instance
-     * @since 1.4
-     */
-    public static ViatraQueryEngine on(QueryScope scope, ViatraQueryEngineOptions options) {
-        return ViatraQueryEngineManager.getInstance().getQueryEngine(scope, options);
-    }
+public abstract class InterpreterEngine {
 
     /**
      * Provides access to the internal base index component of the engine, responsible for keeping track of basic
      * contents of the model.
      *
      * <p>If using an {@link EMFScope},
-     *  consider {@link EMFScope#extractUnderlyingEMFIndex(ViatraQueryEngine)} instead to access EMF-specific details.
+     *  consider {@link EMFScope#extractUnderlyingEMFIndex(InterpreterEngine)} instead to access EMF-specific details.
      *
      * @return the baseIndex the NavigationHelper maintaining the base index
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      *             if the base index could not be constructed
      */
     public abstract IBaseIndex getBaseIndex();
@@ -107,39 +61,39 @@ public abstract class ViatraQueryEngine {
     /**
      * Access a pattern matcher based on a {@link IQuerySpecification}.
      * Multiple calls will return the same matcher.
-     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @param querySpecification a {@link IQuerySpecification} that describes a Refinery Interpreter query specification
      * @return a pattern matcher corresponding to the specification
-     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     * @throws InterpreterRuntimeException if the matcher could not be initialized
      */
-    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(IQuerySpecification<Matcher> querySpecification);
+    public abstract <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getMatcher(IQuerySpecification<Matcher> querySpecification);
 
     /**
      * Access a pattern matcher for the graph pattern with the given fully qualified name.
      * Will succeed only if a query specification for this fully qualified name has been generated and registered.
      * Multiple calls will return the same matcher unless the registered specification changes.
      *
-     * @param patternFQN the fully qualified name of a VIATRA query specification
+     * @param patternFQN the fully qualified name of a Refinery Interpreter query specification
      * @return a pattern matcher corresponding to the specification
-     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     * @throws InterpreterRuntimeException if the matcher could not be initialized
      */
-    public abstract ViatraQueryMatcher<? extends IPatternMatch> getMatcher(String patternFQN);
+    public abstract InterpreterMatcher<? extends IPatternMatch> getMatcher(String patternFQN);
 
     /**
      * Access an existing pattern matcher based on a {@link IQuerySpecification}.
-     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @param querySpecification a {@link IQuerySpecification} that describes a Refinery Interpreter query specification
      * @return a pattern matcher corresponding to the specification, <code>null</code> if a matcher does not exist yet.
      */
-    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification);
+    public abstract <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification);
 
 
     /**
-     * Access a copy of available {@link ViatraQueryMatcher} pattern matchers.
+     * Access a copy of available {@link InterpreterMatcher} pattern matchers.
      * @return a copy of the set of currently available pattern matchers registered on this engine instance
      */
-    public abstract Set<? extends ViatraQueryMatcher<? extends IPatternMatch>> getCurrentMatchers();
+    public abstract Set<? extends InterpreterMatcher<? extends IPatternMatch>> getCurrentMatchers();
 
-    public Set<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> getRegisteredQuerySpecifications() {
-        return getCurrentMatchers().stream().map(ViatraQueryMatcher::getSpecification).collect(Collectors.toSet());
+    public Set<IQuerySpecification<? extends InterpreterMatcher<? extends IPatternMatch>>> getRegisteredQuerySpecifications() {
+        return getCurrentMatchers().stream().map(InterpreterMatcher::getSpecification).collect(Collectors.toSet());
     }
 
     /**
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineInitializationListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineInitializationListener.java
index 02162a65..f26c1bb3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineInitializationListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineInitializationListener.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 /**
  * Listener interface to get notifications when a new managed engine is initialized.
- * 
+ *
  * @author Abel Hegedus
  *
  */
-public interface ViatraQueryEngineInitializationListener {
+public interface InterpreterEngineInitializationListener {
 
     /**
      * Called when a managed engine is initialized in the EngineManager.
-     * 
+     *
      * @param engine the initialized engine
      */
-    void engineInitialized(AdvancedViatraQueryEngine engine);
-    
+    void engineInitialized(AdvancedInterpreterEngine engine);
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineLifecycleListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineLifecycleListener.java
index 1c4dc264..c9c16c01 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineLifecycleListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineLifecycleListener.java
@@ -3,48 +3,48 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 
 /**
- * Listener interface for getting notification on changes in an {@link ViatraQueryEngine}.
- * 
+ * Listener interface for getting notification on changes in an {@link InterpreterEngine}.
+ *
  * You can use it to remove any other listeners that you attached to matchers or the engine,
  * or to handle matchers that are initialized after you started using the engine.
- * 
+ *
  * @author Abel Hegedus
  *
  */
-public interface ViatraQueryEngineLifecycleListener {
+public interface InterpreterEngineLifecycleListener {
 
     // -------------------------------------------------------------------------------
     // MATCHERS (methods notifying on changes in the matchers available in the engine)
     // -------------------------------------------------------------------------------
-    
+
     /**
      * Called after a matcher is instantiated in the engine
-     *  
+     *
      * @param matcher the new matcher
      */
-    void matcherInstantiated(ViatraQueryMatcher<? extends IPatternMatch> matcher);
-    
+    void matcherInstantiated(InterpreterMatcher<? extends IPatternMatch> matcher);
+
     // -------------------------------------------------------------------------
     // HEALTH (methods notifying on changes that affect the health of the engine
     // -------------------------------------------------------------------------
-    
+
     /**
      * Called after the engine has become tainted due to a fatal error
      */
     void engineBecameTainted(String message, Throwable t);
-    
+
     /**
      * Called after the engine has been wiped
      */
     void engineWiped();
-    
+
     /**
      * Called after the engine has been disposed
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineOptions.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineOptions.java
index 15bf1f91..2b0f949b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineOptions.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterEngineOptions.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
+
 
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactoryProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 import java.util.Objects;
 import java.util.ServiceLoader;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-
 /**
- * This class is intended to provide options to a created {@link ViatraQueryEngine} instance. The {@link #DEFAULT}
+ * This class is intended to provide options to a created {@link InterpreterEngine} instance. The {@link #DEFAULT}
  * instance represents the configuration that is selected when no explicit options are provided by the user. To create
  * new configurations, use the static builder methods {@link #defineOptions()} (starts with empty options) or
- * {@link #copyOptions(ViatraQueryEngineOptions)} (starts with all options from an existing configuration).
- * 
+ * {@link #copyOptions(InterpreterEngineOptions)} (starts with all options from an existing configuration).
+ *
  * @author Balázs Grill, Zoltan Ujhelyi
  * @since 1.4
  *
  */
-public final class ViatraQueryEngineOptions {
+public final class InterpreterEngineOptions {
 
     private static boolean areSystemDefaultsCalculated = false;
     private static IQueryBackendFactory systemDefaultBackendFactory;
     private static IQueryBackendFactory systemDefaultCachingBackendFactory;
     private static IQueryBackendFactory systemDefaultSearchBackendFactory;
-    
+
     /**
      * @since 2.0
      */
@@ -41,11 +41,11 @@ public final class ViatraQueryEngineOptions {
             IQueryBackendFactory systemDefaultCachingBackendFactory,
             IQueryBackendFactory systemDefaultSearchBackendFactory) {
                 areSystemDefaultsCalculated = true;
-                ViatraQueryEngineOptions.systemDefaultBackendFactory = systemDefaultBackendFactory;
-                ViatraQueryEngineOptions.systemDefaultCachingBackendFactory = systemDefaultCachingBackendFactory;
-                ViatraQueryEngineOptions.systemDefaultSearchBackendFactory = systemDefaultSearchBackendFactory;
+                InterpreterEngineOptions.systemDefaultBackendFactory = systemDefaultBackendFactory;
+                InterpreterEngineOptions.systemDefaultCachingBackendFactory = systemDefaultCachingBackendFactory;
+                InterpreterEngineOptions.systemDefaultSearchBackendFactory = systemDefaultSearchBackendFactory;
     }
-    
+
     /**
      * If {@link #setSystemDefaultBackends(IQueryBackendFactory, IQueryBackendFactory, IQueryBackendFactory)} is not
      * called, this method is responsible of finding the corresponding backends on the classpath using Java Service
@@ -65,40 +65,40 @@ public final class ViatraQueryEngineOptions {
         }
         areSystemDefaultsCalculated = true;
     }
-    
+
     private static IQueryBackendFactory getSystemDefaultBackend() {
         if (!areSystemDefaultsCalculated) {
             calculateSystemDefaultBackends();
         }
         return Objects.requireNonNull(systemDefaultBackendFactory, "System default backend not found");
     }
-    
+
     private static IQueryBackendFactory getSystemDefaultCachingBackend() {
         if (!areSystemDefaultsCalculated) {
             calculateSystemDefaultBackends();
         }
         return Objects.requireNonNull(systemDefaultCachingBackendFactory, "System default caching backend not found");
     }
-    
+
     private static IQueryBackendFactory getSystemDefaultSearchBackend() {
         if (!areSystemDefaultsCalculated) {
             calculateSystemDefaultBackends();
         }
         return Objects.requireNonNull(systemDefaultSearchBackendFactory, "System default search backend not found");
     }
-    
+
     private final QueryEvaluationHint engineDefaultHints;
 
     private final IQueryBackendFactory defaultCachingBackendFactory;
     private final IQueryBackendFactory defaultSearchBackendFactory;
 
     /** The default engine options; if options are not defined, this version will be used. */
-    private static ViatraQueryEngineOptions DEFAULT;
-    
+    private static InterpreterEngineOptions DEFAULT;
+
     /**
      * @since 2.0
      */
-    public static final ViatraQueryEngineOptions getDefault() {
+    public static final InterpreterEngineOptions getDefault() {
         if (DEFAULT == null) {
             DEFAULT = new Builder().build();
         }
@@ -116,7 +116,7 @@ public final class ViatraQueryEngineOptions {
 
         }
 
-        public Builder(ViatraQueryEngineOptions from) {
+        public Builder(InterpreterEngineOptions from) {
             this.engineDefaultHints = from.engineDefaultHints;
             this.defaultBackendFactory = engineDefaultHints.getQueryBackendFactory();
             this.defaultCachingBackendFactory = from.defaultCachingBackendFactory;
@@ -149,17 +149,17 @@ public final class ViatraQueryEngineOptions {
             this.defaultSearchBackendFactory = defaultSearchBackendFactory;
             return this;
         }
-        
+
         public Builder withDefaultCachingBackend(IQueryBackendFactory defaultCachingBackendFactory) {
             Preconditions.checkArgument(defaultCachingBackendFactory.isCaching(), "%s is not a caching backend", defaultCachingBackendFactory.getClass());
             this.defaultCachingBackendFactory = defaultCachingBackendFactory;
             return this;
         }
 
-        public ViatraQueryEngineOptions build() {
+        public InterpreterEngineOptions build() {
             IQueryBackendFactory defaultFactory = getDefaultBackend();
             QueryEvaluationHint hint = getEngineDefaultHints(defaultFactory);
-            return new ViatraQueryEngineOptions(hint, getDefaultCachingBackend(), getDefaultSearchBackend());
+            return new InterpreterEngineOptions(hint, getDefaultCachingBackend(), getDefaultSearchBackend());
         }
 
         private IQueryBackendFactory getDefaultBackend() {
@@ -181,7 +181,7 @@ public final class ViatraQueryEngineOptions {
                 return getSystemDefaultCachingBackend();
             }
         }
-        
+
         private IQueryBackendFactory getDefaultSearchBackend() {
             if (defaultSearchBackendFactory != null) {
                 return defaultSearchBackendFactory;
@@ -211,12 +211,12 @@ public final class ViatraQueryEngineOptions {
     /**
      * Initializes an option builder with settings from an existing configuration.
      */
-    public static Builder copyOptions(ViatraQueryEngineOptions options) {
+    public static Builder copyOptions(InterpreterEngineOptions options) {
         return new Builder(options);
     }
 
-    private ViatraQueryEngineOptions(QueryEvaluationHint engineDefaultHints,
-            IQueryBackendFactory defaultCachingBackendFactory, IQueryBackendFactory defaultSearchBackendFactory) {
+    private InterpreterEngineOptions(QueryEvaluationHint engineDefaultHints,
+                                                                         IQueryBackendFactory defaultCachingBackendFactory, IQueryBackendFactory defaultSearchBackendFactory) {
         this.engineDefaultHints = engineDefaultHints;
         this.defaultCachingBackendFactory = defaultCachingBackendFactory;
         this.defaultSearchBackendFactory = defaultSearchBackendFactory;
@@ -228,20 +228,20 @@ public final class ViatraQueryEngineOptions {
 
     /**
      * Returns the configured default backend
-     * 
+     *
      * @return the defaultBackendFactory
      */
     public IQueryBackendFactory getDefaultBackendFactory() {
         switch (engineDefaultHints.getQueryBackendRequirementType()) {
         case DEFAULT_CACHING:
-            return ViatraQueryEngineOptions.getSystemDefaultCachingBackend();
+            return InterpreterEngineOptions.getSystemDefaultCachingBackend();
         case DEFAULT_SEARCH:
-            return ViatraQueryEngineOptions.getSystemDefaultCachingBackend();
+            return InterpreterEngineOptions.getSystemDefaultCachingBackend();
         case SPECIFIC:
             return engineDefaultHints.getQueryBackendFactory();
         case UNSPECIFIED:
         default:
-            return ViatraQueryEngineOptions.getSystemDefaultBackend();
+            return InterpreterEngineOptions.getSystemDefaultBackend();
         }
     }
 
@@ -252,7 +252,7 @@ public final class ViatraQueryEngineOptions {
     public IQueryBackendFactory getDefaultCachingBackendFactory() {
         return defaultCachingBackendFactory;
     }
-    
+
     /**
      * Returns the configured default search-based backend. If the default backend is search-based, it is usually expected, but
      * not mandatory for the two default backends to be the same.
@@ -265,12 +265,12 @@ public final class ViatraQueryEngineOptions {
     @Override
     public String toString() {
         // TODO defaultCachingBackendFactory is ignored
-        if(Objects.equals(engineDefaultHints, DEFAULT.engineDefaultHints)) 
+        if(Objects.equals(engineDefaultHints, DEFAULT.engineDefaultHints))
             return "defaults";
         else
             return engineDefaultHints.toString();
     }
-    
+
     /**
      * @since 2.0
      */
@@ -280,9 +280,9 @@ public final class ViatraQueryEngineOptions {
         }
 
         switch (hint.getQueryBackendRequirementType()) {
-        case DEFAULT_CACHING: 
+        case DEFAULT_CACHING:
             return getDefaultCachingBackendFactory();
-        case DEFAULT_SEARCH: 
+        case DEFAULT_SEARCH:
             return getDefaultSearchBackendFactory();
         case SPECIFIC:
             return hint.getQueryBackendFactory();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryMatcher.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterMatcher.java
index 1ae0c96f..beeb124c 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryMatcher.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterMatcher.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,17 +17,17 @@ import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 /**
- * Interface for a VIATRA Query matcher associated with a graph pattern.
- * 
+ * Interface for a Refinery Interpreter matcher associated with a graph pattern.
+ *
  * @param <Match>
  *            the IPatternMatch type representing a single match of this pattern.
  * @author Bergmann Gábor
  * @noimplement This interface is not intended to be implemented by clients. Implement BaseMatcher instead.
  */
-public interface ViatraQueryMatcher<Match extends IPatternMatch> {
+public interface InterpreterMatcher<Match extends IPatternMatch> {
     // REFLECTION
     /** The pattern that will be matched. */
-    IQuerySpecification<? extends ViatraQueryMatcher<Match>> getSpecification();
+    IQuerySpecification<? extends InterpreterMatcher<Match>> getSpecification();
 
     /** Fully qualified name of the pattern. */
     String getPatternName();
@@ -41,40 +41,40 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     // ALL MATCHES
     /**
      * Returns the set of all pattern matches.
-     * 
+     *
      * @return matches represented as a Match object.
      */
     Collection<Match> getAllMatches();
 
     /**
      * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * 
+     *
      * @param partialMatch
      *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
      *            a fixed value.
      * @return matches represented as a Match object.
      */
     Collection<Match> getAllMatches(Match partialMatch);
-    
+
     /**
      * Returns a stream of all pattern matches.
      * <p>
      * <strong>WARNING</strong> If the result set changes while the stream is evaluated, the set of matches included in
      * the stream are unspecified. In such cases, either rely on {@link #getAllMatches()} or collect the results of the
      * stream in end-user code.
-     * 
+     *
      * @return matches represented as a Match object.
      * @since 2.0
      */
     Stream<Match> streamAllMatches();
-    
+
     /**
      * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
      * <p>
      * <strong>WARNING</strong> If the result set changes while the stream is evaluated, the set of matches included in
      * the stream are unspecified. In such cases, either rely on {@link #getAllMatches()} or collect the results of the
      * stream in end-user code.
-     * 
+     *
      * @param partialMatch
      *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
      *            a fixed value.
@@ -82,13 +82,13 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
      * @since 2.0
      */
     Stream<Match> streamAllMatches(Match partialMatch);
-    
+
     // variant(s) with input binding as pattern-specific parameters: not declared in interface
 
     // SINGLE MATCH
     /**
      * Returns an arbitrarily chosen pattern match. Neither determinism nor randomness of selection is guaranteed.
-     * 
+     *
      * @return a match represented as a Match object, or an empty Optional if no match is found.
      * @since 2.0
      */
@@ -97,7 +97,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     /**
      * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
      * Neither determinism nor randomness of selection is guaranteed.
-     * 
+     *
      * @param partialMatch
      *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
      *            a fixed value.
@@ -111,16 +111,16 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     // MATCH CHECKING
     /**
      * Indicates whether the query has any kind of matches.
-     * 
+     *
      * @return true if there exists a valid match of the pattern.
      * @since 1.7
      */
     boolean hasMatch();
-    
+
     /**
      * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match, under
      * any possible substitution of the unspecified parameters (if any).
-     * 
+     *
      * @param partialMatch
      *            a (partial) match of the pattern where each non-null field binds the corresponding pattern parameter
      *            to a fixed value.
@@ -133,14 +133,14 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     // NUMBER OF MATCHES
     /**
      * Returns the number of all pattern matches.
-     * 
+     *
      * @return the number of pattern matches found.
      */
     int countMatches();
 
     /**
      * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * 
+     *
      * @param partialMatch
      *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
      *            a fixed value.
@@ -153,7 +153,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     // FOR EACH MATCH
     /**
      * Executes the given processor on each match of the pattern.
-     * 
+     *
      * @param processor
      *            the action that will process each pattern match.
      * @since 2.0
@@ -163,7 +163,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     /**
      * Executes the given processor on each match of the pattern that conforms to the given fixed values of some
      * parameters.
-     * 
+     *
      * @param partialMatch
      *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
      * @param processor
@@ -178,7 +178,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     /**
      * Executes the given processor on an arbitrarily chosen match of the pattern. Neither determinism nor randomness of
      * selection is guaranteed.
-     * 
+     *
      * @param processor
      *            the action that will process the selected match.
      * @return true if the pattern has at least one match, false if the processor was not invoked
@@ -189,7 +189,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     /**
      * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed
      * values of some parameters. Neither determinism nor randomness of selection is guaranteed.
-     * 
+     *
      * @param partialMatch
      *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
      * @param processor
@@ -201,24 +201,24 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     boolean forOneArbitraryMatch(Match partialMatch, Consumer<? super Match> processor);
 
     // variant(s) with input binding as pattern-specific parameters: not declared in interface
-    
+
     /**
-     * Returns an empty, mutable Match for the matcher. 
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
-     * This can be used to call the matcher with a partial match 
+     * Returns an empty, mutable Match for the matcher.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * This can be used to call the matcher with a partial match
      *  even if the specific class of the matcher or the match is unknown.
-     * 
+     *
      * @return the empty match
      */
     Match newEmptyMatch();
 
     /**
-     * Returns a new (partial) Match object for the matcher. 
+     * Returns a new (partial) Match object for the matcher.
      * This can be used e.g. to call the matcher with a partial
-     * match. 
-     * 
+     * match.
+     *
      * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * 
+     *
      * @param parameters
      *            the fixed value of pattern parameters, or null if not bound.
      * @return the (partial) match object.
@@ -227,7 +227,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
 
     /**
      * Retrieve the set of values that occur in matches for the given parameterName.
-     * 
+     *
      * @param parameterName
      *            name of the parameter for which values are returned
      * @return the Set of all values for the given parameter, null if the parameter with the given name does not exists,
@@ -238,7 +238,7 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
     /**
      * Retrieve the set of values that occur in matches for the given parameterName, that conforms to the given fixed
      * values of some parameters.
-     * 
+     *
      * @param parameterName
      *            name of the parameter for which values are returned
      * @param partialMatch
@@ -251,8 +251,8 @@ public interface ViatraQueryMatcher<Match extends IPatternMatch> {
 
     /**
      * Returns the engine that the matcher uses.
-     * 
+     *
      * @return the engine
      */
-    ViatraQueryEngine getEngine();
-}
\ No newline at end of file
+    InterpreterEngine getEngine();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryModelUpdateListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterModelUpdateListener.java
index da8bf87e..796b1828 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryModelUpdateListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/InterpreterModelUpdateListener.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 
 
 /**
- * Listener interface for model changes affecting different levels of the VIATRA Query architecture.
- * 
+ * Listener interface for model changes affecting different levels of the Refinery Interpreter architecture.
+ *
  * @author Abel Hegedus
  *
  */
-public interface ViatraQueryModelUpdateListener {
+public interface InterpreterModelUpdateListener {
 
-    /** 
+    /**
      * Possible notification levels for changes
-     * 
+     *
      * @author Abel Hegedus
      *
      */
     enum ChangeLevel {
         NO_CHANGE, MODEL, INDEX, MATCHSET;
-        
+
         public ChangeLevel changeOccured(ChangeLevel occuredLevel) {
             if(this.compareTo(occuredLevel) < 0) {
                 return occuredLevel;
@@ -38,18 +38,18 @@ public interface ViatraQueryModelUpdateListener {
     /**
      * Called after each change with also sending the level of change.
      * Only called if the change level is at least at the level returned by getLevel().
-     * 
+     *
      * @param changeLevel
      */
     void notifyChanged(ChangeLevel changeLevel);
-    
+
     /**
      * This may be queried only ONCE (!!!) at the registration of the listener.
-     * 
+     *
      * NOTE: this allows us to only create engine level change providers if there is someone who needs it.
-     * 
+     *
      * @return the change level where you want notifications
      */
     ChangeLevel getLevel();
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/MatchUpdateAdapter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/MatchUpdateAdapter.java
index 7de6d2c6..7b3a2087 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/MatchUpdateAdapter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/MatchUpdateAdapter.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api;
+package tools.refinery.interpreter.api;
 
 import java.util.function.Consumer;
 
 /**
  * A default implementation of {@link IMatchUpdateListener} that contains two match processors, one for appearance, one
  * for disappearance. Any of the two can be null; in this case, corresponding notifications will be ignored.
- * 
+ *
  * <p>
  * Instantiate using either constructor.
- * 
+ *
  * @author Bergmann Gabor
- * 
+ *
  */
 public class MatchUpdateAdapter<Match extends IPatternMatch> implements IMatchUpdateListener<Match> {
 
@@ -27,7 +27,7 @@ public class MatchUpdateAdapter<Match extends IPatternMatch> implements IMatchUp
 
     /**
      * Constructs an instance without any match processors registered yet.
-     * 
+     *
      * Use {@link #setAppearCallback(Consumer)} and {@link #setDisappearCallback(Consumer)} to specify
      * optional match processors for match appearance and disappearance, respectively.
      */
@@ -37,7 +37,7 @@ public class MatchUpdateAdapter<Match extends IPatternMatch> implements IMatchUp
 
     /**
      * Constructs an instance by specifying match processors.
-     * 
+     *
      * @param appearCallback
      *            a match processor that will be invoked on each new match that appears. If null, no callback will be
      *            executed on match appearance. See {@link Consumer} for details on how to implement.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseGeneratedPatternGroup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseGeneratedPatternGroup.java
index 2e2a823b..be8fc07c 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseGeneratedPatternGroup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseGeneratedPatternGroup.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.impl;
+package tools.refinery.interpreter.api.impl;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.interpreter.api.IQuerySpecification;
 
 /**
  * @author Mark Czotter
- * 
+ *
  */
 public abstract class BaseGeneratedPatternGroup extends BaseQueryGroup {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseMatcher.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseMatcher.java
index ad79aafd..7cf36736 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseMatcher.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseMatcher.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api.impl;
+package tools.refinery.interpreter.api.impl;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,15 +17,15 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.api.IPatternMatch;
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
-import tools.refinery.viatra.runtime.internal.apiimpl.QueryResultWrapper;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.internal.apiimpl.QueryResultWrapper;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.api.IPatternMatch;
+import tools.refinery.interpreter.api.IQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngine;
+import tools.refinery.interpreter.api.InterpreterMatcher;
 
 /**
  * Base implementation of ViatraQueryMatcher.
@@ -34,11 +34,11 @@ import tools.refinery.viatra.runtime.matchers.util.Preconditions;
  *
  * @param <Match>
  */
-public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResultWrapper implements ViatraQueryMatcher<Match> {
+public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResultWrapper implements InterpreterMatcher<Match> {
 
     // FIELDS AND CONSTRUCTOR
 
-    protected ViatraQueryEngine engine;
+    protected InterpreterEngine engine;
     protected IQuerySpecification<? extends BaseMatcher<Match>> querySpecification;
     private IMatcherCapability capabilities;
 
@@ -49,13 +49,13 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
         this.querySpecification = querySpecification;
         this.querySpecification.getInternalQueryRepresentation().ensureInitialized();
     }
-    
+
     /**
      * @since 1.4
      */
     @Override
     protected
-    void setBackend(ViatraQueryEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities){
+    void setBackend(InterpreterEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities){
         this.backend = resultProvider;
         this.engine = engine;
         this.capabilities = capabilities;
@@ -101,7 +101,7 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
     public Collection<Match> getAllMatches() {
         return rawStreamAllMatches(emptyArray()).collect(Collectors.toSet());
     }
-    
+
     @Override
     public Stream<Match> streamAllMatches() {
         return rawStreamAllMatches(emptyArray());
@@ -125,7 +125,7 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
     public Collection<Match> getAllMatches(Match partialMatch) {
         return rawStreamAllMatches(partialMatch.toArray()).collect(Collectors.toSet());
     }
-    
+
     @Override
     public Stream<Match> streamAllMatches(Match partialMatch) {
         return rawStreamAllMatches(partialMatch.toArray());
@@ -175,7 +175,7 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
     public boolean hasMatch() {
         return rawHasMatch(emptyArray());
     }
-    
+
     @Override
     public boolean hasMatch(Match partialMatch) {
         return rawHasMatch(partialMatch.toArray());
@@ -286,7 +286,7 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
     public Set<Object> getAllValues(final String parameterName, Match partialMatch) {
         return rawStreamAllValues(getPositionOfParameter(parameterName), partialMatch.toArray()).collect(Collectors.toSet());
     }
-    
+
     /**
      * Retrieve a stream of values that occur in matches for the given parameterName, that conforms to the given fixed
      * values of some parameters.
@@ -325,9 +325,9 @@ public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResu
     protected <T> void rawAccumulateAllValues(final int position, Object[] parameters, final Set<T> accumulator) {
         rawForEachMatch(parameters, match -> accumulator.add((T) match.get(position)));
     }
-    
+
     @Override
-    public ViatraQueryEngine getEngine() {
+    public InterpreterEngine getEngine() {
         return engine;
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BasePatternMatch.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BasePatternMatch.java
index 182bb466..0dfaa666 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BasePatternMatch.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BasePatternMatch.java
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api.impl;
+package tools.refinery.interpreter.api.impl;
 
-import tools.refinery.viatra.runtime.api.IPatternMatch;
+import tools.refinery.interpreter.api.IPatternMatch;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQueryGroup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseQueryGroup.java
index b92727e7..c0f619ea 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQueryGroup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseQueryGroup.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.impl;
+package tools.refinery.interpreter.api.impl;
 
-import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.IQueryGroup;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.interpreter.api.AdvancedInterpreterEngine;
+import tools.refinery.interpreter.api.IQueryGroup;
+import tools.refinery.interpreter.api.InterpreterEngine;
 
 /**
  * Base implementation of {@link IQueryGroup}.
@@ -21,13 +21,13 @@ import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
 public abstract class BaseQueryGroup implements IQueryGroup {
 
     @Override
-    public void prepare(ViatraQueryEngine engine) {
-        prepare(AdvancedViatraQueryEngine.from(engine));
+    public void prepare(InterpreterEngine engine) {
+        prepare(AdvancedInterpreterEngine.from(engine));
     }
-    
-    protected void prepare(AdvancedViatraQueryEngine engine) {
+
+    protected void prepare(AdvancedInterpreterEngine engine) {
         engine.prepareGroup(this, null /* default options */);
     }
-    
+
 
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQuerySpecification.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseQuerySpecification.java
index bee4b93d..411a8c18 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQuerySpecification.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/impl/BaseQuerySpecification.java
@@ -3,27 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.api.impl;
+package tools.refinery.interpreter.api.impl;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.api.IPatternMatch;
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
-import tools.refinery.viatra.runtime.exception.ViatraQueryException;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+import tools.refinery.interpreter.exception.InterpreterException;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
+import tools.refinery.interpreter.matchers.psystem.queries.QueryInitializationException;
+import tools.refinery.interpreter.api.IPatternMatch;
+import tools.refinery.interpreter.api.IQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngine;
+import tools.refinery.interpreter.api.InterpreterMatcher;
 
 /**
  * Base implementation of IQuerySpecification.
@@ -31,41 +30,41 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
  * @author Gabor Bergmann
  *
  */
-public abstract class BaseQuerySpecification<Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> implements
+public abstract class BaseQuerySpecification<Matcher extends InterpreterMatcher<? extends IPatternMatch>> implements
         IQuerySpecification<Matcher> {
 
     /**
      * @since 1.6
      */
-    protected static ViatraQueryException processInitializerError(ExceptionInInitializerError err) {
+    protected static InterpreterException processInitializerError(ExceptionInInitializerError err) {
         Throwable cause1 = err.getCause();
         if (cause1 instanceof RuntimeException) {
             Throwable cause2 = ((RuntimeException) cause1).getCause();
-            if (cause2 instanceof ViatraQueryException) {
-                return (ViatraQueryException) cause2;
+            if (cause2 instanceof InterpreterException) {
+                return (InterpreterException) cause2;
             } else if (cause2 instanceof QueryInitializationException) {
-                return new ViatraQueryException((QueryInitializationException) cause2);
-            } 
+                return new InterpreterException((QueryInitializationException) cause2);
+            }
         }
         throw err;
     }
     protected final PQuery wrappedPQuery;
-    
-    protected abstract Matcher instantiate(ViatraQueryEngine engine);
+
+    protected abstract Matcher instantiate(InterpreterEngine engine);
 
     /**
      * For backward compatibility of code generated with previous versions of viatra query, this method has a default
      * implementation returning null, indicating that a matcher can only be created using the old method, which ignores
      * the hints provided by the user.
-     * 
+     *
      * @since 1.4
      */
     @Override
     public Matcher instantiate() {
         return null;
     }
-    
-    
+
+
     /**
      * Instantiates query specification for the given internal query representation.
      */
@@ -82,15 +81,15 @@ public abstract class BaseQuerySpecification<Matcher extends ViatraQueryMatcher<
     }
 
     @Override
-    public Matcher getMatcher(ViatraQueryEngine engine) {
+    public Matcher getMatcher(InterpreterEngine engine) {
         ensureInitializedInternal();
-        if (wrappedPQuery.getStatus() == PQueryStatus.ERROR) {
+        if (wrappedPQuery.getStatus() == PQuery.PQueryStatus.ERROR) {
             String errorMessages = wrappedPQuery.getPProblems().stream()
                     .map(input -> (input == null) ? "" : input.getShortMessage()).collect(Collectors.joining("\n"));
-            throw new ViatraQueryException(String.format("Erroneous query specification: %s %n %s", getFullyQualifiedName(), errorMessages),
+            throw new InterpreterException(String.format("Erroneous query specification: %s %n %s", getFullyQualifiedName(), errorMessages),
                     "Cannot initialize matchers on erroneous query specifications.");
         } else if (!engine.getScope().isCompatibleWithQueryScope(this.getPreferredScopeClass())) {
-            throw new ViatraQueryException(
+            throw new InterpreterException(
                     String.format(
                             "Scope class incompatibility: the query %s is formulated over query scopes of class %s, "
                                     + " thus the query engine formulated over scope %s of class %s cannot evaluate it.",
@@ -104,9 +103,9 @@ public abstract class BaseQuerySpecification<Matcher extends ViatraQueryMatcher<
     protected void ensureInitializedInternal() {
         wrappedPQuery.ensureInitialized();
     }
-    
+
     // // DELEGATIONS
-    
+
     @Override
     public List<PAnnotation> getAllAnnotations() {
         return wrappedPQuery.getAllAnnotations();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IBaseIndex.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IBaseIndex.java
index 1795a8ef..949ab2d7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IBaseIndex.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IBaseIndex.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.scope;
+package tools.refinery.interpreter.api.scope;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
@@ -15,39 +15,39 @@ import java.util.concurrent.Callable;
  * Represents the index maintained on the model.
  * @author Bergmann Gabor
  * @since 0.9
- * 
+ *
  */
 public interface IBaseIndex {
     // TODO lightweightObserver?
     // TODO ViatraBaseIndexChangeListener?
-    
+
     /**
      * The given callback will be executed, and all model traversals and index registrations will be delayed until the
      * execution is done. If there are any outstanding feature, class or datatype registrations, a single coalesced model
      * traversal will initialize the caches and deliver the notifications.
-     * 
+     *
      * @param callable
      */
     public <V> V coalesceTraversals(Callable<V> callable) throws InvocationTargetException;
-    
+
     /**
      * Adds a coarse-grained listener that will be invoked after the NavigationHelper index or the underlying model is changed. Can be used
      * e.g. to check model contents. Not intended for general use.
-     * 
-     * <p/> See {@link #removeBaseIndexChangeListener(ViatraBaseIndexChangeListener)}
+     *
+     * <p/> See {@link #removeBaseIndexChangeListener(InterpreterBaseIndexChangeListener)}
      * @param listener
      */
-    public void addBaseIndexChangeListener(ViatraBaseIndexChangeListener listener);
-    
+    public void addBaseIndexChangeListener(InterpreterBaseIndexChangeListener listener);
+
     /**
      * Removes a registered listener.
-     * 
-     * <p/> See {@link #addBaseIndexChangeListener(ViatraBaseIndexChangeListener)}
-     * 
+     *
+     * <p/> See {@link #addBaseIndexChangeListener(InterpreterBaseIndexChangeListener)}
+     *
      * @param listener
      */
-    public void removeBaseIndexChangeListener(ViatraBaseIndexChangeListener listener);
-    
+    public void removeBaseIndexChangeListener(InterpreterBaseIndexChangeListener listener);
+
     /**
      * Updates the value of indexed derived features that are not well-behaving.
      */
@@ -70,20 +70,20 @@ public interface IBaseIndex {
 
     /**
      * Register a lightweight observer that is notified if any edge starting at the given Object changes.
-     * 
+     *
      * @param observer the listener instance
      * @param observedObject the observed instance object
-     * @return false if no observer can be registered for the given instance (e.g. it is a primitive), 
+     * @return false if no observer can be registered for the given instance (e.g. it is a primitive),
      *  or observer was already registered (call has no effect)
      */
     public boolean addInstanceObserver(IInstanceObserver observer, Object observedObject);
-    
+
     /**
      * Unregisters a lightweight observer for the given Object.
-     * 
+     *
      * @param observer the listener instance
      * @param observedObject the observed instance object
-     * @return false if no observer can be registered for the given instance (e.g. it is a primitive), 
+     * @return false if no observer can be registered for the given instance (e.g. it is a primitive),
      *  or no observer was registered previously (call has no effect)
      */
     public boolean removeInstanceObserver(IInstanceObserver observer, Object observedObject);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IEngineContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IEngineContext.java
index 55060853..013a3d1c 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IEngineContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IEngineContext.java
@@ -3,47 +3,47 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.scope;
+package tools.refinery.interpreter.api.scope;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
 
 /**
- * The context of the engine is instantiated by the scope, 
- * and provides information and services regarding the model the towards the engine.  
- * 
+ * The context of the engine is instantiated by the scope,
+ * and provides information and services regarding the model the towards the engine.
+ *
  * @author Bergmann Gabor
  *
  */
 public interface IEngineContext {
-    
+
     /**
-     * Returns the base index. 
-     * @throws ViatraQueryRuntimeException if the base index cannot be accessed 
-     */ 
+     * Returns the base index.
+     * @throws InterpreterRuntimeException if the base index cannot be accessed
+     */
     IBaseIndex getBaseIndex();
 
     /**
      * Disposes this context object. Resources in the index may now be freed up.
      * No more methods should be called after this one.
-     * 
+     *
      * @throws IllegalStateException if there are any active listeners to the underlying index
      */
     void dispose();
 
     /**
      * Provides instance model information for pattern matching.
-     * 
-     * <p> Implementors note: must be reentrant. 
-     * If called while index loading is already in progress, must return the single runtime context instance that will eventually index the model. 
-     * When the runtime query context is invoked in such a case, incomplete indexes are tolerable, but change notifications must be correctly provided as loading commences. 
-     * 
+     *
+     * <p> Implementors note: must be reentrant.
+     * If called while index loading is already in progress, must return the single runtime context instance that will eventually index the model.
+     * When the runtime query context is invoked in such a case, incomplete indexes are tolerable, but change notifications must be correctly provided as loading commences.
+     *
      * @return a runtime context for pattern matching
      * @since 1.2
-     * @throws ViatraQueryRuntimeException if the runtime context cannot be initialized
+     * @throws InterpreterRuntimeException if the runtime context cannot be initialized
      */
     public IQueryRuntimeContext getQueryRuntimeContext();
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IIndexingErrorListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IIndexingErrorListener.java
index f61a5edb..904619b2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IIndexingErrorListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IIndexingErrorListener.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.scope;
+package tools.refinery.interpreter.api.scope;
 
 /**
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IInstanceObserver.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IInstanceObserver.java
index 8ef29cbe..18c43aac 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IInstanceObserver.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/IInstanceObserver.java
@@ -1,21 +1,21 @@
-/*******************************************************************************

- * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro

- * This program and the accompanying materials are made available under the

- * terms of the Eclipse Public License v. 2.0 which is available at

- * http://www.eclipse.org/legal/epl-v20.html.

- * 

- * SPDX-License-Identifier: EPL-2.0

- *******************************************************************************/

-package tools.refinery.viatra.runtime.api.scope;

-

-

-/**

- * Listener interface for lightweight observation of changes in edges leaving from given source instance elements.

- * @author Bergmann Gabor

- * @since 0.9

- *

- */

-public interface IInstanceObserver {

-    void notifyBinaryChanged(Object sourceElement, Object edgeType);

-    void notifyTernaryChanged(Object sourceElement, Object edgeType);

-}

+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.interpreter.api.scope;
+
+
+/**
+ * Listener interface for lightweight observation of changes in edges leaving from given source instance elements.
+ * @author Bergmann Gabor
+ * @since 0.9
+ *
+ */
+public interface IInstanceObserver {
+    void notifyBinaryChanged(Object sourceElement, Object edgeType);
+    void notifyTernaryChanged(Object sourceElement, Object edgeType);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/ViatraBaseIndexChangeListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/InterpreterBaseIndexChangeListener.java
index b746e637..97a2166f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/ViatraBaseIndexChangeListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/InterpreterBaseIndexChangeListener.java
@@ -3,32 +3,33 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.scope;
+package tools.refinery.interpreter.api.scope;
 
 /**
- * Listener interface for change notifications from the VIATRA Base index.
- * 
+ * Listener interface for change notifications from the Refinery Base index.
+ *
  * @author Abel Hegedus
  * @since 0.9
  *
  */
-public interface ViatraBaseIndexChangeListener {
+public interface InterpreterBaseIndexChangeListener {
 
     /**
      * NOTE: it is possible that this method is called only ONCE! Consider returning a constant value that is set in the constructor.
-     * 
-     * @return true, if the listener should be notified only after index changes, false if notification is needed after each model change 
+     *
+     * @return true, if the listener should be notified only after index changes, false if notification is needed after each model change
      */
     public boolean onlyOnIndexChange();
-    
+
     /**
-     * Called after a model change is handled by the VIATRA Base index and if <code>indexChanged == onlyOnIndexChange()</code>.
-     *  
+     * Called after a model change is handled by the Refinery Interpreter base index and if <code>indexChanged ==
+         * onlyOnIndexChange()</code>.
+     *
      * @param indexChanged true, if the model change also affected the contents of the base index
      */
     public void notifyChanged(boolean indexChanged);
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/QueryScope.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/QueryScope.java
index 5456b9ea..81e200d7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/QueryScope.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/api/scope/QueryScope.java
@@ -3,28 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.api.scope;
+package tools.refinery.interpreter.api.scope;
 
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.internal.apiimpl.EngineContextFactory;
+import tools.refinery.interpreter.internal.apiimpl.EngineContextFactory;
+import tools.refinery.interpreter.api.IQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngine;
 
 /**
- * Defines a scope for a VIATRA Query engine, which determines the set of model elements that query evaluation operates on.
- * 
+ * Defines a scope for a Refinery Interpreter engine, which determines the set of model elements that query evaluation
+ * operates on.
+ *
  * @author Bergmann Gabor
  *
  */
 public abstract class QueryScope extends EngineContextFactory {
-    
+
     /**
      * Determines whether a query engine initialized on this scope can evaluate queries formulated against the given scope type.
      * <p> Every query scope class is compatible with a query engine initialized on a scope of the same class or a subclass.
      * @param queryScopeClass the scope class returned by invoking {@link IQuerySpecification#getPreferredScopeClass()} on a query specification
-     * @return true if an {@link ViatraQueryEngine} initialized on this scope can consume an {@link IQuerySpecification}
+     * @return true if an {@link InterpreterEngine} initialized on this scope can consume an {@link IQuerySpecification}
      */
     public boolean isCompatibleWithQueryScope(Class<? extends QueryScope> queryScopeClass) {
         return queryScopeClass.isAssignableFrom(this.getClass());
diff --git a/subprojects/interpreter/src/main/java/tools/refinery/interpreter/exception/InterpreterException.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/exception/InterpreterException.java
new file mode 100644
index 00000000..2100f11e
--- /dev/null
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/exception/InterpreterException.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Akos Horvath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.interpreter.exception;
+
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.psystem.queries.QueryInitializationException;
+
+import java.io.Serial;
+
+/**
+ * A general Refinery Interpreter-related problem during the operation of the Refinery Interpreter
+ * engine, or the loading, manipulation and evaluation of queries.
+ *
+ * @author Bergmann Gabor
+ * @since 0.9
+ *
+ */
+public class InterpreterException extends InterpreterRuntimeException {
+
+    @Serial
+        private static final long serialVersionUID = -74252748358355750L;
+
+    /**
+     * @since 0.9
+     */
+    public static final String PROCESSING_PROBLEM = "The following error occurred during the processing of a query " +
+                        "(e.g. for the preparation of a Refinery pattern matcher)";
+    /**
+     * @since 0.9
+     */
+    public static final String QUERY_INIT_PROBLEM = "The following error occurred during the initialization of a " +
+                        "Refinery query specification";
+
+    private final String shortMessage;
+
+    public InterpreterException(String s, String shortMessage) {
+        super(s);
+        this.shortMessage = shortMessage;
+    }
+
+    public InterpreterException(QueryProcessingException e) {
+        super(PROCESSING_PROBLEM + ": " + e.getMessage(), e);
+        this.shortMessage = e.getShortMessage();
+    }
+
+    public InterpreterException(QueryInitializationException e) {
+        super(QUERY_INIT_PROBLEM + ": " + e.getMessage(), e);
+        this.shortMessage = e.getShortMessage();
+    }
+
+    public InterpreterException(String s, String shortMessage, Throwable e) {
+        super(s + ": " + e.getMessage(), e);
+        this.shortMessage = shortMessage;
+    }
+
+    public String getShortMessage() {
+        return shortMessage;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/EngineContextFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/EngineContextFactory.java
index bed07ebf..9e9172cb 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/EngineContextFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/EngineContextFactory.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.internal.apiimpl;
+package tools.refinery.interpreter.internal.apiimpl;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.scope.IEngineContext;
-import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
+import tools.refinery.interpreter.api.InterpreterEngine;
+import tools.refinery.interpreter.api.scope.IEngineContext;
+import tools.refinery.interpreter.api.scope.IIndexingErrorListener;
 
 /**
  * Internal interface for a Scope to reveal model contents to the engine.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public abstract class EngineContextFactory {
-    protected abstract IEngineContext createEngineContext(ViatraQueryEngine engine, IIndexingErrorListener errorListener, Logger logger);
+    protected abstract IEngineContext createEngineContext(InterpreterEngine engine, IIndexingErrorListener errorListener, Logger logger);
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/ViatraQueryEngineImpl.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/InterpreterEngineImpl.java
index 84ac8f7d..8a2e4c5e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/ViatraQueryEngineImpl.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/InterpreterEngineImpl.java
@@ -8,34 +8,32 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.internal.apiimpl;
+package tools.refinery.interpreter.internal.apiimpl;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.api.*;
-import tools.refinery.viatra.runtime.api.impl.BaseMatcher;
-import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
-import tools.refinery.viatra.runtime.api.scope.IEngineContext;
-import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.exception.ViatraQueryException;
-import tools.refinery.viatra.runtime.internal.engine.LifecycleProvider;
-import tools.refinery.viatra.runtime.internal.engine.ModelUpdateProvider;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.*;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryCacheContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.util.ViatraQueryLoggingUtil;
+import tools.refinery.interpreter.api.*;
+import tools.refinery.interpreter.api.impl.BaseMatcher;
+import tools.refinery.interpreter.api.scope.IBaseIndex;
+import tools.refinery.interpreter.api.scope.IEngineContext;
+import tools.refinery.interpreter.api.scope.IIndexingErrorListener;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.exception.InterpreterException;
+import tools.refinery.interpreter.internal.engine.LifecycleProvider;
+import tools.refinery.interpreter.internal.engine.ModelUpdateProvider;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.*;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryCacheContext;
+import tools.refinery.interpreter.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.queries.PQueries;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.util.InterpreterLoggingUtil;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
@@ -44,14 +42,12 @@ import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
-
 /**
- * A VIATRA Query engine back-end (implementation)
+ * A Refinery Interpreter engine back-end (implementation)
  *
  * @author Bergmann Gábor
  */
-public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
+public final class InterpreterEngineImpl extends AdvancedInterpreterEngine
         implements IQueryBackendHintProvider, IQueryCacheContext, IQueryResultProviderAccess {
 
     /**
@@ -62,10 +58,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      *
      */
     private static final String QUERY_ON_DISPOSED_ENGINE_MESSAGE = "Cannot evaluate query on disposed engine!";
-    /**
-     * The engine manager responsible for this engine. Null if this engine is unmanaged.
-     */
-    private final ViatraQueryEngineManager manager;
+
     /**
      * The model to which the engine is attached.
      */
@@ -79,18 +72,18 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     /**
      * Initialized matchers for each query
      */
-    private final IMultiLookup<IQuerySpecification<? extends ViatraQueryMatcher<?>>, ViatraQueryMatcher<?>> matchers =
-            CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
+    private final IMultiLookup<IQuerySpecification<? extends InterpreterMatcher<?>>, InterpreterMatcher<?>> matchers =
+            CollectionsFactory.createMultiLookup(Object.class, CollectionsFactory.MemoryType.SETS, Object.class);
 
     /**
-     * The RETE and other pattern matcher implementations of the VIATRA Query Engine.
+     * The RETE and other pattern matcher implementations of the Refinery Interpreter engine.
      */
     private final Map<IQueryBackendFactory, IQueryBackend> queryBackends = Collections.synchronizedMap(new HashMap<>());
 
     /**
      * The current engine default hints
      */
-    private final ViatraQueryEngineOptions engineOptions;
+    private final InterpreterEngineOptions engineOptions;
 
     /**
      * Common query analysis provided to backends
@@ -108,16 +101,13 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     private boolean disposed = false;
 
     /**
-     * @param manager
-     *            null if unmanaged
      * @param scope
      * @param engineDefaultHint
      * @since 1.4
      */
-    public ViatraQueryEngineImpl(ViatraQueryEngineManager manager, QueryScope scope,
-            ViatraQueryEngineOptions engineOptions) {
+    public InterpreterEngineImpl(QueryScope scope,
+                                                                 InterpreterEngineOptions engineOptions) {
         super();
-        this.manager = manager;
         this.scope = scope;
         this.lifecycleProvider = new LifecycleProvider(this, getLogger());
         this.modelUpdateProvider = new ModelUpdateProvider(this, getLogger());
@@ -126,7 +116,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
         if (engineOptions != null) {
             this.engineOptions = engineOptions;
         } else {
-            this.engineOptions = ViatraQueryEngineOptions.getDefault();
+            this.engineOptions = InterpreterEngineOptions.getDefault();
         }
 
     }
@@ -137,8 +127,8 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      * @param scope
      * @param engineDefaultHint
      */
-    public ViatraQueryEngineImpl(ViatraQueryEngineManager manager, QueryScope scope) {
-        this(manager, scope, ViatraQueryEngineOptions.getDefault());
+    public InterpreterEngineImpl(QueryScope scope) {
+        this(scope, InterpreterEngineOptions.getDefault());
     }
 
     @Override
@@ -192,18 +182,18 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
         }
 
         @Override
-    public Set<? extends ViatraQueryMatcher<? extends IPatternMatch>> getCurrentMatchers() {
+    public Set<? extends InterpreterMatcher<? extends IPatternMatch>> getCurrentMatchers() {
         return matchers.distinctValuesStream().collect(Collectors.toSet());
     }
 
     @Override
-    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+    public <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getMatcher(
             IQuerySpecification<Matcher> querySpecification) {
         return getMatcher(querySpecification, null);
     }
 
     @Override
-    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+    public <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getMatcher(
             IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalEvaluationHints) {
                 return withFlushingChanges(() -> {
                         IMatcherCapability capability = getRequestedCapability(querySpecification, optionalEvaluationHints);
@@ -222,21 +212,21 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
+    public <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
             IQuerySpecification<Matcher> querySpecification) {
         return getExistingMatcher(querySpecification, null);
     }
 
     @Override
-    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
+    public <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
             IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalOverrideHints) {
         return doGetExistingMatcher(querySpecification, getRequestedCapability(querySpecification, optionalOverrideHints));
     }
 
     @SuppressWarnings("unchecked")
-    private <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher doGetExistingMatcher(
+    private <Matcher extends InterpreterMatcher<? extends IPatternMatch>> Matcher doGetExistingMatcher(
             IQuerySpecification<Matcher> querySpecification, IMatcherCapability requestedCapability) {
-        for (ViatraQueryMatcher<?> matcher : matchers.lookupOrEmpty(querySpecification)) {
+        for (InterpreterMatcher<?> matcher : matchers.lookupOrEmpty(querySpecification)) {
             BaseMatcher<?> baseMatcher = (BaseMatcher<?>) matcher;
             if (baseMatcher.getCapabilities().canBeSubstitute(requestedCapability))
                 return (Matcher) matcher;
@@ -245,7 +235,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public ViatraQueryMatcher<? extends IPatternMatch> getMatcher(String patternFQN) {
+    public InterpreterMatcher<? extends IPatternMatch> getMatcher(String patternFQN) {
                 throw new UnsupportedOperationException("Query specification registry is not available");
     }
 
@@ -257,22 +247,22 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     public final Logger getLogger() {
         if (logger == null) {
             final int hash = System.identityHashCode(this);
-            logger = Logger.getLogger(ViatraQueryLoggingUtil.getLogger(ViatraQueryEngine.class).getName() + "." + hash);
+            logger = Logger.getLogger(InterpreterLoggingUtil.getLogger(InterpreterEngine.class).getName() + "." + hash);
             if (logger == null)
                 throw new AssertionError(
-                        "Configuration error: unable to create VIATRA Query runtime logger for engine " + hash);
+                        "Configuration error: unable to create Refinery Interpreter runtime logger for engine " + hash);
         }
         return logger;
     }
 
     ///////////////// internal stuff //////////////
-    private void internalRegisterMatcher(IQuerySpecification<?> querySpecification, ViatraQueryMatcher<?> matcher) {
+    private void internalRegisterMatcher(IQuerySpecification<?> querySpecification, InterpreterMatcher<?> matcher) {
         matchers.addPair(querySpecification, matcher);
         lifecycleProvider.matcherInstantiated(matcher);
     }
 
     /**
-     * Provides access to the selected query backend component of the VIATRA Query Engine.
+     * Provides access to the selected query backend component of the Refinery Interpreter engine.
      */
     @Override
     public IQueryBackend getQueryBackend(IQueryBackendFactory iQueryBackendFactory) {
@@ -297,7 +287,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
 
                     @Override
                     public IQueryCacheContext getQueryCacheContext() {
-                        return ViatraQueryEngineImpl.this;
+                        return InterpreterEngineImpl.this;
                     }
 
                     @Override
@@ -307,12 +297,12 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
 
                     @Override
                     public IQueryBackendHintProvider getHintProvider() {
-                        return ViatraQueryEngineImpl.this;
+                        return InterpreterEngineImpl.this;
                     }
 
                     @Override
                     public IQueryResultProviderAccess getResultProviderAccess() {
-                        return ViatraQueryEngineImpl.this;
+                        return InterpreterEngineImpl.this;
                     }
 
                     @Override
@@ -324,12 +314,12 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
 
                     @Override
                     public boolean areUpdatesDelayed() {
-                        return ViatraQueryEngineImpl.this.delayMessageDelivery;
+                        return InterpreterEngineImpl.this.delayMessageDelivery;
                     }
 
                     @Override
                     public IMatcherCapability getRequiredMatcherCapability(PQuery query,
-                            QueryEvaluationHint hint) {
+                                                                           QueryEvaluationHint hint) {
                         return engineOptions.getQueryBackendFactory(hint).calculateRequiredCapability(query, hint);
                     }
 
@@ -346,10 +336,6 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
 
     @Override
     public void dispose() {
-        if (manager != null) {
-            throw new UnsupportedOperationException(
-                    String.format("Cannot dispose() managed VIATRA Query Engine. Attempted for scope %s.", scope));
-        }
         wipe();
 
         this.disposed = true;
@@ -361,22 +347,17 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
             engineContext.dispose();
         } catch (IllegalStateException ex) {
             getLogger().warn(
-                    "The base index could not be disposed along with the VIATRA Query engine, as there are still active listeners on it.");
+                    "The base index could not be disposed along with the Refinery Interpreter engine, as there are " +
+                                                        "still active listeners on it.");
         }
     }
 
     @Override
     public void wipe() {
-        if (manager != null) {
-            throw new UnsupportedOperationException(
-                    String.format("Cannot wipe() managed VIATRA Query Engine. Attempted for scope %s.", scope));
-        }
-        if (queryBackends != null) {
-            for (IQueryBackend backend : queryBackends.values()) {
-                backend.dispose();
-            }
-            queryBackends.clear();
-        }
+                for (IQueryBackend backend : queryBackends.values()) {
+                        backend.dispose();
+                }
+                queryBackends.clear();
         matchers.clear();
         queryAnalyzer = null;
         lifecycleProvider.engineWiped();
@@ -389,14 +370,14 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     private IIndexingErrorListener taintListener = new SelfTaintListener(this);
 
     private static class SelfTaintListener implements IIndexingErrorListener {
-        WeakReference<ViatraQueryEngineImpl> queryEngineRef;
+        WeakReference<InterpreterEngineImpl> queryEngineRef;
 
-        public SelfTaintListener(ViatraQueryEngineImpl queryEngine) {
-            this.queryEngineRef = new WeakReference<ViatraQueryEngineImpl>(queryEngine);
+        public SelfTaintListener(InterpreterEngineImpl queryEngine) {
+            this.queryEngineRef = new WeakReference<InterpreterEngineImpl>(queryEngine);
         }
 
         public void engineBecameTainted(String description, Throwable t) {
-            final ViatraQueryEngineImpl queryEngine = queryEngineRef.get();
+            final InterpreterEngineImpl queryEngine = queryEngineRef.get();
             if (queryEngine != null) {
                 queryEngine.tainted = true;
                 queryEngine.lifecycleProvider.engineBecameTainted(description, t);
@@ -428,12 +409,6 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
         return tainted;
     }
 
-    @Override
-    public boolean isManaged() {
-        return manager != null;
-        // return isAdvanced; ???
-    }
-
     private <Match extends IPatternMatch> IQueryResultProvider getUnderlyingResultProvider(
             final BaseMatcher<Match> matcher) {
         // IQueryResultProvider resultProvider = reteEngine.accessMatcher(matcher.getSpecification());
@@ -441,12 +416,12 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public <Match extends IPatternMatch> void addMatchUpdateListener(final ViatraQueryMatcher<Match> matcher,
+    public <Match extends IPatternMatch> void addMatchUpdateListener(final InterpreterMatcher<Match> matcher,
             final IMatchUpdateListener<? super Match> listener, boolean fireNow) {
 
-        checkArgument(listener != null, "Cannot add null listener!");
-        checkArgument(matcher.getEngine() == this, "Cannot register listener for matcher of different engine!");
-        checkArgument(!disposed, "Cannot register listener on matcher of disposed engine!");
+        Preconditions.checkArgument(listener != null, "Cannot add null listener!");
+        Preconditions.checkArgument(matcher.getEngine() == this, "Cannot register listener for matcher of different engine!");
+        Preconditions.checkArgument(!disposed, "Cannot register listener on matcher of disposed engine!");
 
         final BaseMatcher<Match> bm = (BaseMatcher<Match>) matcher;
 
@@ -477,11 +452,11 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public <Match extends IPatternMatch> void removeMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
-            IMatchUpdateListener<? super Match> listener) {
-        checkArgument(listener != null, "Cannot remove null listener!");
-        checkArgument(matcher.getEngine() == this, "Cannot remove listener from matcher of different engine!");
-        checkArgument(!disposed, "Cannot remove listener from matcher of disposed engine!");
+    public <Match extends IPatternMatch> void removeMatchUpdateListener(InterpreterMatcher<Match> matcher,
+                                                                                                                                                IMatchUpdateListener<? super Match> listener) {
+        Preconditions.checkArgument(listener != null, "Cannot remove null listener!");
+        Preconditions.checkArgument(matcher.getEngine() == this, "Cannot remove listener from matcher of different engine!");
+        Preconditions.checkArgument(!disposed, "Cannot remove listener from matcher of disposed engine!");
 
         final BaseMatcher<Match> bm = (BaseMatcher<Match>) matcher;
 
@@ -496,22 +471,22 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public void addModelUpdateListener(ViatraQueryModelUpdateListener listener) {
+    public void addModelUpdateListener(InterpreterModelUpdateListener listener) {
         modelUpdateProvider.addListener(listener);
     }
 
     @Override
-    public void removeModelUpdateListener(ViatraQueryModelUpdateListener listener) {
+    public void removeModelUpdateListener(InterpreterModelUpdateListener listener) {
         modelUpdateProvider.removeListener(listener);
     }
 
     @Override
-    public void addLifecycleListener(ViatraQueryEngineLifecycleListener listener) {
+    public void addLifecycleListener(InterpreterEngineLifecycleListener listener) {
         lifecycleProvider.addListener(listener);
     }
 
     @Override
-    public void removeLifecycleListener(ViatraQueryEngineLifecycleListener listener) {
+    public void removeLifecycleListener(InterpreterEngineLifecycleListener listener) {
         lifecycleProvider.removeListener(listener);
     }
 
@@ -521,7 +496,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      * @param query
      *            the pattern for which the result provider should be delivered
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public IQueryResultProvider getResultProvider(IQuerySpecification<?> query) {
         Preconditions.checkState(!disposed, QUERY_ON_DISPOSED_ENGINE_MESSAGE);
@@ -535,7 +510,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      * @param query
      *            the pattern for which the result provider should be delivered
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public IQueryResultProvider getResultProvider(IQuerySpecification<?> query, QueryEvaluationHint hint) {
         Preconditions.checkState(!disposed, QUERY_ON_DISPOSED_ENGINE_MESSAGE);
@@ -548,7 +523,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      * {@link #getQueryEvaluationHint(IQuerySpecification, QueryEvaluationHint)} before passing a hint to this method to
      * make sure engine and query specific hints are correctly applied.
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     private IQueryResultProvider getResultProviderInternal(IQuerySpecification<?> query, QueryEvaluationHint hint) {
         return getResultProviderInternal(query.getInternalQueryRepresentation(), hint);
@@ -559,11 +534,11 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
      * {@link #getQueryEvaluationHint(IQuerySpecification, QueryEvaluationHint)} before passing a hint to this method to
      * make sure engine and query specific hints are correctly applied.
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     private IQueryResultProvider getResultProviderInternal(PQuery query, QueryEvaluationHint hint) {
         Preconditions.checkArgument(query != null, "Query cannot be null!");
-        Preconditions.checkArgument(query.getStatus() != PQueryStatus.ERROR, "Cannot initialize a result provider for the erronoues query `%s`.", query.getSimpleName());
+        Preconditions.checkArgument(query.getStatus() != PQuery.PQueryStatus.ERROR, "Cannot initialize a result provider for the erronoues query `%s`.", query.getSimpleName());
         final IQueryBackend backend = getQueryBackend(engineOptions.getQueryBackendFactory(getQueryEvaluationHint(query, hint)));
         return backend.getResultProvider(query, hint);
     }
@@ -571,7 +546,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     /**
      * Returns the query backend (influenced by the hint system), even if it is a non-caching backend.
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     private IQueryBackend getQueryBackend(PQuery query) {
         final IQueryBackendFactory factory = engineOptions.getQueryBackendFactory(getQueryEvaluationHint(query));
@@ -581,7 +556,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     /**
      * Returns a caching query backend (influenced by the hint system).
      *
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     private IQueryBackend getCachingQueryBackend(PQuery query) {
         IQueryBackend regularBackend = getQueryBackend(query);
@@ -595,7 +570,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     public boolean isResultCached(PQuery query) {
         try {
             return null != getCachingQueryBackend(query).peekExistingResultProvider(query);
-        } catch (ViatraQueryException iqe) {
+        } catch (InterpreterException iqe) {
             getLogger().error(ERROR_ACCESSING_BACKEND, iqe);
             return false;
         }
@@ -605,7 +580,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     public IQueryResultProvider getCachingResultProvider(PQuery query) {
         try {
             return getCachingQueryBackend(query).getResultProvider(query);
-        } catch (ViatraQueryException iqe) {
+        } catch (InterpreterException iqe) {
             getLogger().error(ERROR_ACCESSING_BACKEND, iqe);
             throw iqe;
         }
@@ -649,7 +624,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
             patterns.forEach(PQuery::ensureInitialized);
 
             Collection<String> erroneousPatterns = patterns.stream().
-                    filter(PQueries.queryStatusPredicate(PQueryStatus.ERROR)).
+                    filter(PQueries.queryStatusPredicate(PQuery.PQueryStatus.ERROR)).
                     map(PQuery::getFullyQualifiedName).
                     collect(Collectors.toList());
             Preconditions.checkState(erroneousPatterns.isEmpty(), "Erroneous query(s) found: %s",
@@ -670,14 +645,14 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
                 final Throwable cause = ex.getCause();
                 if (cause instanceof QueryProcessingException)
                     throw (QueryProcessingException) cause;
-                if (cause instanceof ViatraQueryException)
-                    throw (ViatraQueryException) cause;
+                if (cause instanceof InterpreterException)
+                    throw (InterpreterException) cause;
                 if (cause instanceof RuntimeException)
                     throw (RuntimeException) cause;
                 assert (false);
             }
         } catch (QueryProcessingException e) {
-            throw new ViatraQueryException(e);
+            throw new InterpreterException(e);
         }
     }
 
@@ -687,12 +662,12 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     }
 
     @Override
-    public ViatraQueryEngineOptions getEngineOptions() {
+    public InterpreterEngineOptions getEngineOptions() {
         return engineOptions;
     }
 
     @Override
-    public IQueryResultProvider getResultProviderOfMatcher(ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+    public IQueryResultProvider getResultProviderOfMatcher(InterpreterMatcher<? extends IPatternMatch> matcher) {
         return ((QueryResultWrapper) matcher).backend;
     }
 
@@ -700,7 +675,7 @@ public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
     public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint overrideHints) {
         try {
             return getResultProviderInternal(query, overrideHints);
-        } catch (ViatraQueryException e) {
+        } catch (InterpreterException e) {
             getLogger().error(ERROR_ACCESSING_BACKEND, e);
             throw e;
         }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/QueryResultWrapper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/QueryResultWrapper.java
index 47f3268d..0f50aee1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/QueryResultWrapper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/apiimpl/QueryResultWrapper.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.internal.apiimpl;
+package tools.refinery.interpreter.internal.apiimpl;
 
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.api.InterpreterEngine;
 
 /**
  * Internal class for wrapping a query result providing backend. It's only supported usage is by the
- * {@link ViatraQueryEngineImpl} class.
+ * {@link InterpreterEngineImpl} class.
  * </p>
- * 
+ *
  * <strong>Important note</strong>: this class must not introduce any public method, as it will be visible through
  * BaseMatcher as an API, although this class is not an API itself.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
@@ -27,6 +27,6 @@ public abstract class QueryResultWrapper {
 
     protected IQueryResultProvider backend;
 
-    protected abstract void setBackend(ViatraQueryEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities);
-    
+    protected abstract void setBackend(InterpreterEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities);
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/LifecycleProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/LifecycleProvider.java
index 8bbf2a66..2e89e832 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/LifecycleProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/LifecycleProvider.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.internal.engine;
-
-import java.util.ArrayList;
+package tools.refinery.interpreter.internal.engine;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.IPatternMatch;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineLifecycleListener;
-import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
+import tools.refinery.interpreter.api.AdvancedInterpreterEngine;
+import tools.refinery.interpreter.api.IPatternMatch;
+import tools.refinery.interpreter.api.InterpreterEngineLifecycleListener;
+import tools.refinery.interpreter.api.InterpreterMatcher;
+
+import java.util.ArrayList;
 
-public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngineLifecycleListener> implements ViatraQueryEngineLifecycleListener{
+public final class LifecycleProvider extends ListenerContainer<InterpreterEngineLifecycleListener> implements InterpreterEngineLifecycleListener {
 
         private final Logger logger;
 
         /**
          * @param queryEngine
          */
-        public LifecycleProvider(AdvancedViatraQueryEngine queryEngine, Logger logger) {
+        public LifecycleProvider(AdvancedInterpreterEngine queryEngine, Logger logger) {
             this.logger = logger;
         }
 
         @Override
-        protected void listenerAdded(ViatraQueryEngineLifecycleListener listener) {
+        protected void listenerAdded(InterpreterEngineLifecycleListener listener) {
             logger.debug("Lifecycle listener " + listener + " added to engine.");
         }
 
         @Override
-        protected void listenerRemoved(ViatraQueryEngineLifecycleListener listener) {
+        protected void listenerRemoved(InterpreterEngineLifecycleListener listener) {
             logger.debug("Lifecycle listener " + listener + " removed from engine.");
         }
 
@@ -44,23 +44,23 @@ public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngine
 //                        function.apply(listener);
 //                    } catch (Exception ex) {
 //                        logger.error(
-//                                "VIATRA Query encountered an error in delivering notification to listener "
+//                                "Refinery Interpreter encountered an error in delivering notification to listener "
 //                                        + listener + ".", ex);
 //                    }
 //                }
 //            }
 //        }
-        
+
         @Override
-        public void matcherInstantiated(final ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+        public void matcherInstantiated(final InterpreterMatcher<? extends IPatternMatch> matcher) {
             if (!listeners.isEmpty()) {
-                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                for (InterpreterEngineLifecycleListener listener : new ArrayList<InterpreterEngineLifecycleListener>(listeners)) {
                     try {
                         listener.matcherInstantiated(matcher);
                     } catch (Exception ex) {
                         logger.error(
-                                "VIATRA Query encountered an error in delivering matcher initialization notification to listener "
-                                        + listener + ".", ex);
+                                "Refinery Interpreter encountered an error in delivering matcher initialization " +
+                                                                                "notification to listener " + listener + ".", ex);
                     }
                 }
             }
@@ -75,13 +75,13 @@ public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngine
         @Override
         public void engineBecameTainted(String description, Throwable t) {
             if (!listeners.isEmpty()) {
-                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                for (InterpreterEngineLifecycleListener listener : new ArrayList<InterpreterEngineLifecycleListener>(listeners)) {
                     try {
                         listener.engineBecameTainted(description, t);
                     } catch (Exception ex) {
                         logger.error(
-                                "VIATRA Query encountered an error in delivering engine tainted notification to listener "
-                                        + listener + ".", ex);
+                                "Refinery Interpreter encountered an error in delivering engine tainted notification " +
+                                                                                "to listener " + listener + ".", ex);
                     }
                 }
             }
@@ -96,13 +96,13 @@ public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngine
         @Override
         public void engineWiped() {
             if (!listeners.isEmpty()) {
-                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                for (InterpreterEngineLifecycleListener listener : new ArrayList<InterpreterEngineLifecycleListener>(listeners)) {
                     try {
                         listener.engineWiped();
                     } catch (Exception ex) {
                         logger.error(
-                                "VIATRA Query encountered an error in delivering engine wiped notification to listener "
-                                        + listener + ".", ex);
+                                "Refinery Interpreter encountered an error in delivering engine wiped notification to" +
+                                                                                " listener " + listener + ".", ex);
                     }
                 }
             }
@@ -117,13 +117,13 @@ public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngine
         @Override
         public void engineDisposed() {
             if (!listeners.isEmpty()) {
-                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                for (InterpreterEngineLifecycleListener listener : new ArrayList<InterpreterEngineLifecycleListener>(listeners)) {
                     try {
                         listener.engineDisposed();
                     } catch (Exception ex) {
                         logger.error(
-                                "VIATRA Query encountered an error in delivering engine disposed notification to listener "
-                                        + listener + ".", ex);
+                                "Refinery Interpreter encountered an error in delivering engine disposed notification" +
+                                                                                " to listener " + listener + ".", ex);
                     }
                 }
             }
@@ -134,5 +134,5 @@ public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngine
 //                }
 //             });
         }
-        
-    }
\ No newline at end of file
+
+    }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ListenerContainer.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/ListenerContainer.java
index 34133bed..d168e4f6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ListenerContainer.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/ListenerContainer.java
@@ -3,41 +3,43 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.internal.engine;
+package tools.refinery.interpreter.internal.engine;
 
-import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+
+import static tools.refinery.interpreter.matchers.util.Preconditions.checkArgument;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public abstract class ListenerContainer<Listener> {
-    
+
     protected final Set<Listener> listeners;
-    
+
     public ListenerContainer() {
         this.listeners = new HashSet<Listener>();
     }
-    
+
     public synchronized void addListener(Listener listener) {
-        checkArgument(listener != null, "Cannot add null listener!");
+        Preconditions.checkArgument(listener != null, "Cannot add null listener!");
         boolean added = listeners.add(listener);
         if(added) {
             listenerAdded(listener);
         }
     }
-    
+
     public synchronized void removeListener(Listener listener) {
-        checkArgument(listener != null, "Cannot remove null listener!");
+        Preconditions.checkArgument(listener != null, "Cannot remove null listener!");
         boolean removed = listeners.remove(listener);
         if(removed) {
             listenerRemoved(listener);
         }
     }
-    
+
     protected abstract void listenerAdded(Listener listener);
-    
+
     protected abstract void listenerRemoved(Listener listener);
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ModelUpdateProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/ModelUpdateProvider.java
index 1f2c27e8..637ee306 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ModelUpdateProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/internal/engine/ModelUpdateProvider.java
@@ -3,48 +3,38 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.internal.engine;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
+package tools.refinery.interpreter.internal.engine;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.IMatchUpdateListener;
-import tools.refinery.viatra.runtime.api.IPatternMatch;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineLifecycleListener;
-import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
-import tools.refinery.viatra.runtime.api.ViatraQueryModelUpdateListener;
-import tools.refinery.viatra.runtime.api.ViatraQueryModelUpdateListener.ChangeLevel;
-import tools.refinery.viatra.runtime.api.scope.ViatraBaseIndexChangeListener;
-import tools.refinery.viatra.runtime.exception.ViatraQueryException;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-
-public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryModelUpdateListener> {
-
-    private final AdvancedViatraQueryEngine queryEngine;
+import tools.refinery.interpreter.api.*;
+import tools.refinery.interpreter.api.InterpreterModelUpdateListener.ChangeLevel;
+import tools.refinery.interpreter.api.scope.InterpreterBaseIndexChangeListener;
+import tools.refinery.interpreter.exception.InterpreterException;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+public final class ModelUpdateProvider extends ListenerContainer<InterpreterModelUpdateListener> {
+
+    private final AdvancedInterpreterEngine queryEngine;
     private ChangeLevel currentChange = ChangeLevel.NO_CHANGE;
     private ChangeLevel maxLevel = ChangeLevel.NO_CHANGE;
-    private final Map<ChangeLevel, Collection<ViatraQueryModelUpdateListener>> listenerMap;
+    private final Map<ChangeLevel, Collection<InterpreterModelUpdateListener>> listenerMap;
     private final Logger logger;
-    
-    public ModelUpdateProvider(AdvancedViatraQueryEngine queryEngine, Logger logger) {
+
+    public ModelUpdateProvider(AdvancedInterpreterEngine queryEngine, Logger logger) {
         super();
         this.queryEngine = queryEngine;
         this.logger = logger;
         listenerMap = new EnumMap<>(ChangeLevel.class);
     }
-    
+
     @Override
-    protected void listenerAdded(ViatraQueryModelUpdateListener listener) {
+    protected void listenerAdded(InterpreterModelUpdateListener listener) {
         // check ChangeLevel
         // create callback for given level if required
         if(listenerMap.isEmpty()) {
@@ -52,37 +42,37 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
                 this.queryEngine.getBaseIndex().addBaseIndexChangeListener(indexListener);
                 // add listener to new matchers (use lifecycle listener)
                 this.queryEngine.addLifecycleListener(selfListener);
-            } catch (ViatraQueryException e) {
+            } catch (InterpreterException e) {
                 throw new IllegalStateException("Model update listener used on engine without base index", e);
             }
         }
-        
+
         ChangeLevel changeLevel = listener.getLevel();
         listenerMap.computeIfAbsent(changeLevel, k -> CollectionsFactory.createSet()).add(listener);
         // increase or keep max level of listeners
         ChangeLevel oldMaxLevel = maxLevel;
-        maxLevel = maxLevel.changeOccured(changeLevel); 
+        maxLevel = maxLevel.changeOccured(changeLevel);
         if(!maxLevel.equals(oldMaxLevel) && ChangeLevel.MATCHSET.compareTo(oldMaxLevel) > 0 && ChangeLevel.MATCHSET.compareTo(maxLevel) <= 0) {
             // add matchUpdateListener to all matchers
-            for (ViatraQueryMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
+            for (InterpreterMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
                 this.queryEngine.addMatchUpdateListener(matcher, matchSetListener, false);
             }
         }
     }
 
     @Override
-    protected void listenerRemoved(ViatraQueryModelUpdateListener listener) {
+    protected void listenerRemoved(InterpreterModelUpdateListener listener) {
         ChangeLevel changeLevel = listener.getLevel();
-        Collection<ViatraQueryModelUpdateListener> old = listenerMap.getOrDefault(changeLevel, Collections.emptySet());
+        Collection<InterpreterModelUpdateListener> old = listenerMap.getOrDefault(changeLevel, Collections.emptySet());
         boolean removed = old.remove(listener);
         if(removed) {
             if (old.isEmpty()) listenerMap.remove(changeLevel);
         } else {
             handleUnsuccesfulRemove(listener);
         }
-        
+
         updateMaxLevel();
-        
+
         if(listenerMap.isEmpty()) {
             this.queryEngine.removeLifecycleListener(selfListener);
             removeBaseIndexChangeListener();
@@ -92,7 +82,7 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
     private void removeBaseIndexChangeListener() {
         try {
             this.queryEngine.getBaseIndex().removeBaseIndexChangeListener(indexListener);
-        } catch (ViatraQueryException e) {
+        } catch (InterpreterException e) {
             throw new IllegalStateException("Model update listener used on engine without base index", e);
         }
     }
@@ -107,15 +97,15 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
         }
         if(maxLevel.compareTo(ChangeLevel.MATCHSET) < 0) {
             // remove listener from matchers
-            for (ViatraQueryMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
+            for (InterpreterMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
                 this.queryEngine.removeMatchUpdateListener(matcher, matchSetListener);
             }
         }
     }
 
-    private void handleUnsuccesfulRemove(ViatraQueryModelUpdateListener listener) {
-        for (Entry<ChangeLevel, Collection<ViatraQueryModelUpdateListener>> entry : listenerMap.entrySet()) {
-            Collection<ViatraQueryModelUpdateListener> existingListeners = entry.getValue();
+    private void handleUnsuccesfulRemove(InterpreterModelUpdateListener listener) {
+        for (Entry<ChangeLevel, Collection<InterpreterModelUpdateListener>> entry : listenerMap.entrySet()) {
+            Collection<InterpreterModelUpdateListener> existingListeners = entry.getValue();
             // if the listener is contained in some other bucket, remove it from there
             if(existingListeners.remove(listener)) {
                 logger.error("Listener "+listener+" change level changed since initialization!");
@@ -127,23 +117,23 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
     }
 
     private void notifyListeners() {
-        
+
         // any change that occurs after this point should be regarded as a new event
         // FIXME what should happen when a listener creates new notifications?
         // -> other listeners will get events in different order
         ChangeLevel tempLevel = currentChange;
         currentChange = ChangeLevel.NO_CHANGE;
-        
+
         if(!listenerMap.isEmpty()) {
             for (ChangeLevel level : new HashSet<>(listenerMap.keySet())) {
                 if(tempLevel.compareTo(level) >= 0) {
-                    for (ViatraQueryModelUpdateListener listener : new ArrayList<>(listenerMap.get(level))) {
+                    for (InterpreterModelUpdateListener listener : new ArrayList<>(listenerMap.get(level))) {
                         try {
                             listener.notifyChanged(tempLevel);
                         } catch (Exception ex) {
                             logger.error(
-                                    "VIATRA Query encountered an error in delivering model update notification to listener "
-                                            + listener + ".", ex);
+                                    "Refinery Interpreter encountered an error in delivering model update " +
+                                                                                        "notification to listener " + listener + ".", ex);
                         }
                     }
                 }
@@ -151,19 +141,19 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
         } else {
             throw new IllegalStateException("Notify listeners must not be called without listeners! Maybe an update callback was not removed correctly.");
         }
-        
+
     }
-    
+
     // model update "providers":
     // - model: IQBase callback even if not dirty
     // - index: IQBase dirty callback
-    private final ViatraBaseIndexChangeListener indexListener = new ViatraBaseIndexChangeListener() {
-        
+    private final InterpreterBaseIndexChangeListener indexListener = new InterpreterBaseIndexChangeListener() {
+
         @Override
         public boolean onlyOnIndexChange() {
             return false;
         }
-        
+
         @Override
         public void notifyChanged(boolean indexChanged) {
             if(indexChanged) {
@@ -173,41 +163,41 @@ public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryMode
             }
             notifyListeners();
         }
-        
+
     };
     // - matchset: add the same listener to each matcher and use a dirty flag. needs IQBase callback as well
     private final IMatchUpdateListener<IPatternMatch> matchSetListener = new IMatchUpdateListener<IPatternMatch>() {
-        
+
         @Override
         public void notifyDisappearance(IPatternMatch match) {
             currentChange = currentChange.changeOccured(ChangeLevel.MATCHSET);
         }
-        
+
         @Override
         public void notifyAppearance(IPatternMatch match) {
             currentChange = currentChange.changeOccured(ChangeLevel.MATCHSET);
         }
     };
-    
-    private final ViatraQueryEngineLifecycleListener selfListener = new ViatraQueryEngineLifecycleListener() {
-        
+
+    private final InterpreterEngineLifecycleListener selfListener = new InterpreterEngineLifecycleListener() {
+
         @Override
-        public void matcherInstantiated(ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+        public void matcherInstantiated(InterpreterMatcher<? extends IPatternMatch> matcher) {
             if (maxLevel.compareTo(ChangeLevel.MATCHSET) >= 0) {
                 ModelUpdateProvider.this.queryEngine.addMatchUpdateListener(matcher, matchSetListener, false);
             }
         }
-        
+
         @Override
         public void engineWiped() {}
-        
+
         @Override
         public void engineDisposed() {
             removeBaseIndexChangeListener();
             listenerMap.clear();
             maxLevel = ChangeLevel.NO_CHANGE;
         }
-        
+
         @Override
         public void engineBecameTainted(String description, Throwable t) {}
     };
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/ViatraQueryRuntimeException.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/InterpreterRuntimeException.java
index 83f6f766..3adbd4b6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/ViatraQueryRuntimeException.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/InterpreterRuntimeException.java
@@ -3,39 +3,42 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers;
+package tools.refinery.interpreter.matchers;
+
+import java.io.Serial;
 
 /**
- * A common base class for all exceptions thrown by various VIATRA Query Runtime APIs.
- * 
+ * A common base class for all exceptions thrown by various Refinery Interpreter APIs.
+ *
  * @author Zoltan Ujhelyi
  * @since 2.0
  */
-public abstract class ViatraQueryRuntimeException extends RuntimeException {
+public abstract class InterpreterRuntimeException extends RuntimeException {
 
-    private static final long serialVersionUID = -8505253058035069310L;
+    @Serial
+        private static final long serialVersionUID = -8505253058035069310L;
 
-    public ViatraQueryRuntimeException() {
+    public InterpreterRuntimeException() {
         super();
     }
 
-    public ViatraQueryRuntimeException(String message) {
+    public InterpreterRuntimeException(String message) {
         super(message);
     }
 
-    public ViatraQueryRuntimeException(Throwable cause) {
+    public InterpreterRuntimeException(Throwable cause) {
         super(cause);
     }
 
-    public ViatraQueryRuntimeException(String message, Throwable cause) {
+    public InterpreterRuntimeException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ViatraQueryRuntimeException(String message, Throwable cause, boolean enableSuppression,
-            boolean writableStackTrace) {
+    public InterpreterRuntimeException(String message, Throwable cause, boolean enableSuppression,
+                                                                           boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/AverageAccumulator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/AverageAccumulator.java
index 2c09ede1..86cfac23 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/AverageAccumulator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/AverageAccumulator.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 /**
  * @since 2.0
@@ -20,5 +20,5 @@ class AverageAccumulator<Domain> {
         this.value = value;
         this.count = count;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleAverageOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/DoubleAverageOperator.java
index e8a26afd..30a79ff0 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleAverageOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/DoubleAverageOperator.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.OptionalDouble;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 
 /**
  * @author Zoltan Ujhelyi
@@ -20,11 +20,11 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggr
 public class DoubleAverageOperator implements IMultisetAggregationOperator<Double, AverageAccumulator<Double>, Double> {
 
     public static final DoubleAverageOperator INSTANCE = new DoubleAverageOperator();
-    
+
     private DoubleAverageOperator() {
         // Singleton, do not call.
     }
-    
+
     @Override
     public String getShortDescription() {
         return "avg<Integer> incrementally computes the average of java.lang.Integer values";
@@ -70,7 +70,7 @@ public class DoubleAverageOperator implements IMultisetAggregationOperator<Doubl
         final OptionalDouble averageOpt = stream.mapToDouble(Double::doubleValue).average();
         return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
     }
-    
+
     /**
      * @since 2.4
      */
@@ -78,5 +78,5 @@ public class DoubleAverageOperator implements IMultisetAggregationOperator<Doubl
     public AverageAccumulator<Double> clone(AverageAccumulator<Double> original) {
         return new AverageAccumulator<Double>(original.value, original.count);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleSumOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/DoubleSumOperator.java
index 744b0cd1..a15aadd3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleSumOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/DoubleSumOperator.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
 
 /**
  * Incrementally computes the sum of java.lang.Double values
@@ -19,7 +19,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemor
  */
 public class DoubleSumOperator extends AbstractMemorylessAggregationOperator<Double, Double> {
     public static final DoubleSumOperator INSTANCE = new DoubleSumOperator();
-    
+
     private DoubleSumOperator() {
         // Singleton, do not call.
     }
@@ -32,7 +32,7 @@ public class DoubleSumOperator extends AbstractMemorylessAggregationOperator<Dou
     public String getName() {
         return "sum<Double>";
     }
-    
+
     @Override
     public Double createNeutral() {
         return 0d;
@@ -45,8 +45,8 @@ public class DoubleSumOperator extends AbstractMemorylessAggregationOperator<Dou
 
     @Override
     public Double update(Double oldResult, Double updateValue, boolean isInsertion) {
-        return isInsertion ? 
-                oldResult + updateValue : 
+        return isInsertion ?
+                oldResult + updateValue :
                 oldResult - updateValue;
     }
 
@@ -57,6 +57,6 @@ public class DoubleSumOperator extends AbstractMemorylessAggregationOperator<Dou
     public Double aggregateStream(Stream<Double> stream) {
         return stream.mapToDouble(Double::doubleValue).sum();
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/ExtremumOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/ExtremumOperator.java
index ee4ceeb8..f5952b72 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/ExtremumOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/ExtremumOperator.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 
 /**
  * Incrementally computes the minimum or maximum of java.lang.Comparable values, using the default comparison
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.4
  */
 public class ExtremumOperator<T extends Comparable<T>>
         implements IMultisetAggregationOperator<T, SortedMap<T, Integer>, T> {
-    
+
     public enum Extreme {
         MIN, MAX;
-        
+
         /**
          * @since 2.0
          */
         public <T> T pickFrom(SortedMap<T, Integer> nonEmptyMultiSet) {
             switch(this) {
-            case MIN: 
-                return nonEmptyMultiSet.firstKey(); 
+            case MIN:
+                return nonEmptyMultiSet.firstKey();
             case MAX:
                 return nonEmptyMultiSet.lastKey();
             default:
@@ -51,7 +51,7 @@ public class ExtremumOperator<T extends Comparable<T>>
     public static <T extends Comparable<T>> ExtremumOperator<T> getMax() {
         return MAX_OP;
     }
-    
+
     Extreme extreme;
     private ExtremumOperator(Extreme extreme) {
         super();
@@ -94,7 +94,7 @@ public class ExtremumOperator<T extends Comparable<T>>
     public SortedMap<T, Integer> update(SortedMap<T, Integer> oldResult, T updateValue, boolean isInsertion) {
         oldResult.compute(updateValue, (value, c) -> {
             int count = (c == null) ? 0 : c;
-            int result = (isInsertion) ? count+1 : count-1;  
+            int result = (isInsertion) ? count+1 : count-1;
             return (result == 0) ? null : result;
         });
         return oldResult;
@@ -105,10 +105,10 @@ public class ExtremumOperator<T extends Comparable<T>>
      */
     @Override
     public T getAggregate(SortedMap<T, Integer> result) {
-        return result.isEmpty() ? null : 
+        return result.isEmpty() ? null :
             extreme.pickFrom(result);
     }
-    
+
     /**
      * @since 2.0
      */
@@ -123,7 +123,7 @@ public class ExtremumOperator<T extends Comparable<T>>
             return null;
         }
     }
-    
+
     /**
      * @since 2.4
      */
@@ -131,5 +131,5 @@ public class ExtremumOperator<T extends Comparable<T>>
     public SortedMap<T, Integer> clone(SortedMap<T, Integer> original) {
         return new TreeMap<T, Integer>(original);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerAverageOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/IntegerAverageOperator.java
index bf422476..c33fc382 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerAverageOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/IntegerAverageOperator.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.OptionalDouble;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 
 /**
  * @author Zoltan Ujhelyi
@@ -20,11 +20,11 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggr
 public class IntegerAverageOperator implements IMultisetAggregationOperator<Integer, AverageAccumulator<Integer>, Double> {
 
     public static final IntegerAverageOperator INSTANCE = new IntegerAverageOperator();
-    
+
     private IntegerAverageOperator() {
         // Singleton, do not call.
     }
-    
+
     @Override
     public String getShortDescription() {
         return "avg<Integer> incrementally computes the average of java.lang.Integer values";
@@ -70,7 +70,7 @@ public class IntegerAverageOperator implements IMultisetAggregationOperator<Inte
         final OptionalDouble averageOpt = stream.mapToInt(Integer::intValue).average();
         return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
     }
-    
+
     /**
      * @since 2.4
      */
@@ -78,5 +78,5 @@ public class IntegerAverageOperator implements IMultisetAggregationOperator<Inte
     public AverageAccumulator<Integer> clone(AverageAccumulator<Integer> original) {
         return new AverageAccumulator<Integer>(original.value, original.count);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerSumOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/IntegerSumOperator.java
index 18584256..430875bc 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerSumOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/IntegerSumOperator.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
 
 /**
  * Incrementally computes the sum of java.lang.Integer values
@@ -19,7 +19,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemor
  */
 public class IntegerSumOperator extends AbstractMemorylessAggregationOperator<Integer, Integer> {
     public static final IntegerSumOperator INSTANCE = new IntegerSumOperator();
-    
+
     private IntegerSumOperator() {
         // Singleton, do not call.
     }
@@ -32,7 +32,7 @@ public class IntegerSumOperator extends AbstractMemorylessAggregationOperator<In
     public String getName() {
         return "sum<Integer>";
     }
-    
+
     @Override
     public Integer createNeutral() {
         return 0;
@@ -45,8 +45,8 @@ public class IntegerSumOperator extends AbstractMemorylessAggregationOperator<In
 
     @Override
     public Integer update(Integer oldResult, Integer updateValue, boolean isInsertion) {
-        return isInsertion ? 
-                oldResult + updateValue : 
+        return isInsertion ?
+                oldResult + updateValue :
                 oldResult - updateValue;
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongAverageOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/LongAverageOperator.java
index d56c9507..1314adc3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongAverageOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/LongAverageOperator.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.OptionalDouble;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 
 /**
  * @author Zoltan Ujhelyi
@@ -20,11 +20,11 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggr
 public class LongAverageOperator implements IMultisetAggregationOperator<Long, AverageAccumulator<Long>, Double> {
 
     public static final LongAverageOperator INSTANCE = new LongAverageOperator();
-    
+
     private LongAverageOperator() {
         // Singleton, do not call.
     }
-    
+
     @Override
     public String getShortDescription() {
         return "avg<Integer> incrementally computes the average of java.lang.Integer values";
@@ -70,7 +70,7 @@ public class LongAverageOperator implements IMultisetAggregationOperator<Long, A
         final OptionalDouble averageOpt = stream.mapToLong(Long::longValue).average();
         return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
     }
-    
+
     /**
      * @since 2.4
      */
@@ -78,5 +78,5 @@ public class LongAverageOperator implements IMultisetAggregationOperator<Long, A
     public AverageAccumulator<Long> clone(AverageAccumulator<Long> original) {
         return new AverageAccumulator<Long>(original.value, original.count);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongSumOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/LongSumOperator.java
index 29ded090..2d466314 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongSumOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/LongSumOperator.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
 
 /**
  * Incrementally computes the sum of java.lang.Long values
@@ -19,7 +19,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemor
  */
 public class LongSumOperator extends AbstractMemorylessAggregationOperator<Long, Long> {
     public static final LongSumOperator INSTANCE = new LongSumOperator();
-    
+
     private LongSumOperator() {
         // Singleton, do not call.
     }
@@ -32,7 +32,7 @@ public class LongSumOperator extends AbstractMemorylessAggregationOperator<Long,
     public String getName() {
         return "sum<Long>";
     }
-    
+
     @Override
     public Long createNeutral() {
         return 0L;
@@ -45,8 +45,8 @@ public class LongSumOperator extends AbstractMemorylessAggregationOperator<Long,
 
     @Override
     public Long update(Long oldResult, Long updateValue, boolean isInsertion) {
-        return isInsertion ? 
-                oldResult + updateValue : 
+        return isInsertion ?
+                oldResult + updateValue :
                 oldResult - updateValue;
     }
 
@@ -57,5 +57,5 @@ public class LongSumOperator extends AbstractMemorylessAggregationOperator<Long,
     public Long aggregateStream(Stream<Long> stream) {
         return stream.mapToLong(Long::longValue).sum();
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/avg.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/avg.java
index c25678aa..0d0449d2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/avg.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/avg.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IAggregatorFactory;
 
 /**
  * This aggregator calculates the average of the values of a selected aggregate parameter of a called pattern. The aggregate
  * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
  * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
  * summation.
- * 
+ *
  * @since 2.0
  *
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/count.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/count.java
index 8310a0ce..2cd5e7ed 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/count.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/count.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IAggregatorFactory;
 
 /**
  * An aggregator to count the number of matches a pattern has. The return of the aggregator is an non-negative integer
  * number.
- * 
+ *
  * @since 1.4
  *
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/max.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/max.java
index e0236223..b005bd10 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/max.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/max.java
@@ -3,34 +3,34 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Calendar;
 import java.util.Date;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IAggregatorFactory;
 
 /**
  * This aggregator calculates the maximum value of a selected aggregate parameter of a called pattern. The aggregate
  * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
  * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
  * minimum calculation.
- * 
+ *
  * @since 1.4
  * @author Gabor Bergmann
  */
 @AggregatorType(
         // TODO T extends Comparable?
-        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class,
                 Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class},
-        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class,
                 Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class})
 public final class max implements IAggregatorFactory {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/min.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/min.java
index 6408c57b..58d92e92 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/min.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/min.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Calendar;
 import java.util.Date;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IAggregatorFactory;
 
 /**
  * This aggregator calculates the minimum value of a selected aggregate parameter of a called pattern. The aggregate
  * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
  * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
  * minimum calculation.
- * 
+ *
  * @since 1.4
  *
  */
 @AggregatorType(
         // TODO T extends Comparable?
-        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class,
                 Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class},
-        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class,
                 Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class})
 public final class min implements IAggregatorFactory {
-    
+
     @Override
     public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
         if (Comparable.class.isAssignableFrom(domainClass))
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/sum.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/sum.java
index 69ff2e75..e60b21ee 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/sum.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/aggregators/sum.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.aggregators;
+package tools.refinery.interpreter.matchers.aggregators;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+import tools.refinery.interpreter.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IAggregatorFactory;
 
 /**
  * This aggregator calculates the sum of the values of a selected aggregate parameter of a called pattern. The aggregate
  * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
  * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
  * summation.
- * 
+ *
  * @since 1.4
  *
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/OrderedIterableMerge.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/OrderedIterableMerge.java
index 1917e909..57aff73d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/OrderedIterableMerge.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/OrderedIterableMerge.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.algorithms;
+package tools.refinery.interpreter.matchers.algorithms;
 
 import java.util.Comparator;
 import java.util.Iterator;
@@ -18,13 +18,13 @@ import java.util.NoSuchElementException;
  *
  */
 public class OrderedIterableMerge {
-    
+
     private OrderedIterableMerge() {
         // Hidden utility class constructor
     }
-    
+
     /**
-     * Lazily merges two iterables, each ordered according to a given comparator. 
+     * Lazily merges two iterables, each ordered according to a given comparator.
      * Retains order in the result, and also eliminates any duplicates that appear in both arguments.
      */
     public static <T> Iterable<T> mergeUniques(Iterable<T> first, Iterable<T> second, Comparator<T> comparator) {
@@ -33,29 +33,29 @@ public class OrderedIterableMerge {
             Iterator<T> secondIterator = second.iterator();
             T firstItem;
             T secondItem;
-            
+
             {
                 fetchFirst();
                 fetchSecond();
             }
-            
+
             private T fetchFirst() {
                 T previous = firstItem;
-                if (firstIterator.hasNext()) 
+                if (firstIterator.hasNext())
                     firstItem = firstIterator.next();
-                else 
+                else
                     firstItem = null;
                 return previous;
             }
             private T fetchSecond() {
                T previous = secondItem;
-               if (secondIterator.hasNext()) 
+               if (secondIterator.hasNext())
                     secondItem = secondIterator.next();
-                else 
+                else
                     secondItem = null;
                return previous;
             }
-            
+
             @Override
             public boolean hasNext() {
                 return firstItem != null || secondItem != null;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFind.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/UnionFind.java
index c69f08e5..9d0f5275 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFind.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/UnionFind.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.algorithms;
+package tools.refinery.interpreter.matchers.algorithms;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -15,14 +15,14 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 /**
  * Union-find data structure implementation. Note that the implementation relies on the correct implementation of the
  * equals method of the type parameter's class.
- * 
+ *
  * @author Tamas Szabo
- * 
+ *
  * @param <V>
  *            the type parameter of the element's stored in the union-find data structure
  */
@@ -51,7 +51,7 @@ public class UnionFind<V> {
 
     /**
      * Creates a new union set from a collection of elements.
-     * 
+     *
      * @param nodes
      *            the collection of elements
      * @return the root element
@@ -71,7 +71,7 @@ public class UnionFind<V> {
 
     /**
      * This method creates a single set containing the given node.
-     * 
+     *
      * @param node
      *            the root node of the set
      * @return the root element
@@ -89,7 +89,7 @@ public class UnionFind<V> {
 
     /**
      * Find method with path compression.
-     * 
+     *
      * @param node
      *            the node to find
      * @return the root node of the set in which the given node can be found
@@ -111,7 +111,7 @@ public class UnionFind<V> {
     /**
      * Union by rank implementation of the two sets which contain x and y; x and/or y can be a single element from the
      * universe.
-     * 
+     *
      * @param x
      *            set or single element of the universe
      * @param y
@@ -168,7 +168,7 @@ public class UnionFind<V> {
 
     /**
      * Delete the set whose root is the given node.
-     * 
+     *
      * @param root
      *            the root node
      */
@@ -192,7 +192,7 @@ public class UnionFind<V> {
         return false;
     }
 
-    
+
     /**
      * Returns the partition in which the given element can be found, or null otherwise.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFindNodeProperty.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/UnionFindNodeProperty.java
index 82852f9c..7b8ad3f7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFindNodeProperty.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/algorithms/UnionFindNodeProperty.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.algorithms;
+package tools.refinery.interpreter.matchers.algorithms;
 
 public class UnionFindNodeProperty<V> {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/CommonQueryHintOptions.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/CommonQueryHintOptions.java
index 317293bf..d7d4412e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/CommonQueryHintOptions.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/CommonQueryHintOptions.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IRewriterTraceCollector;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollector;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IRewriterTraceCollector;
+import tools.refinery.interpreter.matchers.psystem.rewriters.NopTraceCollector;
 
 /**
  * Query evaluation hints applicable to any engine
@@ -17,17 +17,17 @@ import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollecto
  *
  */
 public final class CommonQueryHintOptions {
-    
+
     private CommonQueryHintOptions() {
         // Hiding constructor for utility class
     }
-    
+
     /**
      * This hint instructs the query backends to record trace information into the given trace collector
      */
-    public static final QueryHintOption<IRewriterTraceCollector> normalizationTraceCollector = 
+    public static final QueryHintOption<IRewriterTraceCollector> normalizationTraceCollector =
             hintOption("normalizationTraceCollector", NopTraceCollector.INSTANCE);
-    
+
     // internal helper for conciseness
     private static <T> QueryHintOption<T> hintOption(String hintKeyLocalName, T defaultValue) {
         return new QueryHintOption<>(CommonQueryHintOptions.class, hintKeyLocalName, defaultValue);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ICallDelegationStrategy.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/ICallDelegationStrategy.java
index 40853f46..f7f02c75 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ICallDelegationStrategy.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/ICallDelegationStrategy.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 
 /**
  * Function object that specifies how hints (including backend preferences) shall propagate through pattern calls.
- * 
+ *
  * <p> A few useful default implementations are included as static fields.
- * 
+ *
  * <p> As of 2.1, only suppported by the local search backend, and only if the pattern call is not flattened.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.1
  */
@@ -27,56 +27,56 @@ public interface ICallDelegationStrategy {
 
     /**
      * Specifies how hints (including backend preferences) shall propagate through pattern calls.
-     * 
+     *
      * @param call a {@link PConstraint} in a query that calls another query.
-     * @param callerHint  a hint under which the calling pattern is evaluated, 
-     * @param callerBackend the actual backend evaluating the calling pattern.  
+     * @param callerHint  a hint under which the calling pattern is evaluated,
+     * @param callerBackend the actual backend evaluating the calling pattern.
      * @param calleeHintProvider the provider of hints for the called pattern.
-     * @return the hints, including backend selection, 
-     * that the backend responsible for the caller pattern must specify when 
+     * @return the hints, including backend selection,
+     * that the backend responsible for the caller pattern must specify when
      * requesting the {@link IQueryResultProvider} for the called pattern via {@link IQueryResultProviderAccess}.
      */
-    public QueryEvaluationHint transformHints(IQueryReference call, 
-            QueryEvaluationHint callerHint, 
-            IQueryBackend callerBackend,
-            IQueryBackendHintProvider calleeHintProvider);
-    
-    
+    public QueryEvaluationHint transformHints(IQueryReference call,
+                                              QueryEvaluationHint callerHint,
+                                              IQueryBackend callerBackend,
+                                              IQueryBackendHintProvider calleeHintProvider);
+
+
     /**
-     * Options known for callee are used to override caller options, except the backend selection. 
-     * Always use the same backend for the callee and the caller, regardless what is specified for the callee pattern. 
+     * Options known for callee are used to override caller options, except the backend selection.
+     * Always use the same backend for the callee and the caller, regardless what is specified for the callee pattern.
      * @author Gabor Bergmann
      */
     public static final ICallDelegationStrategy FULL_BACKEND_ADHESION = (call, callerHint, callerBackend, calleeHintProvider) -> {
-        QueryEvaluationHint calleeHint = 
+        QueryEvaluationHint calleeHint =
                 calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
-        QueryEvaluationHint result = 
+        QueryEvaluationHint result =
             callerHint == null ? calleeHint : callerHint.overrideBy(calleeHint);
-            
+
         QueryEvaluationHint backendAdhesion = new QueryEvaluationHint(
                 null /* settings-ignorant */, callerBackend.getFactory());
         result = result.overrideBy(backendAdhesion);
         return result;
     };
     /**
-     * Options known for callee are used to override caller options, including the backend selection. 
+     * Options known for callee are used to override caller options, including the backend selection.
      * If callee does not specify a backend requirement, the backend of the caller is kept.
      * @author Gabor Bergmann
      */
     public static final ICallDelegationStrategy PARTIAL_BACKEND_ADHESION = (call, callerHint, callerBackend, calleeHintProvider) -> {
         QueryEvaluationHint backendAdhesion = new QueryEvaluationHint(
                 null /* settings-ignorant */, callerBackend.getFactory());
-        
-        QueryEvaluationHint result = 
+
+        QueryEvaluationHint result =
                 callerHint == null ? backendAdhesion : callerHint.overrideBy(backendAdhesion);
-        
+
         QueryEvaluationHint calleeHint = calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
         result = result.overrideBy(calleeHint);
 
         return result;
     };
     /**
-     * Options known for callee are used to override caller options, including the backend selection. 
+     * Options known for callee are used to override caller options, including the backend selection.
      * Always use the backend specified for the callee (or the default if none), regardless of the backend of the caller.
      * @author Gabor Bergmann
      */
@@ -84,6 +84,6 @@ public interface ICallDelegationStrategy {
         QueryEvaluationHint calleeHint = calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
         return callerHint == null ? calleeHint : callerHint.overrideBy(calleeHint);
     };
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IMatcherCapability.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IMatcherCapability.java
index 104b68a8..ba2f4b42 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IMatcherCapability.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IMatcherCapability.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
 /**
  * Implementations of this interface can be used to decide whether a matcher created by an arbitrary backend can
  * potentially be used as a substitute for another matcher.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -22,5 +22,5 @@ public interface IMatcherCapability {
      * Returns true if matchers of this capability can be used as a substitute for a matcher implementing the given capability
      */
     public boolean canBeSubstitute(IMatcherCapability capability);
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackend.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackend.java
index c85f10a4..c98378a1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackend.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackend.java
@@ -3,44 +3,45 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 /**
- * Internal interface for a VIATRA query specification. Each query is associated with a pattern. Methods instantiate a matcher
- * of the pattern with various parameters.
+ * Internal interface for a Refienry Interpreter query specification. Each query is associated with a pattern. Methods
+ * instantiate a matcher of the pattern with various parameters.
  *
  * @author Bergmann Gábor
  * @since 0.9
- * @noextend This interface is not intended to be extended by users of the VIATRA framework, and should only be used by the query engine
+ * @noextend This interface is not intended to be extended by users of the Refinery Interpreter framework, and should
+ * only be used by the query engine
  */
 public interface IQueryBackend {
-        
+
         /**
-         * @return true iff this backend is incremental, i.e. it caches the results of queries for quick retrieval, 
+         * @return true iff this backend is incremental, i.e. it caches the results of queries for quick retrieval,
          * and can provide update notifications on result set changes.
          */
         public boolean isCaching();
-        
+
     /**
      * Returns a result provider for a given query. Repeated calls may return the same instance.
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
         public IQueryResultProvider getResultProvider(PQuery query);
-        
+
         /**
      * Returns a result provider for a given query. Repeated calls may return the same instance.
      * @param optional hints that may override engine and query defaults (as provided by {@link IQueryBackendHintProvider}). Can be null.
-     * @throws ViatraQueryRuntimeException 
+     * @throws InterpreterRuntimeException
          * @since 1.4
      */
     public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint hints);
-        
+
     /**
      * Returns an existing result provider for a given query, if it was previously constructed, returns null otherwise.
      * Will not construct and initialize new result providers.
@@ -48,17 +49,17 @@ public interface IQueryBackend {
         public IQueryResultProvider peekExistingResultProvider(PQuery query);
 
         /**
-         * Propagates all pending updates in this query backend. The implementation of this method is optional, and it 
-         * can be ignored entirely if the backend does not delay updates.   
+         * Propagates all pending updates in this query backend. The implementation of this method is optional, and it
+         * can be ignored entirely if the backend does not delay updates.
          * @since 1.6
          */
         public void flushUpdates();
-        
+
         /**
          * Disposes the query backend.
          */
         public abstract void dispose();
-        
+
         /**
          * @return the factory that created this backend, if this functionality is supported
          * @since 2.1
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendFactory.java
index e264ab3f..dc82b9ce 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendFactory.java
@@ -3,35 +3,36 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
- * A Query Backend Factory identifies a query evaluator implementation, and can create an evaluator instance (an {@link IQueryBackend}) tied to a specific VIATRA Query engine upon request. 
- * 
- * <p> The factory is used as a lookup key for the backend instance, 
- *   therefore implementors should either be singletons, or implement equals() / hashCode() accordingly. 
- * 
+ * A Query Backend Factory identifies a query evaluator implementation, and can create an evaluator instance (an
+ * {@link IQueryBackend}) tied to a specific Refinery Interpreter engine upon request.
+ *
+ * <p> The factory is used as a lookup key for the backend instance,
+ *   therefore implementors should either be singletons, or implement equals() / hashCode() accordingly.
+ *
  * @author Bergmann Gabor
  *
  */
 public interface IQueryBackendFactory {
-    
+
     /**
-     * Creates a new {@link IQueryBackend} instance tied to the given context elements. 
-     * 
+     * Creates a new {@link IQueryBackend} instance tied to the given context elements.
+     *
      * @return an instance of the class returned by {@link #getBackendClass()} that operates in the given context.
      * @since 1.5
      */
-    public IQueryBackend 
+    public IQueryBackend
         create(IQueryBackendContext context);
-    
-    
+
+
     /**
      * The backend instances created by this factory are guaranteed to conform to the returned class.
      */
@@ -39,11 +40,11 @@ public interface IQueryBackendFactory {
 
     /**
      * Calculate the required capabilities, which are needed to execute the given pattern
-     * 
+     *
      * @since 1.4
      */
     public IMatcherCapability calculateRequiredCapability(PQuery query, QueryEvaluationHint hint);
-    
+
     /**
      * Returns whether the current backend is caching
      * @since 2.0
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactoryProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendFactoryProvider.java
index 8787814e..c868fe5a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactoryProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendFactoryProvider.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
 /**
  * A provider interface for {@link IQueryBackendFactory} instances.
@@ -18,7 +18,7 @@ public interface IQueryBackendFactoryProvider {
      * Returns a query backend factory instance. The method should return the same instance in case of repeated calls.
      */
     IQueryBackendFactory getFactory();
-    
+
     /**
      * Returns whether the given query backend should be considered as system default. If multiple backends are
      * registered as system default, it is undefined which one will be chosen.
@@ -26,7 +26,7 @@ public interface IQueryBackendFactoryProvider {
     default boolean isSystemDefaultEngine() {
         return false;
     }
-    
+
     /**
      * Returns whether the given query backend should be considered as system default search backend. If multiple
      * backends are registered as system default, it is undefined which one will be chosen.
@@ -34,8 +34,8 @@ public interface IQueryBackendFactoryProvider {
     default boolean isSystemDefaultSearchBackend() {
         return false;
     }
-    
-    
+
+
     /**
      * Returns whether the given query backend should be considered as system default caching backend. If multiple
      * backends are registered as system default, it is undefined which one will be chosen.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendHintProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendHintProvider.java
index 9bb76349..992024a2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendHintProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryBackendHintProvider.java
@@ -3,30 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * Provides query evaluation hints consisting of the Engine default hints and
  * the hints provided by the pattern itself.
- * 
+ *
  * @author Bergmann Gabor
  * @since 0.9
  * @noimplement This interface is not intended to be implemented by clients, except in the tools.refinery.viatra.runtime plugin.
  */
 public interface IQueryBackendHintProvider {
-    
+
     /**
-     * Suggests query evaluation hints regarding a query. The returned hints reflects the default hints of the 
+     * Suggests query evaluation hints regarding a query. The returned hints reflects the default hints of the
      * query engine merged with the hints provided by the pattern itself. These can be overridden via specific
-     * advanced API of the engine.  
-     * 
+     * advanced API of the engine.
+     *
      * @since 1.4
      */
     QueryEvaluationHint getQueryEvaluationHint(PQuery query);
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryResultProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryResultProvider.java
index cd7d050f..9183bc70 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryResultProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IQueryResultProvider.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.matchers.planning.helpers.StatisticsHelper;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 /**
- * An internal interface of the query backend that provides results of a given query. 
+ * An internal interface of the query backend that provides results of a given query.
  * @author Bergmann Gabor
  * @noimplement This interface is not intended to be implemented by clients.
  */
@@ -33,7 +33,7 @@ public interface IQueryResultProvider {
      * @since 2.0
      */
     public boolean hasMatch(Object[] parameters);
-    
+
     /**
      * Decides whether there are any matches of the pattern that conform to the given fixed values of some parameters.
      *
@@ -47,7 +47,7 @@ public interface IQueryResultProvider {
      * @since 2.0
      */
     public boolean hasMatch(TupleMask parameterSeedMask, ITuple projectedParameterSeed);
-    
+
     /**
      * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
      *
@@ -57,7 +57,7 @@ public interface IQueryResultProvider {
      * @return the number of pattern matches found.
      */
     public int countMatches(Object[] parameters);
-    
+
     /**
      * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
      *
@@ -72,44 +72,44 @@ public interface IQueryResultProvider {
      * @since 1.7
      */
     public int countMatches(TupleMask parameterSeedMask, ITuple projectedParameterSeed);
-    
+
     /**
      * Gives an estimate of the number of different groups the matches are projected into by the given mask
      * (e.g. for an identity mask, this means the full match set size). The estimate must meet the required accuracy.
-     * 
+     *
      * <p> If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} may be returned.
-     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query. 
+     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query.
      * However, caching backends are expected to simply return the indexed (projection) size, initialized on-demand if necessary.
-     * 
+     *
      * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
-     * 
+     *
      * @return if available, an estimate of the cardinality of the projection of the match set, with the desired accuracy.
-     * 
+     *
      * @since 2.1
      */
     public Optional<Long> estimateCardinality(TupleMask groupMask, Accuracy requiredAccuracy);
-    
+
     /**
      * Gives an estimate of the average size of different groups the matches are projected into by the given mask
-     * (e.g. for an identity mask, this means 1, while for an empty mask, the result is match set size). 
+     * (e.g. for an identity mask, this means 1, while for an empty mask, the result is match set size).
      * The estimate must meet the required accuracy.
-     * 
+     *
      * <p> If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} may be returned.
-     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query. 
+     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query.
      * However, caching backends are expected to simply return the exact value from the index, initialized on-demand if necessary.
-     * 
+     *
      * <p> For an empty match set, zero is acceptable as an exact answer.
-     * 
+     *
      * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
-     * 
+     *
      * @return if available, an estimate of the average size of each projection group of the match set, with the desired accuracy.
-     * 
+     *
      * @since 2.1
      */
     public default Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy) {
         return StatisticsHelper.estimateAverageBucketSize(groupMask, requiredAccuracy, this::estimateCardinality);
     }
-   
+
     /**
      * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
      * Neither determinism nor randomness of selection is guaranteed.
@@ -121,11 +121,11 @@ public interface IQueryResultProvider {
      * @since 2.0
      */
     public Optional<Tuple> getOneArbitraryMatch(Object[] parameters);
-    
+
     /**
      * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
      * Neither determinism nor randomness of selection is guaranteed.
-     * 
+     *
      * @param parameterSeedMask
      *            a mask that extracts those parameters of the query (from the entire parameter list) that should be
      *            bound to a fixed value
@@ -136,8 +136,8 @@ public interface IQueryResultProvider {
      * @return a match represented in the internal {@link Tuple} representation.
      * @since 2.0
      */
-    public Optional<Tuple> getOneArbitraryMatch(TupleMask parameterSeedMask, ITuple parameters); 
-    
+    public Optional<Tuple> getOneArbitraryMatch(TupleMask parameterSeedMask, ITuple parameters);
+
     /**
      * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
      *
@@ -148,7 +148,7 @@ public interface IQueryResultProvider {
      * @since 2.0
      */
     public Stream<Tuple> getAllMatches(Object[] parameters);
-    
+
     /**
      * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
      *
@@ -162,39 +162,39 @@ public interface IQueryResultProvider {
      * @return matches represented in the internal {@link Tuple} representation.
      * @since 2.0
      */
-    public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters); 
-    
+    public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters);
+
     /**
      * The underlying query evaluator backend.
      */
     public IQueryBackend getQueryBackend();
-    
+
     /**
      * Internal method that registers low-level callbacks for match appearance and disappearance.
-     * 
+     *
      * <p>
      * <b>Caution: </b> This is a low-level callback that is invoked when the pattern matcher is not necessarily in a
      * consistent state yet. Importantly, no model modification permitted during the callback.
-     * 
+     *
      * <p>
      * The callback can be unregistered via invoking {@link #removeUpdateListener(Object)} with the same tag.
-     * 
+     *
      * @param listener
      *            the listener that will be notified of each new match that appears or disappears, starting from now.
      * @param listenerTag
-     *            a tag by which to identify the listener for later removal by {@link #removeUpdateListener(Object)}. 
+     *            a tag by which to identify the listener for later removal by {@link #removeUpdateListener(Object)}.
      * @param fireNow
-     *            if true, the insertion update allback will be immediately invoked on all current matches as a one-time effect. 
-     *            
-     * @throws UnsupportedOperationException if this is a non-incremental backend 
+     *            if true, the insertion update allback will be immediately invoked on all current matches as a one-time effect.
+     *
+     * @throws UnsupportedOperationException if this is a non-incremental backend
      *  (i.e. {@link IQueryBackend#isCaching()} on {@link #getQueryBackend()} returns false)
-     */ 
+     */
     public void addUpdateListener(final IUpdateable listener, final Object listenerTag, boolean fireNow);
-    
+
     /**
      * Removes an existing listener previously registered with the given tag.
-     *            
-     * @throws UnsupportedOperationException if this is a non-incremental backend 
+     *
+     * @throws UnsupportedOperationException if this is a non-incremental backend
      *  (i.e. {@link IQueryBackend#isCaching()} on {@link #getQueryBackend()} returns false)
      */
     public void removeUpdateListener(final Object listenerTag);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IUpdateable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IUpdateable.java
index baf7144a..e46f4e32 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IUpdateable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/IUpdateable.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Internal interface for the query backend to singal an update to a query result.
@@ -17,7 +17,7 @@ import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
  *
  */
 public interface IUpdateable {
-    
+
     /**
      * This callback method must be free of exceptions, even {@link RuntimeException}s (though not {@link Error}s).
      * @param updateElement the tuple that is changed
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryEvaluationHint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/QueryEvaluationHint.java
index eab92128..188aaf62 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryEvaluationHint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/QueryEvaluationHint.java
@@ -3,33 +3,30 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import java.util.AbstractMap;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
- * Provides VIATRA Query with additional hints on how a query should be evaluated. The same hint can be provided to multiple queries. 
- * 
+ * Provides Refinery Interpreter with additional hints on how a query should be evaluated. The same hint can be provided
+ * to multiple queries.
+ *
  * <p> This class is immutable. Overriding options will create a new instance.
- * 
+ *
  * <p>
  * Here be dragons: for advanced users only.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public class QueryEvaluationHint {
-    
+
     /**
      * @since 2.0
      *
@@ -52,18 +49,18 @@ public class QueryEvaluationHint {
          */
         SPECIFIC
     }
-    
-    final IQueryBackendFactory queryBackendFactory; 
+
+    final IQueryBackendFactory queryBackendFactory;
     final Map<QueryHintOption<?>, Object> backendHintSettings;
     final BackendRequirement requirement;
 
     /**
      * Specifies the suggested query backend requirements, and value settings for additional backend-specific options.
-     * 
+     *
      * <p>
      * The backend requirement type must not be {@link BackendRequirement#SPECIFIC} - for that case, use the constructor
      * {@link #QueryEvaluationHint(Map, IQueryBackendFactory)}.
-     * 
+     *
      * @param backendHintSettings
      *            if non-null, each entry in the map overrides backend-specific options regarding query evaluation
      *            (null-valued map entries permitted to erase hints); passing null means default options associated with
@@ -77,17 +74,17 @@ public class QueryEvaluationHint {
         Preconditions.checkArgument(backendRequirementType != null, "Specific requirement needs to be set");
         Preconditions.checkArgument(backendRequirementType != BackendRequirement.SPECIFIC, "Specific backend requirement needs providing a corresponding backend type");
         this.queryBackendFactory = null;
-        this.requirement = backendRequirementType; 
-        this.backendHintSettings = (backendHintSettings == null) 
+        this.requirement = backendRequirementType;
+        this.backendHintSettings = (backendHintSettings == null)
                 ? Collections.<QueryHintOption<?>, Object> emptyMap()
                 : new HashMap<>(backendHintSettings);
     }
-    
+
     /**
      * Specifies the suggested query backend, and value settings for additional backend-specific options. The first
      * parameter can be null; if the second parameter is null, it is expected that the other constructor is called
      * instead with a {@link BackendRequirement#UNSPECIFIED} parameter.
-     * 
+     *
      * @param backendHintSettings
      *            if non-null, each entry in the map overrides backend-specific options regarding query evaluation
      *            (null-valued map entries permitted to erase hints); passing null means default options associated with
@@ -98,16 +95,16 @@ public class QueryEvaluationHint {
      * @since 1.5
      */
     public QueryEvaluationHint(
-            Map<QueryHintOption<?>, Object> backendHintSettings, 
+            Map<QueryHintOption<?>, Object> backendHintSettings,
             IQueryBackendFactory queryBackendFactory) {
         super();
         this.queryBackendFactory = queryBackendFactory;
-        this.requirement = (queryBackendFactory == null) ? BackendRequirement.UNSPECIFIED : BackendRequirement.SPECIFIC; 
-        this.backendHintSettings = (backendHintSettings == null) 
+        this.requirement = (queryBackendFactory == null) ? BackendRequirement.UNSPECIFIED : BackendRequirement.SPECIFIC;
+        this.backendHintSettings = (backendHintSettings == null)
                 ? Collections.<QueryHintOption<?>, Object> emptyMap()
                 : new HashMap<>(backendHintSettings);
     }
-    
+
     /**
      * Returns the backend requirement described by this hint. If a specific backend is required, that can be queried by {@link #getQueryBackendFactory()}.
      * @since 2.0
@@ -115,10 +112,10 @@ public class QueryEvaluationHint {
     public BackendRequirement getQueryBackendRequirementType() {
         return requirement;
     }
-    
+
     /**
      * A suggestion for choosing the query evaluator algorithm.
-     * 
+     *
      * <p>
      * Returns null iff {@link #getQueryBackendRequirementType()} does not return {@link BackendRequirement#SPECIFIC};
      * in such cases a corresponding default backend is selected inside the engine
@@ -126,13 +123,13 @@ public class QueryEvaluationHint {
     public IQueryBackendFactory getQueryBackendFactory() {
         return queryBackendFactory;
     }
-    
+
     /**
-     * Each entry in the immutable map overrides backend-specific options regarding query evaluation. 
-     * 
-     * <p>The map is non-null, even if empty. 
-     * Null-valued map entries are also permitted to erase hints via {@link #overrideBy(QueryEvaluationHint)}. 
-     * 
+     * Each entry in the immutable map overrides backend-specific options regarding query evaluation.
+     *
+     * <p>The map is non-null, even if empty.
+     * Null-valued map entries are also permitted to erase hints via {@link #overrideBy(QueryEvaluationHint)}.
+     *
      * @since 1.5
      */
     public Map<QueryHintOption<?>, Object> getBackendHintSettings() {
@@ -142,13 +139,13 @@ public class QueryEvaluationHint {
 
     /**
      * Override values in this hint and return a consolidated instance.
-     * 
+     *
      * @since 1.4
      */
     public QueryEvaluationHint overrideBy(QueryEvaluationHint overridingHint){
         if (overridingHint == null)
             return this;
-        
+
         BackendRequirement overriddenRequirement = this.getQueryBackendRequirementType();
         if (overridingHint.getQueryBackendRequirementType() != BackendRequirement.UNSPECIFIED) {
             overriddenRequirement = overridingHint.getQueryBackendRequirementType();
@@ -167,7 +164,7 @@ public class QueryEvaluationHint {
             return new QueryEvaluationHint(hints, overriddenRequirement);
         }
     }
-    
+
     /**
      * Returns whether the given hint option is overridden.
      * @since 1.5
@@ -175,7 +172,7 @@ public class QueryEvaluationHint {
     public boolean isOptionOverridden(QueryHintOption<?> option) {
         return getBackendHintSettings().containsKey(option);
     }
-    
+
     /**
      * Returns the value of the given hint option from the given hint collection, or null if not defined.
      * @since 1.5
@@ -184,7 +181,7 @@ public class QueryEvaluationHint {
     public <HintValue> HintValue getValueOrNull(QueryHintOption<HintValue> option) {
         return (HintValue) getBackendHintSettings().get(option);
     }
-    
+
     /**
      * Returns the value of the given hint option from the given hint collection, or the default value if not defined.
      * Intended to be called by backends to find out the definitive value that should be considered.
@@ -193,7 +190,7 @@ public class QueryEvaluationHint {
     public <HintValue> HintValue getValueOrDefault(QueryHintOption<HintValue> option) {
         return option.getValueOrDefault(this);
     }
-    
+
     @Override
     public int hashCode() {
         return Objects.hash(backendHintSettings, queryBackendFactory, requirement);
@@ -219,7 +216,7 @@ public class QueryEvaluationHint {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        
+
         if (getQueryBackendFactory() != null)
             sb.append("backend: ").append(getQueryBackendFactory().getBackendClass().getSimpleName());
         if (! backendHintSettings.isEmpty()) {
@@ -228,13 +225,13 @@ public class QueryEvaluationHint {
                 sb.append(backendHintSettings.toString());
             } else {
                 // we have to iterate on the contents
-                
+
                 String joinedHintMap = backendHintSettings.entrySet().stream()
                         .map(setting -> setting.getKey() + "=" + setting.getValue()).collect(Collectors.joining(", "));
                 sb.append('{').append(joinedHintMap).append('}');
-            }            
+            }
         }
-        
+
         final String result = sb.toString();
         return result.isEmpty() ? "defaults" : result;
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryHintOption.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/QueryHintOption.java
index 2c6bb4de..516fa9a9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryHintOption.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/QueryHintOption.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
 import java.util.Map;
 import java.util.Objects;
 
 /**
  * Each instance of this class corresponds to a given hint option.
- * 
+ *
  * It is recommended to expose options to clients (and query backends) as public static fields.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.5
  */
@@ -31,10 +31,10 @@ public class QueryHintOption<HintValue> {
         this.optionQualifiedName = optionQualifiedName;
         this.defaultValue = defaultValue;
     }
-    
+
     /**
-     * This is the recommended constructor for hint options defined as static fields within an enclosing class. 
-     * Combines the qualified name of the hint from the (qualified) name of the enclosing class and a local name (unique within that class).  
+     * This is the recommended constructor for hint options defined as static fields within an enclosing class.
+     * Combines the qualified name of the hint from the (qualified) name of the enclosing class and a local name (unique within that class).
      */
     public <T extends HintValue> QueryHintOption(Class<?> optionNamespace, String optionLocalName, T defaultValue) {
         this(String.format("%s@%s", optionLocalName, optionNamespace.getName()), defaultValue);
@@ -68,30 +68,30 @@ public class QueryHintOption<HintValue> {
         }
     }
 
-    
+
     /**
      * Returns the value of this hint option from the given hint collection, or null if not defined.
      */
     public HintValue getValueOrNull(QueryEvaluationHint hints) {
         return hints.getValueOrNull(this);
     }
-    
+
     /**
      * Returns whether this hint option is defined in the given hint collection.
      */
     public boolean isOverriddenIn(QueryEvaluationHint hints) {
         return hints.isOptionOverridden(this);
     }
-       
+
     /**
      * Puts a value of this hint option into an option-to-value map.
-     * 
-     * <p> This method is offered in lieu of a builder API. 
+     *
+     * <p> This method is offered in lieu of a builder API.
      * Use this method on any number of hint options in order to populate an option-value map.
      * Then instantiate the immutable {@link QueryEvaluationHint} using the map.
-     * 
+     *
      * @see #insertValueIfNondefault(Map, Object)
-     * @return the hint value that was previously present in the map under this hint option, carrying over the semantics of {@link Map#put(Object, Object)}.  
+     * @return the hint value that was previously present in the map under this hint option, carrying over the semantics of {@link Map#put(Object, Object)}.
      */
     @SuppressWarnings("unchecked")
     public HintValue insertOverridingValue(Map<QueryHintOption<?>, Object> hints, HintValue overridingValue) {
@@ -101,11 +101,11 @@ public class QueryHintOption<HintValue> {
     /**
      * Puts a value of this hint option into an option-to-value map, if the given value differs from the default value of the option.
      * If the default value is provided instead, then the map is not updated.
-     * 
-     * <p> This method is offered in lieu of a builder API. 
+     *
+     * <p> This method is offered in lieu of a builder API.
      * Use this method on any number of hint options in order to populate an option-value map.
      * Then instantiate the immutable {@link QueryEvaluationHint} using the map.
-     * 
+     *
      * @see #insertOverridingValue(Map, Object)
      * @since 2.0
      */
@@ -113,10 +113,10 @@ public class QueryHintOption<HintValue> {
         if (!Objects.equals(defaultValue, overridingValue))
             hints.put(this, overridingValue);
     }
-    
+
     @Override
     public String toString() {
         return optionQualifiedName;
     }
-        
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ResultProviderRequestor.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/ResultProviderRequestor.java
index 6ec6d53e..5fe57d5b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ResultProviderRequestor.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/backend/ResultProviderRequestor.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.backend;
+package tools.refinery.interpreter.matchers.backend;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 
 /**
  * Uniform way of requesting result providers for pattern calls within queries.
  * Intended users are query backends, for calling other backends to deliver results of dependee queries.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.1
  */
@@ -26,14 +26,14 @@ public class ResultProviderRequestor {
     ICallDelegationStrategy delegationStrategy;
     QueryEvaluationHint callerHint;
     QueryEvaluationHint universalOverride;
-    
-    
+
+
     /**
-     * @param callerBackend the actual backend evaluating the calling pattern.  
+     * @param callerBackend the actual backend evaluating the calling pattern.
      * @param resultProviderAccess
      * @param hintProvider
      * @param delegationStrategy
-     * @param callerHint  a hint under which the calling pattern is evaluated, 
+     * @param callerHint  a hint under which the calling pattern is evaluated,
      * @param universalOverride if non-null, overrides the hint with extra options <i>after</i> the {@link ICallDelegationStrategy}
      */
     public ResultProviderRequestor(IQueryBackend callerBackend, IQueryResultProviderAccess resultProviderAccess,
@@ -52,22 +52,22 @@ public class ResultProviderRequestor {
 
 
     /**
-     * 
+     *
      * @param call a {@link PConstraint} in a query that calls another query.
-     * @param spotOverride if non-null, overrides the hint with extra options <i>after</i> the {@link ICallDelegationStrategy} 
+     * @param spotOverride if non-null, overrides the hint with extra options <i>after</i> the {@link ICallDelegationStrategy}
      * and the universal override specified in the constructor
      * @return the obtained result provider
      */
     public IQueryResultProvider requestResultProvider(IQueryReference call, QueryEvaluationHint spotOverride) {
-        QueryEvaluationHint hints = 
+        QueryEvaluationHint hints =
                 delegationStrategy.transformHints(call, callerHint, callerBackend, hintProvider);
-        
+
         if (universalOverride != null)
             hints = hints.overrideBy(universalOverride);
-        
+
         if (spotOverride != null)
             hints = hints.overrideBy(spotOverride);
-        
+
         return resultProviderAccess.getResultProvider(call.getReferredQuery(), hints);
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryMetaContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/AbstractQueryMetaContext.java
index 99611758..14ca52c1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryMetaContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/AbstractQueryMetaContext.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -17,13 +17,13 @@ import java.util.Set;
 
 /**
  * Common abstract class for implementers of {@link IQueryMetaContext}
- * 
+ *
  * @author Grill Balázs
  * @since 1.3
  *
  */
 public abstract class AbstractQueryMetaContext implements IQueryMetaContext {
-    
+
     /**
      * @since 2.0
      */
@@ -39,7 +39,7 @@ public abstract class AbstractQueryMetaContext implements IQueryMetaContext {
     public boolean canLeadOutOfScope(IInputKey key) {
         return key.getArity() > 1;
     }
-    
+
     /**
      * @since 1.6
      */
@@ -47,14 +47,14 @@ public abstract class AbstractQueryMetaContext implements IQueryMetaContext {
     public Comparator<IInputKey> getSuggestedEliminationOrdering() {
         return (o1, o2) -> 0;
     }
-    
+
     /**
      * @since 1.6
      */
     @Override
     public Collection<InputKeyImplication> getWeakenedAlternatives(IInputKey implyingKey) {
         return Collections.emptySet();
-    }    
+    }
 
     @Override
     public boolean isPosetKey(IInputKey key) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryRuntimeContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/AbstractQueryRuntimeContext.java
index c797eff9..fa6b5a26 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryRuntimeContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/AbstractQueryRuntimeContext.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 /**
  * This class is intended to be extended by implementors. The main purpose of this abstract implementation to protect
  * implementors from future changes in the interface.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IInputKey.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IInputKey.java
index 4dbcca88..dd6680cb 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IInputKey.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IInputKey.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 /**
  * An input key identifies an input (extensional) relation, such as the instance set of a given node or edge type, or the direct containment relation.
- * 
- * <p> The input key, at the very minimum, is associated with an arity (number of columns), a user-friendly name, and a string identifier (for distributive purposes). 
- * 
- * <p> The input key itself must be an immutable data object that properly overrides equals() and hashCode(). 
- * It must be instantiable without using the query context object, so that query specifications may construct the appropriate PQueries. 
- * 
+ *
+ * <p> The input key, at the very minimum, is associated with an arity (number of columns), a user-friendly name, and a string identifier (for distributive purposes).
+ *
+ * <p> The input key itself must be an immutable data object that properly overrides equals() and hashCode().
+ * It must be instantiable without using the query context object, so that query specifications may construct the appropriate PQueries.
+ *
  * @author Bergmann Gabor
  *
  */
@@ -29,17 +29,17 @@ public interface IInputKey {
      * An internal string identifier that can be used to uniquely identify to input key (relevant for distributed applications).
      */
     public String getStringID();
-    
+
     /**
      * The width of tuples in this relation.
      */
     public int getArity();
-    
+
     /**
      * Returns true iff instance tuples of the key can be enumerated.
      * <p> If false, the runtime can only test tuple membership in the extensional relation identified by the key, but not enumerate member tuples in general.
      */
     boolean isEnumerable();
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IPosetComparator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IPosetComparator.java
index e2d5bcee..137e6338 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IPosetComparator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IPosetComparator.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Implementations of this interface aid the query engine with the ordering of poset elements. This information is
  * particularly important in the delete and re-derive evaluation mode because they let the engine identify monotone
  * change pairs.
- * 
+ *
  * @author Tamas Szabo
  * @since 1.6
  */
@@ -22,8 +22,8 @@ public interface IPosetComparator {
 
     /**
      * Returns true if the 'left' tuple of poset elements is smaller or equal than the 'right' tuple of poset elements according to
-     * the partial order that this poset comparator employs. 
-     * 
+     * the partial order that this poset comparator employs.
+     *
      * @param left
      *            the left tuple of poset elements
      * @param right
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryBackendContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryBackendContext.java
index 04f00aaa..a2f60f0d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryBackendContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryBackendContext.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.IMatcherCapability;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 
 /**
  * This interface is a collector which holds every API that is provided by the engine to control
@@ -25,25 +25,25 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
 public interface IQueryBackendContext {
 
     Logger getLogger();
-    
+
     IQueryRuntimeContext getRuntimeContext();
-    
+
     IQueryCacheContext getQueryCacheContext();
-    
+
     IQueryBackendHintProvider getHintProvider();
-    
+
     IQueryResultProviderAccess getResultProviderAccess();
-    
+
     QueryAnalyzer getQueryAnalyzer();
-    
+
     /**
      * @since 2.0
      */
     IMatcherCapability getRequiredMatcherCapability(PQuery query, QueryEvaluationHint overrideHints);
-    
+
     /**
      * @since 1.6
      */
     boolean areUpdatesDelayed();
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryCacheContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryCacheContext.java
index 617207f6..af525fae 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryCacheContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryCacheContext.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
 
 /**
  * Provides information on already cached queries to query evaluator backends at runtime.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public interface IQueryCacheContext {
-    
+
     /**
      * Checks if there already is a caching result provider for the given query.
-     * <p> Returns false if called while the caching result provider of the given query is being constructed in the first place. 
+     * <p> Returns false if called while the caching result provider of the given query is being constructed in the first place.
      */
     public boolean isResultCached(PQuery query);
-    
+
     /**
      * Returns a caching result provider for the given query; it must be constructed if it does not exist yet.
-     * <p> <b>Caution:</b> behavior undefined if called while the caching result provider of the given query is being constructed. 
-     *   Beware of infinite loops. 
+     * <p> <b>Caution:</b> behavior undefined if called while the caching result provider of the given query is being constructed.
+     *   Beware of infinite loops.
      * <p> <b>Postcondition:</b> {@link IQueryBackend#isCaching()} returns true for the {@link #getQueryBackend()} of the returned provider
-     * 
-     * @throws ViatraQueryRuntimeException
+     *
+     * @throws InterpreterRuntimeException
      */
     public IQueryResultProvider getCachingResultProvider(PQuery query);
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryMetaContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryMetaContext.java
index 4c22a3cb..36e5ae95 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryMetaContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryMetaContext.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -15,25 +15,25 @@ import java.util.Set;
 
 /**
  * Provides metamodel information (relationship of input keys) to query evaluator backends at runtime and at query planning time.
- * 
+ *
  * @noimplement Implementors should extend {@link AbstractQueryMetaContext} instead of directly implementing this interface.
  * @author Bergmann Gabor
  */
 public interface IQueryMetaContext {
-        
+
         /**
          * Returns true iff instance tuples of the given key can be enumerated.
          * <p> If false, the runtime can only test tuple membership in the extensional relation identified by the key, but not enumerate member tuples in general.
          * <p> Equivalent to {@link IInputKey#isEnumerable()}.
          */
         boolean isEnumerable(IInputKey key);
-        
+
         /**
          * Returns true iff the set of instance tuples of the given key is immutable.
          * <p> If false, the runtime provides notifications upon change.
          */
         boolean isStateless(IInputKey key);
-    
+
     /**
      * Returns a set of implications (weakened alternatives),
      *  with a suggestion for the query planner that satisfying them first may help in satisfying the implying key.
@@ -42,57 +42,57 @@ public interface IQueryMetaContext {
      * @since 1.6
      */
     Collection<InputKeyImplication> getWeakenedAlternatives(IInputKey implyingKey);
-        
+
         /**
          * Returns known direct implications, e.g. edge supertypes, edge opposites, node type constraints, etc.
      * <p> Note that for the obvious reasons, enumerable keys can only be implied by enumerable keys.
          */
         Collection<InputKeyImplication> getImplications(IInputKey implyingKey);
-    
+
     /**
      * Returns known "double dispatch" implications, where the given implying key implies other input keys under certain additional conditions (themselves input keys).
      * For example, a "type x, unscoped" input key may imply the "type x, in scope" input key under the condition of the input key "x is in scope"
-     * 
+     *
      * <p> Note that for the obvious reasons, enumerable keys can only be implied by enumerable keys (either as the implying key or as the additional condition).
      * <p> Note that symmetry is not required, i.e. the additional conditions do not have to list the same conditional implication.
      * @return multi-map, where the keys are additional conditions and the values are input key implications jointly implied by the condition and the given implying key.
      * @since 2.0
      */
     Map<InputKeyImplication, Set<InputKeyImplication>> getConditionalImplications(IInputKey implyingKey);
-        
+
         /**
          * Returns functional dependencies of the input key expressed in terms of column indices.
-         * 
-         * <p> Each entry of the map is a functional dependency rule, where the entry key specifies source columns and the entry value specifies target columns. 
+         *
+         * <p> Each entry of the map is a functional dependency rule, where the entry key specifies source columns and the entry value specifies target columns.
          */
         Map<Set<Integer>, Set<Integer>> getFunctionalDependencies(IInputKey key);
-        
+
         /**
          * For query normalizing, this is the order suggested for trying to eliminate input keys.
          * @since 1.6
          */
         Comparator<IInputKey> getSuggestedEliminationOrdering();
-        
+
         /**
          * Tells whether the given {@link IInputKey} is an edge and may lead out of scope.
-         * 
+         *
          * @since 1.6
          */
         boolean canLeadOutOfScope(IInputKey key);
 
         /**
-         * Returns true if the given {@link IInputKey} represents a poset type.    
+         * Returns true if the given {@link IInputKey} represents a poset type.
          * @since 1.6
          */
         boolean isPosetKey(IInputKey key);
-        
+
         /**
-         * Returns an {@link IPosetComparator} for the given set of {@link IInputKey}s. 
-         * 
+         * Returns an {@link IPosetComparator} for the given set of {@link IInputKey}s.
+         *
          * @param keys an iterable collection of input keys
          * @return the poset comparator
          * @since 1.6
          */
         IPosetComparator getPosetComparator(Iterable<IInputKey> keys);
-        
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryResultProviderAccess.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryResultProviderAccess.java
index 7fecd01a..e4970cef 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryResultProviderAccess.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryResultProviderAccess.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 
 /**
  * This interface exposes API to request {@link IQueryResultProvider} for {@link PQuery} instances.
- * 
+ *
  * @author Grill Balázs
  * @since 1.5
  * @noimplement This interface is not intended to be implemented by clients.
@@ -24,8 +24,8 @@ public interface IQueryResultProviderAccess {
     /**
      * Get a result provider for the given {@link PQuery}, which conforms the capabilities requested by the
      * given {@link QueryEvaluationHint} object.
-     * @throws ViatraQueryRuntimeException 
+     * @throws ViatraQueryRuntimeException
      */
     public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint overrideHints);
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContext.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryRuntimeContext.java
index 61359c1b..1a3b300a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContext.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryRuntimeContext.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
-import tools.refinery.viatra.runtime.CancellationToken;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.matchers.planning.helpers.StatisticsHelper;
+import tools.refinery.interpreter.CancellationToken;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContextListener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryRuntimeContextListener.java
index 7be27d56..87b07099 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContextListener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IQueryRuntimeContextListener.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Listens for changes in the runtime context.
@@ -16,7 +16,7 @@ import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
  *
  */
 public interface IQueryRuntimeContextListener {
-    
+
     /**
      * The given tuple was inserted into or removed from the input relation indicated by the given key.
      * @param key the key identifying the input relation that was updated
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IndexingService.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IndexingService.java
index 8210765d..08183746 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IndexingService.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/IndexingService.java
@@ -3,14 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
+
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * These are the different services which can be provided by an {@link IQueryRuntimeContext} implementation.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -18,19 +20,19 @@ package tools.refinery.viatra.runtime.matchers.context;
 public enum IndexingService {
 
     /**
-     * Cardinality information is available. Makes possible to calculate 
-     * unseeded calls of {@link IQueryRuntimeContext#countTuples(IInputKey, tools.refinery.viatra.runtime.matchers.tuple.Tuple)}
+     * Cardinality information is available. Makes possible to calculate
+     * unseeded calls of {@link IQueryRuntimeContext#countTuples(IInputKey, Tuple)}
      */
     STATISTICS,
-    
+
     /**
      * The indexer can provide notifications about changes in the model.
      */
     NOTIFICATIONS,
-    
+
     /**
      * Enables enumeration of instances and reverse-navigation.
      */
     INSTANCES
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/InputKeyImplication.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/InputKeyImplication.java
index 2a403810..b98a8d2f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/InputKeyImplication.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/InputKeyImplication.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context;
+package tools.refinery.interpreter.matchers.context;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,12 +14,12 @@ import java.util.List;
 
 /**
  * Data object representing the implication of an input key, in use cases including edge supertypes, edge opposites, node type constraints, etc.
- * 
+ *
  * <p> Each instance tuple of the <i>implying input key</i> (if given) implies the presence of an instance tuple of the <i>implied input key</i> consisting of elements of the original tuple at given positions.
  * When the input key is null, it is not an input constraint but some other source that implies input keys.
- * 
+ *
  * <p> The implication is an immutable data object.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
@@ -29,7 +29,7 @@ public final class InputKeyImplication {
     private List<Integer> impliedIndices;
 
     /**
-     * Optional. Instance tuples of this input key imply an instance tuple of another key. 
+     * Optional. Instance tuples of this input key imply an instance tuple of another key.
      * Sometimes it is not an input key that implies other input keys, so this attribute can be null.
      */
     public IInputKey getImplyingKey() {
@@ -59,7 +59,7 @@ public final class InputKeyImplication {
         this.impliedKey = impliedKey;
         this.impliedIndices = Collections.unmodifiableList(new ArrayList<>(implyingIndices));
     }
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/BaseInputKeyWrapper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/common/BaseInputKeyWrapper.java
index f9b05e5b..127a8631 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/BaseInputKeyWrapper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/common/BaseInputKeyWrapper.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context.common;
+package tools.refinery.interpreter.matchers.context.common;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IInputKey;
 
 
 /**
- * An input key that is identified by a single wrapped object and the class of the wrapper. 
+ * An input key that is identified by a single wrapped object and the class of the wrapper.
  * @author Bergmann Gabor
  *
  */
@@ -27,8 +27,8 @@ public abstract class BaseInputKeyWrapper<Wrapped> implements IInputKey {
     public Wrapped getWrappedKey() {
         return wrappedKey;
     }
-    
-    
+
+
     @Override
     public int hashCode() {
         return ((wrappedKey == null) ? 0 : wrappedKey.hashCode());
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/JavaTransitiveInstancesKey.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/common/JavaTransitiveInstancesKey.java
index 400a6ab9..fc1accbd 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/JavaTransitiveInstancesKey.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/common/JavaTransitiveInstancesKey.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context.common;
+package tools.refinery.interpreter.matchers.context.common;
 
 
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/surrogate/SurrogateQueryRegistry.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/surrogate/SurrogateQueryRegistry.java
index bb24ec8c..83eba8c9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/surrogate/SurrogateQueryRegistry.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/context/surrogate/SurrogateQueryRegistry.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.context.surrogate;
+package tools.refinery.interpreter.matchers.context.surrogate;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -15,21 +15,21 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.IProvider;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.matchers.util.SingletonInstanceProvider;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.util.IProvider;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.util.SingletonInstanceProvider;
 
 /**
  * @author Abel Hegedus
  *
  */
 public class SurrogateQueryRegistry {
-    
+
     private Map<IInputKey, IProvider<PQuery>> registeredSurrogateQueryMap = new HashMap<>();
     private Map<IInputKey, IProvider<PQuery>> dynamicSurrogateQueryMap = new HashMap<>();
-    
+
     /**
      * Hidden constructor
      */
@@ -37,17 +37,17 @@ public class SurrogateQueryRegistry {
     }
 
     private static final SurrogateQueryRegistry INSTANCE = new SurrogateQueryRegistry();
-    
+
     public static SurrogateQueryRegistry instance() {
         return INSTANCE;
     }
-    
+
     /**
-     * 
+     *
      * @param feature
      * @param surrogateQuery
      * @return the previous surrogate query associated with feature, or null if there was no such query FQN registered
-     * @throws IllegalArgumentException if feature or surrogateQuery is null 
+     * @throws IllegalArgumentException if feature or surrogateQuery is null
      */
     public IProvider<PQuery> registerSurrogateQueryForFeature(IInputKey feature, PQuery surrogateQuery) {
         Preconditions.checkArgument(surrogateQuery != null, "Surrogate query must not be null!");
@@ -55,7 +55,7 @@ public class SurrogateQueryRegistry {
     }
 
     /**
-     * 
+     *
      * @param feature
      * @param surrogateQuery
      * @return the previous surrogate query associated with feature, or null
@@ -68,12 +68,12 @@ public class SurrogateQueryRegistry {
         Preconditions.checkArgument(surrogateQueryProvider != null, "Surrogate query must not be null!");
         return registeredSurrogateQueryMap.put(feature, surrogateQueryProvider);
     }
-    
+
     public IProvider<PQuery> addDynamicSurrogateQueryForFeature(IInputKey feature, PQuery surrogateQuery) {
         Preconditions.checkArgument(surrogateQuery != null, "Surrogate query FQN must not be null!");
         return addDynamicSurrogateQueryForFeature(feature, new SingletonInstanceProvider<PQuery>(surrogateQuery));
     }
-    
+
     public IProvider<PQuery> addDynamicSurrogateQueryForFeature(IInputKey feature, IProvider<PQuery> surrogateQuery) {
         Preconditions.checkArgument(feature != null, "Feature must not be null!");
         Preconditions.checkArgument(surrogateQuery != null, "Surrogate query FQN must not be null!");
@@ -84,9 +84,9 @@ public class SurrogateQueryRegistry {
         Preconditions.checkArgument(feature != null, "Feature must not be null!");
         return dynamicSurrogateQueryMap.remove(feature);
     }
-    
+
     /**
-     * 
+     *
      * @param feature that may have surrogate query defined, null not allowed
      * @return true if the feature has a surrogate query defined
      * @throws IllegalArgumentException if feature is null
@@ -99,9 +99,9 @@ public class SurrogateQueryRegistry {
         }
         return surrogateExists;
     }
-    
+
     /**
-     * 
+     *
      * @param feature for which the surrogate query FQN should be returned
      * @return the surrogate query FQN defined for the feature
      * @throws IllegalArgumentException if feature is null
@@ -126,22 +126,22 @@ public class SurrogateQueryRegistry {
     public Set<IInputKey> getRegisteredSurrogateQueries() {
         return Collections.unmodifiableSet(getRegisteredSurrogateQueriesInternal());
     }
-    
+
     private Set<IInputKey> getRegisteredSurrogateQueriesInternal() {
         return registeredSurrogateQueryMap.keySet();
     }
-    
+
     /**
      * @return an unmodifiable set of features with dynamically added surrogate queries
      */
     public Set<IInputKey> getDynamicSurrogateQueries() {
         return Collections.unmodifiableSet(getDynamicSurrogateQueriesInternal());
     }
-    
+
     private Set<IInputKey> getDynamicSurrogateQueriesInternal() {
-        return dynamicSurrogateQueryMap.keySet();       
+        return dynamicSurrogateQueryMap.keySet();
     }
-    
+
     /**
      * @return an unmodifiable set that contains all features with surrogate queries.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/AbstractTrivialMaskedMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/AbstractTrivialMaskedMemory.java
index 66587f77..94572c06 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/AbstractTrivialMaskedMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/AbstractTrivialMaskedMemory.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.IMemory;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.IMemory;
 
 /**
  * Common parts of nullary and identity specializations.
- * 
+ *
  * @noextend This class is not intended to be subclassed by clients.
  * @author Gabor Bergmann
  * @since 2.0
@@ -34,7 +34,7 @@ abstract class AbstractTrivialMaskedMemory<Timestamp extends Comparable<Timestam
         super(mask, owner);
         tuples = CollectionsFactory.createMemory(Object.class, bucketType);
     }
-    
+
     @Override
     public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
         throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/DefaultMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/DefaultMaskedTupleMemory.java
index 92081409..22c4140a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/DefaultMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/DefaultMaskedTupleMemory.java
@@ -3,38 +3,38 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.IMultiLookup.ChangeGranularity;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  *         Default implementation that covers all cases.
- * 
+ *
  * @since 2.0
  */
 public final class DefaultMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
         extends MaskedTupleMemory<Timestamp> {
     /**
      * Maps a signature tuple to the bucket of tuples with the given signature.
-     * 
+     *
      * @since 2.0
      */
     protected IMultiLookup<Tuple, Tuple> signatureToTuples;
@@ -83,7 +83,7 @@ public final class DefaultMaskedTupleMemory<Timestamp extends Comparable<Timesta
             throw raiseDuplicateDeletion(tuple);
         }
     }
-    
+
     @Override
     public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
         throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/IdentityMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/IdentityMaskedTupleMemory.java
index dc59daf5..bd693eeb 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/IdentityMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/IdentityMaskedTupleMemory.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
 
 /**
  * Specialized for identity mask; tuples are stored as a simple set/multiset memory.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
@@ -49,7 +49,7 @@ public final class IdentityMaskedTupleMemory<Timestamp extends Comparable<Timest
     @Override
     public Collection<Tuple> get(ITuple signature) {
         Tuple contained = tuples.theContainedVersionOfUnsafe(signature);
-        return contained != null ? 
+        return contained != null ?
                         Collections.singleton(contained) :
                         null;
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/MaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/MaskedTupleMemory.java
index 62377624..9c179451 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/MaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/MaskedTupleMemory.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyDefaultMaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyIdentityMaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyNullaryMaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyUnaryMaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Clearable;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.resumable.MaskedResumable;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.memories.timely.TimelyDefaultMaskedTupleMemory;
+import tools.refinery.interpreter.matchers.memories.timely.TimelyIdentityMaskedTupleMemory;
+import tools.refinery.interpreter.matchers.memories.timely.TimelyNullaryMaskedTupleMemory;
+import tools.refinery.interpreter.matchers.memories.timely.TimelyUnaryMaskedTupleMemory;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Clearable;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.resumable.MaskedResumable;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Indexes a collection of tuples by their signature (i.e. footprint, projection) obtained according to a mask. May
@@ -32,7 +32,7 @@ import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
  * <p>
  * There are timeless and timely versions of the different memories. Timely versions associate {@link Timeline}s with
  * the stored tuples.
- * 
+ *
  * @noextend This class is not intended to be subclassed by clients.
  * @author Gabor Bergmann
  * @author Tamas Szabo
@@ -54,7 +54,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
      * the created memory should be timely or not. <br>
      * <br>
      * Timely means that tuples are associated with a timeline.
-     * 
+     *
      * @since 2.3
      */
     public static <T extends Comparable<T>> MaskedTupleMemory<T> create(final TupleMask mask,
@@ -72,7 +72,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
      * Lazyness can only be used together with timely memories. It means that the maintenance of the timelines is lazy,
      * that is, the memory only updates its internal data structures at the timestamp affected by an update, and can be
      * instructed later to resume the maintenance at higher timestamps, as well.
-     * 
+     *
      * @since 2.4
      */
     public static <T extends Comparable<T>> MaskedTupleMemory<T> create(final TupleMask mask,
@@ -124,7 +124,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
     /**
      * Initializes the contents of this memory based on the contents of another memory. The default value is associated
      * with each tuple in the timely memories.
-     * 
+     *
      * @since 2.3
      */
     public void initializeWith(final MaskedTupleMemory<Timestamp> other, final Timestamp defaultValue) {
@@ -142,7 +142,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Returns true of this memory is timely, false otherwise.
-     * 
+     *
      * @since 2.3
      */
     public boolean isTimely() {
@@ -156,14 +156,14 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * The object "owning" this memory. May be null.
-     * 
+     *
      * @since 1.7
      */
     protected final Object owner;
 
     /**
      * The node owning this memory. May be null.
-     * 
+     *
      * @since 2.0
      */
     public Object getOwner() {
@@ -172,7 +172,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * The mask according to which tuples are projected and indexed.
-     * 
+     *
      * @since 2.0
      */
     public TupleMask getMask() {
@@ -187,7 +187,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
     /**
      * @return the total number of distinct tuples stored. Multiple copies of the same tuple, if allowed, are counted as
      *         one.
-     * 
+     *
      *         <p>
      *         This is currently not cached but computed on demand. It is therefore not efficient, and shall only be
      *         used for debug / profiling purposes.
@@ -201,21 +201,21 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Retrieves a read-only view of exactly those signatures for which at least one tuple is stored
-     * 
+     *
      * @since 2.0
      */
     public abstract Iterable<Tuple> getSignatures();
 
     /**
      * Retrieves tuples that have the specified signature
-     * 
+     *
      * @return collection of tuples found, null if none
      */
     public abstract Collection<Tuple> get(final ITuple signature);
 
     /**
      * Retrieves the tuples and their associated timelines that have the specified signature.
-     * 
+     *
      * @return the mappings from tuples to timelines, null if there is no mapping for the signature
      * @since 2.4
      */
@@ -223,7 +223,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Retrieves tuples that have the specified signature.
-     * 
+     *
      * @return collection of tuples found, never null
      * @since 2.1
      */
@@ -234,7 +234,7 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Retrieves tuples with their associated timelines that have the specified signature.
-     * 
+     *
      * @return map of tuples and timelines found, never null
      * @since 2.4
      */
@@ -245,12 +245,12 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Removes a tuple occurrence from the memory with the given signature.
-     * 
+     *
      * @param tuple
      *            the tuple to be removed from the memory
      * @param signature
      *            precomputed footprint of the tuple according to the mask
-     * 
+     *
      * @return true if this was the the last occurrence of the signature (according to the mask)
      */
     public boolean remove(final Tuple tuple, final Tuple signature) {
@@ -259,16 +259,16 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Removes a tuple occurrence from the memory with the given signature and timestamp.
-     * 
+     *
      * @param tuple
      *            the tuple to be removed from the memory
      * @param signature
      *            precomputed footprint of the tuple according to the mask
      * @param timestamp
      *            the timestamp associated with the tuple
-     * 
+     *
      * @return A {@link Diff} describing how the timeline of the given tuple changed.
-     * 
+     *
      * @since 2.4
      */
     public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
@@ -277,10 +277,10 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Removes a tuple occurrence from the memory.
-     * 
+     *
      * @param tuple
      *            the tuple to be removed from the memory
-     * 
+     *
      * @return true if this was the the last occurrence of the signature (according to the mask)
      */
     public boolean remove(final Tuple tuple) {
@@ -289,14 +289,14 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Removes a tuple occurrence from the memory with the given timestamp.
-     * 
+     *
      * @param tuple
      *            the tuple to be removed from the memory
      * @param timestamp
      *            the timestamp associated with the tuple
-     * 
+     *
      * @return A {@link Diff} describing how the timeline of the given tuple changed.
-     * 
+     *
      * @since 2.4
      */
     public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
@@ -305,12 +305,12 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Adds a tuple occurrence to the memory with the given signature.
-     * 
+     *
      * @param tuple
      *            the tuple to be added to the memory
      * @param signature
      *            precomputed footprint of the tuple according to the mask
-     * 
+     *
      * @return true if new signature encountered (according to the mask)
      */
     public boolean add(final Tuple tuple, final Tuple signature) {
@@ -319,16 +319,16 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Adds a tuple occurrence to the memory with the given signature and timestamp.
-     * 
+     *
      * @param tuple
      *            the tuple to be added to the memory
      * @param signature
      *            precomputed footprint of the tuple according to the mask
      * @param timestamp
      *            the timestamp associated with the tuple
-     * 
+     *
      * @return A {@link Diff} describing how the timeline of the given tuple changed.
-     * 
+     *
      * @since 2.4
      */
     public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
@@ -337,10 +337,10 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Adds a tuple occurrence to the memory.
-     * 
+     *
      * @param tuple
      *            the tuple to be added to the memory
-     * 
+     *
      * @return true if new signature encountered (according to the mask)
      */
     public boolean add(final Tuple tuple) {
@@ -349,14 +349,14 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
 
     /**
      * Adds a tuple occurrence to the memory with the given timestamp.
-     * 
+     *
      * @param tuple
      *            the tuple to be added to the memory
      * @param timestamp
      *            the timestamp associated with the tuple
-     * 
+     *
      * @return A {@link Diff} describing how the timeline of the given tuple changed.
-     * 
+     *
      * @since 2.4
      */
     public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
@@ -382,4 +382,4 @@ public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
         return getClass().getSimpleName() + "<" + mask + ">@" + owner;
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/NullaryMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/NullaryMaskedTupleMemory.java
index 7fa9e053..7ed52358 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/NullaryMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/NullaryMaskedTupleMemory.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
 
 /**
  * Specialized for nullary mask; tuples are stored as a simple set/multiset memory.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
 public final class NullaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp>> extends AbstractTrivialMaskedMemory<Timestamp> {
 
-    protected static final Set<Tuple> UNIT_RELATION = 
+    protected static final Set<Tuple> UNIT_RELATION =
             Collections.singleton(Tuples.staticArityFlatTupleOf());
-    protected static final Set<Tuple> EMPTY_RELATION = 
+    protected static final Set<Tuple> EMPTY_RELATION =
             Collections.emptySet();
     /**
      * @param mask
@@ -55,7 +55,7 @@ public final class NullaryMaskedTupleMemory<Timestamp extends Comparable<Timesta
     @Override
     public Collection<Tuple> get(ITuple signature) {
         if (0 == signature.getSize())
-            return tuples.distinctValues(); 
+            return tuples.distinctValues();
         else return null;
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/UnaryMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/UnaryMaskedTupleMemory.java
index f34cc9e3..ccef3a7b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/UnaryMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/UnaryMaskedTupleMemory.java
@@ -3,29 +3,29 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories;
+package tools.refinery.interpreter.matchers.memories;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.IMultiLookup.ChangeGranularity;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Specialized for unary mask; tuples are indexed by a single column as opposed to a projection (signature) tuple.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
@@ -44,12 +44,12 @@ public final class UnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp
     public UnaryMaskedTupleMemory(TupleMask mask, MemoryType bucketType, Object owner) {
         super(mask, owner);
         if (1 != mask.getSize()) throw new IllegalArgumentException(mask.toString());
-        
+
         columnToTuples = CollectionsFactory.<Object, Tuple>createMultiLookup(
                 Object.class, bucketType, Object.class);
         keyPosition = mask.indices[0];
     }
-    
+
     @Override
     public void clear() {
         columnToTuples.clear();
@@ -98,7 +98,7 @@ public final class UnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp
         IMemoryView<Tuple> bucket = columnToTuples.lookup(key);
         return bucket == null ? null : bucket.distinctValues();
     }
-    
+
     @Override
     public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
         throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
@@ -123,7 +123,7 @@ public final class UnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp
     public boolean add(Tuple tuple) {
         return addInternal(tuple, tuple.get(keyPosition));
     }
-    
+
     protected boolean addInternal(Tuple tuple, Object key) {
         try {
             return columnToTuples.addPair(key, tuple) == ChangeGranularity.KEY;
@@ -131,7 +131,7 @@ public final class UnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp
             throw raiseDuplicateInsertion(tuple);
         }
     }
-    
+
     protected boolean removeInternal(Tuple tuple, Object key) {
         try {
             return columnToTuples.removePair(key, tuple) == ChangeGranularity.KEY;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyMaskedMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/AbstractTimelyMaskedMemory.java
index 45ce3a4e..9a1312cd 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyMaskedMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/AbstractTimelyMaskedMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -16,19 +16,19 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.memories.MaskedTupleMemory;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Common parts of timely default and timely unary implementations.
- * 
+ *
  * @noextend This class is not intended to be subclassed by clients.
  * @author Tamas Szabo
  * @since 2.3
@@ -125,16 +125,16 @@ abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp
     protected Diff<Timestamp> removeInternal(final KeyType key, final Tuple tuple, final Timestamp timestamp) {
         Timestamp oldResumableTimestamp = null;
         Timestamp newResumableTimestamp = null;
-        
+
         final TimelyMemory<Timestamp> keyMemory = this.memoryMap.get(key);
         if (keyMemory == null) {
             throw raiseDuplicateDeletion(tuple);
         }
-        
-        if (this.isLazy) {            
+
+        if (this.isLazy) {
             oldResumableTimestamp = keyMemory.getResumableTimestamp();
         }
-        
+
         Diff<Timestamp> diff = null;
         try {
             diff = keyMemory.remove(tuple, timestamp);
@@ -144,42 +144,42 @@ abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp
         if (keyMemory.isEmpty()) {
             this.memoryMap.remove(key);
         }
-        
-        if (this.isLazy) {            
+
+        if (this.isLazy) {
             newResumableTimestamp = keyMemory.getResumableTimestamp();
             if (!Objects.equals(oldResumableTimestamp, newResumableTimestamp)) {
                 unregisterFoldingState(oldResumableTimestamp, key);
                 registerFoldingState(newResumableTimestamp, key);
             }
         }
-        
+
         return diff;
     }
 
     protected Diff<Timestamp> addInternal(final KeyType key, final Tuple tuple, final Timestamp timestamp) {
         Timestamp oldResumableTimestamp = null;
         Timestamp newResumableTimestamp = null;
-                
+
         final TimelyMemory<Timestamp> keyMemory = this.memoryMap.computeIfAbsent(key,
                 k -> new TimelyMemory<Timestamp>(this.isLazy));
-        
-        if (this.isLazy) {            
+
+        if (this.isLazy) {
             oldResumableTimestamp = keyMemory.getResumableTimestamp();
         }
-        
+
         final Diff<Timestamp> diff = keyMemory.put(tuple, timestamp);
-        
-        if (this.isLazy) {            
+
+        if (this.isLazy) {
             newResumableTimestamp = keyMemory.getResumableTimestamp();
             if (!Objects.equals(oldResumableTimestamp, newResumableTimestamp)) {
                 unregisterFoldingState(oldResumableTimestamp, key);
                 registerFoldingState(newResumableTimestamp, key);
             }
         }
-        
+
         return diff;
     }
-    
+
     @Override
     public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
         return removeWithTimestamp(tuple, null, timestamp);
@@ -194,7 +194,7 @@ abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp
     public boolean isTimely() {
         return true;
     }
-    
+
     protected void registerFoldingState(final Timestamp timestamp, final KeyType key) {
         if (timestamp != null) {
             this.foldingStates.compute(timestamp, (k, v) -> {
@@ -206,7 +206,7 @@ abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp
             });
         }
     }
-    
+
     protected void unregisterFoldingState(final Timestamp timestamp, final KeyType key) {
         if (timestamp != null) {
             this.foldingStates.compute(timestamp, (k, v) -> {
@@ -215,7 +215,7 @@ abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp
             });
         }
     }
-    
+
     @Override
     public Timestamp getResumableTimestamp() {
         if (this.foldingStates == null || this.foldingStates.isEmpty()) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java
index ca06685a..a3d66d0d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.memories.MaskedTupleMemory;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Common parts of timely nullary and timely identity implementations.
- * 
+ *
  * @noextend This class is not intended to be subclassed by clients.
  * @author Tamas Szabo
  * @since 2.3
@@ -37,7 +37,7 @@ abstract class AbstractTimelyTrivialMaskedMemory<Timestamp extends Comparable<Ti
         super(mask, owner);
         this.memory = new TimelyMemory<Timestamp>(isLazy);
     }
-    
+
     @Override
     public void initializeWith(final MaskedTupleMemory<Timestamp> other, final Timestamp defaultValue) {
         final Iterable<Tuple> signatures = other.getSignatures();
@@ -49,17 +49,17 @@ abstract class AbstractTimelyTrivialMaskedMemory<Timestamp extends Comparable<Ti
                         if (signed.getDirection() == Direction.DELETE) {
                             this.removeWithTimestamp(entry.getKey(), signed.getPayload());
                         } else {
-                            this.addWithTimestamp(entry.getKey(), signed.getPayload());                                            
+                            this.addWithTimestamp(entry.getKey(), signed.getPayload());
                         }
                     }
-                }                
+                }
             } else {
                 final Collection<Tuple> tuples = other.get(signature);
                 for (final Tuple tuple : tuples) {
                     this.removeWithTimestamp(tuple, defaultValue);
                 }
             }
-        }            
+        }
     }
 
     @Override
@@ -76,7 +76,7 @@ abstract class AbstractTimelyTrivialMaskedMemory<Timestamp extends Comparable<Ti
     public Iterator<Tuple> iterator() {
         return this.memory.keySet().iterator();
     }
-    
+
     @Override
     public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
         return removeWithTimestamp(tuple, null, timestamp);
@@ -86,12 +86,12 @@ abstract class AbstractTimelyTrivialMaskedMemory<Timestamp extends Comparable<Ti
     public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
         return addWithTimestamp(tuple, null, timestamp);
     }
-    
+
     @Override
     public boolean isTimely() {
         return true;
     }
-        
+
     @Override
     public Timestamp getResumableTimestamp() {
         return this.memory.getResumableTimestamp();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java
index 623d7399..23cf572b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
  * Default timely implementation that covers all cases.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -63,12 +63,12 @@ public final class TimelyDefaultMaskedTupleMemory<Timestamp extends Comparable<T
     public Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature) {
         return getWithTimestampInternal(signature.toImmutable());
     }
-    
+
     @Override
     public boolean isPresentAtInfinity(final ITuple signature) {
         return isPresentAtInfinityInteral(signature.toImmutable());
     }
-    
+
     @Override
     public Set<Tuple> getResumableSignatures() {
         if (this.foldingStates == null || this.foldingStates.isEmpty()) {
@@ -77,7 +77,7 @@ public final class TimelyDefaultMaskedTupleMemory<Timestamp extends Comparable<T
             return this.foldingStates.firstEntry().getValue();
         }
     }
-    
+
     @Override
     public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
         final Map<Tuple, Map<Tuple, Diff<Timestamp>>> result = CollectionsFactory.createMap();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java
index 568f274d..1ab01447 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -14,16 +14,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
- * Timely specialization for identity mask. 
- * 
+ * Timely specialization for identity mask.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java
index 75987a89..2c3103db 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
- * Timely specialization for nullary mask. 
- * 
+ * Timely specialization for nullary mask.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java
index 178193af..8a129122 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.memories.timely;
+package tools.refinery.interpreter.matchers.memories.timely;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -14,18 +14,18 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.TimelyMemory;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
 
 /**
- * Timely specialization for unary mask. 
- * 
+ * Timely specialization for unary mask.
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -119,7 +119,7 @@ public final class TimelyUnaryMaskedTupleMemory<Timestamp extends Comparable<Tim
         } else if (resumableTimestamp.compareTo(timestamp) != 0) {
             throw new IllegalStateException("Expected to continue folding at " + resumableTimestamp + "!");
         }
-        
+
         final Set<Object> signatures = this.foldingStates.remove(timestamp);
         for (final Object signature : signatures) {
             final TimelyMemory<Timestamp> memory = this.memoryMap.get(signature);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IOperationCompiler.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/IOperationCompiler.java
index c9f4b305..e2301d77 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IOperationCompiler.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/IOperationCompiler.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.planning;
+package tools.refinery.interpreter.matchers.planning;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
 
 /**
- * 
+ *
  * An implicit common parameter is the "effort" PatternDescription. This
  * indicates that the build request is part of an effort to build the matcher of
  * the given pattern; it it important to record this during code generation so
  * that the generated code can be separated according to patterns.
- * 
+ *
  * @param <Collector>
  *            the handle of a receiver-like RETE ending to which plans can be
  *            connected
@@ -33,19 +33,19 @@ import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
 public interface IOperationCompiler<Collector> {
 
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public Collector patternCollector(PQuery pattern);
- 
+
     public void buildConnection(SubPlan parentPlan, Collector collector);
-    
+
     /**
      * @since 0.9
      */
     public void patternFinished(PQuery pattern, Collector collector);
-    
+
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public SubPlan patternCallPlan(Tuple nodes, PQuery supplierKey);
 
@@ -91,7 +91,7 @@ public interface IOperationCompiler<Collector> {
             SubPlan parentPlan);
     public SubPlan buildFunctionEvaluator(IExpressionEvaluator evaluator, Map<String, Integer> tupleNameMap,
             SubPlan parentPlan, Object computedResultCalibrationElement);
-    
+
     /**
      * @return an operation compiler that potentially acts on a separate container
      */
@@ -105,4 +105,4 @@ public interface IOperationCompiler<Collector> {
 
     public void reinitialize();
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IQueryPlannerStrategy.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/IQueryPlannerStrategy.java
index 6ce9d91b..c9da01e3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IQueryPlannerStrategy.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/IQueryPlannerStrategy.java
@@ -3,27 +3,27 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.planning;
+package tools.refinery.interpreter.matchers.planning;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
 
 /**
  * An algorithm that builds a query plan based on a PSystem representation of a body of constraints. This interface is
  * for internal use of the various query backends.
- * 
+ *
  * @author Gabor Bergmann
  */
 public interface IQueryPlannerStrategy {
-    
+
     /**
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public SubPlan plan(PBody pSystem, Logger logger, IQueryMetaContext context);
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/QueryProcessingException.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/QueryProcessingException.java
index 501ddf73..3efa32a2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/QueryProcessingException.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/QueryProcessingException.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning;
+package tools.refinery.interpreter.matchers.planning;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 /**
  * @author Zoltan Ujhelyi
  * @since 0.9
  */
-public class QueryProcessingException extends ViatraQueryRuntimeException {
+public class QueryProcessingException extends InterpreterRuntimeException {
 
     private static final long serialVersionUID = -8272290113656867086L;
     /**
      * Binding the '{n}' (n = 1..N) strings to contextual conditions in 'context'
-     * 
+     *
      * @param context
      *            : array of context-sensitive Strings
      */
     protected static String bind(String message, String[] context) {
-        if (context == null) 
+        if (context == null)
             return message;
-    
+
         String internal = message;
         for (int i = 0; i < context.length; i++) {
             internal = internal.replace("{" + (i + 1) + "}", context[i] != null ? context[i] : "<<null>>");
         }
         return internal;
     }
-    
+
     private Object patternDescription;
     private String shortMessage;
 
@@ -51,7 +51,7 @@ public class QueryProcessingException extends ViatraQueryRuntimeException {
         super(message);
         initializeFields(message, patternDescription);
     }
-    
+
     /**
      * @param message
      *            The template of the exception message
@@ -80,7 +80,7 @@ public class QueryProcessingException extends ViatraQueryRuntimeException {
         super(bind(message, context), cause);
         initializeFields(shortMessage, patternDescription);
     }
-    
+
     public Object getPatternDescription() {
         return patternDescription;
     }
@@ -94,9 +94,9 @@ public class QueryProcessingException extends ViatraQueryRuntimeException {
         this.shortMessage = shortMessage;
     }
 
-    
+
     public void setPatternDescription(Object patternDescription) {
         this.patternDescription = patternDescription;
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlan.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/SubPlan.java
index 1998df9d..46e6efe3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlan.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/SubPlan.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.planning;
+package tools.refinery.interpreter.matchers.planning;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -16,49 +16,49 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
-import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.planning.helpers.TypeHelper;
+import tools.refinery.interpreter.matchers.planning.operations.POperation;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.planning.operations.PStart;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
 
 /**
  * A plan representing a subset of (or possibly all the) constraints evaluated. A SubPlan instance is responsible for
- * representing a state of the plan; but after it is initialized it is expected be immutable 
+ * representing a state of the plan; but after it is initialized it is expected be immutable
  *  (exception: inferred constraints, see {@link #inferConstraint(PConstraint)}).
- * 
- * <p> A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans. 
+ *
+ * <p> A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans.
  * Important maintained information: <ul>
  * <li>set of <b>variables</b> whose values are known when the runtime evaluation is at this stage,
  * <li>set of <b>constraints</b> that are known to hold true at this point.
  * </ul>
- * 
- * <p> Recommended to instantiate via a {@link SubPlanFactory} or subclasses, 
- * so that query planners can subclass SubPlan if needed. 
- * 
+ *
+ * <p> Recommended to instantiate via a {@link SubPlanFactory} or subclasses,
+ * so that query planners can subclass SubPlan if needed.
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class SubPlan {
     private PBody body;
     private List<? extends SubPlan> parentPlans;
     private POperation operation;
 
-    private final Set<PVariable> visibleVariables; 
-    private final Set<PVariable> allVariables; 
+    private final Set<PVariable> visibleVariables;
+    private final Set<PVariable> allVariables;
     private final Set<PVariable> introducedVariables; // delta compared to first parent
     private Set<PConstraint> allConstraints;
     private Set<PConstraint> deltaConstraints; // delta compared to all parents
-    private Set<PConstraint> externallyInferredConstraints; // inferred in addition to direct consequences of the operation and parents 
-    
+    private Set<PConstraint> externallyInferredConstraints; // inferred in addition to direct consequences of the operation and parents
+
+
+
+
 
-    
-    
-    
     /**
      * A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans.
      */
@@ -73,10 +73,10 @@ public class SubPlan {
         this.body = body;
         this.parentPlans = parentPlans;
         this.operation = operation;
-        
+
         this.externallyInferredConstraints = new HashSet<PConstraint>();
         this.deltaConstraints = new HashSet<PConstraint>(operation.getDeltaConstraints());
-        
+
         this.allVariables = new HashSet<PVariable>();
         for (PConstraint constraint: deltaConstraints) {
             this.allVariables.addAll(constraint.getDeducedVariables());
@@ -85,13 +85,13 @@ public class SubPlan {
         for (SubPlan parentPlan: parentPlans) {
             this.allConstraints.addAll(parentPlan.getAllEnforcedConstraints());
             this.allVariables.addAll(parentPlan.getAllDeducedVariables());
-        }     
-        
+        }
+
         // TODO this is ugly a bit
         if (operation instanceof PStart) {
             this.visibleVariables = new HashSet<PVariable>(((PStart) operation).getAPrioriVariables());
             this.allVariables.addAll(visibleVariables);
-        } else if (operation instanceof PProject) { 
+        } else if (operation instanceof PProject) {
             this.visibleVariables = new HashSet<PVariable>(((PProject) operation).getToVariables());
         } else {
             this.visibleVariables = new HashSet<PVariable>();
@@ -99,27 +99,27 @@ public class SubPlan {
                 this.visibleVariables.addAll(parentPlan.getVisibleVariables());
             for (PConstraint constraint: deltaConstraints)
                 this.visibleVariables.addAll(constraint.getDeducedVariables());
-        } 
-        
+        }
+
         this.introducedVariables = new HashSet<PVariable>(this.visibleVariables);
-        if (!parentPlans.isEmpty()) 
+        if (!parentPlans.isEmpty())
             introducedVariables.removeAll(parentPlans.get(0).getVisibleVariables());
-        
+
         operation.checkConsistency(this);
     }
-    
-    
+
+
     @Override
     public String toString() {
         return toLongString();
     }
     public String toShortString() {
-        return String.format("Plan{%s}:%s", 
+        return String.format("Plan{%s}:%s",
                 visibleVariables.stream().map(PVariable::getName).collect(Collectors.joining(",")),
                 operation.getShortName());
     }
     public String toLongString() {
-        return String.format("%s<%s>", 
+        return String.format("%s<%s>",
                 toShortString(),
                 parentPlans.stream().map(Object::toString).collect(Collectors.joining("; ")));
     }
@@ -141,11 +141,11 @@ public class SubPlan {
     }
 
     /**
-     * Indicate that a given constraint was found to be automatically satisfied at this point 
-     *   without additional operations. 
+     * Indicate that a given constraint was found to be automatically satisfied at this point
+     *   without additional operations.
      * (results are also included in {@link SubPlan#getDeltaEnforcedConstraints()})
-     *   
-     * <p>Warning: not propagated automatically to child plans, 
+     *
+     * <p>Warning: not propagated automatically to child plans,
      *  so best to invoke before constructing further SubPlans. </p>
      */
     public void inferConstraint(PConstraint constraint) {
@@ -153,22 +153,22 @@ public class SubPlan {
         deltaConstraints.add(constraint);
         allConstraints.add(constraint);
     }
-    
+
     public PBody getBody() {
         return body;
     }
-    
+
     /**
-     * Variables which are assigned a value at this point 
+     * Variables which are assigned a value at this point
      * (results are also included in {@link SubPlan#getAllDeducedVariables()})
      */
     public Set<PVariable> getVisibleVariables() {
         return visibleVariables;
     }
     /**
-     * Variables which have been assigned a value; 
-     * includes visible variables (see {@link #getVisibleVariables()}) 
-     *   and additionally any variables hidden by a projection (see {@link PProject}). 
+     * Variables which have been assigned a value;
+     * includes visible variables (see {@link #getVisibleVariables()})
+     *   and additionally any variables hidden by a projection (see {@link PProject}).
      */
     public Set<PVariable> getAllDeducedVariables() {
         return allVariables;
@@ -185,8 +185,8 @@ public class SubPlan {
     public POperation getOperation() {
         return operation;
     }
-    
-    
+
+
     /**
      * The closure of all type judgments of enforced constraints at this point.
      * <p> No subsumption applied.
@@ -201,9 +201,9 @@ public class SubPlan {
         }
         return impliedJudgements;
     }
-    private WeakHashMap<IQueryMetaContext, Set<TypeJudgement>> allImpliedTypeJudgements = new WeakHashMap<IQueryMetaContext, Set<TypeJudgement>>();   
-    
-    
+    private WeakHashMap<IQueryMetaContext, Set<TypeJudgement>> allImpliedTypeJudgements = new WeakHashMap<IQueryMetaContext, Set<TypeJudgement>>();
+
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -236,5 +236,5 @@ public class SubPlan {
         return true;
     }
 
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlanFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/SubPlanFactory.java
index d0df5fac..32014ea6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlanFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/SubPlanFactory.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning;
+package tools.refinery.interpreter.matchers.planning;
 
-import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.planning.operations.POperation;
+import tools.refinery.interpreter.matchers.psystem.PBody;
 
 /**
  * Single entry point for creating subplans.
@@ -25,9 +25,9 @@ public class SubPlanFactory {
         super();
         this.body = body;
     }
-    
+
     public SubPlan createSubPlan(POperation operation, SubPlan... parentPlans) {
-        return new SubPlan(body, operation, parentPlans);               
+        return new SubPlan(body, operation, parentPlans);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/BuildHelper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/BuildHelper.java
index ed5d1cbb..20ecae2a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/BuildHelper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/BuildHelper.java
@@ -3,32 +3,32 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.planning.helpers;
+package tools.refinery.interpreter.matchers.planning.helpers;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
-import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.planning.operations.PProject;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlanFactory;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class BuildHelper {
 
@@ -42,15 +42,15 @@ public class BuildHelper {
 //        return buildable.buildBetaNode(primaryPlan, secondaryPlan, joinHelper.getPrimaryMask(),
 //                joinHelper.getSecondaryMask(), joinHelper.getComplementerMask(), false);
 //    }
-    
-    
+
+
     /**
      * Reduces the number of tuples by trimming (existentially quantifying) the set of variables that <ul>
-     * <li> are visible in the subplan, 
-     * <li> are not exported parameters, 
+     * <li> are visible in the subplan,
+     * <li> are not exported parameters,
      * <li> have all their constraints already enforced in the subplan,
      * </ul> and thus will not be needed anymore.
-     * 
+     *
      * @param onlyIfNotDetermined if true, no trimming performed unless there is at least one variable that is not functionally determined
      * @return the plan after the trimming (possibly the original)
      * @since 1.5
@@ -65,17 +65,17 @@ public class BuildHelper {
                     canBeTrimmed.add(trimCandidate);
             }
         }
-        final Set<PVariable> retainedVars = setMinus(variablesInPlan, canBeTrimmed);    
+        final Set<PVariable> retainedVars = setMinus(variablesInPlan, canBeTrimmed);
         if (!canBeTrimmed.isEmpty() && !(onlyIfNotDetermined && areVariablesDetermined(plan, retainedVars, canBeTrimmed, analyzer, false))) {
-            // TODO add smart ordering? 
+            // TODO add smart ordering?
             plan = planFactory.createSubPlan(new PProject(retainedVars), plan);
         }
         return plan;
     }
-    
+
     /**
      * @return true iff a set of given variables functionally determine all visible variables in the subplan according to the subplan's constraints
-     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation;
      *  if false, user-provided soft dependencies are included as well, that are anticipated but not guaranteed by the storage mechanism;
      *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
      * @since 1.5
@@ -83,15 +83,15 @@ public class BuildHelper {
     public static boolean areAllVariablesDetermined(SubPlan plan, Collection<PVariable> determining, QueryAnalyzer analyzer, boolean strict) {
         return areVariablesDetermined(plan, determining, plan.getVisibleVariables(), analyzer, strict);
     }
-    
+
     /**
      * @return true iff one set of given variables functionally determine the other set according to the subplan's constraints
-     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation;
      *  if false, user-provided soft dependencies are included as well, that are anticipated but not guaranteed by the storage mechanism;
      *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
      * @since 1.5
      */
-    public static boolean areVariablesDetermined(SubPlan plan, Collection<PVariable> determining, Collection<PVariable> determined, 
+    public static boolean areVariablesDetermined(SubPlan plan, Collection<PVariable> determining, Collection<PVariable> determined,
             QueryAnalyzer analyzer, boolean strict) {
         Map<Set<PVariable>, Set<PVariable>> dependencies = analyzer.getFunctionalDependencies(plan.getAllEnforcedConstraints(), strict);
         final Set<PVariable> closure = FunctionalDependencyHelper.closureOf(determining, dependencies);
@@ -104,10 +104,10 @@ public class BuildHelper {
         difference.removeAll(b);
         return difference;
     }
-    
+
     /**
      * Finds an arbitrary constraint that is not enforced at the given plan.
-     * 
+     *
      * @param pSystem
      * @param plan
      * @return a PConstraint that is not enforced, if any, or null if all are enforced
@@ -122,11 +122,11 @@ public class BuildHelper {
         }
         return null;
     }
-    
+
     /**
      * Skips the last few steps, if any, that are projections, so that a custom projection can be added instead.
      * Useful for connecting body final plans into the production node.
-     * 
+     *
      * @since 2.1
      */
     public static SubPlan eliminateTrailingProjections(SubPlan plan) {
@@ -137,10 +137,10 @@ public class BuildHelper {
 
     /**
      * Verifies whether all constraints are enforced and exported parameters are present.
-     * 
+     *
      * @param pSystem
      * @param plan
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     public static void finalCheck(final PBody pSystem, SubPlan plan, IQueryMetaContext context) {
         PConstraint unenforcedConstraint = getAnyUnenforcedConstraint(pSystem, plan);
@@ -160,6 +160,6 @@ public class BuildHelper {
                         null);
             }
         }
-    }    
+    }
 
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/FunctionalDependencyHelper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/FunctionalDependencyHelper.java
index 40835f52..96969fb9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/FunctionalDependencyHelper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/FunctionalDependencyHelper.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.helpers;
+package tools.refinery.interpreter.matchers.planning.helpers;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -16,26 +16,26 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 /**
  * Helper utility class for functional dependency analysis.
- * 
+ *
  * Throughout this class attribute sets are represented as generic sets and functional dependencies as maps from
  * attribute set (generic sets) to attribute set (generic sets)
- * 
+ *
  * @author Adam Dudas
- * 
+ *
  */
 public class FunctionalDependencyHelper {
-    
+
     private FunctionalDependencyHelper() {
         // Hiding constructor for utility class
     }
-    
+
     /**
      * Get the closure of the specified attribute set relative to the specified functional dependencies.
-     * 
+     *
      * @param attributes
      *            The attributes to get the closure of.
      * @param dependencies
@@ -55,7 +55,7 @@ public class FunctionalDependencyHelper {
 
         return closureSet;
     }
-    
+
     /**
      * @return true if the dependency from the left set to the right set is trivial
      * @since 1.5
@@ -63,7 +63,7 @@ public class FunctionalDependencyHelper {
     public static <A> boolean isTrivial(Set<A> left, Set<A> right) {
         return left.containsAll(right);
     }
-    
+
     /***
      * Returns the dependency set over attributes in {@link targetAttributes} that are implied by a given source dependency set.
      * <p> Note: exponential in the size of the target attribute set.
@@ -74,12 +74,12 @@ public class FunctionalDependencyHelper {
      */
     public static <A> Map<Set<A>, Set<A>> projectDependencies(Map<Set<A>, Set<A>> originalDependencies, Set<A> targetAttributes) {
         // only those attributes are considered as left-hand-side candidates that occur at least once in dependencies
-        Set<A> leftCandidates = new HashSet<A>(); 
+        Set<A> leftCandidates = new HashSet<A>();
         for (Entry<Set<A>, Set<A>> dependency : originalDependencies.entrySet()) {
             if (!isTrivial(dependency.getKey(), dependency.getValue())) // only if non-trivial
                 leftCandidates.addAll(Sets.intersection(dependency.getKey(), targetAttributes));
         }
-        
+
         // Compute an initial list of nontrivial projected dependencies - it does not have to be minimal yet
         Map<Set<A>, Set<A>> initialDependencies = new HashMap<Set<A>, Set<A>>();
         for (Set<A> leftSet : Sets.powerSet(leftCandidates)) {
@@ -93,7 +93,7 @@ public class FunctionalDependencyHelper {
         if (! constants.isEmpty()) {
             initialDependencies.put(Collections.<A>emptySet(), constants);
         }
-        
+
         // Omit those dependencies where the LHS has superfluous attributes
         Map<Set<A>, Set<A>> solidDependencies = new HashMap<Set<A>, Set<A>>();
         for (Entry<Set<A>, Set<A>> dependency : initialDependencies.entrySet()) {
@@ -115,13 +115,13 @@ public class FunctionalDependencyHelper {
                 solidDependencies.put(leftSet, rightSet);
             }
         }
-        
-        // TODO perform proper minimization, 
+
+        // TODO perform proper minimization,
         // see e.g. page 45 in http://www.cs.ubc.ca/~hkhosrav/db/slides/03.design%20theory.pdf
-        
+
         return Collections.unmodifiableMap(solidDependencies);
     }
-    
+
     /**
      * Adds a given dependency to a mutable accumulator.
      * @since 1.5
@@ -129,8 +129,8 @@ public class FunctionalDependencyHelper {
     public static <A> void includeDependency(Map<Set<A>, Set<A>> accumulator, Set<A> left, Set<A> right) {
         Set<A> accumulatorRights = accumulator.computeIfAbsent(left, l -> new HashSet<>());
         accumulatorRights.addAll(right);
-    }    
-    
+    }
+
     /**
      * Adds all given dependencies to a mutable accumulator.
      * @since 1.5
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/StatisticsHelper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/StatisticsHelper.java
index b4f848a7..edf67676 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/StatisticsHelper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/StatisticsHelper.java
@@ -3,44 +3,44 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.helpers;
+package tools.refinery.interpreter.matchers.planning.helpers;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 /**
- * Helpers dealing with optionally present statistics information 
- * 
+ * Helpers dealing with optionally present statistics information
+ *
  * @author Gabor Bergmann
  * @since 2.1
  *
  */
 public class StatisticsHelper {
-    
+
     private StatisticsHelper() {
         // Hidden utility class constructor
     }
-    
-    public static Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy, 
-            BiFunction<TupleMask, Accuracy, Optional<Long>> estimateCardinality) 
+
+    public static Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy,
+            BiFunction<TupleMask, Accuracy, Optional<Long>> estimateCardinality)
     {
         if (groupMask.isIdentity()) return Optional.of(1.0);
-        
+
         Accuracy numeratorAccuracy = requiredAccuracy;
         Accuracy denominatorAccuracy = requiredAccuracy.reciprocal();
         TupleMask identityMask = TupleMask.identity(groupMask.sourceWidth);
-        
+
         Optional<Long> totalCountEstimate  = estimateCardinality.apply(identityMask, numeratorAccuracy);
         Optional<Long> bucketCountEstimate = estimateCardinality.apply(groupMask,    denominatorAccuracy);
 
-        return totalCountEstimate.flatMap(matchCount -> 
-            bucketCountEstimate.map(bucketCount -> 
+        return totalCountEstimate.flatMap(matchCount ->
+            bucketCountEstimate.map(bucketCount ->
                 bucketCount == 0L ? 0L : ((double) matchCount) / bucketCount
         ));
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/TypeHelper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/TypeHelper.java
index 926a591f..c9e9a8b2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/TypeHelper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/helpers/TypeHelper.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.planning.helpers;
+package tools.refinery.interpreter.matchers.planning.helpers;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -19,19 +19,19 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
 
 /**
  * @author Gabor Bergmann
  * @author Tamas Szabo
  */
 public class TypeHelper {
-    
+
     private TypeHelper() {
         // Hiding constructor for utility class
     }
@@ -40,7 +40,7 @@ public class TypeHelper {
      * Collects the type constraints for the specified collection of variables. The type constraints consist of the
      * constraints directly enforced on the variable itself, plus all of those that the given variable is unified with
      * through equalities.
-     * 
+     *
      * @param variables
      *            the variables in question
      * @param constraints
@@ -60,11 +60,11 @@ public class TypeHelper {
      * Collects the type constraints for the specified collection of variables. The type constraints consist of the
      * constraints directly enforced on the variable itself, plus all of those that the given variable is unified with
      * through equalities.
-     * 
+     *
      * The method accepts a type map which is the result of the basic type inference from the
      * {@link TypeHelper.inferUnaryTypes} method. The purpose of this method is that the type map can be reused across
      * several calls to this method.
-     * 
+     *
      * @param variables
      *            the variables in question
      * @param typeMap
@@ -99,9 +99,9 @@ public class TypeHelper {
 
     /**
      * Infers unary type information for variables, based on the given constraints.
-     * 
+     *
      * Subsumptions are not taken into account.
-     * 
+     *
      * @param constraints
      *            the set of constraints to extract type info from
      */
@@ -137,7 +137,7 @@ public class TypeHelper {
 
     /**
      * Calculates the closure of a set of type judgements, with respect to supertyping.
-     * 
+     *
      * @return the set of all type judgements in typesToClose and all their direct and indirect supertypes
      */
     public static Set<TypeJudgement> typeClosure(Set<TypeJudgement> typesToClose, IQueryMetaContext context) {
@@ -149,16 +149,16 @@ public class TypeHelper {
      * calculated before for a given base set, but not for a separate delta set.
      * <p>
      * Precondition: the set (typesToClose MINUS delta) is already closed w.r.t. supertyping.
-     * 
+     *
      * @return the set of all type judgements in typesToClose and all their direct and indirect supertypes
      * @since 1.6
      */
     public static Set<TypeJudgement> typeClosure(Set<TypeJudgement> preclosedBaseSet, Set<TypeJudgement> delta,
             IQueryMetaContext context) {
-        Queue<TypeJudgement> queue = delta.stream().filter(input -> !preclosedBaseSet.contains(input)).collect(Collectors.toCollection(LinkedList::new)); 
+        Queue<TypeJudgement> queue = delta.stream().filter(input -> !preclosedBaseSet.contains(input)).collect(Collectors.toCollection(LinkedList::new));
         if (queue.isEmpty())
             return preclosedBaseSet;
-        
+
         Set<TypeJudgement> closure = new HashSet<TypeJudgement>(preclosedBaseSet);
 
         Map<TypeJudgement, Set<TypeJudgement>> conditionalImplications = new HashMap<>();
@@ -199,7 +199,7 @@ public class TypeHelper {
 
     /**
      * Calculates a remainder set of types from a larger set, that are not subsumed by a given set of subsuming types.
-     * 
+     *
      * @param subsumableTypes
      *            a set of types from which some may be implied by the subsuming types
      * @param subsumingTypes
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PApply.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PApply.java
index 2c285b54..dd467598 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PApply.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PApply.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
- * Represents a constraint application on a single parent SubPlan. 
+ * Represents a constraint application on a single parent SubPlan.
  * <p> Either a "selection" filter operation according to a deferred PConstraint (or transform in case of eval/aggregate), or
  * alternatively a shorthand for PJoin + a PEnumerate on the right input for an enumerable PConstraint.
- * 
- * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint, 
+ *
+ * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint,
  *   it is the responsibility of the compiler to check them for equality.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
 public class PApply extends POperation {
-    
+
     private PConstraint pConstraint;
 
     public PApply(PConstraint pConstraint) {
@@ -42,28 +42,28 @@ public class PApply extends POperation {
     public String getShortName() {
         return String.format("APPLY_%s", pConstraint.toString());
     }
-    
+
     @Override
     public Set<? extends PConstraint> getDeltaConstraints() {
         return Collections.singleton(pConstraint);
     }
-    
+
     @Override
     public int numParentSubPlans() {
         return 1;
     }
-    
+
     @Override
     public void checkConsistency(SubPlan subPlan) {
         super.checkConsistency(subPlan);
         for (SubPlan parentPlan : subPlan.getParentPlans())
             Preconditions.checkArgument(!parentPlan.getAllEnforcedConstraints().contains(pConstraint),
-                    "Double-checking constraint %s", pConstraint);              
+                    "Double-checking constraint %s", pConstraint);
         // TODO obtain context?
         //if (pConstraint instanceof DeferredPConstraint)
         //      Preconditions.checkArgument(((DeferredPConstraint) pConstraint).isReadyAt(subPlan, context))
     }
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PEnumerate.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PEnumerate.java
index a975d50c..f9baabd7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PEnumerate.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PEnumerate.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 
 /**
  * Represents a base relation defined by the instance set of an enumerable PConstraint; there are no parent SubPlans.
- * 
- * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint, 
+ *
+ * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint,
  *   it is the responsibility of the compiler to check them for equality.
  * @author Bergmann Gabor
  *
@@ -25,7 +25,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
 public class PEnumerate extends POperation {
 
     EnumerablePConstraint enumerablePConstraint;
-    
+
     public PEnumerate(EnumerablePConstraint enumerablePConstraint) {
         super();
         this.enumerablePConstraint = enumerablePConstraint;
@@ -72,5 +72,5 @@ public class PEnumerate extends POperation {
             return false;
         return true;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PJoin.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PJoin.java
index 10e0a85a..35a4ffac 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PJoin.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PJoin.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 
 /**
  * Represents a natural join of two parent SubPlans.
@@ -19,7 +19,7 @@ import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
  *
  */
 public class PJoin extends POperation {
-    
+
 //      // TODO leave here? is this a problem in equivalnece checking?
 //      private Set<PVariable> onVariables;
 
@@ -44,7 +44,7 @@ public class PJoin extends POperation {
     public String getShortName() {
         return "JOIN"; //String.format("JOIN_{%s}", Joiner.on(",").join(onVariables));
     }
-    
+
     @Override
     public int hashCode() {
         return getClass().hashCode();
@@ -59,6 +59,6 @@ public class PJoin extends POperation {
             return false;
         return true;
     }
-    
+
 
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/POperation.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/POperation.java
index e71cf217..b1cc52f4 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/POperation.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/POperation.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * Abstract superclass for representing a high-level query evaluation operation.
- * 
- *  <p> Subclasses correspond to various POperations modeled after relational algebra.  
- * 
+ *
+ *  <p> Subclasses correspond to various POperations modeled after relational algebra.
+ *
  * @author Bergmann Gabor
  *
  */
@@ -28,14 +28,14 @@ public abstract class POperation {
      * Newly enforced constraints
      */
     public abstract Set<? extends PConstraint> getDeltaConstraints();
-    
+
     public abstract String getShortName();
-    
+
     /**
      * @return the number of SubPlans that must be specified as parents
      */
     public abstract int numParentSubPlans();
-    
+
     /**
      * Checks whether this constraint can be properly applied at the given SubPlan.
      */
@@ -43,7 +43,7 @@ public abstract class POperation {
         Preconditions.checkArgument(this == subPlan.getOperation(), "POperation misalignment");
         Preconditions.checkArgument(subPlan.getParentPlans().size() == numParentSubPlans(), "Incorrect number of parent SubPlans");
     }
-        
+
     @Override
     public String toString() {
         return getShortName();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PProject.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PProject.java
index d0539b2c..adf73344 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PProject.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PProject.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -14,15 +14,15 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * Represents a projection of a single parent SubPlan onto a limited set of variables.
  * <p> May optionally prescribe an ordering of variables (List, as opposed to Set).
- * 
+ *
  * @author Bergmann Gabor
  *
  */
@@ -30,8 +30,8 @@ public class PProject extends POperation {
 
     private Collection<PVariable> toVariables;
     private boolean ordered;
-        
-    
+
+
     public PProject(Set<PVariable> toVariables) {
         super();
         this.toVariables = toVariables;
@@ -42,14 +42,14 @@ public class PProject extends POperation {
         this.toVariables = toVariables;
         this.ordered = true;
     }
-    
+
     public Collection<PVariable> getToVariables() {
         return toVariables;
     }
-    public boolean isOrdered() {                
+    public boolean isOrdered() {
         return ordered;
     }
-    
+
     @Override
     public Set<? extends PConstraint> getDeltaConstraints() {
         return Collections.emptySet();
@@ -62,8 +62,8 @@ public class PProject extends POperation {
     public void checkConsistency(SubPlan subPlan) {
         super.checkConsistency(subPlan);
         final SubPlan parentPlan = subPlan.getParentPlans().get(0);
-        
-        Preconditions.checkArgument(parentPlan.getVisibleVariables().containsAll(toVariables), 
+
+        Preconditions.checkArgument(parentPlan.getVisibleVariables().containsAll(toVariables),
                 () -> toVariables.stream()
                         .filter(input -> !parentPlan.getVisibleVariables().contains(input)).map(PVariable::getName)
                         .collect(Collectors.joining(",", "Variables missing from project: ", "")));
@@ -71,10 +71,10 @@ public class PProject extends POperation {
 
     @Override
     public String getShortName() {
-        return String.format("PROJECT%s_{%s}", ordered? "!" : "", 
+        return String.format("PROJECT%s_{%s}", ordered? "!" : "",
                 toVariables.stream().map(PVariable::getName).collect(Collectors.joining(",")));
     }
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -104,6 +104,6 @@ public class PProject extends POperation {
     }
 
 
-    
+
 
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PStart.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PStart.java
index 9e6ea10e..d3befbc5 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PStart.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/planning/operations/PStart.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.planning.operations;
+package tools.refinery.interpreter.matchers.planning.operations;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,24 +14,24 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
 
 /**
  * No constraints, and no parent SubPlan, just a (possibly empty) set of a priori known (input) variables. Satisfied by a single tuple.
- * 
- * <p> Can also be used without a priori variables, 
- *   e.g. as a "virtual parent" in extreme cases, 
- *   such as <code>pattern foo(Bar) = {Bar = eval (3*4)} </code> 
- * 
+ *
+ * <p> Can also be used without a priori variables,
+ *   e.g. as a "virtual parent" in extreme cases,
+ *   such as <code>pattern foo(Bar) = {Bar = eval (3*4)} </code>
+ *
  * @author Bergmann Gabor
  *
  */
 public class PStart extends POperation {
-    
+
     private Set<PVariable> aPrioriVariables;
 
-    
+
     public PStart(Set<PVariable> aPrioriVariables) {
         super();
         this.aPrioriVariables = aPrioriVariables;
@@ -85,6 +85,6 @@ public class PStart extends POperation {
     }
 
 
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/BasePConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/BasePConstraint.java
index eda4aa25..9e18355b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/BasePConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/BasePConstraint.java
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/DeferredPConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/DeferredPConstraint.java
index d2bf088c..90e853f8 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/DeferredPConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/DeferredPConstraint.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
 
 /**
  * Any constraint that can only be checked on certain SubPlans (e.g. those plans that already contain some variables).
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class DeferredPConstraint extends BasePConstraint {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/EnumerablePConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/EnumerablePConstraint.java
index 9129aa47..a43fa72a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/EnumerablePConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/EnumerablePConstraint.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * A constraint for which all satisfying tuples of variable values can be enumerated at any point during run-time.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class EnumerablePConstraint extends BasePConstraint {
     protected Tuple variablesTuple;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IExpressionEvaluator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IExpressionEvaluator.java
index 686999f7..197a4dfa 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IExpressionEvaluator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IExpressionEvaluator.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 /**
  * An expression evaluator is used to execute arbitrary Java code during pattern matching. In order to include the
  * evaluation in the planning seemlessly it is expected from the evaluator implementors to report all used PVariables by
  * name.
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public interface IExpressionEvaluator {
 
@@ -30,7 +30,7 @@ public interface IExpressionEvaluator {
 
     /**
      * The expression evaluator code
-     * 
+     *
      * @param provider
      *            the value provider is an engine-specific way of reading internal variable tuples to evaluate the
      *            expression with
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IMultiQueryReference.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IMultiQueryReference.java
index 8f647c64..fbce20ed 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IMultiQueryReference.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IMultiQueryReference.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Collection;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * A {@link PConstraint} that implements this interface refers to a list of PQueries.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.8
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IQueryReference.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IQueryReference.java
index 9ee05b39..cf0ac39b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IQueryReference.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IQueryReference.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Collections;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * A {@link PConstraint} that implements this interface refers to a {@link PQuery}.
- * 
+ *
  * @author Zoltan Ujhelyi
  *
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IRelationEvaluator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IRelationEvaluator.java
index e4c396d8..1db05fd2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IRelationEvaluator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IRelationEvaluator.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * Implementations of this interface take an arbitrary number of input relations with their contents and compute the
  * tuples of a single output relation.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.8
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/ITypeConstraint.java
index b72035a8..cc04d9d1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/ITypeConstraint.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 import java.util.Set;
 
@@ -27,24 +27,24 @@ import java.util.Set;
 public interface ITypeConstraint extends ITypeInfoProviderConstraint {
 
     public abstract TypeJudgement getEquivalentJudgement();
-    
+
     /**
      * Static internal utility class for implementations of {@link ITypeConstraint}s.
      * @author Bergmann Gabor
      */
     public static class TypeConstraintUtil {
-        
+
         private TypeConstraintUtil() {
             // Hiding constructor for utility class
         }
-        
+
         public static Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context, IInputKey inputKey, Tuple variablesTuple) {
             final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
-            
+
             Set<Entry<Set<Integer>, Set<Integer>>> dependencies = context.getFunctionalDependencies(inputKey).entrySet();
             for (Entry<Set<Integer>, Set<Integer>> dependency : dependencies) {
                 result.put(
-                        transcribeVariables(dependency.getKey(), variablesTuple), 
+                        transcribeVariables(dependency.getKey(), variablesTuple),
                         transcribeVariables(dependency.getValue(), variablesTuple)
                 );
             }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeInfoProviderConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/ITypeInfoProviderConstraint.java
index ff127d38..84b2147f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeInfoProviderConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/ITypeInfoProviderConstraint.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface ITypeInfoProviderConstraint extends PConstraint {
 
     /**
      * Returns type information implied by this constraint.
-     * 
+     *
      */
     public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context);
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IValueProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IValueProvider.java
index d959adc4..6eaf952a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IValueProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/IValueProvider.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 /**
  * Helper interface to get values from a tuple of variables. All pattern matching engines are expected to implement this
  * to handle their internal structures.
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public interface IValueProvider {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/InitializablePQuery.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/InitializablePQuery.java
index a82d12ec..8e087596 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/InitializablePQuery.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/InitializablePQuery.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PProblem;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.queries.PProblem;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
 
 /**
  * Adds extra methods to the PQuery interface to initialize its contents.
@@ -29,7 +29,7 @@ public interface InitializablePQuery extends PQuery {
      * @param status the new status
      */
     void setStatus(PQueryStatus status);
-    
+
     /**
      * Adds a detected error. Only applicable if the pattern is still {@link PQueryStatus#UNINITIALIZED uninitialized}.
      *
@@ -42,7 +42,7 @@ public interface InitializablePQuery extends PQuery {
      * uninitialized}.
      *
      * @param bodies
-     * @throws ViatraQueryRuntimeException
+     * @throws InterpreterRuntimeException
      */
     void initializeBodies(Set<PBody> bodies);
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/KeyedEnumerablePConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/KeyedEnumerablePConstraint.java
index 91eea817..7337476e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/KeyedEnumerablePConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/KeyedEnumerablePConstraint.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class KeyedEnumerablePConstraint<KeyType> extends EnumerablePConstraint {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PBody.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PBody.java
index c38dc23a..483a2aa2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PBody.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PBody.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,32 +19,31 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.planning.helpers.TypeHelper;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * A set of constraints representing a pattern body
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class PBody implements PTraceable {
-    
+
     public static final String VIRTUAL_VARIABLE_PREFIX = ".virtual";
     private static final String VIRTUAL_VARIABLE_PATTERN = VIRTUAL_VARIABLE_PREFIX + "{%d}";
-    
+
     private PQuery query;
 
     /**
      * If null, then parent query status is reused
      */
-    private PQueryStatus status = PQueryStatus.UNINITIALIZED;
+    private PQuery.PQueryStatus status = PQuery.PQueryStatus.UNINITIALIZED;
 
     private Set<PVariable> allVariables;
     private Set<PVariable> uniqueVariables;
@@ -82,7 +81,7 @@ public class PBody implements PTraceable {
 
     /**
      * Use this method to add a newly created constraint to the pSystem.
-     * 
+     *
      * @return whether the submission of the new constraint was successful
      */
     boolean registerConstraint(PConstraint constraint) {
@@ -92,7 +91,7 @@ public class PBody implements PTraceable {
 
     /**
      * Use this method to remove an obsolete constraint from the pSystem.
-     * 
+     *
      * @return whether the removal of the constraint was successful
      */
     boolean unregisterConstraint(PConstraint constraint) {
@@ -114,14 +113,14 @@ public class PBody implements PTraceable {
         checkMutability();
         String name;
         do {
-            
+
             name = String.format(VIRTUAL_VARIABLE_PATTERN, nextVirtualNodeID++);
         } while (variablesByName.containsKey(name));
         PVariable var = new PVariable(this, name, true);
         addVariable(var);
         return var;
     }
-    
+
     public PVariable newVirtualVariable(String name) {
         checkMutability();
         Preconditions.checkArgument(!variablesByName.containsKey(name), "ID %s already used for a virtual variable", name);
@@ -151,7 +150,7 @@ public class PBody implements PTraceable {
 
     /**
      * Find a PVariable by name
-     * 
+     *
      * @param name
      * @return the found variable
      * @throws IllegalArgumentException
@@ -167,7 +166,7 @@ public class PBody implements PTraceable {
      * Finds and returns a PVariable by name. If no PVariable exists with the name in the body, a new one is created. If
      * the name of the variable starts with {@value #VIRTUAL_VARIABLE_PREFIX}, the created variable will be considered
      * virtual.
-     * 
+     *
      * @param name
      * @return a PVariable with the selected name; never null
      */
@@ -194,11 +193,11 @@ public class PBody implements PTraceable {
 
     /**
      * Returns the symbolic parameters of the body. </p>
-     * 
+     *
      * <p>
      * <strong>Warning</strong>: if two PVariables are unified, the returned list changes. If you want to have a stable
      * version, consider using {@link #getSymbolicParameters()}.
-     * 
+     *
      * @return a non-null, but possibly empty list
      */
     public List<PVariable> getSymbolicParameterVariables() {
@@ -208,11 +207,11 @@ public class PBody implements PTraceable {
 
     /**
      * Returns the exported parameter constraints of the body.
-     * 
+     *
      * @return a non-null, but possibly empty list
      */
     public List<ExportedParameter> getSymbolicParameters() {
-        if (symbolicParameters == null) 
+        if (symbolicParameters == null)
             symbolicParameters = new ArrayList<>();
         return symbolicParameters;
     }
@@ -229,11 +228,11 @@ public class PBody implements PTraceable {
     /**
      * Sets a specific status for the body. If set, the parent PQuery status will not be checked; if set to null, its corresponding PQuery
      * status is checked for mutability.
-     * 
+     *
      * @param status
      *            the status to set
      */
-    public void setStatus(PQueryStatus status) {
+    public void setStatus(PQuery.PQueryStatus status) {
         this.status = status;
     }
 
@@ -241,22 +240,22 @@ public class PBody implements PTraceable {
         if (status == null) {
             return query.isMutable();
         } else {
-            return status.equals(PQueryStatus.UNINITIALIZED);
+            return status.equals(PQuery.PQueryStatus.UNINITIALIZED);
         }
     }
-    
+
     void checkMutability() {
         if (status == null) {
             query.checkMutability();
         } else {
-            Preconditions.checkState(status.equals(PQueryStatus.UNINITIALIZED), "Initialized queries are not mutable");
+            Preconditions.checkState(status.equals(PQuery.PQueryStatus.UNINITIALIZED), "Initialized queries are not mutable");
         }
     }
 
     /**
      * Returns the disjunction the body is contained with. This disjunction may either be the
      * {@link PQuery#getDisjunctBodies() canonical disjunction of the corresponding query} or something equivalent.
-     * 
+     *
      * @return the container disjunction of the body. Can be null if body is not in a disjunction yet.
      */
     public PDisjunction getContainerDisjunction() {
@@ -284,6 +283,6 @@ public class PBody implements PTraceable {
         }
         return currentRestrictions;
     }
-    private WeakHashMap<IQueryMetaContext, Map<PVariable, Set<TypeJudgement>>> allUnaryTypeRestrictions = new WeakHashMap<IQueryMetaContext, Map<PVariable,Set<TypeJudgement>>>();   
-    
+    private WeakHashMap<IQueryMetaContext, Map<PVariable, Set<TypeJudgement>>> allUnaryTypeRestrictions = new WeakHashMap<IQueryMetaContext, Map<PVariable,Set<TypeJudgement>>>();
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PConstraint.java
index ae2c4632..4a19f985 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PConstraint.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Comparator;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public interface PConstraint extends PTraceable {
 
@@ -34,16 +34,16 @@ public interface PConstraint extends PTraceable {
     public Set<PVariable> getAffectedVariables();
 
     /**
-     * The set of variables whose potential values can be enumerated (once all non-deduced variables have known values).  
+     * The set of variables whose potential values can be enumerated (once all non-deduced variables have known values).
      */
     public Set<PVariable> getDeducedVariables();
-    
+
     /**
      * A (preferably minimal) cover of known functional dependencies between variables.
-     * @noreference Use {@link QueryAnalyzer} instead to properly handle dependencies of pattern calls. 
-     * @return non-trivial functional dependencies in the form of {variables} --> {variables}, where dependencies with the same lhs are unified.   
+     * @noreference Use {@link QueryAnalyzer} instead to properly handle dependencies of pattern calls.
+     * @return non-trivial functional dependencies in the form of {variables} --> {variables}, where dependencies with the same lhs are unified.
      */
-    public Map<Set<PVariable>,Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context);  
+    public Map<Set<PVariable>,Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context);
 
     public void replaceVariable(PVariable obsolete, PVariable replacement);
 
@@ -55,16 +55,16 @@ public interface PConstraint extends PTraceable {
      * Returns an integer ID that is guaranteed to increase strictly monotonously for constraints within a pBody.
      */
     public abstract int getMonotonousID();
-    
+
 
     /**
      * A comparator that orders constraints by their {@link #getMonotonousID() monotonous identifiers}. Should only used
      * for tiebreaking in other comparators.
-     * 
+     *
      * @since 2.0
      */
     public static final Comparator<PConstraint> COMPARE_BY_MONOTONOUS_ID = (arg0, arg1) -> arg0.getMonotonousID() - arg1.getMonotonousID();
 
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PTraceable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PTraceable.java
index f0241a9c..a1bb0bf8 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PTraceable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PTraceable.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 /**
  * Marker interface for PSystem elements that can be traced.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PVariable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PVariable.java
index b6ea4861..12ad89a5 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PVariable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/PVariable.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/TypeJudgement.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/TypeJudgement.java
index 4447b225..672e91aa 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/TypeJudgement.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/TypeJudgement.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -15,13 +15,13 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.context.InputKeyImplication;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.context.InputKeyImplication;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * A judgement that means that the given tuple of variables will represent a tuple of values that is a member of the extensional relation identified by the given input key.
@@ -29,7 +29,7 @@ import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
  *
  */
 public class TypeJudgement {
-    
+
     private IInputKey inputKey;
     private Tuple variablesTuple;
     /**
@@ -78,37 +78,37 @@ public class TypeJudgement {
             return false;
         return true;
     }
-    
+
     public Set<TypeJudgement> getDirectlyImpliedJudgements(IQueryMetaContext context) {
         Set<TypeJudgement> results = new HashSet<TypeJudgement>();
         results.add(this);
-        
+
         Collection<InputKeyImplication> implications = context.getImplications(this.inputKey);
         for (InputKeyImplication inputKeyImplication : implications) {
             results.add(
                 transcribeImplication(inputKeyImplication)
             );
         }
-        
+
         return results;
     }
-    
+
     /**
      * @since 1.6
      */
     public Set<TypeJudgement> getWeakenedAlternativeJudgements(IQueryMetaContext context) {
         Set<TypeJudgement> results = new HashSet<TypeJudgement>();
-        
+
         Collection<InputKeyImplication> implications = context.getWeakenedAlternatives(this.inputKey);
         for (InputKeyImplication inputKeyImplication : implications) {
             results.add(
                 transcribeImplication(inputKeyImplication)
             );
         }
-        
+
         return results;
     }
-    
+
     /**
      * @since 2.0
      */
@@ -117,12 +117,12 @@ public class TypeJudgement {
                 entry -> transcribeImplication(entry.getKey()),
                 entry -> entry.getValue().stream().map(this::transcribeImplication).collect(Collectors.toSet())));
     }
-    
-    
-    
+
+
+
     private TypeJudgement transcribeImplication(InputKeyImplication inputKeyImplication) {
         return new TypeJudgement(
-                inputKeyImplication.getImpliedKey(), 
+                inputKeyImplication.getImpliedKey(),
                 transcribeVariablesToTuple(inputKeyImplication.getImpliedIndices())
         );
     }
@@ -137,7 +137,7 @@ public class TypeJudgement {
     public String toString() {
         return "TypeJudgement:" + inputKey.getPrettyPrintableName() + "@" + variablesTuple.toString();
     }
-    
+
     /**
      * Creates this judgement as a direct type constraint in the given PBody under construction.
      * <p> pre: the variables tuple must be formed of variables of that PBody.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/VariableDeferredPConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/VariableDeferredPConstraint.java
index 8ea6bb93..48610bc6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/VariableDeferredPConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/VariableDeferredPConstraint.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem;
+package tools.refinery.interpreter.matchers.psystem;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
 
 /**
  * A kind of deferred constraint that can only be checked when a set of deferring variables are all present in a plan.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class VariableDeferredPConstraint extends DeferredPConstraint {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java
index 63a37bbe..54e714e5 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+package tools.refinery.interpreter.matchers.psystem.aggregations;
 
 /**
- * 
+ *
  * An aggregation operator that does not store interim results beyond the final aggregated value.
  * @author Gabor Bergmann
  * @since 1.4
  */
-public abstract class AbstractMemorylessAggregationOperator<Domain, AggregateResult> 
-    implements IMultisetAggregationOperator<Domain, AggregateResult, AggregateResult> 
+public abstract class AbstractMemorylessAggregationOperator<Domain, AggregateResult>
+    implements IMultisetAggregationOperator<Domain, AggregateResult, AggregateResult>
 {
 
     @Override
@@ -27,5 +27,5 @@ public abstract class AbstractMemorylessAggregationOperator<Domain, AggregateRes
     public AggregateResult clone(AggregateResult original) {
         return original;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AggregatorType.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/AggregatorType.java
index 4cc40a2b..8e6263b0 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AggregatorType.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/AggregatorType.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+package tools.refinery.interpreter.matchers.psystem.aggregations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -14,26 +14,26 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import tools.refinery.viatra.runtime.matchers.aggregators.count;
+import tools.refinery.interpreter.matchers.aggregators.count;
 
 /**
  * The aggregator type annotation describes the type constraints for the selected aggregator. In version 1.4, two kinds of
  * aggregators are supported:
- * 
+ *
  * <ol>
  * <li>An aggregator that does not consider any parameter value from the call ({@link count}), just calculates the
  * number of matches. This is represented by a single {@link Void} and a single corresponding return type.</li>
  * <li>An aggregator that considers a single parameter from the call, and executes some aggregate operations over it.
  * Such an aggregate operation can be defined over multiple types, where each possible parameter type has a corresponding return type declared.</li>
  * </ol>
- * 
+ *
  * <strong>Important!</strong> The parameterTypes and returnTypes arrays must have
  * <ul>
  * <li>The same number of classes defined each.</li>
  * <li>Items are corresponded by index.</li>
  * <li>Items should represent data types</li>
  * </ul>
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.4
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/BoundAggregator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/BoundAggregator.java
index e6972544..71363624 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/BoundAggregator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/BoundAggregator.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+package tools.refinery.interpreter.matchers.psystem.aggregations;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.common.JavaTransitiveInstancesKey;
 
 /**
  * Augments an aggregator operator with type bindings for the type of values being aggregated and the aggregate result.
@@ -22,7 +22,7 @@ public class BoundAggregator {
     private final Class<?> domainType;
     private final Class<?> aggregateResultType;
 
-    public BoundAggregator(IMultisetAggregationOperator<?, ?, ?> operator, 
+    public BoundAggregator(IMultisetAggregationOperator<?, ?, ?> operator,
             Class<?> domainType,
             Class<?> aggregateResultType) {
         super();
@@ -54,7 +54,7 @@ public class BoundAggregator {
     private static IInputKey toJavaInputKey(Class<?> type) {
         if (type==null) {
             return null;
-        } else { 
+        } else {
             return new JavaTransitiveInstancesKey(type);
         }
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IAggregatorFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/IAggregatorFactory.java
index c970bd6a..9cc309cf 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IAggregatorFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/IAggregatorFactory.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+package tools.refinery.interpreter.matchers.psystem.aggregations;
 
 /**
- * 
+ *
  * Describes an aggregation operator keyword, potentially with type polymorphism. The actual runtime
  * {@link IMultisetAggregationOperator} that implements the aggregation logic may depend on the type context.
- * 
+ *
  * <p>
  * Implementors are suggested to use lower-case classnames (as it will end up in the language) and are required use the
  * annotation {@link AggregatorType} to indicate type inference rules.
- * 
+ *
  * <p>
  * <strong>Important!</strong> Implemented aggregators must be (1) deterministic (2) pure and (3)support incremental
  * value updates in the internal operation.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.4
  */
@@ -30,7 +30,7 @@ public interface IAggregatorFactory {
     /**
      * Given type parameters selected from {@link AggregatorType} annotations, returns a run-time aggregator operator
      * that is bound to the actual types.
-     * 
+     *
      * @param domainClass
      *            Java type of the values that are being aggregated
      * @return the actual run-time aggregator logic, with type bindings
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IMultisetAggregationOperator.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/IMultisetAggregationOperator.java
index 3bc22274..659d6bd6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IMultisetAggregationOperator.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/aggregations/IMultisetAggregationOperator.java
@@ -3,55 +3,55 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+package tools.refinery.interpreter.matchers.psystem.aggregations;
 
 import java.util.Collection;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.aggregators.ExtremumOperator;
+import tools.refinery.interpreter.matchers.aggregators.ExtremumOperator;
 
 /**
  * A single column aggregator is used to incrementally compute the aggregate of a multiset of values according to an aggregator operator.
- * 
+ *
  * <p> The operator provides two methods of computation: <ul>
  *  <li>Stateless aggregation of an explicit multiset, provided by {@link #aggregateStatelessly(Collection)}.</li>
- *  <li>Incremental aggregation, provided by {@link #createNeutral()}, {@link #update(Object, Object, boolean)}, {@link #isNeutral(Object)}, {@link #getAggregate(Object)}.    
+ *  <li>Incremental aggregation, provided by {@link #createNeutral()}, {@link #update(Object, Object, boolean)}, {@link #isNeutral(Object)}, {@link #getAggregate(Object)}.
  * </ul>
- * 
- * <p> In case of incremental computation, the aggregable multiset is conceptual; it is not represented by an explicit Collection<Domain> object, but its update operations are tracked.  
- * 
+ *
+ * <p> In case of incremental computation, the aggregable multiset is conceptual; it is not represented by an explicit Collection<Domain> object, but its update operations are tracked.
+ *
  * <p> In case of incremental computation, internal results, potentially distinct from the final aggregate result, may be stored in a helper data structure called <b>accumulator</b>.
  * The goal of this distinction is that the final result may not be sufficient for incremental updates (see e.g. {@link ExtremumOperator}).
- * 
+ *
  * @author Gabor Bergmann
  *
  * @param <Domain> the type of elements to be aggregated.
- * @param <Accumulator> the type used to store the interim results of the aggregate computation, 
+ * @param <Accumulator> the type used to store the interim results of the aggregate computation,
  *  that may be incrementally refreshed upon updates to the multiset, and that can easily yield the final result.
  * @param <AggregateResult> the type of the final result of the aggregation to be output.
- * 
+ *
  * @since 1.4
  */
 public interface IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> {
-    
+
     /**
      * A textual description of the operator.
      */
     String getShortDescription();
-    
+
     /**
      * A name or identifier of the operator.
      */
     String getName();
-    
+
     /**
      * @return the neutral element, i.e. the interim result of aggregating an empty multiset.
      */
     Accumulator createNeutral();
-    
+
     /**
      * @return true if the interim result is equivalent to the neutral element, as if there are no values in the multiset.
      * Must return true if the multiset is empty.
@@ -59,14 +59,14 @@ public interface IMultisetAggregationOperator<Domain, Accumulator, AggregateResu
     boolean isNeutral(Accumulator result);
 
     /**
-     * @return an updated intermediate result, 
-     *  changed to reflect that a given object was added to / removed from the multiset 
+     * @return an updated intermediate result,
+     *  changed to reflect that a given object was added to / removed from the multiset
      *      (as indicated by the parameter isInsertion)
      */
     Accumulator update(Accumulator oldResult, Domain updateValue, boolean isInsertion);
-    
+
     /**
-     * @return the aggregate result obtained from the given intermediate result. 
+     * @return the aggregate result obtained from the given intermediate result.
      * May be null to indicate that the current multiset cannot be aggregated (e.g. 0 elements have no minimum).
      */
     AggregateResult getAggregate(Accumulator result);
@@ -77,30 +77,30 @@ public interface IMultisetAggregationOperator<Domain, Accumulator, AggregateResu
      * @since 2.0
      */
     AggregateResult aggregateStream(Stream<Domain> stream);
-    
+
     /**
      * Clones the given accumulator (with all its internal contents).
      */
     default Accumulator clone(Accumulator original) {
         throw new UnsupportedOperationException();
     }
-    
+
     /**
-     * Combines the given aggregate result and accumulator into a single aggregate result. 
+     * Combines the given aggregate result and accumulator into a single aggregate result.
      */
     default AggregateResult combine(AggregateResult left, Accumulator right) {
         throw new UnsupportedOperationException();
     }
-    
+
     default boolean contains(Domain value, Accumulator accumulator) {
         throw new UnsupportedOperationException();
     }
-    
+
     /**
-     * Pretty prints the contents of the given accumulator. 
+     * Pretty prints the contents of the given accumulator.
      */
     default String prettyPrint(final Accumulator accumulator) {
         return accumulator.toString();
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/analysis/QueryAnalyzer.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/analysis/QueryAnalyzer.java
index e3f28cff..967aaa9e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/analysis/QueryAnalyzer.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/analysis/QueryAnalyzer.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.analysis;
+package tools.refinery.interpreter.matchers.psystem.analysis;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15,32 +15,32 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.ParameterReference;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.annotations.ParameterReference;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.context.IQueryBackendContext;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * Object responsible for computing and caching static query analysis results.
- * <p> Any client can instantiate this to statically analyze queries. 
+ * <p> Any client can instantiate this to statically analyze queries.
  * Query backends should share an instance obtained via {@link IQueryBackendContext} to save resources.
  * <p> Precondition: all involved queries must be initialized.
- * @noinstantiate Considered unstable API; subject to change in future versions. 
- * Either use the analyzer provided by {@link IQueryBackendContext}, or anticipate 
+ * @noinstantiate Considered unstable API; subject to change in future versions.
+ * Either use the analyzer provided by {@link IQueryBackendContext}, or anticipate
  * potential future breakage when instantiating your own analyzer.
  * @author Gabor Bergmann
  * @since 1.5
  */
 public final class QueryAnalyzer {
-    
+
     private IQueryMetaContext metaContext;
 
     public QueryAnalyzer(IQueryMetaContext metaContext) {
@@ -48,20 +48,20 @@ public final class QueryAnalyzer {
     }
 
     // Functional dependencies
-    
+
     /**
-     * Maps query and strictness to functional dependencies 
+     * Maps query and strictness to functional dependencies
      */
-    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> strictFunctionalDependencyGuarantees =  
+    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> strictFunctionalDependencyGuarantees =
             new HashMap<>();
-    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> softFunctionalDependencyGuarantees =  
+    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> softFunctionalDependencyGuarantees =
             new HashMap<>();
 
     /**
-     * Functional dependency information, expressed on query parameters, that the match set of the query is guaranteed to respect. 
+     * Functional dependency information, expressed on query parameters, that the match set of the query is guaranteed to respect.
      * <p> The type dependencies shall be expressed on the <i>parameter index</i> integers, NOT the {@link PParameter} object.
      * @return a non-null map of functional dependencies on parameters that can be processed by {@link FunctionalDependencyHelper}
-     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation;
      *  if false, user-provided soft dependencies (@FunctionalDependency) are included as well, that are anticipated but not guaranteed by the storage mechanism;
      *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
      * @since 1.5
@@ -74,10 +74,10 @@ public final class QueryAnalyzer {
         //      and may thus recurs back into #getProjectedFunctionalDependencies, causing a ConcurrentModificationException
         //      if the called query has not been previously analyzed.
         //
-        //      Note: if patterns are recursive, the empty accumulator will be found in the store 
+        //      Note: if patterns are recursive, the empty accumulator will be found in the store
         //          (this yields a safe lower estimate and guarantees termination for #getProjectedFunctionalDependencies)
-        //          But this case probably will not occur due to recursive queries having a disjunction at some point, 
-        //          and thus ignored by #computeFunctionalDependencies  
+        //          But this case probably will not occur due to recursive queries having a disjunction at some point,
+        //          and thus ignored by #computeFunctionalDependencies
         if (dependencies == null) {
             dependencies = new HashMap<>(); // accumulator
             guaranteeStore.put(query, dependencies);
@@ -87,24 +87,24 @@ public final class QueryAnalyzer {
     }
 
     private void computeFunctionalDependencies(Map<Set<Integer>, Set<Integer>> accumulator, PQuery query, boolean strict) {
-        Set<PBody> bodies = query.getDisjunctBodies().getBodies();            
+        Set<PBody> bodies = query.getDisjunctBodies().getBodies();
         if (bodies.size() == 1) { // no support for recursion or disjunction
 
             PBody body = bodies.iterator().next();
-            
+
             // collect parameter variables
             Map<PVariable, Integer> parameters = body.getSymbolicParameters().stream()
                     .collect(Collectors.toMap(ExportedParameter::getParameterVariable,
                             param -> query.getParameters().indexOf(param.getPatternParameter())));
-            
+
             // collect all internal dependencies
-            Map<Set<PVariable>, Set<PVariable>> internalDependencies = 
+            Map<Set<PVariable>, Set<PVariable>> internalDependencies =
                     getFunctionalDependencies(body.getConstraints(), strict);
-            
+
             // project onto parameter variables
-            Map<Set<PVariable>, Set<PVariable>> projectedDeps = 
+            Map<Set<PVariable>, Set<PVariable>> projectedDeps =
                     FunctionalDependencyHelper.projectDependencies(internalDependencies, parameters.keySet());
-            
+
             // translate into indices
             for (Entry<Set<PVariable>, Set<PVariable>> entry : projectedDeps.entrySet()) {
                 Set<Integer> left = new HashSet<Integer>();
@@ -117,21 +117,21 @@ public final class QueryAnalyzer {
                 }
                 accumulator.put(left, right);
             }
-            
+
         } else {
             // Disjunctive case, no dependencies are inferred
-            // TODO: we can still salvage the intersection of dependencies IF 
+            // TODO: we can still salvage the intersection of dependencies IF
             // - all bodies have disjoint match sets
             // - and we avoid recursion
         }
-        
+
         // add annotation-based soft dependencies (regardless of number of bodies)
         if (!strict) {
             outer:
                 for (PAnnotation annotation : query.getAnnotationsByName("FunctionalDependency")) {
                     Set<Integer> lefts = new HashSet<Integer>();
                     Set<Integer> rights = new HashSet<Integer>();
-                    
+
                     for (Object object : annotation.getAllValues("forEach")) {
                         ParameterReference parameter = (ParameterReference) object;
                         Integer position = query.getPositionOfParameter(parameter.getName());
@@ -144,17 +144,17 @@ public final class QueryAnalyzer {
                         if (position == null) continue outer;
                         rights.add(position);
                     }
-                    
+
                     FunctionalDependencyHelper.includeDependency(accumulator, lefts, rights);
                 }
         }
     }
 
     /**
-     * Functional dependency information, expressed on PVariables within a body, that the selected constraints imply. 
+     * Functional dependency information, expressed on PVariables within a body, that the selected constraints imply.
      * @return a non-null map of functional dependencies on PVariables that can be processed by {@link FunctionalDependencyHelper}
      * @param constraints the set of constraints whose consequences will be analyzed
-     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation;
      *  if false, user-provided soft dependencies (@FunctionalDependency) are included as well, that are anticipated but not guaranteed by the storage mechanism;
      *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
      * @since 1.5
@@ -170,20 +170,20 @@ public final class QueryAnalyzer {
                 for (Entry<Set<Integer>, Set<Integer>> entry : paramDependencies.entrySet()) {
                     Set<PVariable> lefts = new HashSet<PVariable>();
                     Set<PVariable> rights = new HashSet<PVariable>();
-                    
+
                     for (Integer index : entry.getKey()) {
                         lefts.add(call.getVariableInTuple(index));
                     }
                     for (Integer index : entry.getValue()) {
                         rights.add(call.getVariableInTuple(index));
                     }
-                    
-                    FunctionalDependencyHelper.includeDependency(accumulator, 
+
+                    FunctionalDependencyHelper.includeDependency(accumulator,
                             lefts, rights);
                 }
             } else {
                 // delegate to PConstraint
-                FunctionalDependencyHelper.includeDependencies(accumulator, 
+                FunctionalDependencyHelper.includeDependencies(accumulator,
                         pConstraint.getFunctionalDependencies(metaContext));
             }
         }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/PAnnotation.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/annotations/PAnnotation.java
index c4fbe0e9..3a9883ed 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/PAnnotation.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/annotations/PAnnotation.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.annotations;
+package tools.refinery.interpreter.matchers.psystem.annotations;
 
 import java.util.List;
 import java.util.Optional;
@@ -56,7 +56,7 @@ public class PAnnotation {
     public Optional<Object> getFirstValue(String attributeName) {
         return getAllValues(attributeName).stream().findFirst();
     }
-    
+
     /**
      * Returns the value of the first occurrence of an attribute
      * @param attributeName
@@ -75,7 +75,7 @@ public class PAnnotation {
     public List<Object> getAllValues(String attributeName) {
         return attributes.get(attributeName).toList();
     }
-    
+
     /**
      * Executes a consumer over all attributes. A selected attribute name (key) can appear (and thus consumed) multiple times.
      * @since 2.0
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/ParameterReference.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/annotations/ParameterReference.java
index c67e9046..199b7291 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/ParameterReference.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/annotations/ParameterReference.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.annotations;
+package tools.refinery.interpreter.matchers.psystem.annotations;
 
 /**
  * An annotation parameter referencing a query parameter by name. Does not check whether the parameter exists.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/AggregatorConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/AggregatorConstraint.java
index 56f86e89..41870544 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/AggregatorConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/AggregatorConstraint.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -14,20 +14,20 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * The PSystem representation of an aggregation.
- * 
+ *
  * @author Tamas Szabo
  * @since 1.4
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java
index 7bc949a8..722e5cb4 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class BaseTypeSafeConstraint extends
         VariableDeferredPConstraint {
-    
+
     protected Set<PVariable> inputVariables;
     protected PVariable outputVariable;
 
@@ -42,9 +42,9 @@ public abstract class BaseTypeSafeConstraint extends
      */
     public BaseTypeSafeConstraint(PBody pBody,
             Set<PVariable> inputVariables, final PVariable outputVariable) {
-        super(pBody, 
-                (outputVariable == null) ? 
-                        inputVariables : 
+        super(pBody,
+                (outputVariable == null) ?
+                        inputVariables :
                             Stream.concat(inputVariables.stream(), Stream.of(outputVariable)).collect(Collectors.toSet())
                     );
         this.inputVariables = inputVariables;
@@ -53,8 +53,8 @@ public abstract class BaseTypeSafeConstraint extends
 
     @Override
     public Set<PVariable> getDeducedVariables() {
-        if (outputVariable == null) 
-            return Collections.emptySet(); 
+        if (outputVariable == null)
+            return Collections.emptySet();
         else
             return Collections.singleton(outputVariable);
     }
@@ -74,13 +74,13 @@ public abstract class BaseTypeSafeConstraint extends
 
     /**
      * Checks whether all type restrictions are already enforced on affected variables.
-     * 
+     *
      * @param plan
      * @return a variable whose type safety is not enforced yet, or null if the plan is typesafe
      */
     public PVariable checkTypeSafety(SubPlan plan, IQueryMetaContext context) {
         Set<TypeJudgement> impliedJudgements = plan.getAllImpliedTypeJudgements(context);
-        
+
         for (PVariable pVariable : inputVariables) {
             Set<TypeJudgement> allTypeRestrictionsForVariable = pBody.getAllUnaryTypeRestrictions(context).get(pVariable);
             if (allTypeRestrictionsForVariable != null && !impliedJudgements.containsAll(allTypeRestrictionsForVariable))
@@ -88,12 +88,12 @@ public abstract class BaseTypeSafeConstraint extends
         }
         return null;
     }
-    
+
     @Override
     protected void doReplaceVariable(PVariable obsolete, PVariable replacement) {
-        if (inputVariables.remove(obsolete)) 
+        if (inputVariables.remove(obsolete))
             inputVariables.add(replacement);
-        if (outputVariable == obsolete) 
+        if (outputVariable == obsolete)
             outputVariable = replacement;
     }
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Equality.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/Equality.java
index b978b62c..7649a80a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Equality.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/Equality.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -15,15 +15,15 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
-import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.planning.SubPlan;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.DeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class Equality extends DeferredPConstraint {
 
@@ -45,7 +45,7 @@ public class Equality extends DeferredPConstraint {
 
     /**
      * An equality is moot if it compares the a variable with itself.
-     * 
+     *
      * @return true, if the equality is moot
      */
     public boolean isMoot() {
@@ -77,7 +77,7 @@ public class Equality extends DeferredPConstraint {
     public Set<PVariable> getDeducedVariables() {
         return Collections.emptySet();
     }
-    
+
     @Override
     public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
         final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExportedParameter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/ExportedParameter.java
index 80706792..246da4ff 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExportedParameter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/ExportedParameter.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * @author Gabor Bergmann
@@ -58,7 +58,7 @@ public class ExportedParameter extends VariableDeferredPConstraint {
     /**
      * The name of the parameter; usually, it is expected that {@link #getParameterVariable()} is more useful, except
      * maybe for debugging purposes.
-     * 
+     *
      * @return a non-null name of the parameter
      */
     public String getParameterName() {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExpressionEvaluation.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/ExpressionEvaluation.java
index 06688c36..3f090205 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExpressionEvaluation.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/ExpressionEvaluation.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,11 +14,11 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * @author Zoltan Ujhelyi
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Inequality.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/Inequality.java
index 5cac33dc..f434accf 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Inequality.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/Inequality.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class Inequality extends VariableDeferredPConstraint {
 
@@ -117,7 +117,7 @@ public class Inequality extends VariableDeferredPConstraint {
     /**
      * The inequality constraint is weak if it can be ignored when who is the same as withWhom, or if any if them is
      * undeducible.
-     * 
+     *
      * @return the weak
      */
     public boolean isWeak() {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/NegativePatternCall.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/NegativePatternCall.java
index 87d9d9fc..add51f99 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/NegativePatternCall.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/NegativePatternCall.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class NegativePatternCall extends PatternCallBasedDeferred {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java
index 93eeffec..3616a2b1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * @author Gabor Bergmann
@@ -78,7 +78,7 @@ public abstract class PatternCallBasedDeferred extends VariableDeferredPConstrai
                 for (PConstraint pConstraint : var.getReferringConstraints()) {
                     if (pConstraint != this
                             && !(pConstraint instanceof Equality && ((Equality) pConstraint).isMoot()))
-                        throw new QueryProcessingException (
+                        throw new QueryProcessingException(
                                 "Variable {1} of constraint {2} is not a positively determined part of the pattern, yet it is also affected by {3}.",
                                 new String[] { var.toString(), this.toString(), pConstraint.toString() },
                                 "Read-only variable can not be deduced", null);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternMatchCounter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/PatternMatchCounter.java
index 0c40d91e..6a6e7dcf 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternMatchCounter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/PatternMatchCounter.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * @author Gabor Bergmann
@@ -37,7 +37,7 @@ public class PatternMatchCounter extends PatternCallBasedDeferred {
     public Set<PVariable> getDeducedVariables() {
         return Collections.singleton(resultVariable);
     }
-    
+
     @Override
     public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
         final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
@@ -67,4 +67,4 @@ public class PatternMatchCounter extends PatternCallBasedDeferred {
         return resultVariable;
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/RelationEvaluation.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/RelationEvaluation.java
index 336a83fb..45ad19bf 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/RelationEvaluation.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/RelationEvaluation.java
@@ -3,33 +3,33 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.IMultiQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.IMultiQueryReference;
+import tools.refinery.interpreter.matchers.psystem.IRelationEvaluator;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * A constraint which prescribes the evaluation of custom Java logic that takes an arbitrary number of input relations
  * and produces one output relation. Contrast this to {@link ExpressionEvaluation}, which produces a single output value
  * given an input tuple.
- * 
+ *
  * The assumption is that the relation evaluation logic is not incremental, that is, it can only perform from-scratch
  * computation of the output relation given the complete input relations. To this end, the relation evaluator always
  * receives the complete input relations with all their contents as input. However, the evaluator engine makes sure that
  * the output of the relation evaluation is at least "seemingly" incremental. This means that the underlying computation
  * network computes the delta on the output compared to the previous output and only propagates the delta further.
- * 
+ *
  * @author Tamas Szabo
- * 
+ *
  * @since 2.8
  *
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/TypeFilterConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/TypeFilterConstraint.java
index 8b6e29ef..46e67757 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/TypeFilterConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicdeferred/TypeFilterConstraint.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+package tools.refinery.interpreter.matchers.psystem.basicdeferred;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.ITypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
- * Represents a non-enumerable type constraint that asserts that values substituted for the given tuple of variables 
+ * Represents a non-enumerable type constraint that asserts that values substituted for the given tuple of variables
  *      form a tuple that belongs to a (typically non-enumerable) extensional relation identified by an {@link IInputKey}.
- * 
+ *
  * <p> The InputKey is typically not enumerable. If it is enumerable, use {@link TypeConstraint} instead, so that the PConstraint carries over the property of enumerability.
- * 
+ *
  * @author Bergmann Gabor
  *
  */
@@ -36,26 +36,26 @@ public class TypeFilterConstraint extends VariableDeferredPConstraint implements
 
     private Tuple variablesTuple;
     private IInputKey inputKey;
-    
+
     private TypeJudgement equivalentJudgement;
 
-    
+
     public TypeFilterConstraint(PBody pBody, Tuple variablesTuple, IInputKey inputKey) {
         super(pBody, variablesTuple.<PVariable> getDistinctElements());
         this.equivalentJudgement = new TypeJudgement(inputKey, variablesTuple);
 
         this.variablesTuple = variablesTuple;
         this.inputKey = inputKey;
-        
+
         if (variablesTuple.getSize() != inputKey.getArity())
             throw new IllegalArgumentException(
-                    this.getClass().getSimpleName() + 
-                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " + 
+                    this.getClass().getSimpleName() +
+                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " +
                             inputKey);
    }
 
-    
-    
+
+
     public Tuple getVariablesTuple() {
         return variablesTuple;
     }
@@ -94,12 +94,12 @@ public class TypeFilterConstraint extends VariableDeferredPConstraint implements
     protected String toStringRest() {
         return inputKey.getPrettyPrintableName() + "@" + variablesTuple;
     }
-    
+
     @Override
     public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
         return TypeConstraintUtil.getFunctionalDependencies(context, inputKey, variablesTuple);
     }
 
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java
index 7bbf7118..ad60e3cc 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.interpreter.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * @since 2.0
@@ -41,4 +41,4 @@ public abstract class AbstractTransitiveClosure extends KeyedEnumerablePConstrai
         return PositivePatternCall.getTypesImpliedByCall(supplierKey, variablesTuple);
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java
index e3dae240..a7c7fae7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * For a binary base pattern over an enumerable universe type, computes the reflexive transitive closure (base)*
- * 
+ *
  * @author Gabor Bergmann, Zoltan Ujhelyi
  * @since 2.0
  */
@@ -37,7 +37,7 @@ public class BinaryReflexiveTransitiveClosure extends AbstractTransitiveClosure
     }
 
     /**
-     * Returns the type whose instances should be returned as 0-long paths. 
+     * Returns the type whose instances should be returned as 0-long paths.
      * @since 2.0
      */
     public IInputKey getUniverseType() {
@@ -53,5 +53,5 @@ public class BinaryReflexiveTransitiveClosure extends AbstractTransitiveClosure
                     pBody.getPattern());
         }
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java
index 716d043b..ae961cea 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
  * For a binary base pattern, computes the irreflexive transitive closure (base)+
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class BinaryTransitiveClosure extends AbstractTransitiveClosure {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/Connectivity.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/Connectivity.java
index 10da2e21..8127926b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/Connectivity.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/Connectivity.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
 public enum Connectivity {
         WEAK,
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/ConstantValue.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/ConstantValue.java
index 251146c8..21950a7b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/ConstantValue.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/ConstantValue.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * @author Gabor Bergmann
- * 
+ *
  */
 public class ConstantValue extends KeyedEnumerablePConstraint<Object> {
 
@@ -37,14 +37,14 @@ public class ConstantValue extends KeyedEnumerablePConstraint<Object> {
     protected String keyToString() {
         return supplierKey.toString();
     }
-    
+
     /**
      * @since 1.7
      */
     public PVariable getVariable() {
         return variable;
     }
-    
+
     @Override
     public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
         final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/PositivePatternCall.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/PositivePatternCall.java
index 25ab34b4..be3556d0 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/PositivePatternCall.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/PositivePatternCall.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.IQueryReference;
+import tools.refinery.interpreter.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.interpreter.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * @author Gabor Bergmann
@@ -60,15 +60,15 @@ public class PositivePatternCall extends KeyedEnumerablePConstraint<PQuery> impl
      */
     public static Set<TypeJudgement> getTypesImpliedByCall(PQuery calledQuery, Tuple actualParametersTuple) {
         Set<TypeJudgement> result = new HashSet<TypeJudgement>();
-        for (TypeJudgement parameterJudgement : calledQuery.getTypeGuarantees()) {                      
+        for (TypeJudgement parameterJudgement : calledQuery.getTypeGuarantees()) {
             IInputKey inputKey = parameterJudgement.getInputKey();
             Tuple judgementIndexTuple = parameterJudgement.getVariablesTuple();
-            
+
             Object[] judgementVariables = new Object[judgementIndexTuple.getSize()];
             for (int i=0; i<judgementVariables.length; ++i)
                 judgementVariables[i] = actualParametersTuple.get((int) judgementIndexTuple.get(i));
-            
-            result.add(new TypeJudgement(inputKey, Tuples.flatTupleOf(judgementVariables))); 
+
+            result.add(new TypeJudgement(inputKey, Tuples.flatTupleOf(judgementVariables)));
         }
         return result;
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java
index b97ff55f..8edcb0b3 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.*;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.*;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 import java.util.Set;
 
@@ -17,7 +17,7 @@ public class RepresentativeElectionConstraint extends KeyedEnumerablePConstraint
         private final Connectivity connectivity;
 
         public RepresentativeElectionConstraint(PBody pBody, Tuple variablesTuple, PQuery supplierKey,
-                                                                                        Connectivity connectivity) {
+                                            Connectivity connectivity) {
                 super(pBody, variablesTuple, supplierKey);
                 this.connectivity = connectivity;
         }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/TypeConstraint.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/TypeConstraint.java
index 2ca54cc0..cc3b8d12 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/TypeConstraint.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/basicenumerables/TypeConstraint.java
@@ -3,26 +3,26 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+package tools.refinery.interpreter.matchers.psystem.basicenumerables;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.ITypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 /**
- * Represents an enumerable type constraint that asserts that values substituted for the given tuple of variables 
+ * Represents an enumerable type constraint that asserts that values substituted for the given tuple of variables
  *      form a tuple that belongs to an enumerable extensional relation identified by an {@link IInputKey}.
  *
  * <p> The InputKey must be enumerable!
@@ -31,22 +31,22 @@ import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
  *
  */
 public class TypeConstraint extends KeyedEnumerablePConstraint<IInputKey> implements ITypeConstraint {
-    
+
     private TypeJudgement equivalentJudgement;
-    
+
     public TypeConstraint(PBody pBody, Tuple variablesTuple, IInputKey inputKey) {
         super(pBody, variablesTuple, inputKey);
         this.equivalentJudgement = new TypeJudgement(inputKey, variablesTuple);
-        
+
         if (! inputKey.isEnumerable())
             throw new IllegalArgumentException(
-                    this.getClass().getSimpleName() + 
-                    " applicable for enumerable input keys only; received instead " + 
+                    this.getClass().getSimpleName() +
+                    " applicable for enumerable input keys only; received instead " +
                             inputKey);
         if (variablesTuple.getSize() != inputKey.getArity())
             throw new IllegalArgumentException(
-                    this.getClass().getSimpleName() + 
-                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " + 
+                    this.getClass().getSimpleName() +
+                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " +
                             inputKey);
     }
 
@@ -54,7 +54,7 @@ public class TypeConstraint extends KeyedEnumerablePConstraint<IInputKey> implem
     protected String keyToString() {
         return supplierKey.getPrettyPrintableName();
     }
-    
+
     @Override
     public TypeJudgement getEquivalentJudgement() {
         return equivalentJudgement;
@@ -65,7 +65,7 @@ public class TypeConstraint extends KeyedEnumerablePConstraint<IInputKey> implem
         return Collections.singleton(equivalentJudgement);
         //return equivalentJudgement.getDirectlyImpliedJudgements(context);
     }
-    
+
     @Override
     public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
         return TypeConstraintUtil.getFunctionalDependencies(context, supplierKey, variablesTuple);
@@ -76,4 +76,4 @@ public class TypeConstraint extends KeyedEnumerablePConstraint<IInputKey> implem
         super.doReplaceVariable(obsolete, replacement);
         this.equivalentJudgement = new TypeJudgement(getSupplierKey(), variablesTuple);
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/BasePQuery.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/BasePQuery.java
index 2c03a894..06f01f57 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/BasePQuery.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/BasePQuery.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,19 +18,19 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * Default implementation of PQuery.
- * 
+ *
  * @author Bergmann Gabor
  */
 public abstract class BasePQuery implements PQuery {
@@ -45,7 +45,7 @@ public abstract class BasePQuery implements PQuery {
         private QueryEvaluationHint evaluationHints = new QueryEvaluationHint(null, (IQueryBackendFactory)null);
         PDisjunction canonicalDisjunction;
         private List<String> parameterNames = null; // Lazy initialization
-        
+
         /** For traceability only. */
         private List<Object> wrappingQuerySpecifications = new ArrayList<Object>(1);
 
@@ -115,7 +115,7 @@ public abstract class BasePQuery implements PQuery {
             ensureInitialized();
         return annotations.stream().filter(Objects::nonNull).filter(annotation -> Objects.equals(name, annotation.getName()));
         }
-        
+
         @Override
         public List<PAnnotation> getAnnotationsByName(final String annotationName) {
                 return getAnnotationStreamByName(annotationName).collect(Collectors.toList());
@@ -130,7 +130,7 @@ public abstract class BasePQuery implements PQuery {
         public List<String> getParameterNames() {
                 ensureInitialized();
                 if (parameterNames == null) {
-                    parameterNames = getParameters().stream().map(PParameter::getName).collect(Collectors.toList()); 
+                    parameterNames = getParameters().stream().map(PParameter::getName).collect(Collectors.toList());
                 }
             return parameterNames;
         }
@@ -152,12 +152,12 @@ public abstract class BasePQuery implements PQuery {
         public List<Object> publishedAs() {
                 return wrappingQuerySpecifications;
         }
-        
+
         @Override
         public Set<TypeJudgement> getTypeGuarantees() {
             ensureInitialized();
                 Set<TypeJudgement> result = new HashSet<TypeJudgement>();
-                
+
                 List<PParameter> parameters = getParameters();
                 for (int i=0; i<parameters.size(); ++i) {
                         PParameter parameter = parameters.get(i);
@@ -166,10 +166,10 @@ public abstract class BasePQuery implements PQuery {
                                 result.add(new TypeJudgement(declaredUnaryType, Tuples.staticArityFlatTupleOf(i)));
                         }
                 }
-                
+
                 return result;
         }
-        
+
         /**
      * @since 2.0
      */
@@ -209,9 +209,9 @@ public abstract class BasePQuery implements PQuery {
 
         /**
          * Creates and returns the bodies of the query. If recalled again, a new instance is created.
-         * 
+         *
          * @return
-         * @throws ViatraQueryRuntimeException
+         * @throws InterpreterRuntimeException
          */
         protected abstract Set<PBody> doGetContainedBodies();
 
@@ -227,5 +227,5 @@ public abstract class BasePQuery implements PQuery {
     public PVisibility getVisibility() {
         return visibility;
     }
-        
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PDisjunction.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PDisjunction.java
index eae4eacf..7f1cfd01 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PDisjunction.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PDisjunction.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PBody;
 
 /**
- * 
+ *
  * A disjunction is a set of bodies representing separate conditions. A {@link PQuery} has a single, canonical
  * PDisjunction, that can be replaced using rewriter
- * 
+ *
  * @author Zoltan Ujhelyi
- * 
+ *
  */
 public class PDisjunction {
 
@@ -41,7 +41,7 @@ public class PDisjunction {
 
     /**
      * Returns an immutable set of bodies that consists of this disjunction
-     * 
+     *
      * @return the bodies
      */
     public Set<PBody> getBodies() {
@@ -57,7 +57,7 @@ public class PDisjunction {
 
     /**
      * Returns all queries directly referred in the constraints. They are all required to evaluate this query
-     * 
+     *
      * @return a non-null, but possibly empty list of query definitions
      */
     public Set<PQuery> getDirectReferredQueries() {
@@ -68,7 +68,7 @@ public class PDisjunction {
 
     /**
      * Returns all queries required to evaluate this query (transitively).
-     * 
+     *
      * @return a non-null, but possibly empty list of query definitions
      */
     public Set<PQuery> getAllReferredQueries() {
@@ -76,7 +76,7 @@ public class PDisjunction {
         processedQueries.add(this.getQuery());
         Set<PQuery> foundQueries = getDirectReferredQueries();
         Set<PQuery> newQueries = new LinkedHashSet<>(foundQueries);
-    
+
         while(!processedQueries.containsAll(newQueries)) {
             PQuery query = newQueries.iterator().next();
             processedQueries.add(query);
@@ -88,10 +88,10 @@ public class PDisjunction {
         }
         return foundQueries;
     }
-    
+
     /**
      * Decides whether a disjunction is mutable. A disjunction is mutable if all its contained bodies are mutable.
-     * 
+     *
      */
     public boolean isMutable() {
         for (PBody body : bodies) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PParameter.java
index 07165aa2..8aa26198 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PParameter.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 import java.util.Objects;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IInputKey;
 
 /**
  * A descriptor for declared PQuery parameters. A parameter has a name, a declared type and a direction constraint
@@ -70,7 +70,7 @@ public class PParameter {
 
     /**
      * Returns a textual representation of the declared type of the parameter
-     * 
+     *
      * @return the type description, or null if not available
      */
     public String getTypeName() {
@@ -79,7 +79,7 @@ public class PParameter {
 
     /**
      * Yield an {@link IInputKey} representation of the type declared for this parameter.
-     * 
+     *
      * @return the unary type that was declared on this parameter in the query header, or null if not available
      */
     public IInputKey getDeclaredUnaryType() {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameterDirection.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PParameterDirection.java
index c94d4797..d8bdda61 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameterDirection.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PParameterDirection.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 /**
  * Values of this enum describe a constraint to the calling of patterns regarding its parameters.
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
@@ -21,15 +21,15 @@ public enum PParameterDirection {
      * Default value, no additional constraint is applied
      */
     INOUT,
-    
+
     /**
      * The parameters marked with this constraints shall be set to a value before calling the pattern
      */
     IN,
-    
+
     /**
      * The parameters marked with this constraints shall not be set to a value before calling the pattern
      */
     OUT
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PProblem.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PProblem.java
index 1fe4f541..03405420 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PProblem.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PProblem.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
 
 /**
  * Represents an error that was detected while the {@link PQuery} object was built from a source.
@@ -18,7 +18,7 @@ import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
 public class PProblem {
 
     private final String shortMessage;
-    private final String location; 
+    private final String location;
     private final Exception exception;
 
     public PProblem(String shortMessage) {
@@ -36,7 +36,7 @@ public class PProblem {
     public PProblem(Exception exception, String shortMessage) {
         this(exception, shortMessage, null, null);
     }
-    
+
     /**
      * @since 2.0
      */
@@ -64,5 +64,5 @@ public class PProblem {
     public String getLocation() {
         return location;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueries.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQueries.java
index 56f8ca76..a4898d09 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueries.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQueries.java
@@ -3,10 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
+
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.IMultiQueryReference;
+import tools.refinery.interpreter.matchers.psystem.ITypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -14,14 +21,6 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.IMultiQueryReference;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-
 /**
  * Utility class for using PQueries in functional/streaming collection operations effectively
  *
@@ -40,7 +39,7 @@ public final class PQueries {
      * Predicate checking for the status of selected queries
      *
      */
-    public static Predicate<PQuery> queryStatusPredicate(final PQueryStatus status) {
+    public static Predicate<PQuery> queryStatusPredicate(final PQuery.PQueryStatus status) {
         return query -> query.getStatus().equals(status);
     }
 
@@ -54,7 +53,7 @@ public final class PQueries {
 
     /**
      * Enumerates directly referred extensional relations (without duplicates) in the canonical form of the given query
-     * 
+     *
      * @param enumerablesOnly
      *                            only enumerable type constraints are considered
      * @since 2.0
@@ -65,7 +64,7 @@ public final class PQueries {
 
     /**
      * Enumerates directly referred extensional relations (without duplicates) for the given formulation of a query.
-     * 
+     *
      * @param enumerablesOnly
      *                            only enumerable type constraints are considered
      * @since 2.0
@@ -86,7 +85,7 @@ public final class PQueries {
 
     /**
      * Returns all {@link PTraceable}s contained in the given {@link PQuery}: itself, its bodies and their constraints.
-     * 
+     *
      * @since 1.6
      */
     public static Set<PTraceable> getTraceables(PQuery query) {
@@ -101,7 +100,7 @@ public final class PQueries {
 
     /**
      * Calculates the simple name related from a given qualified name by finding the part after the last '.' character.
-     * 
+     *
      * @since 2.0
      */
     public static String calculateSimpleName(String qualifiedName) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQuery.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQuery.java
index a909c650..39c08b07 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQuery.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQuery.java
@@ -3,34 +3,34 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
+
+import tools.refinery.interpreter.matchers.InterpreterRuntimeException;
+import tools.refinery.interpreter.matchers.backend.IQueryBackend;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
 
 import java.util.List;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-
 /**
- * Internal representation of a query / graph pattern (using a constraint system formalism), 
- * to be interpreted by a query evaluator ({@link IQueryBackend}). 
- * End-users of VIATRA Query should access a query as an IQuerySpecification instead. 
- * 
+ * Internal representation of a query / graph pattern (using a constraint system formalism),
+ * to be interpreted by a query evaluator ({@link IQueryBackend}).
+ * End-users of Refinery Intepreter should access a query as an IQuerySpecification instead.
+ *
  * <p>
  * PQuerys are definitions of queries usable inside pattern descriptions. Such description always has (a non-null) name. The query
  * itself is defined as a (non-empty) set of {@link PBody} instances, the result is the disjunction of the single
  * {@link PBody} instances. </p>
  * <p>
  * A PQuery might be constructed from erroneous patterns or might be uninitialized - this is represented by its status.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 0.8.0
  * @noimplement This interface is not intended to be implemented by clients. Use {@link BasePQuery} as a base class instead.
@@ -38,10 +38,10 @@ import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
 public interface PQuery extends PQueryHeader, PTraceable {
 
     // TODO rewritten as / rewritten from traceability to PDisjunction?
-    
+
     /**
      * @author Zoltan Ujhelyi
-     * 
+     *
      */
     public enum PQueryStatus {
         /**
@@ -70,35 +70,35 @@ public interface PQuery extends PQueryHeader, PTraceable {
     /**
      * Returns all bodies associated with the query in their canonical form. If called multiple times, the same set with
      * the same contents will be returned.
-     * 
+     *
      */
     PDisjunction getDisjunctBodies();
 
     /**
      * Returns all queries directly referred in the constraints. They are all required to evaluate this query
-     * 
+     *
      * @return a non-null, but possibly empty list of query definitions
      */
     Set<PQuery> getDirectReferredQueries();
 
     /**
      * Returns all queries required to evaluate this query (transitively).
-     * 
+     *
      * @return a non-null, but possibly empty list of query definitions
      */
     Set<PQuery> getAllReferredQueries();
 
     /**
      * Returns the initialization status of the definition
-     * 
+     *
      */
     PQueryStatus getStatus();
-    
+
     /**
      * Returns a list describing the problems that were found in this query.
-     * 
+     *
      * <p> TODO: formulate invariant connecting {@link #getPProblems()} and {@link #getStatus()}.
-     * 
+     *
      * @return a non-null, but possibly empty list of problems
      */
     List<PProblem> getPProblems();
@@ -112,43 +112,43 @@ public interface PQuery extends PQueryHeader, PTraceable {
     /**
      * An option to check mutability of the query. It can be used to avoid getting an {@link IllegalStateException} by
      * the execution of {@link #checkMutability()}.
-     * 
+     *
      * @return true if the query specification is still editable
      */
     boolean isMutable();
 
     /**
      * Optional hints regarding the query evaluation strategy, to be interpreted by the query engine.
-     * <p> To ensure the possibility of external overrides, 
-     *  the evaluation engine should not directly consult this field, 
+     * <p> To ensure the possibility of external overrides,
+     *  the evaluation engine should not directly consult this field,
      *  but use an {@link IQueryBackendHintProvider} instead.
      */
     public QueryEvaluationHint getEvaluationHints();
 
-    
+
     /**
-     * Type information, expressed on query parameters, that all matches of the query are guaranteed to respect. 
+     * Type information, expressed on query parameters, that all matches of the query are guaranteed to respect.
      * <p> At the very minimum, this should include the declared types of the parameters.
      * <p> The type judgement tuples shall contain the <i>parameter index</i>, NOT the {@link PParameter} object.
-     * 
+     *
      * @return a non-null set of type judgements that the query guarantees for its matches
      */
     public Set<TypeJudgement> getTypeGuarantees();
 
     /**
      * If the query definition is uninitialized, initializes it.
-     * @throws ViatraQueryRuntimeException if initialization of query specification fails
+     * @throws InterpreterRuntimeException if initialization of query specification fails
      */
     public abstract void ensureInitialized();
-    
+
     /**
      * Returns the end-user query specification API objects that wrap this query.
-     * 
-     * <p> Intended for traceability and debug purposes, not part of normal operation. 
+     *
+     * <p> Intended for traceability and debug purposes, not part of normal operation.
      * Returned list is intended to be appended during query specification construction time.
-     * 
+     *
      * @return a non-null, but possibly empty list of query specification objects;
      */
     List<Object> publishedAs();
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueryHeader.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQueryHeader.java
index f3671934..54678755 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueryHeader.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PQueryHeader.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 import java.util.List;
 import java.util.Optional;
 
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
 
 /**
- * Represents header information (metainfo) about a query. 
- * <p> To be implemented both by IQuerySpecifications intended for end users, 
+ * Represents header information (metainfo) about a query.
+ * <p> To be implemented both by IQuerySpecifications intended for end users,
  * and the internal query representation {@link PQuery}.
- * 
- * 
+ *
+ *
  * @author Bergmann Gabor
  * @since 0.9
  */
@@ -31,21 +31,21 @@ public interface PQueryHeader {
 
     /**
      * Return the list of parameter names
-     * 
+     *
      * @return a non-null, but possibly empty list of parameter names
      */
     public List<String> getParameterNames();
 
     /**
      * Returns a list of parameter descriptions
-     * 
+     *
      * @return a non-null, but possibly empty list of parameter descriptions
      */
     public List<PParameter> getParameters();
 
     /**
      * Returns the index of a named parameter
-     * 
+     *
      * @param parameterName
      * @return the index, or null of no such parameter is available
      */
@@ -59,17 +59,17 @@ public interface PQueryHeader {
         return Optional.ofNullable(getPositionOfParameter(parameterName))
             .map(getParameters()::get);
     }
-    
+
     /**
      * Returns the list of annotations specified for this query
-     * 
+     *
      * @return a non-null, but possibly empty list of annotations
      */
     public List<PAnnotation> getAllAnnotations();
 
     /**
      * Returns the list of annotations with a specified name
-     * 
+     *
      * @param annotationName
      * @return a non-null, but possibly empty list of annotations
      */
@@ -77,25 +77,25 @@ public interface PQueryHeader {
 
     /**
      * Returns the first annotation with a specified name
-     * 
+     *
      * @since 2.0
      */
     public Optional<PAnnotation> getFirstAnnotationByName(String annotationName);
-    
+
     /**
      * Returns the visibility information about the query.
      * @since 2.0
      */
     public PVisibility getVisibility();
-    
+
     /**
      * Returns the non-qualified name of the query. By default this means returning the qualified name after the last
      * '.' character.
-     * 
+     *
      * @since 2.0
      */
     public default String getSimpleName() {
         return PQueries.calculateSimpleName(getFullyQualifiedName());
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PVisibility.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PVisibility.java
index 7cb312bd..074648a4 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PVisibility.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/PVisibility.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
 /**
  * @author Zoltan Ujhelyi
@@ -20,13 +20,13 @@ public enum PVisibility {
      */
     PUBLIC,
     /**
-     * A private query is not expected to be called directly, only by a different query matcher. 
+     * A private query is not expected to be called directly, only by a different query matcher.
      */
     PRIVATE,
     /**
      * A query that is only used inside a single caller query and is not visible outside its container query. Such
      * patterns must also fulfill the following additional constraints:
-     * 
+     *
      * <ul>
      * <li>An embedded query must have only a single body.</li>
      * <li>An embedded query must not be recursice.</li>
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/QueryInitializationException.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/QueryInitializationException.java
index 470d7287..9d05a0dd 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/QueryInitializationException.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/queries/QueryInitializationException.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.queries;
+package tools.refinery.interpreter.matchers.psystem.queries;
 
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
 
 /**
- * Represent an exception that occurred while initializing the specification of a query. 
+ * Represent an exception that occurred while initializing the specification of a query.
  * @author Bergmann Gabor
  * @since 0.9
  *
@@ -30,6 +30,6 @@ public class QueryInitializationException extends QueryProcessingException {
     private static final long serialVersionUID = 9106033062252951489L;
 
 
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/AbstractRewriterTraceSource.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/AbstractRewriterTraceSource.java
index 276b2b42..59422e3e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/AbstractRewriterTraceSource.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/AbstractRewriterTraceSource.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.Objects;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
 
 /**
  * @since 1.6
@@ -20,19 +20,19 @@ import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
 public class AbstractRewriterTraceSource {
 
     private IRewriterTraceCollector traceCollector = NopTraceCollector.INSTANCE;
-    
+
     public void setTraceCollector(IRewriterTraceCollector traceCollector) {
         this.traceCollector = Objects.requireNonNull(traceCollector);
     }
-    
+
     public IPTraceableTraceProvider getTraces() {
         return traceCollector;
     }
-    
+
     protected IRewriterTraceCollector getTraceCollector() {
         return traceCollector;
     }
-    
+
     /**
      * Mark the given derivative to be originated from the given original constraint.
      * @since 1.6
@@ -40,7 +40,7 @@ public class AbstractRewriterTraceSource {
     protected void addTrace(PTraceable original, PTraceable derivative){
         traceCollector.addTrace(original, derivative);
     }
-    
+
     /**
      * Indicate that the given derivative is removed from the resulting query, thus its trace
      * information should be removed also.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/ConstraintRemovalReason.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/ConstraintRemovalReason.java
index 237a762d..4948c1e5 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/ConstraintRemovalReason.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/ConstraintRemovalReason.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 /**
  * Common reasons for removing constraint through rewriters
@@ -19,5 +19,5 @@ public enum ConstraintRemovalReason implements IDerivativeModificationReason {
     WEAK_INEQUALITY_SELF_LOOP,
     TYPE_SUBSUMED,
     DUPLICATE
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java
index 3b5d7390..b2e46ee6 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
 
 /**
  * @author Marton Bur
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/FlattenerCopier.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/FlattenerCopier.java
index 06b8d372..cddd182b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/FlattenerCopier.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/FlattenerCopier.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.HashMap;
 import java.util.List;
@@ -16,19 +16,19 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * This rewriter class can add new equality constraints to the copied body
- * 
+ *
  * @author Marton Bur
  *
  */
@@ -39,18 +39,18 @@ class FlattenerCopier extends PBodyCopier {
     private static class CallInformation {
         final PBody body;
         final Map<PVariable, PVariable> variableMapping;
-        
+
         private CallInformation(PBody body) {
             this.body = body;
             this.variableMapping = new HashMap<>();
         }
     }
-    
+
     public FlattenerCopier(PQuery query, Map<PositivePatternCall, PBody> callsToFlatten) {
         super(query);
         this.calls = callsToFlatten.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> new CallInformation(entry.getValue())));
     }
-    
+
     protected void copyVariable(PositivePatternCall contextPatternCall, PVariable variable, String newName) {
         PVariable newPVariable = body.getOrCreateVariableByName(newName);
         calls.get(contextPatternCall).variableMapping.put(variable, newPVariable);
@@ -60,7 +60,7 @@ class FlattenerCopier extends PBodyCopier {
     /**
      * Merge all variables and constraints from the body called through the given pattern call to a target body. If
      * multiple bodies are merged into a single one, use the renamer and filter options to avoid collisions.
-     * 
+     *
      * @param sourceBody
      * @param namingTool
      * @param filter
@@ -121,9 +121,9 @@ class FlattenerCopier extends PBodyCopier {
         Map<PVariable, PVariable> variableMapping = this.variableMapping.entrySet().stream()
                 .filter(input -> expressionEvaluation.getPSystem().getAllVariables().contains(input.getKey()))
                 .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
-        
+
         PVariable mappedOutputVariable = variableMapping.get(expressionEvaluation.getOutputVariable());
         addTrace(expressionEvaluation, new ExpressionEvaluation(body, new VariableMappingExpressionEvaluatorWrapper(expressionEvaluation.getEvaluator(), variableMapping), mappedOutputVariable, expressionEvaluation.isUnwinding()));
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IConstraintFilter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IConstraintFilter.java
index 518b9c64..85c30296 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IConstraintFilter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IConstraintFilter.java
@@ -3,46 +3,46 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
 
 /**
  * Helper interface to exclude constraints from PBody copy processes
- * 
+ *
  * @author Marton Bur
- * 
+ *
  */
 public interface IConstraintFilter {
     /**
      * Returns true, if the given constraint should be filtered (thus should not be copied)
-     * 
+     *
      * @param constraint
      *            to check
      * @return true, if the constraint should be filtered
      */
     boolean filter(PConstraint constraint);
-    
+
     public static class ExportedParameterFilter implements IConstraintFilter {
-        
+
         @Override
         public boolean filter(PConstraint constraint) {
             return constraint instanceof ExportedParameter;
         }
-        
+
     }
-    
+
     public static class AllowAllFilter implements IConstraintFilter {
-        
+
         @Override
         public boolean filter(PConstraint constraint) {
             // Nothing is filtered
             return false;
         }
-        
+
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IDerivativeModificationReason.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IDerivativeModificationReason.java
index dbd6a78d..0afc3456 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IDerivativeModificationReason.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IDerivativeModificationReason.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 /**
  * This is a role indication interface, implementations may provide a reason about
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IFlattenCallPredicate.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IFlattenCallPredicate.java
index 7e224e98..2d43b17b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IFlattenCallPredicate.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IFlattenCallPredicate.java
@@ -3,31 +3,31 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
 
 
 /**
  * Interface used by the PQueryFlattener to decide which positive pattern calls to flatten
- * 
+ *
  * @author Marton Bur
  *
  */
 public interface IFlattenCallPredicate {
-    
+
     /**
      * Decides whether the called query by the pattern call should be flattened into the caller or not.
-     * 
+     *
      * @param positivePatternCall
      *            the pattern call
      * @return true if the call should be flattened
      */
     boolean shouldFlatten(PositivePatternCall positivePatternCall);
-    
+
     /**
      * Flattens only if all operand predicates vote for flattening.
      * @author Gabor Bergmann
@@ -38,7 +38,7 @@ public interface IFlattenCallPredicate {
         public And(IFlattenCallPredicate... operands) {
             this.operands = operands;
         }
-        
+
         @Override
         public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
             for (IFlattenCallPredicate operand : operands) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IPTraceableTraceProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IPTraceableTraceProvider.java
index 84da4d1b..4699c4eb 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IPTraceableTraceProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IPTraceableTraceProvider.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * This interface provides methods to trace the {@link PTraceable}s of a transformed {@link PQuery} produced by
  * a {@link PDisjunctionRewriter}. In case the associated rewriter is a composite (a.k.a. {@link PDisjunctionRewriterCacher}),
  * this trace provider handles traces end-to-end, hiding all the intermediate transformation steps.
- * 
+ *
  * @since 1.6
  * @noimplement This interface is not intended to be implemented by clients.
  */
@@ -26,21 +26,21 @@ public interface IPTraceableTraceProvider {
     /**
      * Find and return the canonical {@link PTraceable}s in the original query which are the sources of the given derivative
      * {@link PTraceable} according to the transformation.
-     * 
+     *
      * @param derivative a {@link PTraceable} which is contained by the {@link PQuery} produced by the associated rewriter
      * @since 2.0
      */
     public Stream<PTraceable> getCanonicalTraceables(PTraceable derivative);
-    
+
     /**
      * Find and return the {@link PTraceable}s in the rewritten query which are the destinations of the given source
      * {@link PTraceable} according to the transformation.
-     * 
+     *
      * @param source a {@link PTraceable} which is contained by a {@link PQuery} before rewriting
      * @since 2.0
      */
     public Stream<PTraceable> getRewrittenTraceables(PTraceable source);
-    
+
     /**
      * Returns whether the given traceable element has been removed by every rewriter for a reason.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IRewriterTraceCollector.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IRewriterTraceCollector.java
index 70771ea7..883ca737 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IRewriterTraceCollector.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IRewriterTraceCollector.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
 
 /**
  * This is the internal API of {@link IPTraceableTraceProvider} expected to be used by
  * copier and rewriter implementations.
- * 
+ *
  * @since 1.6
  * @noreference This interface is not intended to be referenced by clients.
  */
@@ -23,11 +23,11 @@ public interface IRewriterTraceCollector extends IPTraceableTraceProvider {
      * Mark the given derivative to be originated from the given original constraint.
      */
     public void addTrace(PTraceable origin, PTraceable derivative);
-    
+
     /**
      * Indicate that the given derivative is removed from the resulting query, thus its trace
      * information should be removed also.
      */
     public void derivativeRemoved(PTraceable derivative, IDerivativeModificationReason reason);
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IVariableRenamer.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IVariableRenamer.java
index ce446e0d..27fc433d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IVariableRenamer.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/IVariableRenamer.java
@@ -3,38 +3,38 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * Helper interface to ease the naming of the new variables during flattening
- * 
+ *
  * @author Marton Bur
- * 
+ *
  */
 public interface IVariableRenamer {
     /**
      * Creates a variable name based on a given variable and a given query. It only creates a String, doesn't set
      * anything.
-     * 
+     *
      * @param pVariable
      * @param query
      * @return the new variable name as a String
      */
     String createVariableName(PVariable pVariable, PQuery query);
-    
+
     public class SameName implements IVariableRenamer {
         @Override
         public String createVariableName(PVariable pVariable, PQuery query) {
             return pVariable.getName();
         }
     }
-    
+
     public class HierarchicalName implements IVariableRenamer {
 
         private int callCount;
@@ -49,11 +49,11 @@ public interface IVariableRenamer {
             String newVarName = getShortName(query) + "<" + callCount + ">" + "_" + pVariable.getName();
             return pVariable.getName().startsWith("_") ? "_" + newVarName : newVarName ;
         }
-        
+
         private String getShortName(PQuery query) {
             String fullyQualifiedName = query.getFullyQualifiedName();
             int beginIndex = fullyQualifiedName.lastIndexOf('.') + 1;
             return fullyQualifiedName.substring(beginIndex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/MappingTraceCollector.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/MappingTraceCollector.java
index 7429fc60..3b9e5d78 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/MappingTraceCollector.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/MappingTraceCollector.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -18,17 +18,17 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
-import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
-import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.IMemoryView;
+import tools.refinery.interpreter.matchers.util.IMultiLookup;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * Multimap-based implementation to contain and query traces
- * 
+ *
  * @since 1.6
  *
  */
@@ -43,12 +43,12 @@ public class MappingTraceCollector implements IRewriterTraceCollector {
      * Traces from original to derivative
      */
     private final IMultiLookup<PTraceable, PTraceable> inverseTraces = CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
-    
+
     /**
      * Reasons for removing {@link PTraceable}s
      */
     private final Map<PTraceable, IDerivativeModificationReason> removals = new HashMap<>();
-    
+
     /**
      * Decides whether {@link PTraceable} is removed
      */
@@ -71,7 +71,7 @@ public class MappingTraceCollector implements IRewriterTraceCollector {
     }
 
     /**
-     * Returns the end of trace chains starting from the given {@link PTraceable} along the given trace edges. 
+     * Returns the end of trace chains starting from the given {@link PTraceable} along the given trace edges.
      */
     private Set<PTraceable> findTraceEnds(PTraceable traceable, IMultiLookup<PTraceable, PTraceable> traceRecords) {
         if (traceable instanceof PQuery) { // PQueries are preserved
@@ -108,11 +108,11 @@ public class MappingTraceCollector implements IRewriterTraceCollector {
         // Even if this element was marked as removed earlier, now we replace it with another constraint!
         removals.remove(original);
     }
-    
+
     @Override
     public void derivativeRemoved(PTraceable derivative, IDerivativeModificationReason reason){
         Preconditions.checkState(!removals.containsKey(derivative), "Traceable %s removed multiple times", derivative);
-        // XXX the derivative must not be removed from the trace chain, as some rewriters, e.g. the normalizer keeps trace links to deleted elements 
+        // XXX the derivative must not be removed from the trace chain, as some rewriters, e.g. the normalizer keeps trace links to deleted elements
         if (!inverseTraces.lookupExists(derivative)) {
             // If there already exists a trace link, this removal means an update
             removals.put(derivative, reason);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NeverFlattenCallPredicate.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/NeverFlattenCallPredicate.java
index 96c0b205..1d3484bb 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NeverFlattenCallPredicate.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/NeverFlattenCallPredicate.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
 
 /**
  * @author Grill Balázs
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NopTraceCollector.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/NopTraceCollector.java
index 15cf577e..ce768636 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NopTraceCollector.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/NopTraceCollector.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.interpreter.matchers.psystem.PTraceable;
 
 /**
  * This implementation does not store any traces and scales to NOP for every traceability feature.
@@ -20,11 +20,11 @@ import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
 public class NopTraceCollector implements IRewriterTraceCollector {
 
     public static final IRewriterTraceCollector INSTANCE = new NopTraceCollector();
-    
+
     private NopTraceCollector() {
         // Private constructor to force using the common instance
     }
-    
+
     /**
      * @since 2.0
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyCopier.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PBodyCopier.java
index 10ab19c8..99350185 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyCopier.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PBodyCopier.java
@@ -7,21 +7,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
-
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.AllowAllFilter;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.SameName;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
+
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.*;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.*;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -66,7 +64,7 @@ public class PBodyCopier extends AbstractRewriterTraceSource {
     }
 
     public void mergeBody(PBody sourceBody) {
-        mergeBody(sourceBody, new SameName(), new AllowAllFilter());
+        mergeBody(sourceBody, new IVariableRenamer.SameName(), new IConstraintFilter.AllowAllFilter());
     }
 
     /**
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyNormalizer.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PBodyNormalizer.java
index 90943129..5a189394 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyNormalizer.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PBodyNormalizer.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,29 +23,29 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.interpreter.matchers.planning.QueryProcessingException;
+import tools.refinery.interpreter.matchers.planning.helpers.TypeHelper;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryMetaContext;
+import tools.refinery.interpreter.matchers.psystem.ITypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.TypeJudgement;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory;
 
 /**
  * A disjunction rewriter for creating a normalized form of specification, unifying variables and running basic sanity
  * checks. This rewriter does not copy but modifies directly the original specification, requiring a mutable
  * disjunction.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public class PBodyNormalizer extends PDisjunctionRewriter {
 
@@ -58,7 +58,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
     /**
      * Returns whether unary constraint elimination is enabled. This behavior can be customized by creating a subclass
      * with a custom implementation.
-     * 
+     *
      * @since 1.6
      */
     protected boolean shouldCalculateImpliedTypes(PQuery query) {
@@ -66,10 +66,10 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
     }
 
     /**
-     * Returns whether 'weakened alternative' suggestions of the context shall be expanded as additional PConstraints. 
+     * Returns whether 'weakened alternative' suggestions of the context shall be expanded as additional PConstraints.
      * This behavior can be customized by creating a subclass
      * with a custom implementation.
-     * 
+     *
      * @since 1.6
      */
     protected boolean shouldExpandWeakenedAlternatives(PQuery query) {
@@ -96,7 +96,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
     /**
      * Provides a normalized version of the pattern body. May return a different version than the original version if
      * needed.
-     * 
+     *
      * @param body
      */
     public PBody normalizeBody(PBody body) {
@@ -118,7 +118,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
         if (shouldExpandWeakenedAlternatives(body.getPattern())) {
             expandWeakenedAlternativeConstraints(body);
         }
-        
+
         // CONSTRAINT ELIMINATION WITH TYPE INFERENCE
         if (shouldCalculateImpliedTypes(body.getPattern())) {
             eliminateInferrableTypes(body, context);
@@ -127,12 +127,12 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
             eliminateDuplicateTypeConstraints(body);
         }
 
-        
+
         // PREVENTIVE CHECKS
         checkSanity(body);
         return body;
     }
-    
+
     private void removeMootEqualities(PBody body) {
         Set<Equality> equals = body.getConstraintsOfType(Equality.class);
         for (Equality equality : equals) {
@@ -145,7 +145,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
 
     /**
      * Unifies allVariables along equalities so that they can be handled as one.
-     * 
+     *
      * @param body
      */
     void unifyVariablesAlongEqualities(PBody body) {
@@ -159,7 +159,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
 
     /**
      * Eliminates weak inequalities if they are not substantiated.
-     * 
+     *
      * @param body
      */
     void eliminateWeakInequalities(PBody body) {
@@ -191,13 +191,13 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
         Comparator<ITypeConstraint> eliminationOrder = (o1, o2) -> {
             IInputKey type1 = o1.getEquivalentJudgement().getInputKey();
             IInputKey type2 = o2.getEquivalentJudgement().getInputKey();
-            
+
             int result = context.getSuggestedEliminationOrdering().compare(type1, type2);
-            return (result == 0) 
-                    ? PConstraint.COMPARE_BY_MONOTONOUS_ID.compare(o1, o2) 
+            return (result == 0)
+                    ? PConstraint.COMPARE_BY_MONOTONOUS_ID.compare(o1, o2)
                     : result;
-        }; 
-                
+        };
+
         Collections.sort(allTypeConstraints, eliminationOrder);
         Queue<ITypeConstraint> potentialConstraints = allTypeConstraints; // rename for better comprehension
 
@@ -235,14 +235,14 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
         Set<TypeJudgement> newJudgementsToAdd = new HashSet<TypeJudgement>();
         Queue<TypeJudgement> judgementsToProcess = new LinkedList<TypeJudgement>();
         Map<TypeJudgement, List<PConstraint>> traceability = CollectionsFactory.createMap();
-        
+
         for (ITypeConstraint typeConstraint : body.getConstraintsOfType(ITypeConstraint.class)) {
             TypeJudgement equivalentJudgement = typeConstraint.getEquivalentJudgement();
             judgementsToProcess.add(equivalentJudgement);
             allJudgements.add(equivalentJudgement);
             traceability.computeIfAbsent(equivalentJudgement, k-> new ArrayList<>()).add(typeConstraint);
         }
-        
+
         while (!judgementsToProcess.isEmpty()) {
             TypeJudgement judgement = judgementsToProcess.poll();
             for (TypeJudgement alternativeJudgement : judgement.getWeakenedAlternativeJudgements(context)) {
@@ -250,22 +250,22 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
                     newJudgementsToAdd.add(alternativeJudgement);
                     judgementsToProcess.add(alternativeJudgement);
                     traceability.merge(
-                            alternativeJudgement, 
+                            alternativeJudgement,
                             traceability.getOrDefault(judgement, new ArrayList<>()),
                             (old,further) -> {old.addAll(further); return old;}
                     );
                 }
             }
         }
-        
+
         for (TypeJudgement typeJudgement : newJudgementsToAdd) {
             PConstraint newConstraint = typeJudgement.createConstraintFor(body);
             for (PConstraint source : traceability.getOrDefault(typeJudgement, Collections.emptyList())) {
                 addTrace(source, newConstraint);
             }
-        }        
+        }
     }
-    
+
     private Object getConstraintKey(PConstraint constraint) {
         if (constraint instanceof ITypeConstraint) {
             return ((ITypeConstraint) constraint).getEquivalentJudgement();
@@ -273,7 +273,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
         // Do not check duplication for any other types
         return constraint;
     }
-    
+
     void eliminateDuplicateTypeConstraints(PBody body) {
         Map<Object, PConstraint> constraints = new HashMap<>();
         for (PConstraint constraint : body.getConstraints()) {
@@ -286,7 +286,7 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
 
         // Retain collected constraints, remove everything else
         Iterator<PConstraint> iterator = body.getConstraints().iterator();
-        Collection<PConstraint> toRetain = constraints.values(); 
+        Collection<PConstraint> toRetain = constraints.values();
         while(iterator.hasNext()){
             PConstraint next = iterator.next();
             if (!toRetain.contains(next)){
@@ -295,10 +295,10 @@ public class PBodyNormalizer extends PDisjunctionRewriter {
             }
         }
     }
-    
+
     /**
      * Verifies the sanity of all constraints. Should be issued as a preventive check before layouting.
-     * 
+     *
      * @param body
      * @throws RetePatternBuildException
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PDisjunctionRewriter.java
index c844ccf7..8eea0585 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PDisjunctionRewriter.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * An abstract base class for creating alternative representations for PDisjunctions.
@@ -17,11 +17,11 @@ import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
  *
  */
 public abstract class PDisjunctionRewriter extends AbstractRewriterTraceSource{
-    
+
     public abstract PDisjunction rewrite(PDisjunction disjunction);
-    
+
     public PDisjunction rewrite(PQuery query) {
         return rewrite(query.getDisjunctBodies());
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java
index eb5422ca..58491961 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,11 +14,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.WeakHashMap;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
 
 /**
  * A rewriter that stores the previously computed results of a rewriter or a rewriter chain.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.0
  */
@@ -34,19 +34,19 @@ public class PDisjunctionRewriterCacher extends PDisjunctionRewriter {
             rewriter.setTraceCollector(collector);
         }
     }
-    
+
     public PDisjunctionRewriterCacher(PDisjunctionRewriter rewriter) {
         rewriterChain = Collections.singletonList(rewriter);
     }
-    
+
     public PDisjunctionRewriterCacher(PDisjunctionRewriter... rewriters) {
         rewriterChain = new ArrayList<>(Arrays.asList(rewriters));
     }
-    
+
     public PDisjunctionRewriterCacher(List<PDisjunctionRewriter> rewriterChain) {
         this.rewriterChain = new ArrayList<>(rewriterChain);
     }
-    
+
     @Override
     public PDisjunction rewrite(PDisjunction disjunction) {
         if (!cachedResults.containsKey(disjunction)) {
@@ -55,10 +55,10 @@ public class PDisjunctionRewriterCacher extends PDisjunctionRewriter {
             for (PDisjunctionRewriter rewriter : rewriterChain) {
                 rewritten = rewriter.rewrite(rewritten);
             }
-            
+
             cachedResults.put(disjunction, rewritten);
         }
         return cachedResults.get(disjunction);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PQueryFlattener.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PQueryFlattener.java
index 76311d8f..d1447199 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PQueryFlattener.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/PQueryFlattener.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -20,30 +20,28 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.AllowAllFilter;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.ExportedParameterFilter;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.HierarchicalName;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.SameName;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
-import tools.refinery.viatra.runtime.matchers.util.Sets;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IConstraintFilter.AllowAllFilter;
+import tools.refinery.interpreter.matchers.psystem.rewriters.IConstraintFilter.ExportedParameterFilter;
+import tools.refinery.interpreter.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.util.Sets;
 
 /**
  * This rewriter class holds the query flattening logic
- * 
+ *
  * @author Marton Bur
- * 
+ *
  */
 public class PQueryFlattener extends PDisjunctionRewriter {
 
     /**
      * Utility function to produce the permutation of every possible mapping of values.
-     * 
+     *
      * @param values
      * @return
      */
@@ -98,7 +96,7 @@ public class PQueryFlattener extends PDisjunctionRewriter {
 
     /**
      * Return the list of dependencies (including the root) in chronological order
-     * 
+     *
      * @param rootDisjunction
      * @return
      */
@@ -131,13 +129,13 @@ public class PQueryFlattener extends PDisjunctionRewriter {
         // Remove duplicates (keeping the last instance) and reverse order
         Set<PDisjunction> visited = new HashSet<PDisjunction>();
         List<PDisjunction> result = new ArrayList<PDisjunction>(list.size());
-        
+
         list.descendingIterator().forEachRemaining(item -> {
             if (!visited.contains(item)) {
                 result.add(item);
                 visited.add(item);
             }
-            
+
         });
 
         return result;
@@ -145,7 +143,7 @@ public class PQueryFlattener extends PDisjunctionRewriter {
 
     /**
      * This function holds the actual flattening logic for a PQuery
-     * 
+     *
      * @param rootDisjunction
      *            to be flattened
      * @return the flattened bodies of the pQuery
@@ -189,7 +187,7 @@ public class PQueryFlattener extends PDisjunctionRewriter {
 
     /**
      * Creates the flattened bodies based on the caller body and the called (and already flattened) disjunctions
-     * 
+     *
      * @param pBody
      *            the body to flatten
      * @param flattenedDisjunctions
@@ -209,7 +207,7 @@ public class PQueryFlattener extends PDisjunctionRewriter {
             FlattenerCopier copier = createBodyCopier(pQuery, calledBodies);
 
             int i = 0;
-            HierarchicalName hierarchicalNamingTool = new HierarchicalName();
+            IVariableRenamer.HierarchicalName hierarchicalNamingTool = new IVariableRenamer.HierarchicalName();
             for (PositivePatternCall patternCall : calledBodies.keySet()) {
                 // Merge each called body
                 hierarchicalNamingTool.setCallCount(i++);
@@ -235,7 +233,7 @@ public class PQueryFlattener extends PDisjunctionRewriter {
 
     private PBody prepareFlatPBody(PBody pBody) {
         PBodyCopier copier = createBodyCopier(pBody.getPattern(), Collections.<PositivePatternCall, PBody> emptyMap());
-        copier.mergeBody(pBody, new SameName(), new AllowAllFilter());
+        copier.mergeBody(pBody, new IVariableRenamer.SameName(), new AllowAllFilter());
         // the copying of the body here is necessary for only one containing PDisjunction can be assigned to a PBody
         return copier.getCopiedBody();
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/RewriterException.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/RewriterException.java
index d0fc286b..61b5049b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/RewriterException.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/RewriterException.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
+import tools.refinery.interpreter.matchers.psystem.queries.QueryInitializationException;
 
 /**
  * An exception to wrap various issues during PDisjunction rewriting.
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/SurrogateQueryRewriter.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/SurrogateQueryRewriter.java
index 71459558..6ab2a3de 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/SurrogateQueryRewriter.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/SurrogateQueryRewriter.java
@@ -3,25 +3,25 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.surrogate.SurrogateQueryRegistry;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.surrogate.SurrogateQueryRegistry;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.queries.PDisjunction;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 /**
  * @author Zoltan Ujhelyi
@@ -34,17 +34,17 @@ public class SurrogateQueryRewriter extends PDisjunctionRewriter {
         Set<PBody> replacedBodies = new LinkedHashSet<>();
         for (PBody body : disjunction.getBodies()) {
             PBodyCopier copier = new PBodyCopier(body, getTraceCollector()) {
-                
+
                 @Override
                 protected void copyTypeConstraint(TypeConstraint typeConstraint) {
                     PVariable[] mappedVariables = extractMappedVariables(typeConstraint);
-                    Tuple variablesTuple = Tuples.flatTupleOf((Object[])mappedVariables);       
+                    Tuple variablesTuple = Tuples.flatTupleOf((Object[])mappedVariables);
                     final IInputKey supplierKey = typeConstraint.getSupplierKey();
                     if(SurrogateQueryRegistry.instance().hasSurrogateQueryFQN(supplierKey)) {
                         PQuery surrogateQuery = SurrogateQueryRegistry.instance().getSurrogateQuery(supplierKey);
                         if (surrogateQuery == null) {
                             throw new IllegalStateException(
-                                        String.format("Surrogate query for feature %s not found", 
+                                        String.format("Surrogate query for feature %s not found",
                                                         supplierKey.getPrettyPrintableName()));
                         }
                         addTrace(typeConstraint, new PositivePatternCall(getCopiedBody(), variablesTuple, surrogateQuery));
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java
index e0e17b5e..29920a4d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java
@@ -6,12 +6,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+package tools.refinery.interpreter.matchers.psystem.rewriters;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/AbstractTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/AbstractTuple.java
index a26d9193..854ce717 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/AbstractTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/AbstractTuple.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,7 +19,7 @@ import java.util.Set;
 /**
  * Common implementation methods for immutable and volatile tuples. The class should not be used directly in client
  * code, except for the definition of new tuple implementations.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  */
@@ -27,7 +27,7 @@ public abstract class AbstractTuple implements ITuple {
 
     /**
      * As the tuple is supposed to be immutable, do not modify the returned array.
-     * 
+     *
      * @return the array containing all elements of this Tuple
      */
     @Override
@@ -55,7 +55,7 @@ public abstract class AbstractTuple implements ITuple {
     /**
      * Calculates an inverted index of the elements of this pattern. For each element, the index of the (last)
      * occurrence is calculated.
-     * 
+     *
      * @return the inverted index mapping each element of this pattern to its index in the array
      */
     @Override
@@ -69,7 +69,7 @@ public abstract class AbstractTuple implements ITuple {
     /**
      * Calculates an inverted index of the elements of this pattern. For each element, the index of all of its
      * occurrences is calculated.
-     * 
+     *
      * @return the inverted index mapping each element of this pattern to its index in the array
      */
     @Override
@@ -133,4 +133,4 @@ public abstract class AbstractTuple implements ITuple {
         return hash;
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseFlatTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/BaseFlatTuple.java
index 6f46b763..3c13e0fd 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseFlatTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/BaseFlatTuple.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Base class for all flat tuple implementations.
  * Flat tuples store all elements locally (do not reference other tuples).
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseLeftInheritanceTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/BaseLeftInheritanceTuple.java
index 03f9ea89..5a6b7564 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseLeftInheritanceTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/BaseLeftInheritanceTuple.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Common functionality of left inheritance tuple implementations.
- * 
- * <p>Left inheritance tuples inherit their first few elements from another tuple, 
+ *
+ * <p>Left inheritance tuples inherit their first few elements from another tuple,
  * and extend it with additional "local" elements.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  */
@@ -27,7 +27,7 @@ public abstract class BaseLeftInheritanceTuple extends Tuple {
      * This object contains the same elements as the ancestor on the first inheritedIndex positions
      */
     protected final Tuple ancestor;
-    
+
     /**
      * @param ancestor
      */
@@ -41,10 +41,10 @@ public abstract class BaseLeftInheritanceTuple extends Tuple {
      * @return the number of local (non-inherited) elements
      */
     public abstract int getLocalSize();
-    
+
     /**
      * Optimized equals calculation (prediction: true, since hash values match)
-     */    
+     */
     @Override
     protected boolean internalEquals(ITuple other) {
         if (other instanceof BaseLeftInheritanceTuple) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple.java
index 8bbb0ac2..c28d55db 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Arrays;
 
 /**
  * Default Tuple implementation, with statically unknown arity.
- * @author Gabor Bergmann 
+ * @author Gabor Bergmann
  */
 public final class FlatTuple extends BaseFlatTuple {
 
@@ -25,9 +25,9 @@ public final class FlatTuple extends BaseFlatTuple {
     /**
      * Creates a FlatTuple instance, fills it with the given array.
      * <p> Users should consider calling {@link Tuples#flatTupleOf(Object...)} instead to save memory on low-arity tuples.
-     * 
+     *
      * @param elements
-     *            array of substitution values 
+     *            array of substitution values
      */
     protected FlatTuple(Object... elements) {
         this.elements = Arrays.copyOf(elements, elements.length);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple0.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple0.java
index 93f412b7..4b5d507a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple0.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple0.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Flat tuple with statically known arity of 0.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  *
@@ -21,7 +21,7 @@ public final class FlatTuple0 extends BaseFlatTuple {
     private FlatTuple0() {
         calcHash();
     }
-    
+
     @Override
     public int getSize() {
         return 0;
@@ -33,12 +33,12 @@ public final class FlatTuple0 extends BaseFlatTuple {
     }
 
     private static final Object[] NULLARY_ARRAY = new Object[0];
-    
+
     @Override
     public Object[] getElements() {
         return NULLARY_ARRAY;
     }
-    
+
     @Override
     protected boolean internalEquals(ITuple other) {
         return 0 == other.getSize();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple1.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple1.java
index b3b1c312..1ab6a379 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple1.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple1.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
 /**
  * Flat tuple with statically known arity of 1.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  *
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple2.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple2.java
index 2dcfd718..0e128013 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple2.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple2.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
 /**
  * Flat tuple with statically known arity of 2.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  *
@@ -40,7 +40,7 @@ public final class FlatTuple2 extends BaseFlatTuple {
         default: throw raiseIndexingError(index);
         }
     }
-    
+
     @Override
     protected boolean internalEquals(ITuple other) {
         return 2 == other.getSize() &&
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple3.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple3.java
index 50cee57e..d44f06f9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple3.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple3.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
 /**
  * Flat tuple with statically known arity of 3.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  *
@@ -21,7 +21,7 @@ public final class FlatTuple3 extends BaseFlatTuple {
     private final Object element0;
     private final Object element1;
     private final Object element2;
-    
+
     protected FlatTuple3(Object element0, Object element1, Object element2) {
         this.element0 = element0;
         this.element1 = element1;
@@ -43,7 +43,7 @@ public final class FlatTuple3 extends BaseFlatTuple {
         default: throw raiseIndexingError(index);
         }
     }
-    
+
     @Override
     protected boolean internalEquals(ITuple other) {
         return 3 == other.getSize() &&
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple4.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple4.java
index 024c94f4..cd88f3dc 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple4.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/FlatTuple4.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
 /**
  * Flat tuple with statically known arity of 4.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  *
@@ -30,7 +30,7 @@ public final class FlatTuple4 extends BaseFlatTuple {
         this.element3 = element3;
         calcHash();
     }
-    
+
     @Override
     public int getSize() {
         return 4;
@@ -46,7 +46,7 @@ public final class FlatTuple4 extends BaseFlatTuple {
         default: throw raiseIndexingError(index);
         }
     }
-    
+
     @Override
     protected boolean internalEquals(ITuple other) {
         return 4 == other.getSize() &&
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/IModifiableTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/IModifiableTuple.java
index f5dab2a5..7719e6bc 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/IModifiableTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/IModifiableTuple.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * A tuple that allows modifying the underlying value. Should not be used for non-volatile tuples.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  */
@@ -18,9 +18,9 @@ public interface IModifiableTuple extends ITuple {
 
     /**
      * Sets the selected value for a tuple
-     * 
+     *
      * @pre: 0 <= index < getSize()
-     * 
+     *
      */
     void set(int index, Object value);
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/ITuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/ITuple.java
index 92014781..8394163f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/ITuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/ITuple.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.List;
 import java.util.Map;
@@ -14,7 +14,7 @@ import java.util.Set;
 
 /**
  * Represents both mutable and immutable tuples
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  *
@@ -23,7 +23,7 @@ public interface ITuple {
 
     /**
      * @pre: 0 <= index < getSize()
-     * 
+     *
      * @return the element at the specified index
      */
     Object get(int index);
@@ -43,11 +43,11 @@ public interface ITuple {
      * @return number of elements
      */
     int getSize();
-    
+
     /**
      * Calculates an inverted index of the elements of this pattern. For each element, the index of the (last)
      * occurrence is calculated.
-     * 
+     *
      * @return the inverted index mapping each element of this pattern to its index in the array
      */
     Map<Object, Integer> invertIndex();
@@ -55,10 +55,10 @@ public interface ITuple {
     /**
      * Calculates an inverted index of the elements of this pattern. For each element, the index of all of its
      * occurrences is calculated.
-     * 
+     *
      * @return the inverted index mapping each element of this pattern to its index in the array
      */
     Map<Object, List<Integer>> invertIndexWithMupliplicity();
 
     Tuple toImmutable();
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple.java
index dcdfc376..92ca62b2 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Arrays;
 import java.util.Objects;
 
 /**
- * 
+ *
  * Tuple that inherits another tuple on the left.
- * 
+ *
  * @author Gabor Bergmann
- * 
+ *
  */
 public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
     /**
@@ -39,14 +39,14 @@ public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
     // calcHash();
     // }
 
-    
-    
+
+
     /**
      * Creates a Tuple instance, lets it inherit from an ancestor, extends it with a given array. @pre: no elements are
      * null
-     * 
+     *
      * @param localElements
-     *            array of substitution values 
+     *            array of substitution values
      */
     LeftInheritanceTuple(Tuple ancestor, Object[] localElements) {
         super(ancestor);
@@ -105,7 +105,7 @@ public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
     public int getSize() {
         return inheritedIndex + localElements.length;
     }
-    
+
     @Override
     public int getLocalSize() {
         return localElements.length;
@@ -113,7 +113,7 @@ public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
 
     /**
      * @pre: 0 <= index < getSize()
-     * 
+     *
      * @return the element at the specified index
      */
     public Object get(int index) {
@@ -137,7 +137,7 @@ public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
 
     /**
      * Optimized equals calculation (prediction: true, since hash values match)
-     */    
+     */
     @Override
     protected boolean localEquals(BaseLeftInheritanceTuple other) {
         if (other instanceof LeftInheritanceTuple) {
@@ -148,7 +148,7 @@ public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
                 return false;
             int index = inheritedIndex;
             for (int i = 0; i<localElements.length; ++i) {
-                if (! Objects.equals(localElements[i], other.get(index++))) 
+                if (! Objects.equals(localElements[i], other.get(index++)))
                     return false;
             }
             return true;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple1.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple1.java
index 61123176..a4df4781 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple1.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple1.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
@@ -16,7 +16,7 @@ import java.util.Objects;
  */
 public final class LeftInheritanceTuple1 extends BaseLeftInheritanceTuple {
     /**
-     * A single substituted value after inheritedIndex. 
+     * A single substituted value after inheritedIndex.
      */
     private final Object localElement;
 
@@ -29,7 +29,7 @@ public final class LeftInheritanceTuple1 extends BaseLeftInheritanceTuple {
         this.localElement = localElement;
         calcHash();
     }
-    
+
     /**
      * @return number of elements
      */
@@ -44,12 +44,12 @@ public final class LeftInheritanceTuple1 extends BaseLeftInheritanceTuple {
 
     /**
      * @pre: 0 <= index < getSize()
-     * 
+     *
      * @return the element at the specified index
      */
     public Object get(int index) {
         int local = index - inheritedIndex;
-        if (local < 0) 
+        if (local < 0)
             return ancestor.get(index);
         else if (local == 0) return localElement;
         else throw raiseIndexingError(index);
@@ -68,14 +68,14 @@ public final class LeftInheritanceTuple1 extends BaseLeftInheritanceTuple {
 
     /**
      * Optimized equals calculation (prediction: true, since hash values match)
-     */    
+     */
     @Override
     protected boolean localEquals(BaseLeftInheritanceTuple other) {
         if (other instanceof LeftInheritanceTuple1) {
             LeftInheritanceTuple1 lit = (LeftInheritanceTuple1)other;
             return Objects.equals(this.localElement, lit.localElement);
         } else {
-            return (1 == other.getLocalSize()) && 
+            return (1 == other.getLocalSize()) &&
                     Objects.equals(localElement, other.get(inheritedIndex));
         }
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple2.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple2.java
index e9fb98e8..af5f2d0a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple2.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple2.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
@@ -17,7 +17,7 @@ import java.util.Objects;
 public final class LeftInheritanceTuple2 extends BaseLeftInheritanceTuple {
     private final Object localElement0;
     private final Object localElement1;
-    
+
     protected LeftInheritanceTuple2(Tuple ancestor, Object localElement0, Object localElement1) {
         super(ancestor);
         this.localElement0 = localElement0;
@@ -29,7 +29,7 @@ public final class LeftInheritanceTuple2 extends BaseLeftInheritanceTuple {
     public int getLocalSize() {
         return 2;
     }
-    
+
     @Override
     public int getSize() {
         return inheritedIndex + 2;
@@ -38,7 +38,7 @@ public final class LeftInheritanceTuple2 extends BaseLeftInheritanceTuple {
     @Override
     public Object get(int index) {
         int local = index - inheritedIndex;
-        if (local < 0) 
+        if (local < 0)
             return ancestor.get(index);
         else if (local == 0) return localElement0;
         else if (local == 1) return localElement1;
@@ -65,8 +65,8 @@ public final class LeftInheritanceTuple2 extends BaseLeftInheritanceTuple {
             return Objects.equals(this.localElement0, lit.localElement0) &&
                     Objects.equals(this.localElement1, lit.localElement1);
         } else {
-            return (2 == other.getLocalSize()) && 
-                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
+            return (2 == other.getLocalSize()) &&
+                    Objects.equals(localElement0, other.get(inheritedIndex)) &&
                     Objects.equals(localElement1, other.get(inheritedIndex + 1));
         }
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple3.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple3.java
index e61d196f..108e011f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple3.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple3.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
@@ -26,12 +26,12 @@ public final class LeftInheritanceTuple3 extends BaseLeftInheritanceTuple {
         this.localElement2 = localElement2;
         calcHash();
     }
-    
+
     @Override
     public int getLocalSize() {
         return 3;
     }
-    
+
     @Override
     public int getSize() {
         return inheritedIndex + 3;
@@ -40,7 +40,7 @@ public final class LeftInheritanceTuple3 extends BaseLeftInheritanceTuple {
     @Override
     public Object get(int index) {
         int local = index - inheritedIndex;
-        if (local < 0) 
+        if (local < 0)
             return ancestor.get(index);
         else if (local == 0) return localElement0;
         else if (local == 1) return localElement1;
@@ -71,11 +71,11 @@ public final class LeftInheritanceTuple3 extends BaseLeftInheritanceTuple {
                     Objects.equals(this.localElement1, lit.localElement1) &&
                     Objects.equals(this.localElement2, lit.localElement2);
         } else {
-            return (3 == other.getLocalSize()) && 
-                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
-                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) && 
+            return (3 == other.getLocalSize()) &&
+                    Objects.equals(localElement0, other.get(inheritedIndex)) &&
+                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) &&
                     Objects.equals(localElement2, other.get(inheritedIndex + 2));
         }
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple4.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple4.java
index 4e50f1e1..793c4e3a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple4.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/LeftInheritanceTuple4.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Objects;
 
@@ -34,7 +34,7 @@ public final class LeftInheritanceTuple4 extends BaseLeftInheritanceTuple {
     public int getLocalSize() {
         return 4;
     }
-    
+
     @Override
     public int getSize() {
         return inheritedIndex + 4;
@@ -43,7 +43,7 @@ public final class LeftInheritanceTuple4 extends BaseLeftInheritanceTuple {
     @Override
     public Object get(int index) {
         int local = index - inheritedIndex;
-        if (local < 0) 
+        if (local < 0)
             return ancestor.get(index);
         else if (local == 0) return localElement0;
         else if (local == 1) return localElement1;
@@ -78,10 +78,10 @@ public final class LeftInheritanceTuple4 extends BaseLeftInheritanceTuple {
                     Objects.equals(this.localElement2, lit.localElement2) &&
                     Objects.equals(this.localElement3, lit.localElement3);
         } else {
-            return (4 == other.getLocalSize()) && 
-                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
-                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) && 
-                    Objects.equals(localElement2, other.get(inheritedIndex + 2)) && 
+            return (4 == other.getLocalSize()) &&
+                    Objects.equals(localElement0, other.get(inheritedIndex)) &&
+                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) &&
+                    Objects.equals(localElement2, other.get(inheritedIndex + 2)) &&
                     Objects.equals(localElement3, other.get(inheritedIndex + 3));
         }
     }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/MaskedTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/MaskedTuple.java
index a5d1991c..fdc92b71 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/MaskedTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/MaskedTuple.java
@@ -3,18 +3,18 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * A tuple that transparently provides a masked (transformed) view of another tuple.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
- * 
+ *
  */
 public class MaskedTuple extends Tuple {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/Tuple.java
index d94f545f..a3d2745a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/Tuple.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Immutable tuple. Obtain instances via utility class {@link Tuples}.
  * @author Gabor Bergmann
- * 
+ *
  */
 public abstract class Tuple extends AbstractTuple {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMask.java
index 49c55fef..bc31c747 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMask.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,10 +19,10 @@ import java.util.OptionalInt;
 import java.util.Set;
 
 /**
- * 
+ *
  * Specifies select indices of a tuple. If viewed through this mask (see {@link #transform(ITuple)}), the signature of the pattern will consist of its
  * individual substitutions at the given positions, in the exact same order as they appear in indices[].
- * 
+ *
  * @author Gabor Bergmann
  */
 public class TupleMask {
@@ -36,11 +36,11 @@ public class TupleMask {
      */
     public int sourceWidth;
     /**
-     * indicesSorted is indices, sorted in ascending order. 
+     * indicesSorted is indices, sorted in ascending order.
      * null by default, call {@link #ensureIndicesSorted()} before using
      */
     int[] indicesSorted;
-    
+
     /**
      * true if no index occurs twice; computed on demand by {@link #isNonrepeating()}
      */
@@ -57,21 +57,21 @@ public class TupleMask {
         this.indicesSorted = indicesSorted;
         this.isNonrepeating = isNonrepeating;
     }
-    
+
     /**
      * Creates a TupleMask instance that selects given positions.
      * The mask takes ownership of the array selectedIndices, the client must not modify it afterwards.
-     * 
+     *
      * <p> indicesSorted and isNonrepeating may be OPTIONALLY given if known.
      * @since 2.0
      */
     protected static TupleMask fromSelectedIndicesInternal(
             int[] selectedIndices, int sourceArity,
-            int[] indicesSorted, Boolean isNonrepeating) 
+            int[] indicesSorted, Boolean isNonrepeating)
     {
         if (selectedIndices.length == 0) // is it nullary?
             return new TupleMask0(sourceArity);
-        
+
         // is it identity?
         boolean identity = sourceArity == selectedIndices.length;
         if (identity) {
@@ -80,15 +80,15 @@ public class TupleMask {
                     identity = false;
                     break;
                 }
-            }            
+            }
         }
         if (identity)
             return new TupleMaskIdentity(selectedIndices, sourceArity);
-         
+
         // generic case
         return new TupleMask(selectedIndices, sourceArity, indicesSorted, isNonrepeating);
     }
-    
+
     /**
      * Creates a TupleMask instance that selects given positions in monotonically increasing order.
      * The mask takes ownership of the array selectedIndices, the client must not modify it afterwards.
@@ -123,7 +123,7 @@ public class TupleMask {
      * Creates a TupleMask instance of the given size that maps every single element intact
      */
     public static TupleMask identity(int size) {
-        return new TupleMaskIdentity(size);   
+        return new TupleMaskIdentity(size);
     }
 
     /**
@@ -147,7 +147,7 @@ public class TupleMask {
         return fromSelectedMonotonicIndicesInternal(indices, sourceWidth);
     }
 
-    
+
     /**
      * Creates a TupleMask instance that selects positions where keep is true
      * @since 1.7
@@ -165,7 +165,7 @@ public class TupleMask {
                 indices[l++] = k;
         return fromSelectedMonotonicIndicesInternal(indices, keep.length);
     }
-    
+
     /**
      * Creates a TupleMask instance that selects given positions.
      * @since 1.7
@@ -264,9 +264,9 @@ public class TupleMask {
                 indicesSorted[i++] = a;
         }
     }
-    
-    
-    
+
+
+
     /**
      * Returns the first index of the source that is not selected by the mask, or empty if all indices are selected.
      * <p> PRE: mask indices are all different
@@ -274,7 +274,7 @@ public class TupleMask {
      */
     public OptionalInt getFirstOmittedIndex() {
         ensureIndicesSorted();
-        int column = 0; 
+        int column = 0;
         while (column < getSize() && indicesSorted[column] == column) column++;
         if (column < getSourceWidth()) return OptionalInt.of(column);
         else return OptionalInt.empty();
@@ -283,26 +283,26 @@ public class TupleMask {
 
     /**
      * Returns a selected masked value from the selected tuple.
-     * @pre: 0 <= index < getSize() 
+     * @pre: 0 <= index < getSize()
      * @since 1.7
      */
     public Object getValue(ITuple original, int index) {
         return original.get(indices[index]);
     }
-    
+
     /**
      * Sets the selected value in the original tuple based on the mask definition
-     * 
+     *
      * @pre: 0 <= index < getSize()
      * @since 1.7
      */
     public void set(IModifiableTuple tuple, int index, Object value) {
         tuple.set(indices[index], value);
     }
-    
+
     /**
      * Generates an immutable, masked view of the original tuple.
-     * <p> The new tuple will have arity {@link #getSize()}, 
+     * <p> The new tuple will have arity {@link #getSize()},
      *  and will consist of the elements of the original tuple, at positions indicated by this mask.
      * @since 1.7
      */
@@ -325,7 +325,7 @@ public class TupleMask {
             return new FlatTuple(signature);
         }
     }
-    
+
     /**
      * @return true iff no two selected indices are the same
      * @since 2.0
@@ -342,11 +342,11 @@ public class TupleMask {
         }
         return isNonrepeating;
     }
-    
+
     /**
      * Returns a tuple `result` that satisfies `this.transform(result).equals(masked)`. Positions of the result tuple
      * that are not determined this way will be filled with null.
-     * 
+     *
      * @pre: all indices of the mask must be different, i.e {@link #isNonrepeating()} must return true
      * @since 1.7
      */
@@ -356,14 +356,14 @@ public class TupleMask {
             signature[indices[i]] = masked.get(i);
         return Tuples.flatTupleOf(signature);
     }
-    
+
     /**
-     * Returns a tuple `result`, same arity as the original tuple, that satisfies 
-     *   `this.transform(result).equals(this.transform(tuple))`. 
-     * Positions of the result tuple that are not determined this way will be filled with null. 
-     * <p> In other words, a copy of the original tuple is returned, 
+     * Returns a tuple `result`, same arity as the original tuple, that satisfies
+     *   `this.transform(result).equals(this.transform(tuple))`.
+     * Positions of the result tuple that are not determined this way will be filled with null.
+     * <p> In other words, a copy of the original tuple is returned,
      *   with null substituted at each position that is <em>not</em> selected by this mask.
-     * 
+     *
      * @pre: all indices of the mask must be different, i.e {@link #isNonrepeating()} must return true
      * @since 2.1
      */
@@ -376,7 +376,7 @@ public class TupleMask {
 
     /**
      * Generates an immutable, masked view of the original tuple.
-     * <p> The list will have arity {@link #getSize()}, 
+     * <p> The list will have arity {@link #getSize()},
      *  and will consist of the elements of the original tuple, at positions indicated by this mask.
      */
     public <T> List<T> transform(List<T> original) {
@@ -388,7 +388,7 @@ public class TupleMask {
 
     /**
      * Transforms a given mask directly, instead of transforming tuples that were transformed by the other mask.
-     * 
+     *
      * @return a mask that cascades the effects this mask after the mask provided as parameter.
      */
     public TupleMask transform(TupleMask mask) {
@@ -425,9 +425,9 @@ public class TupleMask {
     /**
      * Combines two substitutions. The new pattern will contain all substitutions of masked and unmasked, assuming that
      * the elements of masked indicated by this mask are already matched against unmasked.
-     * 
+     *
      * POST: the result will start with an exact copy of unmasked
-     * 
+     *
      * @param unmasked
      *            primary pattern substitution that is left intact.
      * @param masked
@@ -506,10 +506,10 @@ public class TupleMask {
         s.append(')');
         return s.toString();
     }
-    
+
     /**
      * Returns the size of the masked tuples described by this mask
-     * @since 1.7 
+     * @since 1.7
      */
     public int getSize() {
         return indices.length;
@@ -522,21 +522,21 @@ public class TupleMask {
     public int getSourceWidth() {
         return sourceWidth;
     }
-    
-    
+
+
     /**
      * @return true iff this mask is a no-op
      * @since 2.0
      */
     public boolean isIdentity() {
-        // Contract: if identity mask, a specialized subclass is constructed instead 
+        // Contract: if identity mask, a specialized subclass is constructed instead
         return false;
     }
-    
+
     /**
      * Transforms the given list by applying the mask and putting all results into a set; keeping only a single element
      * in case of the mapping result in duplicate values.
-     * 
+     *
      * @since 1.7
      */
     public <T> Set<T> transformUnique(List<T> original) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask0.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMask0.java
index 5a0c79ff..7e4449fc 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask0.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMask0.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Collections;
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
  * @since 1.7
  */
 public final class TupleMask0 extends TupleMask {
-    
+
     private final static int[] EMPTY_ARRAY = {};
 
     /**
@@ -25,12 +25,12 @@ public final class TupleMask0 extends TupleMask {
     TupleMask0(int sourceWidth) {
         super(EMPTY_ARRAY, sourceWidth, EMPTY_ARRAY, true);
     }
-    
+
     @Override
     public <T> List<T> transform(List<T> original) {
         return Collections.emptyList();
     }
-    
+
     @Override
     public Tuple transform(ITuple original) {
         return Tuples.staticArityFlatTupleOf();
@@ -48,7 +48,7 @@ public final class TupleMask0 extends TupleMask {
         else
             return super.combine(unmasked, masked, useInheritance, asComplementer);
     }
-    
+
     @Override
     public boolean isIdentity() {
         return 0 == sourceWidth;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMaskIdentity.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMaskIdentity.java
index 62746587..a3f78560 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMaskIdentity.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleMaskIdentity.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.List;
 
@@ -27,12 +27,12 @@ public final class TupleMaskIdentity extends TupleMask {
     public <T> List<T> transform(List<T> original) {
         return original;
     }
-    
+
     @Override
     public Tuple transform(ITuple original) {
         return original.toImmutable();
     }
-    
+
     @Override
     public TupleMask transform(TupleMask mask) {
         return mask;
@@ -42,10 +42,10 @@ public final class TupleMaskIdentity extends TupleMask {
     public Tuple revertFrom(ITuple masked) {
         return masked.toImmutable();
     }
-    
+
     @Override
     public boolean isIdentity() {
         return true;
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleValueProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleValueProvider.java
index 79193516..c28cc309 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleValueProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/TupleValueProvider.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
 
 /**
  * @author Zoltan Ujhelyi
@@ -20,7 +20,7 @@ public class TupleValueProvider implements IValueProvider {
 
     final ITuple tuple;
     final Map<String, Integer> indexMapping;
-    
+
     /**
      * Wraps a tuple with an index mapping
      * @param tuple
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuples.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/Tuples.java
index 5e41d7d8..66c3a71f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuples.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/Tuples.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Common static factory utilities for tuples.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  */
@@ -19,20 +19,20 @@ public class Tuples {
     private Tuples() {
         // Empty utility class constructor
     }
-    
+
     /**
-     * Creates a flat tuple consisting of the given elements. 
-     * For low-arity tuples, specialized implementations 
+     * Creates a flat tuple consisting of the given elements.
+     * For low-arity tuples, specialized implementations
      * (such as {@link FlatTuple2}) will be instantiated.
-     * 
-     * <p> In case the exact arity is <i>statically</i> known, 
-     * it may be more efficient for the client to instantiate 
-     * the appropriate specialized implementation 
+     *
+     * <p> In case the exact arity is <i>statically</i> known,
+     * it may be more efficient for the client to instantiate
+     * the appropriate specialized implementation
      * (via {@link #staticArityFlatTupleOf(Object, Object)} etc.
      * or {@link #wideFlatTupleOf(Object...)}),
-     * instead of invoking this method. 
-     * This method does a runtime arity check, and therefore 
-     * also appropriate if the arity is determined at runtime. 
+     * instead of invoking this method.
+     * This method does a runtime arity check, and therefore
+     * also appropriate if the arity is determined at runtime.
      */
     public static Tuple flatTupleOf(Object... elements) {
         switch (elements.length) {
@@ -51,19 +51,19 @@ public class Tuples {
         }
     }
     /**
-     * Creates a left inheritance tuple that extends an ancestor tuple 
-     *  by the given "local" elements. 
-     * For locally low-arity tuples, specialized implementations 
+     * Creates a left inheritance tuple that extends an ancestor tuple
+     *  by the given "local" elements.
+     * For locally low-arity tuples, specialized implementations
      * (such as {@link LeftInheritanceTuple2}) will be instantiated.
-     * 
-     * <p> In case the exact arity is <i>statically</i> known, 
-     * it may be more efficient for the client to instantiate 
-     * the appropriate specialized implementation 
+     *
+     * <p> In case the exact arity is <i>statically</i> known,
+     * it may be more efficient for the client to instantiate
+     * the appropriate specialized implementation
      * (via {@link #staticArityLeftInheritanceTupleOf(Object, Object)} etc.
      * or {@link #wideLeftInheritanceTupleOf(Object...)}),
-     * instead of invoking this method. 
-     * This method does a runtime arity check, and therefore 
-     * also appropriate if the arity is determined at runtime. 
+     * instead of invoking this method.
+     * This method does a runtime arity check, and therefore
+     * also appropriate if the arity is determined at runtime.
      */
     public static Tuple leftInheritanceTupleOf(Tuple ancestor, Object... localElements) {
         switch (localElements.length) {
@@ -83,75 +83,75 @@ public class Tuples {
     }
 
     /**
-     * Creates a flat tuple consisting of no elements. 
+     * Creates a flat tuple consisting of no elements.
      */
     public static Tuple staticArityFlatTupleOf() {
         return FlatTuple0.INSTANCE;
     }
     /**
-     * Creates a flat tuple consisting of the given single element. 
+     * Creates a flat tuple consisting of the given single element.
      */
     public static Tuple staticArityFlatTupleOf(Object element) {
         return new FlatTuple1(element);
     }
     /**
-     * Creates a flat tuple consisting of the given elements. 
+     * Creates a flat tuple consisting of the given elements.
      */
     public static Tuple staticArityFlatTupleOf(Object element0, Object element1) {
         return new FlatTuple2(element0, element1);
     }
     /**
-     * Creates a flat tuple consisting of the given elements. 
+     * Creates a flat tuple consisting of the given elements.
      */
     public static Tuple staticArityFlatTupleOf(Object element0, Object element1, Object element2) {
         return new FlatTuple3(element0, element1, element2);
     }
     /**
-     * Creates a flat tuple consisting of the given elements. 
+     * Creates a flat tuple consisting of the given elements.
      */
     public static Tuple staticArityFlatTupleOf(Object element0, Object element1, Object element2, Object element3) {
         return new FlatTuple4(element0, element1, element2, element3);
     }
     /**
-     * Creates a flat tuple consisting of the given elements. 
-     * <p> Invoke this only if it is statically known that the tuple will be wide. 
+     * Creates a flat tuple consisting of the given elements.
+     * <p> Invoke this only if it is statically known that the tuple will be wide.
      * Otherwise, use {@link #flatTupleOf(Object...)}.
      */
     public static Tuple wideFlatTupleOf(Object... elements) {
         return new FlatTuple(elements);
     }
-    
+
     /**
-     * Creates a left inheritance tuple consisting of the given single local element. 
+     * Creates a left inheritance tuple consisting of the given single local element.
      */
     public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element) {
         return new LeftInheritanceTuple1(ancestor, element);
     }
     /**
-     * Creates a left inheritance tuple consisting of the given local elements. 
+     * Creates a left inheritance tuple consisting of the given local elements.
      */
     public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1) {
         return new LeftInheritanceTuple2(ancestor, element0, element1);
     }
     /**
-     * Creates a left inheritance tuple consisting of the given local elements. 
+     * Creates a left inheritance tuple consisting of the given local elements.
      */
     public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1, Object element2) {
         return new LeftInheritanceTuple3(ancestor, element0, element1, element2);
     }
     /**
-     * Creates a left inheritance tuple consisting of the given local elements. 
+     * Creates a left inheritance tuple consisting of the given local elements.
      */
     public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1, Object element2, Object element3) {
         return new LeftInheritanceTuple4(ancestor, element0, element1, element2, element3);
     }
     /**
-     * Creates a left inheritance tuple consisting of the given local elements. 
-     * <p> Invoke this only if it is statically known that the tuple will be wide. 
+     * Creates a left inheritance tuple consisting of the given local elements.
+     * <p> Invoke this only if it is statically known that the tuple will be wide.
      * Otherwise, use {@link #leftInheritanceTupleOf(Tuple, Object...)}.
      */
     public static Tuple wideLeftInheritanceTupleOf(Tuple ancestor, Object... elements) {
         return new LeftInheritanceTuple(ancestor, elements);
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileMaskedTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileMaskedTuple.java
index f683d544..c47a1b89 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileMaskedTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileMaskedTuple.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * This class provides a volatile tuple view with a given mask of a given tuple instance. If the masked tuple changes,
  * the view updates as well.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  *
@@ -31,14 +31,14 @@ public class VolatileMaskedTuple extends VolatileTuple {
     public VolatileMaskedTuple(TupleMask mask) {
         this(null, mask);
     }
-    
+
     public void updateTuple(ITuple newSource) {
         source = newSource;
     }
-    
+
     @Override
     public Object get(int index) {
-        Preconditions.checkState(source != null, "Source tuple is not set."); 
+        Preconditions.checkState(source != null, "Source tuple is not set.");
         return mask.getValue(source, index);
     }
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileModifiableMaskedTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileModifiableMaskedTuple.java
index 92306c6e..2a388150 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileModifiableMaskedTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileModifiableMaskedTuple.java
@@ -3,12 +3,12 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.interpreter.matchers.util.Preconditions;
 
 /**
  * A masked tuple implementation that allows modifying the backing tuple.
@@ -28,13 +28,13 @@ public class VolatileModifiableMaskedTuple extends VolatileMaskedTuple implement
     public VolatileModifiableMaskedTuple(TupleMask mask) {
         this(null, mask);
     }
-    
+
     @Override
     public void updateTuple(ITuple newSource) {
         Preconditions.checkArgument(newSource instanceof IModifiableTuple, "Provided tuple does not support updates");
         this.updateTuple((IModifiableTuple)newSource);
     }
-    
+
     public void updateTuple(IModifiableTuple newSource) {
         super.updateTuple(newSource);
         modifiableTuple = newSource;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileTuple.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileTuple.java
index 699105a5..2e4e0b9d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileTuple.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/tuple/VolatileTuple.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.tuple;
+package tools.refinery.interpreter.matchers.tuple;
 
 /**
  * Mutable tuple without explicit modification commands. In practical terms, the values stored in a volatile tuple can
  * be changed without any notification.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
- * 
+ *
  */
 public abstract class VolatileTuple extends AbstractTuple {
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Accuracy.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Accuracy.java
index 338990ab..8c1dfca4 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Accuracy.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Accuracy.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * The degree of accuracy of a cardinality estimate
@@ -18,7 +18,7 @@ public enum Accuracy {
     BEST_UPPER_BOUND,
     BEST_LOWER_BOUND,
     APPROXIMATION;
-    
+
     /**
      * Partial order comparison.
      */
@@ -26,14 +26,14 @@ public enum Accuracy {
         switch (this) {
         case EXACT_COUNT: return true;
         case APPROXIMATION: return APPROXIMATION == other;
-        case BEST_UPPER_BOUND: return BEST_UPPER_BOUND == other || APPROXIMATION == other; 
-        case BEST_LOWER_BOUND: return BEST_LOWER_BOUND == other || APPROXIMATION == other; 
+        case BEST_UPPER_BOUND: return BEST_UPPER_BOUND == other || APPROXIMATION == other;
+        case BEST_LOWER_BOUND: return BEST_LOWER_BOUND == other || APPROXIMATION == other;
         default: throw new IllegalArgumentException();
         }
     }
-    
+
     /**
-     * @return another accuracy value that is anti-monotonic to this one, 
+     * @return another accuracy value that is anti-monotonic to this one,
      * i.e. an accuracy that should be used in the denominator to obtain a fraction with this accuracy
      */
     public Accuracy reciprocal() {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Clearable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Clearable.java
index 1b09aec6..5291cd28 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Clearable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Clearable.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * @author Gabor Bergmann
@@ -17,7 +17,7 @@ package tools.refinery.viatra.runtime.matchers.util;
 public interface Clearable {
     /**
      * Clear all partial matchings stored in memory
-     * 
+     *
      */
     void clear();
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/CollectionsFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/CollectionsFactory.java
index 590a1ec3..c1ede988 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/CollectionsFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/CollectionsFactory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,12 +16,12 @@ import java.util.TreeMap;
 import java.util.function.Function;
 
 /**
- * Factory class used as an accessor to Collections implementations. 
+ * Factory class used as an accessor to Collections implementations.
  * @author istvanrath
  */
 public final class CollectionsFactory
 {
-    
+
     /**
      * Instantiates a new empty map.
      * @since 1.7
@@ -37,15 +37,15 @@ public final class CollectionsFactory
     public static <K, V> Map<K, V> createMap(Map<K, V> initial) {
         return FRAMEWORK.createMap(initial);
     }
-    
+
     /**
-     * Instantiates a new tree map. 
+     * Instantiates a new tree map.
      * @since 2.3
      */
     public static <K, V> TreeMap<K, V> createTreeMap() {
         return FRAMEWORK.createTreeMap();
     }
-    
+
     /**
      * Instantiates a new empty set.
      * @since 1.7
@@ -65,7 +65,7 @@ public final class CollectionsFactory
     /**
      * Instantiates an empty set; the key parameter is used to allow using this as a method reference as a
      * {@link Function}, e.g. in {@link Map#computeIfAbsent(Object, Function)}.
-     * 
+     *
      * @param key
      *            the value of this parameter is ignored
      * @since 2.0
@@ -85,7 +85,7 @@ public final class CollectionsFactory
     /**
      * Instantiates an empty multiset; the key parameter is used to allow using this as a method reference as a
      * {@link Function}, e.g. in {@link Map#computeIfAbsent(Object, Function)}.
-     * 
+     *
      * @param key
      *            the value of this parameter is ignored
      * @since 2.0
@@ -93,7 +93,7 @@ public final class CollectionsFactory
     public static <T> IMultiset<T> emptyMultiset(Object key) {
         return FRAMEWORK.createMultiset();
     }
-    
+
     /**
      * Instantiates a new empty delta bag.
      * @since 1.7
@@ -109,11 +109,11 @@ public final class CollectionsFactory
     public static <O> List<O> createObserverList() {
         return FRAMEWORK.createObserverList();
     }
-    
+
     /**
      * Instantiates a size-optimized multimap from keys to sets of values.
      * <p>For a single key, many values can be associated according to the given bucket semantics.
-     * <p>The keys and values are stored as type fromKeys resp. ofValues; 
+     * <p>The keys and values are stored as type fromKeys resp. ofValues;
      *  currently Object.class and Long.class are supported.
      * @since 2.0
      */
@@ -121,11 +121,11 @@ public final class CollectionsFactory
             Class<? super K> fromKeys, MemoryType toBuckets, Class<? super V> ofValues) {
         return FRAMEWORK.createMultiLookup(fromKeys, toBuckets, ofValues);
     }
-    
+
     /**
      * Instantiates a memory storing values.
      * <p>For a single key, many values can be associated according to the given memory semantics.
-     * <p>The values are stored as type 'values'; 
+     * <p>The values are stored as type 'values';
      *  currently Object.class and Long.class are supported.
      * @since 2.0
      */
@@ -133,7 +133,7 @@ public final class CollectionsFactory
             Class<? super T> values, MemoryType memoryType) {
         return FRAMEWORK.createMemory(values, memoryType);
     }
-    
+
    /**
     * The type of {@link IMemory}
      * @since 2.0
@@ -149,19 +149,19 @@ public final class CollectionsFactory
         */
        MULTISETS
    }
-   
+
     /**
      * The collections framework of the current configuration.
      * @since 1.7
      */
     private static final ICollectionsFramework FRAMEWORK = new EclipseCollectionsFactory();
-    
+
     /**
      * Interface abstracting over a collections technology that provides custom collection implementations.
      * @since 1.7
      */
     public static interface ICollectionsFramework {
-        
+
         public abstract <K,V> Map<K,V> createMap();
         public abstract <K,V> Map<K,V> createMap(Map<K,V> initial);
         /**
@@ -173,7 +173,7 @@ public final class CollectionsFactory
         public abstract <T> IMultiset<T> createMultiset();
         public abstract <T> IDeltaBag<T> createDeltaBag();
         public abstract <O> List<O> createObserverList();
-        
+
         /**
          * @since 2.0
          */
@@ -184,5 +184,5 @@ public final class CollectionsFactory
          */
         public abstract <T> IMemory<T> createMemory(Class<? super T> values, MemoryType memoryType);
     }
-                
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Direction.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Direction.java
index 88f7ec00..18824cbf 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Direction.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Direction.java
@@ -3,14 +3,14 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * Indicates whether a propagated update event signals the insertion or deletion of an element
- * 
+ *
  * @author Gabor Bergmann
  */
 public enum Direction {
@@ -39,14 +39,14 @@ public enum Direction {
             return '-';
         }
     }
-    
+
     /**
      * Returns the direction that is the product of this direction and the other direction.
-     *  
+     *
      * DELETE x DELETE = INSERT
      * DELETE x INSERT = DELETE
      * INSERT x DELETE = DELETE
-     * INSERT x INSERT = INSERT 
+     * INSERT x INSERT = INSERT
      * @since 2.4
      */
     public Direction multiply(final Direction other) {
@@ -57,5 +57,5 @@ public enum Direction {
             return other;
         }
     }
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsBagMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsBagMemory.java
index e24b2448..eded382f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsBagMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsBagMemory.java
@@ -3,11 +3,11 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -17,10 +17,10 @@ import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap;
 
 /**
  * Eclipse Collections-based multiset for tuples. Can contain duplicate occurrences of the same matching.
- * 
- * <p>Inherits Eclipse Collections' Object-to-Int primitive hashmap and counts the number of occurrences of each value. 
+ *
+ * <p>Inherits Eclipse Collections' Object-to-Int primitive hashmap and counts the number of occurrences of each value.
  * Element is deleted if # of occurences drops to 0.
- * 
+ *
  * @author Gabor Bergmann.
  * @since 1.7
  * @noreference
@@ -63,7 +63,7 @@ public abstract class EclipseCollectionsBagMemory<T> extends ObjectIntHashMap<T>
     public String toString() {
         return "TM" + super.toString();
     }
-    
+
     @Override
     public Set<T> distinctValues() {
         return super.keySet();
@@ -73,7 +73,7 @@ public abstract class EclipseCollectionsBagMemory<T> extends ObjectIntHashMap<T>
     public void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
         super.forEachKeyValue(entryConsumer::accept);
     }
-    
+
     @Override
     public int hashCode() {
         return IMemoryView.hashCode(this);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsDeltaBag.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsDeltaBag.java
index 94ec33cd..139145d8 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsDeltaBag.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsDeltaBag.java
@@ -3,37 +3,37 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * @author Gabor Bergmann
  * @since 1.7
  */
 public class EclipseCollectionsDeltaBag<T> extends EclipseCollectionsBagMemory<T> implements IDeltaBag<T> {
-    
+
     @Override
     public boolean addOne(T value) {
         return addSigned(value, +1);
     }
-    
+
     @Override
     public boolean addSigned(T value, int count) {
         int oldCount = super.getIfAbsent(value, 0);
         int newCount = oldCount + count;
-        
+
         boolean becomesZero = newCount == 0;
         if (becomesZero)
             super.removeKey(value);
-        else 
+        else
             super.put(value, newCount);
-       
+
         return becomesZero || oldCount == 0;
     }
-    
-    
+
+
     @Override
     public boolean removeOne(T value) {
         return addSigned(value, -1);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsFactory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsFactory.java
index 5a623c9b..6907df2f 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsFactory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsFactory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,28 +18,26 @@ import java.util.TreeMap;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.impl.factory.Maps;
 import org.eclipse.collections.impl.factory.Sets;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.ICollectionsFramework;
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
 
 /**
  * @author Gabor Bergmann
  * @since 1.7
  * @noreference This class is not intended to be referenced by clients.
  */
-public class EclipseCollectionsFactory implements ICollectionsFramework {
+public class EclipseCollectionsFactory implements CollectionsFactory.ICollectionsFramework {
 
     @Override
     public <K, V> Map<K, V> createMap() {
         return Maps.mutable.empty();
     }
-    
+
     @Override
     public <K, V> Map<K, V> createMap(Map<K, V> initial) {
         MutableMap<K, V> result = Maps.mutable.ofInitialCapacity(initial.size());
         result.putAll(initial);
         return result;
     }
-    
+
     @Override
     public <K, V> TreeMap<K, V> createTreeMap() {
         // eclipse collections is doing the same
@@ -55,30 +53,30 @@ public class EclipseCollectionsFactory implements ICollectionsFramework {
     public <E> Set<E> createSet(Collection<E> initial) {
         return Sets.mutable.ofAll(initial);
     }
-    
+
     @Override
     public <T> IMultiset<T> createMultiset() {
         return new EclipseCollectionsMultiset<T>();
     }
-    
+
     @Override
     public <T> IDeltaBag<T> createDeltaBag() {
         return new EclipseCollectionsDeltaBag<T>();
     }
-    
+
     @Override
     public <O> List<O> createObserverList() {
         return new ArrayList<O>(1); // keep concurrent modification exceptions for error detection
         // Lists.mutable.empty
 
     }
-    
+
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public <K, V> IMultiLookup<K, V> createMultiLookup(
-            Class<? super K> fromKeys, 
-            MemoryType toBuckets,
-            Class<? super V> ofValues) 
+            Class<? super K> fromKeys,
+            CollectionsFactory.MemoryType toBuckets,
+            Class<? super V> ofValues)
     {
         boolean longKeys = Long.class.equals(fromKeys);
         boolean objectKeys = Object.class.equals(fromKeys);
@@ -86,7 +84,7 @@ public class EclipseCollectionsFactory implements ICollectionsFramework {
         boolean longValues = Long.class.equals(ofValues);
         boolean objectValues = Object.class.equals(ofValues);
         if (! (longValues || objectValues)) throw new IllegalArgumentException(ofValues.getName());
-        
+
         if (longKeys) { // K == java.lang.Long
             if (longValues) { // V == java.lang.Long
                 switch(toBuckets) {
@@ -129,10 +127,10 @@ public class EclipseCollectionsFactory implements ICollectionsFramework {
             }
         }
     }
-    
+
     @Override
     @SuppressWarnings("unchecked")
-    public <T> IMemory<T> createMemory(Class<? super T> values, MemoryType memoryType) {
+    public <T> IMemory<T> createMemory(Class<? super T> values, CollectionsFactory.MemoryType memoryType) {
         if (Long.class.equals(values)) { // T == java.lang.Long
             switch(memoryType) {
             case MULTISETS:
@@ -153,7 +151,7 @@ public class EclipseCollectionsFactory implements ICollectionsFramework {
             }
         }
     }
-    
+
 
 
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongMultiset.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsLongMultiset.java
index 88773c5d..b05d8cb7 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongMultiset.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsLongMultiset.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -35,17 +35,17 @@ public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IM
     public boolean addSigned(Long value, int count) {
         int oldCount = super.getIfAbsent(value, 0);
         int newCount = oldCount + count;
-        
+
         boolean becomesZero = newCount == 0;
         if (newCount < 0)
             throw new IllegalStateException(String.format(
-                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s", 
+                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s",
                     count, value, newCount, this));
         else if (becomesZero)
             super.removeKey(value);
         else // (newCount > 0)
             super.put(value, newCount);
-       
+
         return becomesZero || oldCount == 0;
     }
 
@@ -60,8 +60,8 @@ public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IM
     public boolean removeOneOrNop(Long value) {
         return removeOneInternal(value, false);
     }
-    
-    
+
+
     /**
      * @since 2.3
      */
@@ -69,11 +69,11 @@ public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IM
         int oldCount = super.getIfAbsent(value, 0);
         if (oldCount == 0) {
             if (throwIfImpossible) throw new IllegalStateException(String.format(
-                    "Cannot remove value '%s' that is not contained in %s", 
+                    "Cannot remove value '%s' that is not contained in %s",
                     value, this));
             else return false;
         }
-        
+
         int rest = oldCount - 1;
         boolean empty = rest == 0;
 
@@ -104,7 +104,7 @@ public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IM
     public boolean containsNonZero(Long value) {
         return super.containsKey(value);
     }
-    
+
     @Override
     public boolean containsNonZeroUnsafe(Object value) {
         return value instanceof Long && containsNonZero((Long) value);
@@ -137,7 +137,7 @@ public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IM
     public void forEachEntryWithMultiplicities(BiConsumer<Long, Integer> entryConsumer) {
         super.forEachKeyValue(entryConsumer::accept);
     }
-    
+
     @Override
     public int hashCode() {
         return IMemoryView.hashCode(this);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongSetMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsLongSetMemory.java
index ce3efa92..c6f1ae96 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongSetMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsLongSetMemory.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import org.eclipse.collections.api.LongIterable;
 import org.eclipse.collections.api.iterator.LongIterator;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiLookup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsMultiLookup.java
index 394135c9..b9836137 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiLookup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsMultiLookup.java
@@ -6,12 +6,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap;
-import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedMultiset;
-import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedSet;
+import tools.refinery.interpreter.matchers.util.MarkedMemory.MarkedMultiset;
+import tools.refinery.interpreter.matchers.util.MarkedMemory.MarkedSet;
 
 import java.util.Set;
 import java.util.stream.Stream;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiset.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsMultiset.java
index 46977c8b..c9aed507 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiset.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsMultiset.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * @author Gabor Bergmann
@@ -35,31 +35,31 @@ public class EclipseCollectionsMultiset<T> extends EclipseCollectionsBagMemory<T
 
         return oldCount == 0;
     }
-    
+
     @Override
     public boolean addSigned(T value, int count) {
         int oldCount = super.getIfAbsent(value, 0);
         int newCount = oldCount + count;
-        
+
         boolean becomesZero = newCount == 0;
         if (newCount < 0)
             throw new IllegalStateException(String.format(
-                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s", 
+                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s",
                     count, value, newCount, this));
         else if (becomesZero)
             super.removeKey(value);
         else // (newCount > 0)
             super.put(value, newCount);
-       
+
         return becomesZero || oldCount == 0;
     }
-    
-    
+
+
     @Override
     public boolean removeOne(T value) {
         return removeOneInternal(value, true);
     }
-    
+
     @Override
     public boolean removeOneOrNop(T value) {
         return removeOneInternal(value, false);
@@ -72,11 +72,11 @@ public class EclipseCollectionsMultiset<T> extends EclipseCollectionsBagMemory<T
         int oldCount = super.getIfAbsent(value, 0);
         if (oldCount == 0) {
             if (throwIfImpossible) throw new IllegalStateException(String.format(
-                    "Cannot remove value '%s' that is not contained in %s", 
+                    "Cannot remove value '%s' that is not contained in %s",
                     value, this));
             else return false;
         }
-        
+
         int rest = oldCount - 1;
         boolean empty = rest == 0;
 
@@ -88,6 +88,6 @@ public class EclipseCollectionsMultiset<T> extends EclipseCollectionsBagMemory<T
 
         return empty;
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsSetMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsSetMemory.java
index 92f65246..82d255c1 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsSetMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EclipseCollectionsSetMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Set;
 
@@ -29,7 +29,7 @@ public class EclipseCollectionsSetMemory<Value> extends UnifiedSet<Value> implem
     public boolean containsNonZero(Value value) {
         return super.contains(value);
     }
-    
+
     @Override
     public boolean containsNonZeroUnsafe(Object value) {
         return super.contains(value);
@@ -43,16 +43,16 @@ public class EclipseCollectionsSetMemory<Value> extends UnifiedSet<Value> implem
     @Override
     public boolean addSigned(Value value, int count) {
         if (count == 1) return addOne(value);
-        else if (count == -1) return removeOne(value); 
+        else if (count == -1) return removeOne(value);
         else throw new IllegalStateException();
     }
-    
+
     @Override
     public boolean removeOne(Value value) {
         // Kept for binary compatibility
         return ISetMemory.super.removeOne(value);
     }
-    
+
     @Override
     public boolean removeOneOrNop(Value value) {
         return super.remove(value);
@@ -67,20 +67,20 @@ public class EclipseCollectionsSetMemory<Value> extends UnifiedSet<Value> implem
     public Set<Value> distinctValues() {
         return this;
     }
-    
+
     @Override
     public Value theContainedVersionOf(Value value) {
         return super.get(value);
     }
-    
+
     @Override
     @SuppressWarnings("unchecked")
     public Value theContainedVersionOfUnsafe(Object value) {
-        if (super.contains(value)) 
+        if (super.contains(value))
             return super.get((Value)value);
         else return null;
     }
-    
+
     @Override
     public int hashCode() {
         return IMemoryView.hashCode(this);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EmptyMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EmptyMemory.java
index a17b3a3f..9a46b343 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EmptyMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/EmptyMemory.java
@@ -3,17 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 
 /**
- * A singleton immutable empty memory. 
+ * A singleton immutable empty memory.
  * @author Gabor Bergmann
  * @since 2.0
  *
@@ -22,14 +22,14 @@ public class EmptyMemory<T> implements IMemoryView<T> {
 
     @SuppressWarnings("rawtypes")
     private static final EmptyMemory INSTANCE = new EmptyMemory();
-    
+
     @SuppressWarnings("unchecked")
     public static <T> EmptyMemory<T> instance() {
         return INSTANCE;
     }
-    
-    
-    
+
+
+
     /**
      * Singleton; hidden constructor
      */
@@ -76,7 +76,7 @@ public class EmptyMemory<T> implements IMemoryView<T> {
     public Set<T> distinctValues() {
         return Collections.emptySet();
     }
-    
+
     @Override
     public int hashCode() {
         return IMemoryView.hashCode(this);
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ICache.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/ICache.java
index 8c2e54ad..3e9c5770 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ICache.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/ICache.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.function.Supplier;
 
 /**
  * A cache is a simple key-value pair that stores calculated values for specific key objects
- * 
+ *
  * <p>
- * <b>NOTE</b> These caches are not expected to be used outside query backend implementations 
- * 
+ * <b>NOTE</b> These caches are not expected to be used outside query backend implementations
+ *
  * @author Zoltan Ujhelyi
  * @since 1.7
  * @noreference This interface is not intended to be referenced by clients.
@@ -29,4 +29,4 @@ public interface ICache {
      */
     <T> T getValue(Object key, Class<? extends T> clazz, Supplier<T> valueProvider);
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IDeltaBag.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IDeltaBag.java
index 99a4cb3b..2651535d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IDeltaBag.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IDeltaBag.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * An {@link IMemory} that represents the difference between two states of a set or {@link IMultiset}, and therefore
  *  may contain values with a negative multiplicity.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  */
 public interface IDeltaBag<T> extends IMemory<T> {
-    
+
     @Override
     default boolean removeOneOrNop(T value) {
         // makes no difference for delta bags
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMemory.java
index ea788e53..037b949d 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMemory.java
@@ -3,21 +3,21 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * A memory containing a positive or negative number of equal() copies for some values.
  * During iterations, each distinct value is iterated only once.
- * 
- * <p> Refined by: <ul> 
+ *
+ * <p> Refined by: <ul>
  *  <li>{@link IMultiset}, which always contains values with a nonnegative multiplicity. </li>
  *  <li>{@link IDeltaBag}, which may contain values with negative multiplicity. </li>
  *  <li>{@link ISetMemory}, which is just a set (allowed multiplicities: 0 and 1). </li>
  * </ul>
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  * @noimplement This interface is not intended to be implemented by clients.
@@ -26,9 +26,9 @@ public interface IMemory<T> extends IMemoryView<T>, Clearable {
 
     /**
      * Adds one value occurrence to the memory.
-     * 
+     *
      * @return true if the tuple was not present before in the memory, or
-     *      (in case of {@link IDeltaBag}) is no longer present in the memory 
+     *      (in case of {@link IDeltaBag}) is no longer present in the memory
      */
     boolean addOne(T value);
 
@@ -36,7 +36,7 @@ public interface IMemory<T> extends IMemoryView<T>, Clearable {
      * Adds the given number of occurrences to the memory. The count value may or may not be negative.
      * <p> Precondition if {@link IMultiset}: at least the given amount of occurrences exist, if count is negative.
      * <p> Precondition if {@link ISetMemory}: count is +1 or -1, the latter is only allowed if the set contains the value.
-     * 
+     *
      * @param count
      *            the number of occurrences
      * @return true if the tuple was not present before in the memory, or is no longer present in the memory
@@ -47,22 +47,22 @@ public interface IMemory<T> extends IMemoryView<T>, Clearable {
     /**
      * Removes one occurrence of the given value from the memory.
      * <p> Precondition if {@link IMultiset} or {@link ISetMemory}: the value must have a positive amount of occurrences in the memory.
-     * 
+     *
      * @return true if this was the the last occurrence of the value, or
-     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value 
+     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value
      * @throws IllegalStateException if {@link IMultiset} or {@link ISetMemory} and value had no occurrences in the memory
      */
     boolean removeOne(T value);
-    
+
     /**
      * Removes one occurrence of the given value from the memory, if possible.
-     * 
-     * <p> Memory is unchanged and false is returned if 
+     *
+     * <p> Memory is unchanged and false is returned if
      *   {@link IMultiset} or {@link ISetMemory} and value had no occurrences in the memory
-     * 
+     *
      * @return true if this was the the last occurrence of the value, or
-     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value 
-     *      
+     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value
+     *
      * @since 2.3
      */
     boolean removeOneOrNop(T value);
@@ -73,9 +73,9 @@ public interface IMemory<T> extends IMemoryView<T>, Clearable {
     void clearAllOf(T value);
 
     /**
-     * Empties out the memory. 
+     * Empties out the memory.
      */
     @Override
     void clear();
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemoryView.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMemoryView.java
index add575c6..8510e649 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemoryView.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMemoryView.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -19,11 +19,11 @@ import java.util.stream.StreamSupport;
 /**
  * A read-only view on a memory containing a positive or negative number of equal() copies for some values.
  * During iterations, each distinct value is iterated only once.
- * 
+ *
  * <p> See {@link IMemory}.
- * 
+ *
  * <p> Implementors must provide semantic (not identity-based) hashCode() and equals() using the static helpers {@link #hashCode(IMemoryView)} and {@link #equals(IMemoryView, Object)} here.
- * 
+ *
  * @author Gabor Bergmann
  *
  * @since 2.0
@@ -32,14 +32,14 @@ public interface IMemoryView<T> extends Iterable<T> {
 
     /**
      * Returns the number of occurrences of the given value.
-     * 
+     *
      * @return the number of occurrences
      */
     int getCount(T value);
 
     /**
      * Returns the number of occurrences of the given value (which may be of any type).
-     * 
+     *
      * @return the number of occurrences
      */
     int getCountUnsafe(Object value);
@@ -53,14 +53,14 @@ public interface IMemoryView<T> extends Iterable<T> {
      * @return true if the given value (which may be of any type) is contained with a nonzero multiplicity
      */
     boolean containsNonZeroUnsafe(Object value);
-        
+
     /**
-     * @return the number of distinct values 
+     * @return the number of distinct values
      */
     int size();
 
     /**
-     * 
+     *
      * @return iff contains at least one value with non-zero occurrences
      */
     boolean isEmpty();
@@ -69,14 +69,14 @@ public interface IMemoryView<T> extends Iterable<T> {
      * The set of distinct values
      */
     Set<T> distinctValues();
-    
+
 
     /**
      * Where supported, returns the stored element that is equal to the given value, or null if none.
-     * Useful for canonicalization in case of non-identity equals(). 
-     * 
+     * Useful for canonicalization in case of non-identity equals().
+     *
      * <p> For collections that do not support canonicalization, simply returns the argument if contained, null if none.
-     * 
+     *
      * @return a value equal to the argument if such a value is stored, or null if none
      */
     default T theContainedVersionOf(T value) {
@@ -84,10 +84,10 @@ public interface IMemoryView<T> extends Iterable<T> {
     }
 
     /**
-     * Where supported, returns the stored element that is equal to the given value (of any type), 
-     * or null if none. 
-     * Useful for canonicalization in case of non-identity equals(). 
-     * 
+     * Where supported, returns the stored element that is equal to the given value (of any type),
+     * or null if none.
+     * Useful for canonicalization in case of non-identity equals().
+     *
      * <p> For collections that do not support canonicalization, simply returns the argument if contained, null if none.
      *
      * @return a value equal to the argument if such a value is stored, or null if none
@@ -96,7 +96,7 @@ public interface IMemoryView<T> extends Iterable<T> {
     default T theContainedVersionOfUnsafe(Object value) {
         if (containsNonZeroUnsafe(value)) return (T) value; else return null;
     }
-    
+
 
     /**
      * @return an unmodifiable view of contained values with their multiplicities
@@ -129,19 +129,19 @@ public interface IMemoryView<T> extends Iterable<T> {
                         public Integer setValue(Integer value) {
                             throw new UnsupportedOperationException();
                         }
-                        
+
                         @Override
                         public String toString() {
                             return String.format("%d of %s", count, key);
                         }
-                        
+
                     };
                 }
-                
+
             };
         };
     }
-    
+
     /**
      * Process contained values with their multiplicities
      */
@@ -150,24 +150,24 @@ public interface IMemoryView<T> extends Iterable<T> {
             entryConsumer.accept(value, getCount(value));
         }
     }
-    
-    
+
+
     /**
-     * For compatibility with legacy code relying on element-to-integer maps. 
+     * For compatibility with legacy code relying on element-to-integer maps.
      * @return an unmodifiable view of contained values with their multiplicities
      */
     public default Map<T, Integer> asMap() {
         return new MemoryViewBackedMapView<>(this);
     }
-    
+
     /**
-     * For compatibility with legacy code relying on element-to-integer maps. 
+     * For compatibility with legacy code relying on element-to-integer maps.
      * @return an unmodifiable view of contained values with their multiplicities
      */
     public static <T> IMemoryView<T> fromMap(Map<T, Integer> wrapped) {
         return new MapBackedMemoryView<>(wrapped);
     }
-    
+
     /**
      * @return a stream of values, iterable once
      * @since 2.1
@@ -175,7 +175,7 @@ public interface IMemoryView<T> extends Iterable<T> {
     public default Stream<T> asStream() {
         return StreamSupport.stream(spliterator(), false);
     }
-    
+
     /**
      * Provides semantic equality comparison.
      */
@@ -191,7 +191,7 @@ public interface IMemoryView<T> extends Iterable<T> {
         }
         return false;
     }
-    
+
     /**
      * Provides semantic hashCode() comparison.
      */
@@ -202,4 +202,4 @@ public interface IMemoryView<T> extends Iterable<T> {
         }
         return hashCode;
     }
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookup.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiLookup.java
index 1ce1d2c9..59876b7b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookup.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiLookup.java
@@ -3,33 +3,33 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.stream.Stream;
 
-import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.interpreter.matchers.util.CollectionsFactory.MemoryType;
 
 /**
  * A multi-map that associates sets / multisets / delta sets of values to each key.
- * 
+ *
  * <p> Implementors must provide semantic (not identity-based) hashCode() and equals() using the static helpers {@link #hashCode(IMultiLookup)} and {@link #equals(IMultiLookup, Object)} here.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IMultiLookup<Key, Value> {
-    
+
     /**
      * Returns true if this collection is empty, false otherwise.
      * @since 2.2
      */
     boolean isEmpty();
-    
-    
+
+
     /**
      * Returns true if there are any values associated with the given key.
      * @param key a key for which associated values are sought
@@ -44,7 +44,7 @@ public interface IMultiLookup<Key, Value> {
      * @return null if key not found, a bucket of values otherwise
      */
     IMemoryView<Value> lookup(Key key);
-    
+
     /**
      * Returns a (read-only) bucket of values associated with the given key.
      * Clients must not modify the returned bucket.
@@ -55,7 +55,7 @@ public interface IMultiLookup<Key, Value> {
         IMemoryView<Value> bucket = lookup(key);
         return bucket == null ? EmptyMemory.instance() : bucket;
     }
-    
+
     /**
      * Returns a (read-only) bucket of values associated with the given key, while simultaneously removing them.
      * Clients must not modify the returned bucket.
@@ -64,7 +64,7 @@ public interface IMultiLookup<Key, Value> {
      * @since 2.3
      */
     IMemoryView<Value> lookupAndRemoveAll(Key key);
-    
+
     /**
      * Returns a (read-only) bucket of values associated with the given key, which can be of any type.
      * Clients must not modify the returned bucket.
@@ -72,7 +72,7 @@ public interface IMultiLookup<Key, Value> {
      * @return null if key not found, a bucket of values otherwise
      */
     IMemoryView<Value> lookupUnsafe(Object key);
-    
+
     /**
      * Returns a (read-only) bucket of values associated with the given key.
      * Clients must not modify the returned bucket.
@@ -83,40 +83,40 @@ public interface IMultiLookup<Key, Value> {
         IMemoryView<Value> bucket = lookupUnsafe(key);
         return bucket == null ? EmptyMemory.instance() : bucket;
     }
-    
-    
-    
+
+
+
     /**
      * @return the set of distinct keys that have values associated.
      */
     Iterable<Key> distinctKeys();
-    
+
     /**
      * @return the set of distinct keys that have values associated.
      * @since 2.3
      */
     Stream<Key> distinctKeysStream();
-    
+
     /**
      * @return the number of distinct keys that have values associated.
      */
     int countKeys();
-    
+
     /**
      * Iterates once over each distinct value.
      */
     Iterable<Value> distinctValues();
-    
+
     /**
      * Iterates once over each distinct value.
      * @since 2.3
      */
     Stream<Value> distinctValuesStream();
 
-    
-    
+
+
     /**
-     * How significant was the change?     * 
+     * How significant was the change?     *
      * @author Gabor Bergmann
      */
     public enum ChangeGranularity {
@@ -124,29 +124,29 @@ public interface IMultiLookup<Key, Value> {
          * First key-value pair with given key inserted, or last pair with given key deleted.
          * (In case of delta maps, also if last negative key-value pair with given key neutralized.)
          */
-        KEY, 
+        KEY,
         /**
          * First occurrence of given key-value pair inserted, or last occurrence of the pair deleted, while key still has values associated.
          * (In case of delta maps, also if last negative occurrence of key-value pair neutralized.)
          */
-        VALUE, 
+        VALUE,
         /**
          * Duplicate key-value pair inserted or deleted.
          */
         DUPLICATE
     }
-    
+
     /**
      * Adds key-value pair to the lookup structure, or fails if not possible.
-     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}), 
+     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}),
      *   the operation throws an {@link IllegalStateException}.
      * @return the granularity of the change
-     * @throws IllegalStateException if addition would cause duplication that is not permitted 
+     * @throws IllegalStateException if addition would cause duplication that is not permitted
      */
     public ChangeGranularity addPair(Key key, Value value);
     /**
-     * Adds key-value pair to the lookup structure. 
-     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}), 
+     * Adds key-value pair to the lookup structure.
+     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}),
      *   the operation is silently ignored and {@link ChangeGranularity#DUPLICATE} is returned.
      * @return the granularity of the change, or {@link ChangeGranularity#DUPLICATE} if addition would result in a duplicate and therefore ignored
      * @since 2.3
@@ -154,38 +154,38 @@ public interface IMultiLookup<Key, Value> {
     public ChangeGranularity addPairOrNop(Key key, Value value);
     /**
      * Removes key-value pair from the lookup structure, or fails if not possible.
-     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type 
-     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}), an {@link IllegalStateException} is thrown. 
+     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type
+     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}), an {@link IllegalStateException} is thrown.
      * @return the granularity of the change
-     * @throws IllegalStateException if removing non-existing element that is not permitted 
+     * @throws IllegalStateException if removing non-existing element that is not permitted
      */
     public ChangeGranularity removePair(Key key, Value value);
     /**
      * Removes key-value pair from the lookup structure.
-     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type 
-     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}), 
-     * the operation is silently ignored and {@link ChangeGranularity#DUPLICATE} is returned. 
+     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type
+     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}),
+     * the operation is silently ignored and {@link ChangeGranularity#DUPLICATE} is returned.
      * @return the granularity of the change
-     * @throws IllegalStateException if removing non-existing element that is not permitted 
+     * @throws IllegalStateException if removing non-existing element that is not permitted
      * @since 2.3
      */
     public ChangeGranularity removePairOrNop(Key key, Value value);
-    
+
     /**
      * Updates multiplicity of key-value pair by a positive amount.
-     * 
+     *
      * <p> PRE: count > 0
-     * 
+     *
      * @return the granularity of the change
-     * @throws IllegalStateException if addition would cause duplication that is not permitted 
+     * @throws IllegalStateException if addition would cause duplication that is not permitted
      */
     public ChangeGranularity addPairPositiveMultiplicity(Key key, Value value, int count);
-    
+
     /**
      * Empties out the lookup structure.
      */
     public void clear();
-    
+
     /**
      * Provides semantic equality comparison.
      */
@@ -201,7 +201,7 @@ public interface IMultiLookup<Key, Value> {
         }
         return false;
     }
-    
+
     /**
      * Provides semantic hashCode() comparison.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookupAbstract.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiLookupAbstract.java
index 8b1944c1..d7477a5a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookupAbstract.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiLookupAbstract.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -15,37 +15,35 @@ import java.util.Objects;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedSet;
-
 /**
- * Specialized multimap implementation that saves memory 
- *  by storing singleton value objects (multiplicity 1) instead of multiset buckets 
+ * Specialized multimap implementation that saves memory
+ *  by storing singleton value objects (multiplicity 1) instead of multiset buckets
  *  whenever there is only one value associated with a key.
- * 
+ *
  * <p> See specialized {@link ToSetsAbstract}, {@link ToMultisetsAbstract} for various bucket types.
- * 
+ *
  * <p> Implemented as a Key->Object map with invariant: <ul>
- * <li> key maps to null if associated with no values; 
- * <li> key maps to a single Value iff it is associated with a single value of multiplicity +1;  
+ * <li> key maps to null if associated with no values;
+ * <li> key maps to a single Value iff it is associated with a single value of multiplicity +1;
  * <li> key maps to Bucket otherwise
  * </ul>
- * 
+ *
  * Note that due to the above invariant, handling +1 and -1 are asymmetric in case of delta maps.
  *
  * <p> Not intended as an API, but rather as a 'base class' for implementors.
- * Realized as an interface with default implementations, instead of an abstract class, 
- *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
- *  
- *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+ * Realized as an interface with default implementations, instead of an abstract class,
+ *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment.
+ *
+ *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible)
  *      and bind the lowLevel* methods accordingly.
- * 
+ *
  * @noreference This interface is not intended to be referenced by clients.
  * @noimplement This interface is not intended to be implemented by clients.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  *
- * 
+ *
  */
 public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Value>> extends IMultiLookup<Key, Value> {
 
@@ -60,12 +58,12 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
      * Implementor shall bind to the low-level get() or equivalent of the underlying Key-to-Object map
      */
     abstract Object lowLevelGetUnsafe(Object key);
-    
+
     /**
      * Implementor shall bind to the low-level remove() or equivalent of the underlying Key-to-Object map
      */
     abstract Object lowLevelRemove(Key key);
-    
+
     /**
      * Implementor shall bind to the low-level putIfAbsent() or equivalent of the underlying Key-to-Object map
      */
@@ -75,31 +73,31 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
      * Implementor shall bind to the low-level put() or equivalent of the underlying Key-to-Object map
      */
     abstract void lowLevelPut(Key key, Object valueOrBucket);
-    
+
     /**
      * Implementor shall bind to the low-level values() or equivalent of the underlying Key-to-Object map
      */
     abstract Iterable<Object> lowLevelValues();
-    
+
     /**
      * Implementor shall bind to the low-level keySet() or equivalent of the underlying Key-to-Object map
      */
     abstract Iterable<Key> lowLevelKeySet();
-    
+
     /**
      * Implementor shall bind to the low-level size() or equivalent of the underlying Key-to-Object map
      */
     abstract int lowLevelSize();
 
-    
+
     // generic multi-lookup logic
-   
+
     @Override
     default boolean lookupExists(Key key) {
         Object object = lowLevelGet(key);
         return null != object;
     }
-    
+
     @Override
     public default IMemoryView<Value> lookup(Key key) {
         Object object = lowLevelGet(key);
@@ -107,7 +105,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
         if (object instanceof MarkedMemory) return (Bucket) object;
         return yieldSingleton((Value)object);
     }
-    
+
     @Override
     default IMemoryView<Value> lookupAndRemoveAll(Key key) {
         Object object = lowLevelRemove(key);
@@ -115,7 +113,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
         if (object instanceof MarkedMemory) return (Bucket) object;
         return yieldSingleton((Value)object);
     }
-    
+
     @Override
     public default IMemoryView<Value> lookupUnsafe(Object key) {
         Object object = lowLevelGetUnsafe(key);
@@ -128,7 +126,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
     public default ChangeGranularity addPair(Key key, Value value) {
         return addPairInternal(key, value, true);
     }
-    
+
     @Override
     default ChangeGranularity addPairOrNop(Key key, Value value) {
         return addPairInternal(key, value, false);
@@ -146,9 +144,9 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
                 bucket = (Bucket) old;
             } else { // ... as singleton
                 if (!this.duplicatesAllowed() && Objects.equals(value, old)) {
-                    if (throwIfImpossible) 
-                        throw new IllegalStateException(); 
-                    else 
+                    if (throwIfImpossible)
+                        throw new IllegalStateException();
+                    else
                         return ChangeGranularity.DUPLICATE;
                 }
                 bucket = createSingletonBucket((Value) old);
@@ -158,27 +156,27 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
             if (addToBucket(bucket, value, throwIfImpossible)) {
                 // deltas may become empty or a singleton after addition!
                 if (negativesAllowed()) {
-                    if (bucket.isEmpty()) { 
+                    if (bucket.isEmpty()) {
                         lowLevelRemove(key);
                         return ChangeGranularity.KEY;
                     } else {
-                        handleSingleton(key, bucket);                    
+                        handleSingleton(key, bucket);
                         return ChangeGranularity.VALUE;
-                    }                    
-                } else return ChangeGranularity.VALUE; 
+                    }
+                } else return ChangeGranularity.VALUE;
             } else return ChangeGranularity.DUPLICATE;
         }
     }
-    
+
     @Override
     // TODO deltas not supproted yet
     default ChangeGranularity addPairPositiveMultiplicity(Key key, Value value, int count) {
         if (count == 1) return addPair(key, value);
         // count > 1, always end up with non-singleton bucket
-        
+
         Object old = lowLevelGet(key);
         boolean keyChange = (old == null);
-        
+
         Bucket bucket;
         if (keyChange) { // ... nothing associated to key yet
             bucket = createSingletonBucket(value);
@@ -190,9 +188,9 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
             bucket = createSingletonBucket((Value) old);
             lowLevelPut(key, bucket);
         }
-        
+
         boolean newValue = bucket.addSigned(value, count);
-        
+
         if (keyChange) return ChangeGranularity.KEY;
         else if (newValue) return ChangeGranularity.VALUE;
         else return ChangeGranularity.DUPLICATE;
@@ -202,7 +200,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
     public default ChangeGranularity removePair(Key key, Value value) {
         return removePairInternal(key, value, true);
     }
-    
+
     @Override
     default ChangeGranularity removePairOrNop(Key key, Value value) {
         return removePairInternal(key, value, false);
@@ -214,11 +212,11 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
             @SuppressWarnings("unchecked")
             Bucket bucket = (Bucket) old;
             // will throw if removing non-existent, return false if removing duplicate
-            boolean valueChange = removeFromBucket(bucket, value, throwIfImpossible);            
+            boolean valueChange = removeFromBucket(bucket, value, throwIfImpossible);
             handleSingleton(key, bucket);
-            if (valueChange) 
+            if (valueChange)
                 return ChangeGranularity.VALUE;
-            else 
+            else
                 return ChangeGranularity.DUPLICATE;
         } else if (value.equals(old)) { // matching singleton
             lowLevelRemove(key);
@@ -227,11 +225,11 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
             if (negativesAllowed()) {
                 Bucket deltaBucket = createDeltaBucket((Value) old, value); // will throw if no deltas supported
                 lowLevelPut(key, deltaBucket);
-                return ChangeGranularity.VALUE; // no key change                
+                return ChangeGranularity.VALUE; // no key change
             } else {
-                if (throwIfImpossible) 
-                    throw new IllegalStateException(); 
-                else 
+                if (throwIfImpossible)
+                    throw new IllegalStateException();
+                else
                     return ChangeGranularity.DUPLICATE;
             }
         }
@@ -247,18 +245,18 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
     @Override
     public default Iterable<Value> distinctValues() {
         return new Iterable<Value>() {
-            private final Iterator<Value> EMPTY_ITERATOR = Collections.<Value>emptySet().iterator(); 
+            private final Iterator<Value> EMPTY_ITERATOR = Collections.<Value>emptySet().iterator();
             @Override
             public Iterator<Value> iterator() {
                 return new Iterator<Value>() {
                     Iterator<Object> bucketIterator = lowLevelValues().iterator();
                     Iterator<Value> elementIterator = EMPTY_ITERATOR;
-                    
+
                     @Override
                     public boolean hasNext() {
                         return (elementIterator.hasNext() || bucketIterator.hasNext());
                     }
-                    
+
                     @Override
                     public Value next() {
                         if (elementIterator.hasNext())
@@ -266,7 +264,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
                         else if (bucketIterator.hasNext()) {
                             Object bucket = bucketIterator.next();
                             if (bucket instanceof MarkedMemory) {
-                                elementIterator = 
+                                elementIterator =
                                         ((MarkedMemory) bucket).distinctValues().iterator();
                                 return elementIterator.next();
                             } else {
@@ -289,27 +287,27 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
             }
         };
     }
-    
+
     @Override
     default Stream<Value> distinctValuesStream() {
         return StreamSupport.stream(distinctValues().spliterator(), false);
     }
-    
+
     @Override
     default Iterable<Key> distinctKeys() {
         return lowLevelKeySet();
     }
-    
+
     @Override
     default Stream<Key> distinctKeysStream() {
         return StreamSupport.stream(distinctKeys().spliterator(), false);
     }
-    
+
     @Override
     default int countKeys() {
         return lowLevelSize();
     }
-    
+
     // the following methods are customized for bucket type
 
     /**
@@ -322,11 +320,11 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
      * @since 2.3
      */
     abstract boolean duplicatesAllowed();
-    
+
     /**
      * Increases the multiplicity of the value in the bucket.
      * @return true iff non-duplicate
-     * @throws IllegalStateException if disallowed duplication and throwIfImpossible is specified 
+     * @throws IllegalStateException if disallowed duplication and throwIfImpossible is specified
      */
     abstract boolean addToBucket(Bucket bucket, Value value, boolean throwIfImpossible);
 
@@ -360,17 +358,17 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
      * @throws IllegalStateException if deltas not supported
      */
     abstract Bucket createDeltaBucket(Value positive, Value negative);
-    
+
     /**
      * A multi-lookup whose buckets are sets.
-     * 
+     *
      * <p> Not intended as an API, but rather as a 'base class' for implementors.
-     * Realized as an interface with default implementations, instead of an abstract class, 
-     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
-     *  
-     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+     * Realized as an interface with default implementations, instead of an abstract class,
+     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment.
+     *
+     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible)
      *      and bind the lowLevel* methods accordingly.
-     * 
+     *
      * @noreference This interface is not intended to be referenced by clients.
      * @noimplement This interface is not intended to be implemented by clients.
      * @author Gabor Bergmann
@@ -379,7 +377,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
         /**
          * @return a fresh, empty marked set
          */
-        public MarkedSet<Value> createMarkedSet();
+        public MarkedMemory.MarkedSet<Value> createMarkedSet();
 
         @Override
         public default boolean negativesAllowed() {
@@ -391,45 +389,45 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
         }
 
         @Override
-        public default boolean addToBucket(MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
-            if (bucket.addOne(value)) return true; 
+        public default boolean addToBucket(MarkedMemory.MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
+            if (bucket.addOne(value)) return true;
             else if (throwIfImpossible) throw new IllegalStateException();
             else return false;
         }
 
         @Override
-        public default boolean removeFromBucket(MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
+        public default boolean removeFromBucket(MarkedMemory.MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
             return throwIfImpossible ? bucket.removeOne(value) : bucket.removeOneOrNop(value);
         }
 
         @Override
-        public default Value asSingleton(MarkedSet<Value> bucket) {
+        public default Value asSingleton(MarkedMemory.MarkedSet<Value> bucket) {
             return bucket.size() == 1 ? bucket.iterator().next() : null;
         }
 
         @Override
-        public default MarkedSet<Value> createSingletonBucket(Value value) {
-            MarkedSet<Value> result = createMarkedSet();
+        public default MarkedMemory.MarkedSet<Value> createSingletonBucket(Value value) {
+            MarkedMemory.MarkedSet<Value> result = createMarkedSet();
             result.addOne(value);
             return result;
         }
 
         @Override
-        public default MarkedSet<Value> createDeltaBucket(Value positive, Value negative) {
+        public default MarkedMemory.MarkedSet<Value> createDeltaBucket(Value positive, Value negative) {
             throw new IllegalStateException();
-        }        
+        }
     }
-    
+
     /**
      * A multi-lookup whose buckets are multisets.
-     * 
+     *
      * <p> Not intended as an API, but rather as a 'base class' for implementors.
-     * Realized as an interface with default implementations, instead of an abstract class, 
-     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
-     *  
-     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+     * Realized as an interface with default implementations, instead of an abstract class,
+     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment.
+     *
+     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible)
      *      and bind the lowLevel* methods accordingly.
-     * 
+     *
      * @noreference This interface is not intended to be referenced by clients.
      * @noimplement This interface is not intended to be implemented by clients.
      * @author Gabor Bergmann
@@ -451,7 +449,7 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
 
         @Override
         public default boolean addToBucket(MarkedMemory.MarkedMultiset<Value> bucket, Value value, boolean throwIfImpossible) {
-            return bucket.addOne(value); 
+            return bucket.addOne(value);
         }
 
         @Override
@@ -476,10 +474,10 @@ public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Va
         @Override
         public default MarkedMemory.MarkedMultiset<Value> createDeltaBucket(Value positive, Value negative) {
             throw new IllegalStateException();
-        }        
+        }
     }
-    
-    
+
+
     // TODO add ToDeltaBagsAbstract
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiset.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiset.java
index bdd5d597..dfbb9d92 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiset.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IMultiset.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * An {@link IMemory} that always contains values with a nonnegative multiplicity.
- * 
+ *
  * <p> In case a write operation caused underflow, an {@link IllegalStateException} is thrown.
- * 
+ *
  * @author Gabor Bergmann
  * @since 1.7
  */
@@ -20,11 +20,11 @@ public interface IMultiset<T> extends IMemory<T> {
 
     /**
      * Adds the given number of occurrences to the memory. The count value must be a positive number.
-     * 
+     *
      * @param count
      *            the number of occurrences
      * @return true if the tuple was not present before in the memory
      */
     boolean addPositive(T value, int count);
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IProvider.java
index cd25dc95..5b26438c 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/IProvider.java
@@ -3,24 +3,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 
 /**
  * A provider interface useful in various registry instances.
- * 
+ *
  * @author Zoltan Ujhelyi
  *
  */
 public interface IProvider<T> extends Supplier<T>{
-    
+
     public final class ProvidedValueFunction implements Function<IProvider<PQuery>, PQuery> {
         @Override
         public PQuery apply(IProvider<PQuery> input) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ISetMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/ISetMemory.java
index 0c03da48..feb0dd5e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ISetMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/ISetMemory.java
@@ -3,28 +3,28 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.function.BiConsumer;
 
 /**
  * An {@link IMemory} that always contains values with a 0 or +1 multiplicity.
- * 
+ *
  * <p> In case a write operation causes underflow or overflow, an {@link IllegalStateException} is thrown.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
 public interface ISetMemory<T> extends IMemory<T> {
-    
+
     @Override
     default void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
         for (T t : this.distinctValues()) entryConsumer.accept(t, 1);
     }
-    
+
 
     @Override
     default boolean removeOne(T value) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MapBackedMemoryView.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MapBackedMemoryView.java
index 3be078bd..d11e6807 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MapBackedMemoryView.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MapBackedMemoryView.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.function.BiConsumer;
 
 /**
  * Wraps a Map<T, Integer> (mapping elements to non-zero multiplicities) into an {@link IMemoryView}.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
@@ -72,20 +72,20 @@ public class MapBackedMemoryView<T> implements IMemoryView<T> {
     public Set<T> distinctValues() {
         return wrapped.keySet();
     }
-    
-    
+
+
     @Override
     public void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
         for (Entry<T, Integer> entry : wrapped.entrySet()) {
             entryConsumer.accept(entry.getKey(), entry.getValue());
         }
     }
-    
+
     @Override
     public Iterable<Entry<T, Integer>> entriesWithMultiplicities() {
         return wrapped.entrySet();
     }
-    
+
     @Override
     public int hashCode() {
         return IMemoryView.hashCode(this);
@@ -94,7 +94,7 @@ public class MapBackedMemoryView<T> implements IMemoryView<T> {
     public boolean equals(Object obj) {
         return IMemoryView.equals(this, obj);
     }
-    
+
     @Override
     public String toString() {
         return wrapped.toString();
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MarkedMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MarkedMemory.java
index d22dcbe7..5c76c28b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MarkedMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MarkedMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
  * Internal marker type, must only be instantiated inside implementors of IMultiLookupImpl
@@ -14,8 +14,8 @@ package tools.refinery.viatra.runtime.matchers.util;
  * @since 2.0
  */
 public interface MarkedMemory<Value> extends IMemory<Value> {
-    
+
     static interface MarkedSet<Value> extends MarkedMemory<Value> {}
     static interface MarkedMultiset<Value> extends MarkedMemory<Value> {}
     static interface MarkedDeltaBag<Value> extends MarkedMemory<Value> {}
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MemoryViewBackedMapView.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MemoryViewBackedMapView.java
index 49711a89..ba36d630 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MemoryViewBackedMapView.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/MemoryViewBackedMapView.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,19 +16,19 @@ import java.util.Set;
 
 /**
  * A partial and read-only Map implementation, mapping elements to multiplicities backed by an {@link IMemoryView}.
- * 
+ *
  * <p> Not implemented: write methods.
- * 
+ *
  * <p> Inefficiently implemented: {@link #containsValue(Object)}, {@link #values()}, {@link #entrySet()}.
- * 
+ *
  * @author Gabor Bergmann
  * @since 2.0
  */
 public class MemoryViewBackedMapView<T> implements Map<T, Integer> {
-    
+
     private static final String READ_ONLY = "Read only";
     private final IMemoryView<T> wrapped;
-    
+
     /**
      * @param wrapped a memory view whose contents are to be exposed as an element-to-integer map.
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Preconditions.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Preconditions.java
index e9e5e3a0..484ec07b 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Preconditions.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Preconditions.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.function.Supplier;
 
@@ -14,7 +14,7 @@ import java.util.function.Supplier;
  * This class was motivated by the similar Preconditions class from Guava to provide simple precondition checking
  * functionality. However, as starting with version 2.0 the runtime of VIATRA Query should not depend on Guava, the
  * relevant functionality of the Preconditions checking functionality will be implemented here.
- * 
+ *
  * @author Zoltan Ujhelyi
  * @since 2.0
  *
@@ -37,7 +37,7 @@ public final class Preconditions {
             throw new IllegalArgumentException();
         }
     }
-    
+
     /**
      * Ensures the truth of an expression involving one or more parameters to the calling method.
      *
@@ -75,7 +75,7 @@ public final class Preconditions {
             throw new IllegalArgumentException(String.format(errorMessageTemplate, errorMessageArgs));
         }
     }
-    
+
     /**
      * Ensures the truth of an expression involving one or more parameters to the calling method.
      *
@@ -90,7 +90,7 @@ public final class Preconditions {
             throw new IllegalArgumentException(messageSupplier.get());
         }
     }
-    
+
     /**
      * Ensures the truth of an expression involving one or more fields of a class.
      *
@@ -104,7 +104,7 @@ public final class Preconditions {
             throw new IllegalStateException();
         }
     }
-    
+
     /**
      * Ensures the truth of an expression involving one or more fields of a class.
      *
@@ -142,7 +142,7 @@ public final class Preconditions {
             throw new IllegalStateException(String.format(errorMessageTemplate, errorMessageArgs));
         }
     }
-    
+
     /**
      * Ensures the truth of an expression involving one or more fields of a class.
      *
@@ -157,10 +157,10 @@ public final class Preconditions {
             throw new IllegalStateException(messageSupplier.get());
         }
     }
-    
+
     /**
      * Ensures that an index is appropriate for a list or array of given size.
-     * 
+     *
      * @param index
      * @param size
      * @throws IndexOutOfBoundsException
@@ -171,10 +171,10 @@ public final class Preconditions {
             throw new IndexOutOfBoundsException();
         }
     }
-    
+
     /**
      * Ensures that an index is appropriate for a list or array of given size.
-     * 
+     *
      * @param index
      * @param size
      * @param errorMessageTemplate
@@ -190,10 +190,10 @@ public final class Preconditions {
             throw new IndexOutOfBoundsException(String.format(errorMessageTemplate, errorMessageArgs));
         }
     }
-    
+
     /**
      * Ensures that an index is appropriate for a list or array of given size.
-     * 
+     *
      * @param index
      * @param size
      * @param messageSupplier a supplier that is called to calculate the error message if necessary
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/PurgableCache.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/PurgableCache.java
index c4e6b5af..af969ba4 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/PurgableCache.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/PurgableCache.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +20,7 @@ import java.util.function.Supplier;
 public class PurgableCache implements ICache {
 
     Map<Object, Object> storage = new HashMap<>();
-    
+
     @Override
     @SuppressWarnings("unchecked")
     public <T> T getValue(Object key, Class<? extends T> clazz, Supplier<T> valueProvider) {
@@ -34,7 +34,7 @@ public class PurgableCache implements ICache {
             return value;
         }
     }
-    
+
     /**
      * Removes all values stored in the cache
      */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Sets.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Sets.java
index 3749fe06..6647b657 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Sets.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Sets.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Gabor Bergmann - initial API and implementation
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,19 +19,19 @@ import java.util.stream.Stream;
 
 /**
  * This class was motivated by the similar Sets class from Guava to provide simple set manipulation
- * functionality. However, as starting with version 2.3 the runtime of VIATRA Query should not depend on Guava, 
+ * functionality. However, as starting with version 2.3 the runtime of VIATRA Query should not depend on Guava,
  * not even internally, the relevant subset of Sets methods will be reimplemented here.
- * 
+ *
  * <p> The current approach is to delegate to Eclipse Collections wherever possible.
  * Such glue methods are useful so that downstream clients can avoid directly depending on Eclipse Collections.
- * 
+ *
  * <p> Without an equivalent from Eclipse Collections, {@link #cartesianProduct(List)} is implemented here from scratch.
- *  
+ *
  * @author Gabor Bergmann
  * @since 2.3
  */
 public final class Sets {
-    
+
     /**
      * @since 2.4
      */
@@ -50,13 +50,13 @@ public final class Sets {
     public static <A> Set<A> union(Set<A> left, Set<A> right) {
         return org.eclipse.collections.impl.factory.Sets.union(left, right);
     }
-    
+
     public static <A> Set<? extends Set<A>> powerSet(Set<A> set) {
         return org.eclipse.collections.impl.factory.Sets.powerSet(set);
     }
 
     public static <A> Set<List<A>> cartesianProduct(List<? extends Set<? extends A>> setsList) {
-        
+
         class Suffix { // simple immutable linked list
             private A head;
             private Suffix next;
@@ -74,17 +74,17 @@ public final class Sets {
                 return result;
             }
         }
-        
-        // build result lists from end to start, in the form of suffixes 
-        Stream<Suffix> suffixes = Stream.of((Suffix) null /* empty suffix*/); 
+
+        // build result lists from end to start, in the form of suffixes
+        Stream<Suffix> suffixes = Stream.of((Suffix) null /* empty suffix*/);
         for (int i = setsList.size()-1; i>=0; --i) { // iterate sets in reverse order
             Set<? extends A> set = setsList.get(i);
             suffixes = suffixes.flatMap(suffix -> set.stream().map(newElement -> new Suffix(newElement, suffix)));
         }
-        
-        
+
+
         return suffixes.map(Suffix::toList).collect(Collectors.toSet());
     }
-    
-    
+
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Signed.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Signed.java
index 8f8bc228..47808dfd 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Signed.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/Signed.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Objects;
 
 /**
- * A piece of data associated with a direction. 
- * 
+ * A piece of data associated with a direction.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -57,4 +57,4 @@ public class Signed<Payload extends Comparable<Payload>> {
         return this.direction.asSign() + this.payload.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonInstanceProvider.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/SingletonInstanceProvider.java
index cc5963f7..6074adce 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonInstanceProvider.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/SingletonInstanceProvider.java
@@ -3,13 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 /**
- * A provider implementation that always returns the same object instance. 
+ * A provider implementation that always returns the same object instance.
  * @author Zoltan Ujhelyi
  */
 public class SingletonInstanceProvider<T> implements IProvider<T>{
@@ -20,10 +20,10 @@ public class SingletonInstanceProvider<T> implements IProvider<T>{
         Preconditions.checkArgument(instance != null, "Instance parameter must not be null.");
         this.instance = instance;
     }
-    
+
     @Override
     public T get() {
         return instance;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonMemoryView.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/SingletonMemoryView.java
index b303f9ad..d368f629 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonMemoryView.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/SingletonMemoryView.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -31,7 +31,7 @@ public final class SingletonMemoryView<Value> implements IMemoryView<Value> {
     public Iterator<Value> iterator() {
         return new Iterator<Value>() {
             boolean hasNext = true;
-            
+
             @Override
             public boolean hasNext() {
                 return hasNext;
@@ -81,7 +81,7 @@ public final class SingletonMemoryView<Value> implements IMemoryView<Value> {
     public Set<Value> distinctValues() {
         return Collections.singleton(wrapped);
     }
-    
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof IMemoryView<?>) {
@@ -92,7 +92,7 @@ public final class SingletonMemoryView<Value> implements IMemoryView<Value> {
         }
         return false;
     }
-    
+
     @Override
     public int hashCode() {
         return wrapped.hashCode() ^ ONE_HASH;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/TimelyMemory.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/TimelyMemory.java
index 90fcad4d..4aebfa7a 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/TimelyMemory.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/TimelyMemory.java
@@ -3,10 +3,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util;
+package tools.refinery.interpreter.matchers.util;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,18 +15,18 @@ import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.resumable.Resumable;
-import tools.refinery.viatra.runtime.matchers.util.resumable.UnmaskedResumable;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.resumable.Resumable;
+import tools.refinery.interpreter.matchers.util.resumable.UnmaskedResumable;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.util.timeline.Timeline;
+import tools.refinery.interpreter.matchers.util.timeline.Timelines;
 
 /**
  * A timely memory implementation that incrementally maintains the {@link Timeline}s of tuples. The memory is capable of
  * lazy folding (see {@link Resumable}).
- * 
+ *
  * @author Tamas Szabo
  * @since 2.3
  */
@@ -192,7 +192,7 @@ public class TimelyMemory<Timestamp extends Comparable<Timestamp>> implements Cl
     /**
      * Utility method that computes the timeline diffs in case of lazy memories. The diffs will be inserted into the
      * input parameter. This method computes diffs for entire plateaus that spans from timestamp to nextTimestamp.
-     * 
+     *
      * Compared to the eager version of this method, the lazy version makes use of both the old and the new cumulative
      * values because it can happen that the cumulative is incremented by a value that is larger than 1 (as folding
      * states are merged together). This means that we cant decide whether the cumulative became positive by comparing
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/MaskedResumable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/MaskedResumable.java
index ea70e61d..f7d48536 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/MaskedResumable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/MaskedResumable.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.resumable;
+package tools.refinery.interpreter.matchers.util.resumable;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
 
 /**
- * A masked {@link Resumable} implementation, which maintains lazy folding per tuple signature. 
- * 
+ * A masked {@link Resumable} implementation, which maintains lazy folding per tuple signature.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -27,9 +27,9 @@ public interface MaskedResumable<Timestamp extends Comparable<Timestamp>> extend
      * folding to do towards higher timestamps.
      */
     public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp);
-    
+
     /**
-     * Returns the set of signatures for which lazy folding shall be resumed at the next timestamp. 
+     * Returns the set of signatures for which lazy folding shall be resumed at the next timestamp.
      */
     public Iterable<Tuple> getResumableSignatures();
 
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/Resumable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/Resumable.java
index 2861df20..f3d70834 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/Resumable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/Resumable.java
@@ -3,16 +3,16 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.resumable;
+package tools.refinery.interpreter.matchers.util.resumable;
 
 /**
  * A resumable lazily folds its state towards higher timestamps. Folding shall be done in the increasing order of
  * timestamps, and it shall be interrupted after each step. The resumable can then be instructed to resume the folding,
  * one step at a time.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/UnmaskedResumable.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/UnmaskedResumable.java
index 1671940b..ff97fe77 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/UnmaskedResumable.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/resumable/UnmaskedResumable.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.resumable;
+package tools.refinery.interpreter.matchers.util.resumable;
 
 import java.util.Map;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.util.timeline.Diff;
 
 /**
- * A unmasked {@link Resumable} implementation, which maintains lazy folding without caring about tuple signatures. 
- * 
+ * A unmasked {@link Resumable} implementation, which maintains lazy folding without caring about tuple signatures.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -29,8 +29,8 @@ public interface UnmaskedResumable<Timestamp extends Comparable<Timestamp>> exte
     public Map<Tuple, Diff<Timestamp>> resumeAt(final Timestamp timestamp);
 
     /**
-     * Returns the set of tuples for which lazy folding shall be resumed at the next timestamp. 
+     * Returns the set of tuples for which lazy folding shall be resumed at the next timestamp.
      */
     public Iterable<Tuple> getResumableTuples();
-    
+
 }
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/CompactTimeline.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/CompactTimeline.java
index 0532d094..6406c387 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/CompactTimeline.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/CompactTimeline.java
@@ -3,22 +3,22 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.timeline;
+package tools.refinery.interpreter.matchers.util.timeline;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
 
 /**
- * A compact timeline may cosist of an arbitrary amount of moments. 
- * It is backed by an {@link ArrayList}. 
- * 
+ * A compact timeline may cosist of an arbitrary amount of moments.
+ * It is backed by an {@link ArrayList}.
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -29,12 +29,12 @@ public class CompactTimeline<Timestamp extends Comparable<Timestamp>> extends Ti
     CompactTimeline() {
         this.elements = new ArrayList<>();
     }
-    
+
     CompactTimeline(final Timestamp timestamp) {
         this();
         this.elements.add(timestamp);
     }
-    
+
     CompactTimeline(final List<Timestamp> timestamps) {
         this.elements = new ArrayList<>(timestamps.size());
         this.elements.addAll(timestamps);
@@ -52,7 +52,7 @@ public class CompactTimeline<Timestamp extends Comparable<Timestamp>> extends Ti
             expected = expected.opposite();
         }
     }
-    
+
     @Override
     public Signed<Timestamp> getSigned(final int index) {
         final Direction direction = index % 2 == 0 ? Direction.INSERT : Direction.DELETE;
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Diff.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Diff.java
index cec6049e..e70629f9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Diff.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Diff.java
@@ -3,19 +3,19 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.timeline;
+package tools.refinery.interpreter.matchers.util.timeline;
 
 import java.util.ArrayList;
 
-import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.Signed;
 
 /**
  * The description of a delta that specifies how a {@link Timeline} changes. It consists of {@link Signed} timestamps that
  * depict the moments of insertions and deletions on the timeline.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  * @param <Timestamp>
@@ -52,4 +52,4 @@ public class Diff<Timestamp extends Comparable<Timestamp>> extends ArrayList<Sig
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/SingletonTimeline.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/SingletonTimeline.java
index 526a95f5..4a08d22e 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/SingletonTimeline.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/SingletonTimeline.java
@@ -3,20 +3,20 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.timeline;
+package tools.refinery.interpreter.matchers.util.timeline;
 
 import java.util.Collections;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
 
 /**
  * A timeline which solely consists of one timestamp value, representing a single insertion. Intuitively, a singleton
  * timeline always represents a bump which starts at the given timestamp and lasts till plus infinity.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timeline.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Timeline.java
index 9214536c..264a7dc8 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timeline.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Timeline.java
@@ -3,23 +3,23 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.timeline;
+package tools.refinery.interpreter.matchers.util.timeline;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import tools.refinery.viatra.runtime.matchers.util.Direction;
-import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.interpreter.matchers.util.Direction;
+import tools.refinery.interpreter.matchers.util.Signed;
 
 /**
  * A timeline describes the life cycle of a piece of data (typically a tuple in a relation) as a sequence of moments.
  * Even moments represent appearances, odd moments represent disappearances. A timeline is immutable, once created, it
  * is not possible to extend it with further moments.
- * 
+ *
  * @author Tamas Szabo
  * @since 2.4
  */
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timelines.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Timelines.java
index 747fda15..ea37f4a9 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timelines.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/matchers/util/timeline/Timelines.java
@@ -3,15 +3,15 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.matchers.util.timeline;
+package tools.refinery.interpreter.matchers.util.timeline;
 
 import java.util.List;
 
 /**
- * Utility class for creating {@link Timeline}s. 
+ * Utility class for creating {@link Timeline}s.
  * @author Tamas Szabo
  * @since 2.4
  */
@@ -20,7 +20,7 @@ public final class Timelines<Timestamp extends Comparable<Timestamp>> {
     public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createEmpty() {
         return new CompactTimeline<Timestamp>();
     }
-    
+
     public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createFrom(
             final Diff<Timestamp> diffs) {
         if (diffs.size() == 1) {
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/util/ViatraQueryLoggingUtil.java b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/util/InterpreterLoggingUtil.java
index 229801f8..5bcfa892 100644
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/util/ViatraQueryLoggingUtil.java
+++ b/subprojects/interpreter/src/main/java/tools/refinery/interpreter/util/InterpreterLoggingUtil.java
@@ -6,39 +6,29 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.viatra.runtime.util;
+package tools.refinery.interpreter.util;
 
 import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.matchers.util.Preconditions;
 
 /**
- * Centralized logger of the VIATRA Query runtime.
+ * Centralized logger of the Refinery Interpreter runtime.
  * @author Bergmann Gabor
  *
  */
-public class ViatraQueryLoggingUtil {
+public class InterpreterLoggingUtil {
 
-    private ViatraQueryLoggingUtil() {/*Utility class constructor*/}
+    private InterpreterLoggingUtil() {/*Utility class constructor*/}
 
-    private static Logger externalLogger;
-
-    public static void setExternalLogger(Logger externalLogger) {
-        Preconditions.checkArgument(externalLogger != null, "Must not set up null logger");
-        ViatraQueryLoggingUtil.externalLogger = externalLogger;
-    }
-    /**
+    /*
+    *
      * Provides a static default logger.
      */
     public static Logger getDefaultLogger() {
         if (defaultRuntimeLogger == null) {
-            Logger parentLogger = externalLogger;
-            if (parentLogger == null) {
-                defaultRuntimeLogger = Logger.getLogger("org.eclipse.viatra");
-            } else {
-                defaultRuntimeLogger = Logger.getLogger(parentLogger.getName() + ".runtime");
-            }
+                        defaultRuntimeLogger = Logger.getLogger("tools.refinery.interpreter");
             if (defaultRuntimeLogger == null)
-                throw new AssertionError("Configuration error: unable to create default VIATRA Query runtime logger.");
+                throw new AssertionError(
+                                                "Configuration error: unable to create default Refinery Interpreter runtime logger.");
         }
 
         return defaultRuntimeLogger;
@@ -51,7 +41,7 @@ public class ViatraQueryLoggingUtil {
     }
 
     /**
-     * Provides a class-specific logger that also stores the global logger settings of the VIATRA Query runtime
+     * Provides a class-specific logger that also stores the global logger settings of the Refinery Interpreter runtime
      * @param clazz
      */
     public static Logger getLogger(Class<?> clazz) {
@@ -59,7 +49,7 @@ public class ViatraQueryLoggingUtil {
     }
 
     /**
-     * Provides a named logger that also stores the global logger settings of the VIATRA Query runtime
+     * Provides a named logger that also stores the global logger settings of the Refinery Interpreter runtime
      * @param clazz
      * @param name a non-empty name to append to the class names
      * @since 2.5
diff --git a/subprojects/language-semantics/build.gradle.kts b/subprojects/language-semantics/build.gradle.kts
index 338ae345..689f621e 100644
--- a/subprojects/language-semantics/build.gradle.kts
+++ b/subprojects/language-semantics/build.gradle.kts
@@ -17,6 +17,6 @@ dependencies {
         implementation(project(":refinery-store-reasoning-scope"))
         runtimeOnly(libs.eclipseCollections)
         testImplementation(project(":refinery-store-dse-visualization"))
-        testImplementation(project(":refinery-store-query-viatra"))
+        testImplementation(project(":refinery-store-query-interpreter"))
         testImplementation(testFixtures(project(":refinery-language")))
 }
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java
index eee2c4ae..6beae93a 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java
@@ -10,7 +10,7 @@ import tools.refinery.store.dse.propagation.PropagationAdapter;
 import tools.refinery.store.dse.propagation.PropagationResult;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.representation.PartialRelation;
@@ -40,7 +40,7 @@ class CountPropagationTest {
                                 .build();
 
                 var store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(PropagationAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder())
                                 .with(ReasoningAdapter.builder())
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java
index d756099c..c8a79c37 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java
@@ -18,7 +18,7 @@ import tools.refinery.store.dse.propagation.PropagationAdapter;
 import tools.refinery.store.dse.strategy.BestFirstStoreManager;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -81,7 +81,7 @@ class ModelGenerationTest {
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ModelVisualizerAdapter.builder()
                                                 .withOutputPath("test_output")
                                                 .withFormat(FileFormat.DOT)
@@ -215,7 +215,7 @@ class ModelGenerationTest {
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
 //                              .with(ModelVisualizerAdapter.builder()
 //                                              .withOutputPath("test_output")
 //                                              .withFormat(FileFormat.DOT)
@@ -282,7 +282,7 @@ class ModelGenerationTest {
                 var problem = parsedProblem.problem();
 
                 var storeBuilder = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
 //                              .with(ModelVisualizerAdapter.builder()
 //                                              .withOutputPath("test_output")
 //                                              .withFormat(FileFormat.DOT)
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index 88dccdf3..2370794d 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
         implementation(project(":refinery-language"))
         implementation(project(":refinery-language-ide"))
         implementation(project(":refinery-language-semantics"))
-        implementation(project(":refinery-store-query-viatra"))
+        implementation(project(":refinery-store-query-interpreter"))
         implementation(project(":refinery-store-reasoning-scope"))
         implementation(libs.gson)
         implementation(libs.jetty.server)
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
index 9ee74207..1fce10a4 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/generator/ModelGenerationWorker.java
@@ -27,7 +27,7 @@ import tools.refinery.store.dse.propagation.PropagationAdapter;
 import tools.refinery.store.dse.strategy.BestFirstStoreManager;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -177,7 +177,7 @@ public class ModelGenerationWorker implements Runnable {
                 cancellationToken.checkCancelled();
                 var storeBuilder = ModelStore.builder()
                                 .cancellationToken(cancellationToken)
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(PropagationAdapter.builder())
                                 .with(StateCoderAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder())
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
index 512c2778..fb89bea6 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
@@ -21,7 +21,7 @@ import tools.refinery.language.semantics.model.ModelInitializer;
 import tools.refinery.language.semantics.model.TracedException;
 import tools.refinery.store.dse.propagation.PropagationAdapter;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -66,7 +66,7 @@ class SemanticsWorker implements Callable<SemanticsResult> {
         public SemanticsResult call() {
                 var builder = ModelStore.builder()
                                 .cancellationToken(cancellationToken)
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(PropagationAdapter.builder())
                                 .with(ReasoningAdapter.builder()
                                                 .requiredInterpretations(Concreteness.PARTIAL));
diff --git a/subprojects/store-dse/build.gradle.kts b/subprojects/store-dse/build.gradle.kts
index 5517e189..041adf70 100644
--- a/subprojects/store-dse/build.gradle.kts
+++ b/subprojects/store-dse/build.gradle.kts
@@ -13,5 +13,5 @@ dependencies {
         implementation(project(":refinery-store-dse-visualization"))
         implementation(libs.eclipseCollections.api)
         runtimeOnly(libs.eclipseCollections)
-        testImplementation(project(":refinery-store-query-viatra"))
+        testImplementation(project(":refinery-store-query-interpreter"))
 }
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
index 63da6cc3..fa0b3c73 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
@@ -21,7 +21,7 @@ import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
@@ -115,7 +115,7 @@ class CRAExamplesTest {
         void craTest() {
                 var store = ModelStore.builder()
                                 .symbols(classElement, encapsulates, attribute, method, dataDependency, functionalDependency, name)
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ModelVisualizerAdapter.builder()
                                                 .withOutputPath("test_output")
                                                 .withFormat(FileFormat.DOT)
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
index b912eba3..caead7be 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
@@ -15,7 +15,7 @@ import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
@@ -62,7 +62,7 @@ class DebugTest {
 
                 var store = ModelStore.builder()
                                 .symbols(classModel, classElement, feature, classes, features)
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ModelVisualizerAdapter.builder()
                                                 .withOutputPath("test_output")
                                                 .withFormat(FileFormat.DOT)
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
index 42a0f89b..a79547ec 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
@@ -17,7 +17,7 @@ import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.term.int_.IntTerms;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
@@ -135,7 +135,7 @@ class TransitionBuildTests {
         private Model getModel() {
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(StateCoderAdapter.builder())
                                 .with(ModificationAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder()
diff --git a/subprojects/store-query-interpreter/NOTICE.md b/subprojects/store-query-interpreter/NOTICE.md
new file mode 100644
index 00000000..94c1d803
--- /dev/null
+++ b/subprojects/store-query-interpreter/NOTICE.md
@@ -0,0 +1,94 @@
+<!--
+  Copyright (c) 2018-2019, Zoltan Ujhelyi, IncQuery Labs Ltd.
+  Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+
+This module contains source code from the [Eclipse VIATRA&trade; project](https://projects.eclipse.org/projects/modeling.viatra), which is available under the terms of the [Eclipse Public License v 2.0](http://www.eclipse.org/legal/epl-v20.html).
+
+Eclipse&reg;, VIATRA&trade; and &lsquo;Eclipse VIATRA&trade;&rsquo; are trademarks of Eclipse Foundation, Inc.
+
+To comply with the [Eclipse Foundation Trademark Usage Policy](https://www.eclipse.org/legal/logo_guidelines.php), we replaced the Eclipse VIATRA&trade; branding in this repository with the name _Refinery Interpreter_, since the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/) does not grant trademark usage rights to derived projects.
+_Refinery Interpreter_ is not endorsed or sponsored by Eclipse Foundation, Inc. or any other organizations using the Eclipse VIATRA&trade; trademark.
+
+We publish our modifications to Eclipse VIATRA&trade; for use within the Refinery framework under the name _Refinery Interpreter_. When not using _Refinery Interpreter_ directly in the Refinery framework, users are strongly encouraged to rely on [Eclipse VIATRA&trade;](https://eclipse.dev/viatra/) instead. In particular, _Refinery Interpreter_ does not provide any API stability guarantees that are provided by Eclipse VIATRA&trade;.
+
+We reproduce the [accompanying notices of Eclipse VIATRA&trade;](https://github.com/viatra/org.eclipse.viatra/blob/d422bcc626a99c4640c0d13931f393ccea0d2326/NOTICE.md) in full below:
+
+# Notices for Eclipse VIATRA&trade;
+
+This content is produced and maintained by the Eclipse VIATRA project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.viatra
+
+## Trademarks
+
+Eclipse VIATRA, and VIATRA are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-v20.html.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.modelobfuscator.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra.examples.git
+* http://git.eclipse.org/c/viatra/org.eclipse.viatra2.vpm.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR Runtime only: (3.2)
+
+* License: New BSD license
+
+Apache Commons Language Library (2.1)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License, 2.0
+
+Google Guice / Inject Core API (3.0.0)
+
+* License: Apache License 2.0
+
+Guava (10.0.1)
+
+* License: Apache License, 2.0
+
+Guice (2.0)
+
+* License: Apache License, 2.0
+
+guice-multibindings (3.0.0)
+
+* License: Apache License, 2.0
+
+log4j (1.2.15)
+
+* License: Apache License 2.0
+
+LPG Java Runtime (lpgjavaruntime.jar) (1.1)
+
+* License: Eclipse Public License
+
+mockito (1.9.5)
+
+* License: Apache License, 2.0, New BSD license, MIT license
diff --git a/subprojects/store-query-interpreter/build.gradle.kts b/subprojects/store-query-interpreter/build.gradle.kts
new file mode 100644
index 00000000..d463fac9
--- /dev/null
+++ b/subprojects/store-query-interpreter/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+}
+
+dependencies {
+        api(project(":refinery-interpreter"))
+        api(project(":refinery-interpreter-localsearch"))
+        api(project(":refinery-interpreter-rete"))
+        api(project(":refinery-interpreter-rete-recipes"))
+        api(project(":refinery-store-query"))
+        implementation(libs.ecore)
+        implementation(libs.slf4j.log4j)
+}
+
+tasks {
+        withType(Jar::class) {
+                // Make sure we include external project notices.
+                from(layout.projectDirectory.file("NOTICE.md"))
+        }
+}
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterAdapter.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterAdapter.java
new file mode 100644
index 00000000..83e69ae8
--- /dev/null
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterAdapter.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.interpreter;
+
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterBuilderImpl;
+
+public interface QueryInterpreterAdapter extends ModelQueryAdapter {
+        @Override
+        QueryInterpreterStoreAdapter getStoreAdapter();
+
+        static QueryInterpreterBuilder builder() {
+                return new QueryInterpreterBuilderImpl();
+        }
+}
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java
new file mode 100644
index 00000000..6e167d0d
--- /dev/null
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.interpreter;
+
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.interpreter.api.InterpreterEngineOptions;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+
+import java.util.Collection;
+import java.util.function.Function;
+
+@SuppressWarnings("UnusedReturnValue")
+public interface QueryInterpreterBuilder extends ModelQueryBuilder {
+        QueryInterpreterBuilder engineOptions(InterpreterEngineOptions engineOptions);
+
+        QueryInterpreterBuilder defaultHint(QueryEvaluationHint queryEvaluationHint);
+
+        QueryInterpreterBuilder backend(IQueryBackendFactory queryBackendFactory);
+
+        QueryInterpreterBuilder cachingBackend(IQueryBackendFactory queryBackendFactory);
+
+        QueryInterpreterBuilder searchBackend(IQueryBackendFactory queryBackendFactory);
+
+        @Override
+        default QueryInterpreterBuilder queries(AnyQuery... queries) {
+                ModelQueryBuilder.super.queries(queries);
+                return this;
+        }
+
+        @Override
+        default QueryInterpreterBuilder queries(Collection<? extends AnyQuery> queries) {
+                ModelQueryBuilder.super.queries(queries);
+                return this;
+        }
+
+        @Override
+        QueryInterpreterBuilder query(AnyQuery query);
+
+        @Override
+        QueryInterpreterBuilder rewriter(DnfRewriter rewriter);
+
+        QueryInterpreterBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint);
+
+        @Override
+        QueryInterpreterStoreAdapter build(ModelStore store);
+}
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterStoreAdapter.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterStoreAdapter.java
new file mode 100644
index 00000000..9c55ecc2
--- /dev/null
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterStoreAdapter.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.interpreter;
+
+import tools.refinery.interpreter.api.InterpreterEngineOptions;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.ModelQueryStoreAdapter;
+
+public interface QueryInterpreterStoreAdapter extends ModelQueryStoreAdapter {
+        InterpreterEngineOptions getEngineOptions();
+
+        @Override
+        QueryInterpreterAdapter createModelAdapter(Model model);
+}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java
index ad754988..ee527fd3 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal;
+package tools.refinery.store.query.interpreter.internal;
 
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelListener;
@@ -14,31 +14,31 @@ import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.resultset.AnyResultSet;
 import tools.refinery.store.query.resultset.EmptyResultSet;
 import tools.refinery.store.query.resultset.ResultSet;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
-import tools.refinery.store.query.viatra.internal.matcher.FunctionalViatraMatcher;
-import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
-import tools.refinery.store.query.viatra.internal.matcher.RelationalViatraMatcher;
-import tools.refinery.viatra.runtime.CancellationToken;
-import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.GenericQueryGroup;
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
+import tools.refinery.store.query.interpreter.internal.matcher.InterpretedFunctionalMatcher;
+import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
+import tools.refinery.store.query.interpreter.internal.matcher.InterpretedRelationalMatcher;
+import tools.refinery.interpreter.CancellationToken;
+import tools.refinery.interpreter.api.AdvancedInterpreterEngine;
+import tools.refinery.interpreter.api.GenericQueryGroup;
+import tools.refinery.interpreter.api.IQuerySpecification;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, ModelListener {
+public class QueryInterpreterAdapterImpl implements QueryInterpreterAdapter, ModelListener {
         private final Model model;
-        private final ViatraModelQueryStoreAdapterImpl storeAdapter;
-        private final AdvancedViatraQueryEngine queryEngine;
+        private final QueryInterpreterStoreAdapterImpl storeAdapter;
+        private final AdvancedInterpreterEngine queryEngine;
         private final Map<AnyQuery, AnyResultSet> resultSets;
         private boolean pendingChanges;
 
-        ViatraModelQueryAdapterImpl(Model model, ViatraModelQueryStoreAdapterImpl storeAdapter) {
+        QueryInterpreterAdapterImpl(Model model, QueryInterpreterStoreAdapterImpl storeAdapter) {
                 this.model = model;
                 this.storeAdapter = storeAdapter;
                 var scope = new RelationalScope(this);
-                queryEngine = AdvancedViatraQueryEngine.createUnmanagedEngine(scope,
+                queryEngine = AdvancedInterpreterEngine.createUnmanagedEngine(scope,
                                 storeAdapter.getEngineOptions());
 
                 var querySpecifications = storeAdapter.getQuerySpecifications();
@@ -63,10 +63,10 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
         private <T> ResultSet<T> createResultSet(Query<T> query, RawPatternMatcher matcher) {
                 if (query instanceof RelationalQuery relationalQuery) {
                         @SuppressWarnings("unchecked")
-                        var resultSet = (ResultSet<T>) new RelationalViatraMatcher(this, relationalQuery, matcher);
+                        var resultSet = (ResultSet<T>) new InterpretedRelationalMatcher(this, relationalQuery, matcher);
                         return resultSet;
                 } else if (query instanceof FunctionalQuery<T> functionalQuery) {
-                        return new FunctionalViatraMatcher<>(this, functionalQuery, matcher);
+                        return new InterpretedFunctionalMatcher<>(this, functionalQuery, matcher);
                 } else {
                         throw new IllegalArgumentException("Unknown query: " + query);
                 }
@@ -78,7 +78,7 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
         }
 
         @Override
-        public ViatraModelQueryStoreAdapterImpl getStoreAdapter() {
+        public QueryInterpreterStoreAdapterImpl getStoreAdapter() {
                 return storeAdapter;
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java
index c68152e3..c0d802da 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal;
+package tools.refinery.store.query.interpreter.internal;
 
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
@@ -13,24 +13,24 @@ import tools.refinery.store.query.rewriter.CompositeRewriter;
 import tools.refinery.store.query.rewriter.DnfRewriter;
 import tools.refinery.store.query.rewriter.DuplicateDnfRemover;
 import tools.refinery.store.query.rewriter.InputParameterResolver;
-import tools.refinery.store.query.viatra.ViatraModelQueryBuilder;
-import tools.refinery.store.query.viatra.internal.localsearch.FlatCostFunction;
-import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
-import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery;
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchGenericBackendFactory;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.rete.matcher.ReteBackendFactory;
+import tools.refinery.store.query.interpreter.QueryInterpreterBuilder;
+import tools.refinery.store.query.interpreter.internal.localsearch.FlatCostFunction;
+import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
+import tools.refinery.store.query.interpreter.internal.pquery.Dnf2PQuery;
+import tools.refinery.interpreter.api.IQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngineOptions;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchGenericBackendFactory;
+import tools.refinery.interpreter.localsearch.matcher.integration.LocalSearchHintOptions;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.rete.matcher.ReteBackendFactory;
 
 import java.util.*;
 import java.util.function.Function;
 
-public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<ViatraModelQueryStoreAdapterImpl>
-                implements ViatraModelQueryBuilder {
-        private ViatraQueryEngineOptions.Builder engineOptionsBuilder;
+public class QueryInterpreterBuilderImpl extends AbstractModelAdapterBuilder<QueryInterpreterStoreAdapterImpl>
+                implements QueryInterpreterBuilder {
+        private InterpreterEngineOptions.Builder engineOptionsBuilder;
         private QueryEvaluationHint defaultHint = new QueryEvaluationHint(Map.of(
                         // Use a cost function that ignores the initial (empty) model but allows higher arity input keys.
                         LocalSearchHintOptions.PLANNER_COST_FUNCTION, new FlatCostFunction()
@@ -39,8 +39,8 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via
         private final Dnf2PQuery dnf2PQuery = new Dnf2PQuery();
         private final Set<AnyQuery> queries = new LinkedHashSet<>();
 
-        public ViatraModelQueryBuilderImpl() {
-                engineOptionsBuilder = new ViatraQueryEngineOptions.Builder()
+        public QueryInterpreterBuilderImpl() {
+                engineOptionsBuilder = new InterpreterEngineOptions.Builder()
                                 .withDefaultBackend(ReteBackendFactory.INSTANCE)
                                 .withDefaultCachingBackend(ReteBackendFactory.INSTANCE)
                                 .withDefaultSearchBackend(LocalSearchGenericBackendFactory.INSTANCE);
@@ -50,69 +50,69 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via
         }
 
         @Override
-        public ViatraModelQueryBuilder engineOptions(ViatraQueryEngineOptions engineOptions) {
+        public QueryInterpreterBuilder engineOptions(InterpreterEngineOptions engineOptions) {
                 checkNotConfigured();
-                engineOptionsBuilder = new ViatraQueryEngineOptions.Builder(engineOptions);
+                engineOptionsBuilder = new InterpreterEngineOptions.Builder(engineOptions);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder defaultHint(QueryEvaluationHint queryEvaluationHint) {
+        public QueryInterpreterBuilder defaultHint(QueryEvaluationHint queryEvaluationHint) {
                 checkNotConfigured();
                 defaultHint = defaultHint.overrideBy(queryEvaluationHint);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder backend(IQueryBackendFactory queryBackendFactory) {
+        public QueryInterpreterBuilder backend(IQueryBackendFactory queryBackendFactory) {
                 checkNotConfigured();
                 engineOptionsBuilder.withDefaultBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder cachingBackend(IQueryBackendFactory queryBackendFactory) {
+        public QueryInterpreterBuilder cachingBackend(IQueryBackendFactory queryBackendFactory) {
                 checkNotConfigured();
                 engineOptionsBuilder.withDefaultCachingBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder searchBackend(IQueryBackendFactory queryBackendFactory) {
+        public QueryInterpreterBuilder searchBackend(IQueryBackendFactory queryBackendFactory) {
                 checkNotConfigured();
                 engineOptionsBuilder.withDefaultSearchBackend(queryBackendFactory);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder queries(Collection<? extends AnyQuery> queries) {
+        public QueryInterpreterBuilder queries(Collection<? extends AnyQuery> queries) {
                 checkNotConfigured();
                 this.queries.addAll(queries);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder query(AnyQuery query) {
+        public QueryInterpreterBuilder query(AnyQuery query) {
                 checkNotConfigured();
                 queries.add(query);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder rewriter(DnfRewriter rewriter) {
+        public QueryInterpreterBuilder rewriter(DnfRewriter rewriter) {
                 this.rewriter.addFirst(rewriter);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
+        public QueryInterpreterBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
                 checkNotConfigured();
                 dnf2PQuery.setComputeHint(computeHint);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryStoreAdapterImpl doBuild(ModelStore store) {
+        public QueryInterpreterStoreAdapterImpl doBuild(ModelStore store) {
                 var canonicalQueryMap = new HashMap<AnyQuery, AnyQuery>();
                 var querySpecifications = new LinkedHashMap<AnyQuery, IQuerySpecification<RawPatternMatcher>>();
                 var vacuousQueries = new LinkedHashSet<AnyQuery>();
@@ -134,12 +134,12 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via
                 }
 
                 validateSymbols(store);
-                return new ViatraModelQueryStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(),
+                return new QueryInterpreterStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(),
                                 Collections.unmodifiableMap(canonicalQueryMap), Collections.unmodifiableMap(querySpecifications),
                                 Collections.unmodifiableSet(vacuousQueries), store::checkCancelled);
         }
 
-        private ViatraQueryEngineOptions buildEngineOptions() {
+        private InterpreterEngineOptions buildEngineOptions() {
                 // Workaround: manually override the default backend, because {@link ViatraQueryEngineOptions.Builder}
                 // ignores all backend requirements except {@code SPECIFIC}.
                 switch (defaultHint.getQueryBackendRequirementType()) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java
index f32e1cc6..10e7a402 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java
@@ -3,25 +3,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal;
+package tools.refinery.store.query.interpreter.internal;
 
-import tools.refinery.viatra.runtime.CancellationToken;
-import tools.refinery.viatra.runtime.api.IQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.interpreter.CancellationToken;
+import tools.refinery.interpreter.api.IQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngineOptions;
+import tools.refinery.interpreter.matchers.context.IInputKey;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.viatra.ViatraModelQueryStoreAdapter;
-import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
+import tools.refinery.store.query.interpreter.QueryInterpreterStoreAdapter;
+import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
 import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.*;
 
-public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAdapter {
+public class QueryInterpreterStoreAdapterImpl implements QueryInterpreterStoreAdapter {
         private final ModelStore store;
-        private final ViatraQueryEngineOptions engineOptions;
+        private final InterpreterEngineOptions engineOptions;
         private final Map<AnySymbolView, IInputKey> inputKeys;
         private final Map<AnyQuery, AnyQuery> canonicalQueryMap;
         private final Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications;
@@ -29,7 +29,7 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
         private final Set<AnyQuery> allQueries;
         private final CancellationToken cancellationToken;
 
-        ViatraModelQueryStoreAdapterImpl(ModelStore store, ViatraQueryEngineOptions engineOptions,
+        QueryInterpreterStoreAdapterImpl(ModelStore store, InterpreterEngineOptions engineOptions,
                                                                          Map<AnySymbolView, IInputKey> inputKeys,
                                                                          Map<AnyQuery, AnyQuery> canonicalQueryMap,
                                                                          Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications,
@@ -89,12 +89,12 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
         }
 
         @Override
-        public ViatraQueryEngineOptions getEngineOptions() {
+        public InterpreterEngineOptions getEngineOptions() {
                 return engineOptions;
         }
 
         @Override
-        public ViatraModelQueryAdapterImpl createModelAdapter(Model model) {
-                return new ViatraModelQueryAdapterImpl(model, this);
+        public QueryInterpreterAdapterImpl createModelAdapter(Model model) {
+                return new QueryInterpreterAdapterImpl(model, this);
         }
 }
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/RelationalScope.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/RelationalScope.java
new file mode 100644
index 00000000..7eef5b85
--- /dev/null
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/RelationalScope.java
@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.interpreter.internal;
+
+import org.apache.log4j.Logger;
+import tools.refinery.interpreter.api.InterpreterEngine;
+import tools.refinery.interpreter.api.scope.IEngineContext;
+import tools.refinery.interpreter.api.scope.IIndexingErrorListener;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.store.query.interpreter.internal.context.RelationalEngineContext;
+
+public class RelationalScope extends QueryScope {
+        private final QueryInterpreterAdapterImpl adapter;
+
+        public RelationalScope(QueryInterpreterAdapterImpl adapter) {
+                this.adapter = adapter;
+        }
+
+        @Override
+        protected IEngineContext createEngineContext(InterpreterEngine engine, IIndexingErrorListener errorListener,
+                                                                                                 Logger logger) {
+                return new RelationalEngineContext(adapter);
+        }
+}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/DummyBaseIndexer.java
index 64d98258..e9a05fe9 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/DummyBaseIndexer.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.context;
+package tools.refinery.store.query.interpreter.internal.context;
 
-import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
-import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
-import tools.refinery.viatra.runtime.api.scope.IInstanceObserver;
-import tools.refinery.viatra.runtime.api.scope.ViatraBaseIndexChangeListener;
+import tools.refinery.interpreter.api.scope.IBaseIndex;
+import tools.refinery.interpreter.api.scope.IIndexingErrorListener;
+import tools.refinery.interpreter.api.scope.IInstanceObserver;
+import tools.refinery.interpreter.api.scope.InterpreterBaseIndexChangeListener;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
@@ -30,12 +30,12 @@ public class DummyBaseIndexer implements IBaseIndex {
         }
 
         @Override
-        public void addBaseIndexChangeListener(ViatraBaseIndexChangeListener listener) {
+        public void addBaseIndexChangeListener(InterpreterBaseIndexChangeListener listener) {
                 // no notification support
         }
 
         @Override
-        public void removeBaseIndexChangeListener(ViatraBaseIndexChangeListener listener) {
+        public void removeBaseIndexChangeListener(InterpreterBaseIndexChangeListener listener) {
                 // no notification support
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalEngineContext.java
index f7d323ff..f6e8b605 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalEngineContext.java
@@ -3,18 +3,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.context;
+package tools.refinery.store.query.interpreter.internal.context;
 
-import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
-import tools.refinery.viatra.runtime.api.scope.IEngineContext;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.interpreter.api.scope.IBaseIndex;
+import tools.refinery.interpreter.api.scope.IEngineContext;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 
 public class RelationalEngineContext implements IEngineContext {
         private final IBaseIndex baseIndex = new DummyBaseIndexer();
         private final RelationalRuntimeContext runtimeContext;
 
-        public RelationalEngineContext(ViatraModelQueryAdapterImpl adapter) {
+        public RelationalEngineContext(QueryInterpreterAdapterImpl adapter) {
                 runtimeContext = new RelationalRuntimeContext(adapter);
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java
index 77d86a1c..2b1ff2b4 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java
@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.context;
+package tools.refinery.store.query.interpreter.internal.context;
 
-import tools.refinery.viatra.runtime.matchers.context.AbstractQueryMetaContext;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.InputKeyImplication;
-import tools.refinery.viatra.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import tools.refinery.store.query.viatra.internal.pquery.SymbolViewWrapper;
+import tools.refinery.interpreter.matchers.context.AbstractQueryMetaContext;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.InputKeyImplication;
+import tools.refinery.interpreter.matchers.context.common.JavaTransitiveInstancesKey;
+import tools.refinery.store.query.interpreter.internal.pquery.SymbolViewWrapper;
 import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.*;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalRuntimeContext.java
index dadab5dd..5870b0c2 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalRuntimeContext.java
@@ -3,19 +3,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.context;
-
-import tools.refinery.viatra.runtime.CancellationToken;
-import tools.refinery.viatra.runtime.matchers.context.*;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+package tools.refinery.store.query.interpreter.internal.context;
+
+import tools.refinery.interpreter.CancellationToken;
+import tools.refinery.interpreter.matchers.context.*;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
-import tools.refinery.store.query.viatra.internal.pquery.SymbolViewWrapper;
-import tools.refinery.store.query.viatra.internal.update.ModelUpdateListener;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.pquery.SymbolViewWrapper;
+import tools.refinery.store.query.interpreter.internal.update.ModelUpdateListener;
 import tools.refinery.store.query.view.AnySymbolView;
 
 import java.lang.reflect.InvocationTargetException;
@@ -35,7 +35,7 @@ public class RelationalRuntimeContext implements IQueryRuntimeContext {
 
         private final CancellationToken cancellationToken;
 
-        RelationalRuntimeContext(ViatraModelQueryAdapterImpl adapter) {
+        RelationalRuntimeContext(QueryInterpreterAdapterImpl adapter) {
                 model = adapter.getModel();
                 metaContext = new RelationalQueryMetaContext(adapter.getStoreAdapter().getInputKeys());
                 modelUpdateListener = new ModelUpdateListener(adapter);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/localsearch/FlatCostFunction.java
index ce2a75bd..45fd9fbd 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/localsearch/FlatCostFunction.java
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.localsearch;
+package tools.refinery.store.query.interpreter.internal.localsearch;
 
-import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.interpreter.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.interpreter.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.util.Accuracy;
 
 import java.util.Optional;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java
index c4a5a236..8cec0bf6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java
@@ -3,19 +3,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
-import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.matchers.backend.IUpdateable;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.resultset.AbstractResultSet;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 
-public abstract class AbstractViatraMatcher<T> extends AbstractResultSet<T> implements IUpdateable {
+public abstract class AbstractInterpretedMatcher<T> extends AbstractResultSet<T> implements IUpdateable {
         protected final IQueryResultProvider backend;
 
-        protected AbstractViatraMatcher(ViatraModelQueryAdapterImpl adapter, Query<T> query,
-                                                                        RawPatternMatcher rawPatternMatcher) {
+        protected AbstractInterpretedMatcher(QueryInterpreterAdapterImpl adapter, Query<T> query,
+                                                                                 RawPatternMatcher rawPatternMatcher) {
                 super(adapter, query);
                 backend = rawPatternMatcher.getBackend();
         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/FunctionalCursor.java
index 44038669..e3b53f6b 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/FunctionalCursor.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.interpreter.rete.index.IterableIndexer;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
@@ -13,7 +13,7 @@ import java.util.Iterator;
 
 class FunctionalCursor<T> implements Cursor<Tuple, T> {
         private final IterableIndexer indexer;
-        private final Iterator<tools.refinery.viatra.runtime.matchers.tuple.Tuple> iterator;
+        private final Iterator<tools.refinery.interpreter.matchers.tuple.Tuple> iterator;
         private boolean terminated;
         private Tuple key;
         private T value;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java
index fb9e4df6..249664a4 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java
@@ -3,34 +3,35 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
-import tools.refinery.viatra.runtime.rete.matcher.RetePatternMatcher;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.rete.index.IterableIndexer;
+import tools.refinery.interpreter.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.query.dnf.FunctionalQuery;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.tuple.Tuple;
 
 /**
- * Directly access the tuples inside a VIATRA pattern matcher.<p>
+ * Directly access the tuples inside a Refinery Interpreter pattern matcher.<p>
  * This class neglects calling
- * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
+ * {@link IQueryRuntimeContext#wrapTuple(tools.refinery.interpreter.matchers.tuple.Tuple)}
  * and
- * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
- * because {@link tools.refinery.store.query.viatra.internal.context.RelationalRuntimeContext} provides a trivial
+ * {@link IQueryRuntimeContext#unwrapTuple(tools.refinery.interpreter.matchers.tuple.Tuple)},
+ * because {@link tools.refinery.store.query.interpreter.internal.context.RelationalRuntimeContext} provides a trivial
  * implementation for these methods.
  * Using this class with any other runtime context may lead to undefined behavior.
  */
-public class FunctionalViatraMatcher<T> extends AbstractViatraMatcher<T> {
+public class InterpretedFunctionalMatcher<T> extends AbstractInterpretedMatcher<T> {
         private final TupleMask emptyMask;
         private final TupleMask omitOutputMask;
         private final IterableIndexer omitOutputIndexer;
 
-        public FunctionalViatraMatcher(ViatraModelQueryAdapterImpl adapter, FunctionalQuery<T> query,
-                                                                   RawPatternMatcher rawPatternMatcher) {
+        public InterpretedFunctionalMatcher(QueryInterpreterAdapterImpl adapter, FunctionalQuery<T> query,
+                                                                                RawPatternMatcher rawPatternMatcher) {
                 super(adapter, query, rawPatternMatcher);
                 int arity = query.arity();
                 int arityWithOutput = arity + 1;
@@ -76,7 +77,7 @@ public class FunctionalViatraMatcher<T> extends AbstractViatraMatcher<T> {
         }
 
         @Override
-        public void update(tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
+        public void update(tools.refinery.interpreter.matchers.tuple.Tuple updateElement, boolean isInsertion) {
                 var key = MatcherUtils.keyToRefineryTuple(updateElement);
                 var value = MatcherUtils.<T>getValue(updateElement);
                 if (isInsertion) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java
index da75e864..9278b46d 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java
@@ -3,35 +3,36 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
-import tools.refinery.viatra.runtime.rete.index.Indexer;
-import tools.refinery.viatra.runtime.rete.matcher.RetePatternMatcher;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContext;
+import tools.refinery.interpreter.matchers.tuple.TupleMask;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
+import tools.refinery.interpreter.rete.index.Indexer;
+import tools.refinery.interpreter.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
 import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.tuple.Tuple;
 
 /**
- * Directly access the tuples inside a VIATRA pattern matcher.<p>
+ * Directly access the tuples inside a Refinery Interpreter pattern matcher.<p>
  * This class neglects calling
- * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
+ * {@link IQueryRuntimeContext#wrapTuple(tools.refinery.interpreter.matchers.tuple.Tuple)}
  * and
- * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
- * because {@link tools.refinery.store.query.viatra.internal.context.RelationalRuntimeContext} provides a trivial
+ * {@link IQueryRuntimeContext#unwrapTuple(tools.refinery.interpreter.matchers.tuple.Tuple)},
+ * because {@link tools.refinery.store.query.interpreter.internal.context.RelationalRuntimeContext} provides a trivial
  * implementation for these methods.
  * Using this class with any other runtime context may lead to undefined behavior.
  */
-public class RelationalViatraMatcher extends AbstractViatraMatcher<Boolean> {
+public class InterpretedRelationalMatcher extends AbstractInterpretedMatcher<Boolean> {
         private final TupleMask emptyMask;
         private final TupleMask identityMask;
         private final Indexer emptyMaskIndexer;
 
-        public RelationalViatraMatcher(ViatraModelQueryAdapterImpl adapter, RelationalQuery query,
-                                                                   RawPatternMatcher rawPatternMatcher) {
+        public InterpretedRelationalMatcher(QueryInterpreterAdapterImpl adapter, RelationalQuery query,
+                                                                                RawPatternMatcher rawPatternMatcher) {
                 super(adapter, query, rawPatternMatcher);
                 int arity = query.arity();
                 emptyMask = TupleMask.empty(arity);
@@ -73,7 +74,7 @@ public class RelationalViatraMatcher extends AbstractViatraMatcher<Boolean> {
         }
 
         @Override
-        public void update(tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
+        public void update(tools.refinery.interpreter.matchers.tuple.Tuple updateElement, boolean isInsertion) {
                 var key = MatcherUtils.toRefineryTuple(updateElement);
                 notifyChange(key, !isInsertion, isInsertion);
         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/MatcherUtils.java
index 6cda23cd..b30b83b5 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/MatcherUtils.java
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.store.tuple.*;
 
@@ -17,7 +17,7 @@ final class MatcherUtils {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
 
-        public static tools.refinery.viatra.runtime.matchers.tuple.Tuple toViatraTuple(Tuple refineryTuple) {
+        public static tools.refinery.interpreter.matchers.tuple.Tuple toViatraTuple(Tuple refineryTuple) {
                 if (refineryTuple instanceof Tuple0) {
                         return Tuples.staticArityFlatTupleOf();
                 } else if (refineryTuple instanceof Tuple1) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/RawPatternMatcher.java
index c0be70ba..fcd5a236 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/RawPatternMatcher.java
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.api.GenericPatternMatcher;
-import tools.refinery.viatra.runtime.api.GenericQuerySpecification;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.interpreter.api.GenericPatternMatcher;
+import tools.refinery.interpreter.api.GenericQuerySpecification;
+import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
 
 public class RawPatternMatcher extends GenericPatternMatcher {
     public RawPatternMatcher(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/RelationalCursor.java
index 53475218..45eb9fff 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/RelationalCursor.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/UnsafeFunctionalCursor.java
index 093ade96..d3a7c743 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/UnsafeFunctionalCursor.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CheckEvaluator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java
index ada154d4..4a71e879 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CheckEvaluator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.term.Term;
 
 class CheckEvaluator extends TermEvaluator<Boolean> {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java
index 492bd054..73ce4043 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java
@@ -3,8 +3,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.*;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.*;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.Connectivity;
 import tools.refinery.store.query.Constraint;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.DnfClause;
@@ -16,22 +19,19 @@ import tools.refinery.store.query.term.StatelessAggregator;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.util.CycleDetectingMapper;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.Connectivity;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java
index d21131e5..a710dab3 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java
@@ -3,19 +3,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
-
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
-import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+package tools.refinery.store.query.interpreter.internal.pquery;
+
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.PVariable;
+import tools.refinery.interpreter.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.interpreter.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 import tools.refinery.store.query.Constraint;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.DnfUtils;
@@ -55,7 +55,7 @@ class QueryWrapperFactory {
                 var appendVariable = new VariableAppender();
                 for (int i = 0; i < arity; i++) {
                         var variable = arguments.get(i);
-                        // Unify all variables to avoid VIATRA bugs, even if they're bound in the containing clause.
+                        // Unify all variables to avoid Refinery Interpreter bugs, even if they're bound in the containing clause.
                         remappedParameters[i] = unboundVariableIndices.computeIfAbsent(variable, appendVariable::applyAsInt);
                 }
                 var pattern = maybeWrapConstraint(callLiteral.getTarget(), remappedParameters);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/RawPQuery.java
index 06644bf2..bbb35f91 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/RawPQuery.java
@@ -3,18 +3,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.api.GenericQuerySpecification;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.matchers.psystem.PBody;
-import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.BasePQuery;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
-import tools.refinery.store.query.viatra.internal.RelationalScope;
-import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
+import tools.refinery.interpreter.api.GenericQuerySpecification;
+import tools.refinery.interpreter.api.InterpreterEngine;
+import tools.refinery.interpreter.api.scope.QueryScope;
+import tools.refinery.interpreter.matchers.psystem.PBody;
+import tools.refinery.interpreter.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.interpreter.matchers.psystem.queries.BasePQuery;
+import tools.refinery.interpreter.matchers.psystem.queries.PParameter;
+import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
+import tools.refinery.store.query.interpreter.internal.RelationalScope;
+import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
 
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -70,7 +70,7 @@ public class RawPQuery extends BasePQuery {
                         }
 
                         @Override
-                        protected RawPatternMatcher instantiate(ViatraQueryEngine engine) {
+                        protected RawPatternMatcher instantiate(InterpreterEngine engine) {
                                 RawPatternMatcher matcher = engine.getExistingMatcher(this);
                                 if (matcher == null) {
                                         matcher = engine.getMatcher(this);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java
index ba99cf9a..7552117b 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 import tools.refinery.store.query.term.StatefulAggregate;
 import tools.refinery.store.query.term.StatefulAggregator;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java
index bf2c2f4f..2da7ba87 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
 import tools.refinery.store.query.term.StatelessAggregator;
 
 import java.util.stream.Stream;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/SymbolViewWrapper.java
index a774404e..51795f4a 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/SymbolViewWrapper.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.matchers.context.common.BaseInputKeyWrapper;
+import tools.refinery.interpreter.matchers.context.common.BaseInputKeyWrapper;
 import tools.refinery.store.query.view.AnySymbolView;
 
 public class SymbolViewWrapper extends BaseInputKeyWrapper<AnySymbolView> {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java
index d064ff2c..ed991091 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
 import tools.refinery.store.query.term.Term;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
 
 import java.util.stream.Collectors;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java
index b9ae8ab2..4124c9bb 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.pquery;
+package tools.refinery.store.query.interpreter.internal.pquery;
 
-import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.interpreter.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.term.DataVariable;
 import tools.refinery.store.query.valuation.Valuation;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/ModelUpdateListener.java
index e1bc9efc..fad53675 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/ModelUpdateListener.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.update;
+package tools.refinery.store.query.interpreter.internal.update;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.SymbolView;
 
@@ -18,7 +18,7 @@ import java.util.Map;
 public class ModelUpdateListener {
         private final Map<AnySymbolView, SymbolViewUpdateListener<?>> symbolViewUpdateListeners;
 
-        public ModelUpdateListener(ViatraModelQueryAdapterImpl adapter) {
+        public ModelUpdateListener(QueryInterpreterAdapterImpl adapter) {
                 var symbolViews = adapter.getStoreAdapter().getInputKeys().keySet();
                 symbolViewUpdateListeners = new HashMap<>(symbolViews.size());
                 for (var symbolView : symbolViews) {
@@ -26,7 +26,7 @@ public class ModelUpdateListener {
                 }
         }
 
-        private <T> void registerView(ViatraModelQueryAdapterImpl adapter, SymbolView<T> view) {
+        private <T> void registerView(QueryInterpreterAdapterImpl adapter, SymbolView<T> view) {
                 var model = adapter.getModel();
                 var interpretation = model.getInterpretation(view.getSymbol());
                 var listener = SymbolViewUpdateListener.of(adapter, view, interpretation);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/RelationViewFilter.java
index 73c4a3f9..4b4c73eb 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/RelationViewFilter.java
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.update;
+package tools.refinery.store.query.interpreter.internal.update;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/SymbolViewUpdateListener.java
index d0cdda72..68020b11 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/SymbolViewUpdateListener.java
@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.update;
+package tools.refinery.store.query.interpreter.internal.update;
 
-import tools.refinery.viatra.runtime.matchers.context.IInputKey;
-import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
-import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.interpreter.matchers.context.IInputKey;
+import tools.refinery.interpreter.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.interpreter.matchers.tuple.ITuple;
+import tools.refinery.interpreter.matchers.tuple.Tuple;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.InterpretationListener;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.query.view.SymbolView;
 import tools.refinery.store.query.view.TuplePreservingView;
 
@@ -19,11 +19,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class SymbolViewUpdateListener<T> implements InterpretationListener<T> {
-        private final ViatraModelQueryAdapterImpl adapter;
+        private final QueryInterpreterAdapterImpl adapter;
         private final Interpretation<T> interpretation;
         private final List<RelationViewFilter> filters = new ArrayList<>();
 
-        protected SymbolViewUpdateListener(ViatraModelQueryAdapterImpl adapter, Interpretation<T> interpretation) {
+        protected SymbolViewUpdateListener(QueryInterpreterAdapterImpl adapter, Interpretation<T> interpretation) {
                 this.adapter = adapter;
                 this.interpretation = interpretation;
         }
@@ -53,9 +53,9 @@ public abstract class SymbolViewUpdateListener<T> implements InterpretationListe
                 }
         }
 
-        public static <T> SymbolViewUpdateListener<T> of(ViatraModelQueryAdapterImpl adapter,
-                                                                                                         SymbolView<T> view,
-                                                                                                         Interpretation<T> interpretation) {
+        public static <T> SymbolViewUpdateListener<T> of(QueryInterpreterAdapterImpl adapter,
+                                                     SymbolView<T> view,
+                                                     Interpretation<T> interpretation) {
                 if (view instanceof TuplePreservingView<T> tuplePreservingRelationView) {
                         return new TuplePreservingViewUpdateListener<>(adapter, tuplePreservingRelationView,
                                         interpretation);
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/TupleChangingViewUpdateListener.java
index 5577faa3..13b4af80 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/TupleChangingViewUpdateListener.java
@@ -3,21 +3,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.update;
+package tools.refinery.store.query.interpreter.internal.update;
 
 import tools.refinery.store.model.Interpretation;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.query.view.SymbolView;
 import tools.refinery.store.tuple.Tuple;
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 
 import java.util.Arrays;
 
 public class TupleChangingViewUpdateListener<T> extends SymbolViewUpdateListener<T> {
         private final SymbolView<T> view;
 
-        TupleChangingViewUpdateListener(ViatraModelQueryAdapterImpl adapter, SymbolView<T> view,
-                                                                        Interpretation<T> interpretation) {
+        TupleChangingViewUpdateListener(QueryInterpreterAdapterImpl adapter, SymbolView<T> view,
+                                    Interpretation<T> interpretation) {
         super(adapter, interpretation);
         this.view = view;
         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/TuplePreservingViewUpdateListener.java
index 7dbd50b3..c9f69145 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/update/TuplePreservingViewUpdateListener.java
@@ -3,19 +3,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.update;
+package tools.refinery.store.query.interpreter.internal.update;
 
-import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.interpreter.matchers.tuple.Tuples;
 import tools.refinery.store.model.Interpretation;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
+import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.query.view.TuplePreservingView;
 import tools.refinery.store.tuple.Tuple;
 
 public class TuplePreservingViewUpdateListener<T> extends SymbolViewUpdateListener<T> {
         private final TuplePreservingView<T> view;
 
-        TuplePreservingViewUpdateListener(ViatraModelQueryAdapterImpl adapter, TuplePreservingView<T> view,
-                                                                          Interpretation<T> interpretation) {
+        TuplePreservingViewUpdateListener(QueryInterpreterAdapterImpl adapter, TuplePreservingView<T> view,
+                                      Interpretation<T> interpretation) {
         super(adapter, interpretation);
         this.view = view;
         }
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java
index 85bdc204..76de8679 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.viatra.tests.QueryEngineTest;
+import tools.refinery.store.query.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertNullableResults;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class DiagonalQueryTest {
         private static final Symbol<Boolean> person = Symbol.of("Person", 1);
@@ -45,7 +45,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -92,7 +92,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -131,7 +131,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -178,7 +178,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -218,7 +218,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, intSymbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -276,7 +276,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, intSymbol)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -315,7 +315,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -361,7 +361,7 @@ class DiagonalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java
index 7190d8f1..00721a34 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java
@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 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.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static tools.refinery.store.query.literal.Literals.check;
 import static tools.refinery.store.query.term.int_.IntTerms.*;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertNullableResults;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class FunctionalQueryTest {
         private static final Symbol<Boolean> person = Symbol.of("Person", 1);
@@ -51,7 +51,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -90,7 +90,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -129,7 +129,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -163,7 +163,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -205,7 +205,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -241,7 +241,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -270,7 +270,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -306,7 +306,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(minQuery, maxQuery))
                                 .build();
@@ -360,7 +360,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -395,7 +395,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -435,7 +435,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -469,7 +469,7 @@ class FunctionalQueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/OrderedResultSetTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java
index 8ede6c80..96d0f302 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/OrderedResultSetTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
@@ -31,7 +31,7 @@ class OrderedResultSetTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -71,7 +71,7 @@ class OrderedResultSetTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java
index ce403e3a..72728dcd 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
@@ -13,7 +13,7 @@ import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.viatra.tests.QueryEngineTest;
+import tools.refinery.store.query.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
@@ -29,7 +29,7 @@ import static tools.refinery.store.query.literal.Literals.check;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.term.int_.IntTerms.constant;
 import static tools.refinery.store.query.term.int_.IntTerms.greaterEq;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class QueryTest {
         private static final Symbol<Boolean> person = Symbol.of("Person", 1);
@@ -45,7 +45,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, asset)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -80,7 +80,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -119,7 +119,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -157,7 +157,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -203,7 +203,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, animal, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -246,7 +246,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -282,7 +282,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -323,7 +323,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -370,7 +370,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -408,7 +408,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -457,7 +457,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -500,7 +500,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -541,7 +541,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -578,7 +578,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -626,7 +626,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(predicate))
                                 .build();
@@ -672,7 +672,7 @@ class QueryTest {
                 )));
                 var store = ModelStore.builder()
                                 .symbols(distance)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(dangerQuery))
                                 .build();
 
@@ -708,7 +708,7 @@ class QueryTest {
                 )));
                 var store = ModelStore.builder()
                                 .symbols(distance)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(dangerQuery))
                                 .build();
 
@@ -744,7 +744,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .defaultHint(hint)
                                                 .queries(query))
                                 .build();
@@ -775,7 +775,7 @@ class QueryTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(predicate))
                                 .build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java
index 3f8c060a..1cd05d91 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
@@ -23,8 +23,8 @@ import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertNullableResults;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class QueryTransactionTest {
         private static final Symbol<Boolean> person = Symbol.of("Person", 1);
@@ -38,7 +38,7 @@ class QueryTransactionTest {
         void flushTest() {
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(predicate))
                                 .build();
 
@@ -100,7 +100,7 @@ class QueryTransactionTest {
         void localSearchTest() {
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                         .defaultHint(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.DEFAULT_SEARCH))
                                         .queries(predicate))
                                 .build();
@@ -147,7 +147,7 @@ class QueryTransactionTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, asset)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(predicate))
                                 .build();
 
@@ -215,7 +215,7 @@ class QueryTransactionTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -254,7 +254,7 @@ class QueryTransactionTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -286,7 +286,7 @@ class QueryTransactionTest {
         void commitAfterFlushTest() {
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(predicate))
                                 .build();
 
@@ -334,7 +334,7 @@ class QueryTransactionTest {
         void commitWithoutFlushTest() {
                 var store = ModelStore.builder()
                                 .symbols(person)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(predicate))
                                 .build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/StronglyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java
index 37795ff3..edbd9aff 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/StronglyConnectedComponentsTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class StronglyConnectedComponentsTest {
         private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
@@ -37,7 +37,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -70,7 +70,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -112,7 +112,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -149,7 +149,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -192,7 +192,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -225,7 +225,7 @@ class StronglyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/WeaklyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java
index 613d4284..3fc85480 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/WeaklyConnectedComponentsTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra;
+package tools.refinery.store.query.interpreter;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 
 class WeaklyConnectedComponentsTest {
         private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
@@ -37,7 +37,7 @@ class WeaklyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -73,7 +73,7 @@ class WeaklyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -118,7 +118,7 @@ class WeaklyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
@@ -162,7 +162,7 @@ class WeaklyConnectedComponentsTest {
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .queries(query))
                                 .build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/internal/matcher/MatcherUtilsTest.java
index 319797a0..1c8044ea 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/internal/matcher/MatcherUtilsTest.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.internal.matcher;
+package tools.refinery.store.query.interpreter.internal.matcher;
 
-import tools.refinery.viatra.runtime.matchers.tuple.*;
+import tools.refinery.interpreter.matchers.tuple.*;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.*;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryAssertions.java
index 5c1c4fc1..c4659a98 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryAssertions.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.tests;
+package tools.refinery.store.query.interpreter.tests;
 
 import org.junit.jupiter.api.function.Executable;
 import tools.refinery.store.query.resultset.ResultSet;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryBackendHint.java
index 5f88e04b..f9d5b219 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryBackendHint.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.tests;
+package tools.refinery.store.query.interpreter.tests;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 
 /**
  * Overrides {@link QueryEvaluationHint#toString()} for pretty names in parametric test names.
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEngineTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryEngineTest.java
index d4f16da7..a5cc7e9c 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEngineTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryEngineTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.tests;
+package tools.refinery.store.query.interpreter.tests;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryEvaluationHintSource.java
index ed356eeb..6503ff2f 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/tests/QueryEvaluationHintSource.java
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.query.viatra.tests;
+package tools.refinery.store.query.interpreter.tests;
 
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
diff --git a/subprojects/store-query-viatra/build.gradle.kts b/subprojects/store-query-viatra/build.gradle.kts
deleted file mode 100644
index fa1c1da3..00000000
--- a/subprojects/store-query-viatra/build.gradle.kts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-plugins {
-        id("tools.refinery.gradle.java-library")
-}
-
-dependencies {
-        api(project(":refinery-viatra-runtime"))
-        api(project(":refinery-viatra-runtime-localsearch"))
-        api(project(":refinery-viatra-runtime-rete"))
-        api(project(":refinery-viatra-runtime-rete-recipes"))
-        api(project(":refinery-store-query"))
-        implementation(libs.ecore)
-        implementation(libs.slf4j.log4j)
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java
deleted file mode 100644
index 12c93f62..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryAdapter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra;
-
-import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.viatra.internal.ViatraModelQueryBuilderImpl;
-
-public interface ViatraModelQueryAdapter extends ModelQueryAdapter {
-        @Override
-        ViatraModelQueryStoreAdapter getStoreAdapter();
-
-        static ViatraModelQueryBuilder builder() {
-                return new ViatraModelQueryBuilderImpl();
-        }
-}
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
deleted file mode 100644
index d19c3bb4..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra;
-
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.rewriter.DnfRewriter;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-
-import java.util.Collection;
-import java.util.function.Function;
-
-@SuppressWarnings("UnusedReturnValue")
-public interface ViatraModelQueryBuilder extends ModelQueryBuilder {
-        ViatraModelQueryBuilder engineOptions(ViatraQueryEngineOptions engineOptions);
-
-        ViatraModelQueryBuilder defaultHint(QueryEvaluationHint queryEvaluationHint);
-
-        ViatraModelQueryBuilder backend(IQueryBackendFactory queryBackendFactory);
-
-        ViatraModelQueryBuilder cachingBackend(IQueryBackendFactory queryBackendFactory);
-
-        ViatraModelQueryBuilder searchBackend(IQueryBackendFactory queryBackendFactory);
-
-        @Override
-        default ViatraModelQueryBuilder queries(AnyQuery... queries) {
-                ModelQueryBuilder.super.queries(queries);
-                return this;
-        }
-
-        @Override
-        default ViatraModelQueryBuilder queries(Collection<? extends AnyQuery> queries) {
-                ModelQueryBuilder.super.queries(queries);
-                return this;
-        }
-
-        @Override
-        ViatraModelQueryBuilder query(AnyQuery query);
-
-        @Override
-        ViatraModelQueryBuilder rewriter(DnfRewriter rewriter);
-
-        ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint);
-
-        @Override
-        ViatraModelQueryStoreAdapter build(ModelStore store);
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java
deleted file mode 100644
index 588c00d4..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra;
-
-import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.ModelQueryStoreAdapter;
-
-public interface ViatraModelQueryStoreAdapter extends ModelQueryStoreAdapter {
-        ViatraQueryEngineOptions getEngineOptions();
-
-        @Override
-        ViatraModelQueryAdapter createModelAdapter(Model model);
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java
deleted file mode 100644
index 9303cae6..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra.internal;
-
-import org.apache.log4j.Logger;
-import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
-import tools.refinery.viatra.runtime.api.scope.IEngineContext;
-import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.store.query.viatra.internal.context.RelationalEngineContext;
-
-public class RelationalScope extends QueryScope {
-        private final ViatraModelQueryAdapterImpl adapter;
-
-        public RelationalScope(ViatraModelQueryAdapterImpl adapter) {
-                this.adapter = adapter;
-        }
-
-        @Override
-        protected IEngineContext createEngineContext(ViatraQueryEngine engine, IIndexingErrorListener errorListener,
-                                                                                                 Logger logger) {
-                return new RelationalEngineContext(adapter);
-        }
-}
diff --git a/subprojects/store-reasoning-scope/build.gradle.kts b/subprojects/store-reasoning-scope/build.gradle.kts
index 6e41dc8e..7e6cd58d 100644
--- a/subprojects/store-reasoning-scope/build.gradle.kts
+++ b/subprojects/store-reasoning-scope/build.gradle.kts
@@ -13,5 +13,5 @@ dependencies {
         implementation(libs.eclipseCollections.api)
         implementation(libs.ortools)
         runtimeOnly(libs.eclipseCollections)
-        testImplementation(project(":refinery-store-query-viatra"))
+        testImplementation(project(":refinery-store-query-interpreter"))
 }
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
index 0132b3f9..97b9fa5e 100644
--- a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
@@ -12,7 +12,7 @@ import tools.refinery.store.dse.propagation.PropagationResult;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.representation.PartialRelation;
@@ -40,7 +40,7 @@ class MultiObjectTest {
         @BeforeEach
         void beforeEach() {
                 store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(PropagationAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new MultiObjectTranslator())
diff --git a/subprojects/store-reasoning/build.gradle.kts b/subprojects/store-reasoning/build.gradle.kts
index ed8355f3..068256c2 100644
--- a/subprojects/store-reasoning/build.gradle.kts
+++ b/subprojects/store-reasoning/build.gradle.kts
@@ -11,5 +11,5 @@ plugins {
 dependencies {
         api(project(":refinery-store-dse"))
         testImplementation(testFixtures(project(":refinery-store-query")))
-        testImplementation(project(":refinery-store-query-viatra"))
+        testImplementation(project(":refinery-store-query-interpreter"))
 }
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
index 77560a68..f8135102 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
@@ -10,7 +10,7 @@ import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.ForbiddenView;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
@@ -42,7 +42,7 @@ class PartialModelTest {
                 var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.UNKNOWN);
 
                 var store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new MultiObjectTranslator())
                                 .with(PartialRelationTranslator.of(person)
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
index bbfaff84..1d0ac02d 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.containment;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -52,7 +52,7 @@ class ContainmentHierarchyTranslatorTest {
                 );
 
                 store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new MultiObjectTranslator())
                                 .with(new TypeHierarchyTranslator(typeHierarchy))
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
index eabbdffe..6c2f55af 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.metamodel;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -141,7 +141,7 @@ class MetamodelTest {
 
         private static Model createModel(Metamodel metamodel, ModelSeed seed) {
                 var store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new MultiObjectTranslator())
                                 .with(new MetamodelTranslator(metamodel))
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
index 64230cf6..48a046fc 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
@@ -11,7 +11,7 @@ import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
@@ -305,7 +305,7 @@ class PartialCountTest {
                 var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.FALSE);
 
                 var store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder()
+                                .with(QueryInterpreterAdapter.builder()
                                                 .query(query))
                                 .with(ReasoningAdapter.builder())
                                 .with(new MultiObjectTranslator())
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
index 3658d603..4bef9d8e 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.typehierarchy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -34,7 +34,7 @@ class ConcreteSupertypeTest {
                                 .build();
 
                 store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new TypeHierarchyTranslator(typeHierarchy))
                                 .build();
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
index cd9df19a..5af725bb 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -42,7 +42,7 @@ class TypeHierarchyPartialModelTest {
                                 .build();
 
                 var store = ModelStore.builder()
-                                .with(ViatraModelQueryAdapter.builder())
+                                .with(QueryInterpreterAdapter.builder())
                                 .with(ReasoningAdapter.builder())
                                 .with(new TypeHierarchyTranslator(typeHierarchy))
                                 .build();
diff --git a/subprojects/viatra-runtime-localsearch/build.gradle.kts b/subprojects/viatra-runtime-localsearch/build.gradle.kts
deleted file mode 100644
index d0259d95..00000000
--- a/subprojects/viatra-runtime-localsearch/build.gradle.kts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-plugins {
-        id("tools.refinery.gradle.java-library")
-        // Vendor code from Eclipse VIATRA is maintained by the VIATRA project,
-        // so we don't need to keep track of coverage ourselves.
-        // Our own modifications are covered by tests in the `store-query-viatra` subproject.
-        id("tools.refinery.gradle.skip-coverage")
-}
-
-dependencies {
-        implementation(project(":refinery-viatra-runtime"))
-        implementation(libs.slf4j.log4j)
-}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java
deleted file mode 100644
index b74282ca..00000000
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-v20.html.
- * 
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package tools.refinery.viatra.runtime.localsearch.plan;
-
-import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
-import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
-import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
-import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
-
-/**
- * @author Grill Balázs
- * @since 1.4
- * @noreference This interface is not intended to be referenced by clients.
- */
-public interface IPlanProvider {
-
-    /**
-     * @throws ViatraQueryRuntimeException
-     * @since 2.1
-     */
-    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler, 
-            ResultProviderRequestor resultProviderRequestor,
-            LocalSearchHints configuration, MatcherReference key);
-    
-}
diff --git a/subprojects/viatra-runtime-rete/build.gradle.kts b/subprojects/viatra-runtime-rete/build.gradle.kts
deleted file mode 100644
index 560e8854..00000000
--- a/subprojects/viatra-runtime-rete/build.gradle.kts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-plugins {
-        id("tools.refinery.gradle.java-library")
-        // Vendor code from Eclipse VIATRA is maintained by the VIATRA project,
-        // so we don't need to keep track of coverage ourselves.
-        // Our own modifications are covered by tests in the `store-query-viatra` subproject.
-        id("tools.refinery.gradle.skip-coverage")
-}
-
-dependencies {
-        implementation(project(":refinery-viatra-runtime"))
-        implementation(project(":refinery-viatra-runtime-rete-recipes"))
-        implementation(libs.slf4j.log4j)
-}
diff --git a/subprojects/viatra-runtime/build.gradle.kts b/subprojects/viatra-runtime/build.gradle.kts
deleted file mode 100644
index 05c2b754..00000000
--- a/subprojects/viatra-runtime/build.gradle.kts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-plugins {
-        id("tools.refinery.gradle.java-library")
-        // Vendor code from Eclipse VIATRA is maintained by the VIATRA project,
-        // so we don't need to keep track of coverage ourselves.
-        // Our own modifications are covered by tests in the `store-query-viatra` subproject.
-        id("tools.refinery.gradle.skip-coverage")
-}
-
-dependencies {
-        implementation(libs.slf4j.log4j)
-        implementation(libs.eclipseCollections)
-        implementation(libs.eclipseCollections.api)
-}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java
deleted file mode 100644
index 4a256aea..00000000
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-v20.html.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package tools.refinery.viatra.runtime.api;
-
-import tools.refinery.viatra.runtime.api.scope.QueryScope;
-import tools.refinery.viatra.runtime.internal.apiimpl.ViatraQueryEngineImpl;
-import tools.refinery.viatra.runtime.util.ViatraQueryLoggingUtil;
-
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
-
-/**
- * Global registry of active VIATRA Query Engines.
- *
- * <p>
- * Manages an {@link ViatraQueryEngine} for each model (more precisely scope), that is created on demand. Managed engines are shared between
- * clients querying the same model.
- *
- * <p>
- * It is also possible to create private, unmanaged engines that are not shared between clients.
- *
- * <p>
- * Only weak references are retained on the managed engines. So if there are no other references to the matchers or the
- * engine, they can eventually be GC'ed, and they won't block the model from being GC'ed either.
- *
- *
- * @author Bergmann Gabor
- *
- */
-public class ViatraQueryEngineManager {
-    private static ViatraQueryEngineManager instance = new ViatraQueryEngineManager();
-
-
-    /**
-     * @return the singleton instance
-     */
-    public static ViatraQueryEngineManager getInstance() {
-        return instance;
-    }
-
-    /**
-     * The engine manager keeps track of the managed engines via weak references only, so it will not keep unused
-     * managed engines from being garbage collected. Still, as long as the user keeps the model in memory, the
-     * associated managed engine will not be garbage collected, as it is expected to be strongly reachable from the
-     * model via the scope-specific base index or change notification listeners (see
-     * {@link BaseIndexListener#iqEngine}).
-     */
-    Map<QueryScope, WeakReference<ViatraQueryEngineImpl>> engines;
-
-    ViatraQueryEngineManager() {
-        super();
-        engines = new WeakHashMap<QueryScope, WeakReference<ViatraQueryEngineImpl>>();
-        initializationListeners = new HashSet<ViatraQueryEngineInitializationListener>();
-    }
-
-    /**
-     * Creates a managed VIATRA Query Engine at a given scope (e.g. an EMF Resource or ResourceSet, as in {@link EMFScope})
-     * or retrieves an already existing one. Repeated invocations for a single model root will return the same engine.
-     * Consequently, the engine will be reused between different clients querying the same model, providing performance benefits.
-     *
-     * <p>
-     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
-     *
-     * @param scope
-     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
-     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
-     * @return a new or previously existing engine
-     */
-    public ViatraQueryEngine getQueryEngine(QueryScope scope) {
-        return getQueryEngine(scope, ViatraQueryEngineOptions.getDefault());
-    }
-
-    /**
-     * Creates a managed VIATRA Query Engine at a given scope (e.g. an EMF Resource or ResourceSet, as in {@link EMFScope})
-     * or retrieves an already existing one. Repeated invocations for a single model root will return the same engine.
-     * Consequently, the engine will be reused between different clients querying the same model, providing performance benefits.
-     *
-     * <p>
-     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
-     *
-     * @param scope
-     *      the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
-     *      Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
-     * @return a new or previously existing engine
-     * @since 1.4
-     */
-    public ViatraQueryEngine getQueryEngine(QueryScope scope, ViatraQueryEngineOptions options) {
-        ViatraQueryEngineImpl engine = getEngineInternal(scope);
-        if (engine == null) {
-            engine = new ViatraQueryEngineImpl(this, scope, options);
-            engines.put(scope, new WeakReference<ViatraQueryEngineImpl>(engine));
-            notifyInitializationListeners(engine);
-        }
-        return engine;
-    }
-
-    /**
-     * Retrieves an already existing managed VIATRA Query Engine.
-     *
-     * @param scope
-     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
-     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
-     * @return a previously existing engine, or null if no engine is active for the given EMF model root
-     */
-    public ViatraQueryEngine getQueryEngineIfExists(QueryScope scope) {
-        return getEngineInternal(scope);
-    }
-
-    /**
-     * Collects all {@link ViatraQueryEngine} instances that still exist.
-     *
-     * @return set of engines if there is any, otherwise EMTPY_SET
-     */
-    public Set<ViatraQueryEngine> getExistingQueryEngines(){
-        Set<ViatraQueryEngine> existingEngines = null;
-        for (WeakReference<ViatraQueryEngineImpl> engineRef : engines.values()) {
-            AdvancedViatraQueryEngine engine = engineRef == null ? null : engineRef.get();
-            if(existingEngines == null) {
-                existingEngines = new HashSet<>();
-            }
-            existingEngines.add(engine);
-        }
-        if(existingEngines == null) {
-            existingEngines = Collections.emptySet();
-        }
-        return existingEngines;
-    }
-
-    private final Set<ViatraQueryEngineInitializationListener> initializationListeners;
-
-    /**
-     * Registers a listener for new engine initialization.
-     *
-     * <p/> For removal, use {@link #removeQueryEngineInitializationListener}
-     *
-     * @param listener the listener to register
-     */
-    public void addQueryEngineInitializationListener(ViatraQueryEngineInitializationListener listener) {
-        checkArgument(listener != null, "Cannot add null listener!");
-        initializationListeners.add(listener);
-    }
-
-    /**
-     * Removes a registered listener added with {@link #addQueryEngineInitializationListener}
-     *
-     * @param listener
-     */
-    public void removeQueryEngineInitializationListener(ViatraQueryEngineInitializationListener listener) {
-        checkArgument(listener != null, "Cannot remove null listener!");
-        initializationListeners.remove(listener);
-    }
-
-    /**
-     * Notifies listeners that a new engine has been initialized.
-     *
-     * @param engine the initialized engine
-     */
-    protected void notifyInitializationListeners(AdvancedViatraQueryEngine engine) {
-        try {
-            if (!initializationListeners.isEmpty()) {
-                for (ViatraQueryEngineInitializationListener listener : new HashSet<>(initializationListeners)) {
-                    listener.engineInitialized(engine);
-                }
-            }
-        } catch (Exception ex) {
-            ViatraQueryLoggingUtil.getLogger(getClass()).fatal(
-                    "VIATRA Query Engine Manager encountered an error in delivering notifications"
-                            + " about engine initialization. ", ex);
-        }
-    }
-
-    /**
-     * @param emfRoot
-     * @return
-     */
-    private ViatraQueryEngineImpl getEngineInternal(QueryScope scope) {
-        final WeakReference<ViatraQueryEngineImpl> engineRef = engines.get(scope);
-        ViatraQueryEngineImpl engine = engineRef == null ? null : engineRef.get();
-        return engine;
-    }
-
-}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java
deleted file mode 100644
index fec547a6..00000000
--- a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004-2010 Akos Horvath and Daniel Varro
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-v20.html.
- * 
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package tools.refinery.viatra.runtime.exception;
-
-import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
-import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
-import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
-
-/**
- * A general VIATRA Query-related problem during the operation of the VIATRA Query
- * engine, or the loading, manipulation and evaluation of queries.
- * 
- * @author Bergmann Gabor
- * @since 0.9
- * 
- */
-public class ViatraQueryException extends ViatraQueryRuntimeException {
-
-    private static final long serialVersionUID = -74252748358355750L;
-
-    public static final String PARAM_NOT_SUITABLE_WITH_NO = "The type of the parameters are not suitable for the operation. Parameter number: ";
-    public static final String CONVERSION_FAILED = "Could not convert the term to the designated type";
-    public static final String CONVERT_NULL_PARAMETER = "Could not convert null to the designated type";
-    public static final String RELATIONAL_PARAM_UNSUITABLE = "The parameters are not acceptable by the operation";
-    /**
-     * @since 0.9
-     */
-    public static final String PROCESSING_PROBLEM = "The following error occurred during the processing of a query (e.g. for the preparation of a VIATRA pattern matcher)";
-    /**
-     * @since 0.9
-     */
-    public static final String QUERY_INIT_PROBLEM = "The following error occurred during the initialization of a VIATRA query specification";
-    public static final String GETNAME_FAILED = "Could not get 'name' attribute of the result";
-
-    public static final String INVALID_EMFROOT = "Incremental EMF query engine can only be attached on the contents of an EMF EObject, Resource, ResourceSet or multiple ResourceSets. Received instead: ";
-    public static final String INVALID_EMFROOT_SHORT = "Invalid EMF model root";
-    // public static final String EMF_MODEL_PROCESSING_ERROR = "Error while processing the EMF model";
-
-    private final String shortMessage;
-
-    public ViatraQueryException(String s, String shortMessage) {
-        super(s);
-        this.shortMessage = shortMessage;
-    }
-
-    public ViatraQueryException(QueryProcessingException e) {
-        super(PROCESSING_PROBLEM + ": " + e.getMessage(), e);
-        this.shortMessage = e.getShortMessage();
-    }
-    
-    public ViatraQueryException(QueryInitializationException e) {
-        super(QUERY_INIT_PROBLEM + ": " + e.getMessage(), e);
-        this.shortMessage = e.getShortMessage();
-    }
-
-    public ViatraQueryException(String s, String shortMessage, Throwable e) {
-        super(s + ": " + e.getMessage(), e);
-        this.shortMessage = shortMessage;
-    }
-
-    public String getShortMessage() {
-        return shortMessage;
-    }
-
-}