From 436ec038c24c42e615feb22a0fed029494bc74ea Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Tue, 7 May 2019 11:54:19 -0400
Subject: Revert "Try to restructure satellite case study"

This reverts commit 9b83e33c055660f6de218d1b672f67734675f1f6.
---
 .../domains/satellite/queries/.gitignore           |   2 -
 ...icationLinkDoesNotStartAtContainingElement.java | 579 +++++++++++++++++
 .../queries/CommunicationLinkOfElement.java        | 705 ---------------------
 .../satellite/queries/CommunicationLoop.java       |   6 +-
 .../satellite/queries/CubeSatWithKaAntenna.java    |   6 +-
 .../queries/IncompatibleSourceAndTargetBand.java   |   6 +-
 .../queries/IncompatibleSourceAndTargetGain.java   |   6 +-
 .../satellite/queries/KaAntennaGainLow.java        |   6 +-
 .../queries/MultipleCommunicationLinks.java        | 576 -----------------
 .../satellite/queries/NoLinkToGroundStation.java   |   6 +-
 .../queries/NoPotentialLinkToGroundStation.java    |   6 +-
 .../queries/NotEnoughInterferometryPayloads.java   |   6 +-
 .../satellite/queries/SatelliteQueries.java        |  25 +-
 .../domains/satellite/queries/SmallSat.java        |  50 +-
 .../satellite/queries/SpacecraftOfKind.java        |  10 +-
 .../queries/ThreeUCubeSatWithNonUhfCrossLink.java  |   6 +-
 .../satellite/queries/UhfAntennaGainNotLow.java    |   6 +-
 .../satellite/queries/XAntennaGainNotMedium.java   |   6 +-
 .../internal/AtLeastTwoInterferometryPayloads.java |   2 +-
 .../queries/internal/CommSubsystemBand.java        |   4 +-
 .../queries/internal/CommSubsystemBandUhf.java     |   2 +-
 .../queries/internal/CommSubsystemGain.java        |   4 +-
 .../queries/internal/CommSubsystemGainLow.java     |   2 +-
 .../queries/internal/CommSubsystemGainMedium.java  |   2 +-
 .../satellite/queries/internal/CubeSat3U.java      |   2 +-
 .../queries/internal/DirectCommunicationLink.java  |   4 +-
 .../queries/internal/GroundStationNetwork.java     |   2 +-
 .../internal/IndirectCommunicationLink.java        |   4 +-
 .../queries/internal/IndirectLinkAllowed.java      |   4 +-
 .../satellite/queries/internal/LinkAllowed.java    |   4 +-
 .../queries/internal/MatchingAntenna.java          |   6 +-
 .../queries/internal/SatelliteQueriesAll.java      |   9 +-
 .../SpacecraftWithInterferometryPayload.java       |   4 +-
 33 files changed, 675 insertions(+), 1393 deletions(-)
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
index 4354da2c..6f361334 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
@@ -23,5 +23,3 @@
 /.SpacecraftOfKind.java._trace
 /.NoPotentialLinkToGroundStation.java._trace
 /.SmallSat.java._trace
-/.CommunicationLinkOfElement.java._trace
-/.MultipleCommunicationLinks.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java
new file mode 100644
index 00000000..dde3c20f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java
@@ -0,0 +1,579 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Link},
+ *         	message = "Communication links must start from the containing element.")
+ *         pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+ *         	CommunicatingElement.communicationLink(Element, Link);
+ *         	DirectedCommunicationLink.source(Link, SourceComm);
+ *         	CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+ *         	Element != SourceElement;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class CommunicationLinkDoesNotStartAtContainingElement extends BaseGeneratedEMFQuerySpecification<CommunicationLinkDoesNotStartAtContainingElement.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private DirectedCommunicationLink fLink;
+    
+    private static List<String> parameterNames = makeImmutableList("Link");
+    
+    private Match(final DirectedCommunicationLink pLink) {
+      this.fLink = pLink;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("Link".equals(parameterName)) return this.fLink;
+      return null;
+    }
+    
+    public DirectedCommunicationLink getLink() {
+      return this.fLink;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Link".equals(parameterName) ) {
+          this.fLink = (DirectedCommunicationLink) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setLink(final DirectedCommunicationLink pLink) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fLink = pLink;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return CommunicationLinkDoesNotStartAtContainingElement.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fLink};
+    }
+    
+    @Override
+    public CommunicationLinkDoesNotStartAtContainingElement.Match toImmutable() {
+      return isMutable() ? newMatch(fLink) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Link\"=" + prettyPrintValue(fLink));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fLink);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof CommunicationLinkDoesNotStartAtContainingElement.Match)) {
+          CommunicationLinkDoesNotStartAtContainingElement.Match other = (CommunicationLinkDoesNotStartAtContainingElement.Match) obj;
+          return Objects.equals(fLink, other.fLink);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public CommunicationLinkDoesNotStartAtContainingElement specification() {
+      return CommunicationLinkDoesNotStartAtContainingElement.instance();
+    }
+    
+    /**
+     * 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 CommunicationLinkDoesNotStartAtContainingElement.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static CommunicationLinkDoesNotStartAtContainingElement.Match newMutableMatch(final DirectedCommunicationLink pLink) {
+      return new Mutable(pLink);
+    }
+    
+    /**
+     * 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()} to obtain a mutable match object.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final DirectedCommunicationLink pLink) {
+      return new Immutable(pLink);
+    }
+    
+    private static final class Mutable extends CommunicationLinkDoesNotStartAtContainingElement.Match {
+      Mutable(final DirectedCommunicationLink pLink) {
+        super(pLink);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends CommunicationLinkDoesNotStartAtContainingElement.Match {
+      Immutable(final DirectedCommunicationLink pLink) {
+        super(pLink);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Link},
+   * 	message = "Communication links must start from the containing element.")
+   * pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+   * 	CommunicatingElement.communicationLink(Element, Link);
+   * 	DirectedCommunicationLink.source(Link, SourceComm);
+   * 	CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+   * 	Element != SourceElement;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see CommunicationLinkDoesNotStartAtContainingElement
+   * 
+   */
+  public static class Matcher extends BaseMatcher<CommunicationLinkDoesNotStartAtContainingElement.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static CommunicationLinkDoesNotStartAtContainingElement.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static CommunicationLinkDoesNotStartAtContainingElement.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_LINK = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CommunicationLinkDoesNotStartAtContainingElement.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<CommunicationLinkDoesNotStartAtContainingElement.Match> getAllMatches(final DirectedCommunicationLink pLink) {
+      return rawStreamAllMatches(new Object[]{pLink}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<CommunicationLinkDoesNotStartAtContainingElement.Match> streamAllMatches(final DirectedCommunicationLink pLink) {
+      return rawStreamAllMatches(new Object[]{pLink});
+    }
+    
+    /**
+     * 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 pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<CommunicationLinkDoesNotStartAtContainingElement.Match> getOneArbitraryMatch(final DirectedCommunicationLink pLink) {
+      return rawGetOneArbitraryMatch(new Object[]{pLink});
+    }
+    
+    /**
+     * 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 pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final DirectedCommunicationLink pLink) {
+      return rawHasMatch(new Object[]{pLink});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final DirectedCommunicationLink pLink) {
+      return rawCountMatches(new Object[]{pLink});
+    }
+    
+    /**
+     * 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 pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final DirectedCommunicationLink pLink, final Consumer<? super CommunicationLinkDoesNotStartAtContainingElement.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pLink}, processor);
+    }
+    
+    /**
+     * 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()} to obtain a mutable match object.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final DirectedCommunicationLink pLink) {
+      return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch(pLink);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Link.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<DirectedCommunicationLink> rawStreamAllValuesOfLink(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LINK, parameters).map(DirectedCommunicationLink.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Link.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<DirectedCommunicationLink> getAllValuesOfLink() {
+      return rawStreamAllValuesOfLink(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Link.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<DirectedCommunicationLink> streamAllValuesOfLink() {
+      return rawStreamAllValuesOfLink(emptyArray());
+    }
+    
+    @Override
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match tupleToMatch(final Tuple t) {
+      try {
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((DirectedCommunicationLink) t.get(POSITION_LINK));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match arrayToMatch(final Object[] match) {
+      try {
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((DirectedCommunicationLink) match[POSITION_LINK]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMutableMatch((DirectedCommunicationLink) match[POSITION_LINK]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<CommunicationLinkDoesNotStartAtContainingElement.Matcher> querySpecification() {
+      return CommunicationLinkDoesNotStartAtContainingElement.instance();
+    }
+  }
+  
+  private CommunicationLinkDoesNotStartAtContainingElement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CommunicationLinkDoesNotStartAtContainingElement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected CommunicationLinkDoesNotStartAtContainingElement.Matcher instantiate(final ViatraQueryEngine engine) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.on(engine);
+  }
+  
+  @Override
+  public CommunicationLinkDoesNotStartAtContainingElement.Matcher instantiate() {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.create();
+  }
+  
+  @Override
+  public CommunicationLinkDoesNotStartAtContainingElement.Match newEmptyMatch() {
+    return CommunicationLinkDoesNotStartAtContainingElement.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final Object... parameters) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement (visibility: PUBLIC, simpleName: CommunicationLinkDoesNotStartAtContainingElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement (visibility: PUBLIC, simpleName: CommunicationLinkDoesNotStartAtContainingElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CommunicationLinkDoesNotStartAtContainingElement INSTANCE = new CommunicationLinkDoesNotStartAtContainingElement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CommunicationLinkDoesNotStartAtContainingElement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Link);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Link");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Link = body.getOrCreateVariableByName("Link");
+          PVariable var_Element = body.getOrCreateVariableByName("Element");
+          PVariable var_SourceComm = body.getOrCreateVariableByName("SourceComm");
+          PVariable var_SourceElement = body.getOrCreateVariableByName("SourceElement");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Link, parameter_Link)
+          ));
+          // 	CommunicatingElement.communicationLink(Element, Link)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "communicationLink")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
+          new Equality(body, var__virtual_0_, var_Link);
+          // 	DirectedCommunicationLink.source(Link, SourceComm)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "source")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_1_, var_SourceComm);
+          // 	CommunicatingElement.commSubsystem(SourceElement, SourceComm)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_SourceElement), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_SourceElement, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_2_, var_SourceComm);
+          // 	Element != SourceElement
+          new Inequality(body, var_Element, var_SourceElement);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Link")
+                              }));
+          annotation.addAttribute("message", "Communication links must start from the containing element.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java
deleted file mode 100644
index 1327c6bf..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
-import satellite.DirectedCommunicationLink;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}QueryBasedFeature(feature = "communicationLink")
- *         pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
- *         	CommunicatingElement.commSubsystem.communicationLink(Element, Link);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class CommunicationLinkOfElement extends BaseGeneratedEMFQuerySpecification<CommunicationLinkOfElement.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private CommunicatingElement fElement;
-    
-    private DirectedCommunicationLink fLink;
-    
-    private static List<String> parameterNames = makeImmutableList("Element", "Link");
-    
-    private Match(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      this.fElement = pElement;
-      this.fLink = pLink;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Element".equals(parameterName)) return this.fElement;
-      if ("Link".equals(parameterName)) return this.fLink;
-      return null;
-    }
-    
-    public CommunicatingElement getElement() {
-      return this.fElement;
-    }
-    
-    public DirectedCommunicationLink getLink() {
-      return this.fLink;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Element".equals(parameterName) ) {
-          this.fElement = (CommunicatingElement) newValue;
-          return true;
-      }
-      if ("Link".equals(parameterName) ) {
-          this.fLink = (DirectedCommunicationLink) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setElement(final CommunicatingElement pElement) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fElement = pElement;
-    }
-    
-    public void setLink(final DirectedCommunicationLink pLink) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fLink = pLink;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return CommunicationLinkOfElement.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fElement, fLink};
-    }
-    
-    @Override
-    public CommunicationLinkOfElement.Match toImmutable() {
-      return isMutable() ? newMatch(fElement, fLink) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Element\"=" + prettyPrintValue(fElement) + ", ");
-      result.append("\"Link\"=" + prettyPrintValue(fLink));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fElement, fLink);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof CommunicationLinkOfElement.Match)) {
-          CommunicationLinkOfElement.Match other = (CommunicationLinkOfElement.Match) obj;
-          return Objects.equals(fElement, other.fElement) && Objects.equals(fLink, other.fLink);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public CommunicationLinkOfElement specification() {
-      return CommunicationLinkOfElement.instance();
-    }
-    
-    /**
-     * 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 CommunicationLinkOfElement.Match newEmptyMatch() {
-      return new Mutable(null, null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static CommunicationLinkOfElement.Match newMutableMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return new Mutable(pElement, pLink);
-    }
-    
-    /**
-     * 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()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static CommunicationLinkOfElement.Match newMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return new Immutable(pElement, pLink);
-    }
-    
-    private static final class Mutable extends CommunicationLinkOfElement.Match {
-      Mutable(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-        super(pElement, pLink);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends CommunicationLinkOfElement.Match {
-      Immutable(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-        super(pElement, pLink);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}QueryBasedFeature(feature = "communicationLink")
-   * pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
-   * 	CommunicatingElement.commSubsystem.communicationLink(Element, Link);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see CommunicationLinkOfElement
-   * 
-   */
-  public static class Matcher extends BaseMatcher<CommunicationLinkOfElement.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static CommunicationLinkOfElement.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static CommunicationLinkOfElement.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_ELEMENT = 0;
-    
-    private static final int POSITION_LINK = 1;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CommunicationLinkOfElement.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<CommunicationLinkOfElement.Match> getAllMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawStreamAllMatches(new Object[]{pElement, pLink}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<CommunicationLinkOfElement.Match> streamAllMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawStreamAllMatches(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<CommunicationLinkOfElement.Match> getOneArbitraryMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawGetOneArbitraryMatch(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawHasMatch(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawCountMatches(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink, final Consumer<? super CommunicationLinkOfElement.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pElement, pLink}, processor);
-    }
-    
-    /**
-     * 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()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public CommunicationLinkOfElement.Match newMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return CommunicationLinkOfElement.Match.newMatch(pElement, pLink);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<CommunicatingElement> rawStreamAllValuesOfElement(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_ELEMENT, parameters).map(CommunicatingElement.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfElement(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement(final DirectedCommunicationLink pLink) {
-      return rawStreamAllValuesOfElement(new Object[]{null, pLink});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfElement(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement(final DirectedCommunicationLink pLink) {
-      return rawStreamAllValuesOfElement(new Object[]{null, pLink}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<DirectedCommunicationLink> rawStreamAllValuesOfLink(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_LINK, parameters).map(DirectedCommunicationLink.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink() {
-      return rawStreamAllValuesOfLink(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink() {
-      return rawStreamAllValuesOfLink(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfLink(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink(final CommunicatingElement pElement) {
-      return rawStreamAllValuesOfLink(new Object[]{pElement, null});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfLink(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink(final CommunicatingElement pElement) {
-      return rawStreamAllValuesOfLink(new Object[]{pElement, null}).collect(Collectors.toSet());
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match tupleToMatch(final Tuple t) {
-      try {
-          return CommunicationLinkOfElement.Match.newMatch((CommunicatingElement) t.get(POSITION_ELEMENT), (DirectedCommunicationLink) t.get(POSITION_LINK));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match arrayToMatch(final Object[] match) {
-      try {
-          return CommunicationLinkOfElement.Match.newMatch((CommunicatingElement) match[POSITION_ELEMENT], (DirectedCommunicationLink) match[POSITION_LINK]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return CommunicationLinkOfElement.Match.newMutableMatch((CommunicatingElement) match[POSITION_ELEMENT], (DirectedCommunicationLink) match[POSITION_LINK]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<CommunicationLinkOfElement.Matcher> querySpecification() {
-      return CommunicationLinkOfElement.instance();
-    }
-  }
-  
-  private CommunicationLinkOfElement() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static CommunicationLinkOfElement instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected CommunicationLinkOfElement.Matcher instantiate(final ViatraQueryEngine engine) {
-    return CommunicationLinkOfElement.Matcher.on(engine);
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Matcher instantiate() {
-    return CommunicationLinkOfElement.Matcher.create();
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Match newEmptyMatch() {
-    return CommunicationLinkOfElement.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Match newMatch(final Object... parameters) {
-    return CommunicationLinkOfElement.Match.newMatch((satellite.CommunicatingElement) parameters[0], (satellite.DirectedCommunicationLink) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement (visibility: PUBLIC, simpleName: CommunicationLinkOfElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement (visibility: PUBLIC, simpleName: CommunicationLinkOfElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final CommunicationLinkOfElement INSTANCE = new CommunicationLinkOfElement();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final CommunicationLinkOfElement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Element, parameter_Link);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Element","Link");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Element = body.getOrCreateVariableByName("Element");
-          PVariable var_Link = body.getOrCreateVariableByName("Link");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Element, parameter_Element),
-             new ExportedParameter(body, var_Link, parameter_Link)
-          ));
-          // 	CommunicatingElement.commSubsystem.communicationLink(Element, Link)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_1_, var_Link);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("QueryBasedFeature");
-          annotation.addAttribute("feature", "communicationLink");
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
index ede57df8..f5835baf 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +39,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class CommunicationLoop extends BaseGeneratedEMFQuerySpecification<
   
   @Override
   public CommunicationLoop.Match newMatch(final Object... parameters) {
-    return CommunicationLoop.Match.newMatch((satellite.CommunicatingElement) parameters[0]);
+    return CommunicationLoop.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class CommunicationLoop extends BaseGeneratedEMFQuerySpecification<
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommunicationLoop.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Element = new PParameter("Element", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Element);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
index b73cb23f..ba69943a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -477,7 +477,7 @@ public final class CubeSatWithKaAntenna extends BaseGeneratedEMFQuerySpecificati
   
   @Override
   public CubeSatWithKaAntenna.Match newMatch(final Object... parameters) {
-    return CubeSatWithKaAntenna.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return CubeSatWithKaAntenna.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -509,7 +509,7 @@ public final class CubeSatWithKaAntenna extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CubeSatWithKaAntenna.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
index f2713f45..4cacc34b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBand;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.DirectedCommunicationLink;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -480,7 +480,7 @@ public final class IncompatibleSourceAndTargetBand extends BaseGeneratedEMFQuery
   
   @Override
   public IncompatibleSourceAndTargetBand.Match newMatch(final Object... parameters) {
-    return IncompatibleSourceAndTargetBand.Match.newMatch((satellite.DirectedCommunicationLink) parameters[0]);
+    return IncompatibleSourceAndTargetBand.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
   }
   
   /**
@@ -512,7 +512,7 @@ public final class IncompatibleSourceAndTargetBand extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IncompatibleSourceAndTargetBand.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Link);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
index 33a4b067..3f247613 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGain;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.DirectedCommunicationLink;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -476,7 +476,7 @@ public final class IncompatibleSourceAndTargetGain extends BaseGeneratedEMFQuery
   
   @Override
   public IncompatibleSourceAndTargetGain.Match newMatch(final Object... parameters) {
-    return IncompatibleSourceAndTargetGain.Match.newMatch((satellite.DirectedCommunicationLink) parameters[0]);
+    return IncompatibleSourceAndTargetGain.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
   }
   
   /**
@@ -508,7 +508,7 @@ public final class IncompatibleSourceAndTargetGain extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IncompatibleSourceAndTargetGain.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Link);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
index 37c35bfe..18f6c32f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -41,7 +42,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -475,7 +475,7 @@ public final class KaAntennaGainLow extends BaseGeneratedEMFQuerySpecification<K
   
   @Override
   public KaAntennaGainLow.Match newMatch(final Object... parameters) {
-    return KaAntennaGainLow.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return KaAntennaGainLow.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -507,7 +507,7 @@ public final class KaAntennaGainLow extends BaseGeneratedEMFQuerySpecification<K
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final KaAntennaGainLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java
deleted file mode 100644
index ad82ead9..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}Constraint(severity = "error", key = {Element},
- *         	message = "Only one communication link is allowed per element.")
- *         pattern multipleCommunicationLinks(Element : CommunicatingElement) {
- *         	CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
- *         	CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
- *         	Link1 != Link2;
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpecification<MultipleCommunicationLinks.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private CommunicatingElement fElement;
-    
-    private static List<String> parameterNames = makeImmutableList("Element");
-    
-    private Match(final CommunicatingElement pElement) {
-      this.fElement = pElement;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Element".equals(parameterName)) return this.fElement;
-      return null;
-    }
-    
-    public CommunicatingElement getElement() {
-      return this.fElement;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Element".equals(parameterName) ) {
-          this.fElement = (CommunicatingElement) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setElement(final CommunicatingElement pElement) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fElement = pElement;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return MultipleCommunicationLinks.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fElement};
-    }
-    
-    @Override
-    public MultipleCommunicationLinks.Match toImmutable() {
-      return isMutable() ? newMatch(fElement) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Element\"=" + prettyPrintValue(fElement));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fElement);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof MultipleCommunicationLinks.Match)) {
-          MultipleCommunicationLinks.Match other = (MultipleCommunicationLinks.Match) obj;
-          return Objects.equals(fElement, other.fElement);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public MultipleCommunicationLinks specification() {
-      return MultipleCommunicationLinks.instance();
-    }
-    
-    /**
-     * 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 MultipleCommunicationLinks.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static MultipleCommunicationLinks.Match newMutableMatch(final CommunicatingElement pElement) {
-      return new Mutable(pElement);
-    }
-    
-    /**
-     * 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()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static MultipleCommunicationLinks.Match newMatch(final CommunicatingElement pElement) {
-      return new Immutable(pElement);
-    }
-    
-    private static final class Mutable extends MultipleCommunicationLinks.Match {
-      Mutable(final CommunicatingElement pElement) {
-        super(pElement);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends MultipleCommunicationLinks.Match {
-      Immutable(final CommunicatingElement pElement) {
-        super(pElement);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}Constraint(severity = "error", key = {Element},
-   * 	message = "Only one communication link is allowed per element.")
-   * pattern multipleCommunicationLinks(Element : CommunicatingElement) {
-   * 	CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
-   * 	CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
-   * 	Link1 != Link2;
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see MultipleCommunicationLinks
-   * 
-   */
-  public static class Matcher extends BaseMatcher<MultipleCommunicationLinks.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static MultipleCommunicationLinks.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static MultipleCommunicationLinks.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_ELEMENT = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MultipleCommunicationLinks.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<MultipleCommunicationLinks.Match> getAllMatches(final CommunicatingElement pElement) {
-      return rawStreamAllMatches(new Object[]{pElement}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<MultipleCommunicationLinks.Match> streamAllMatches(final CommunicatingElement pElement) {
-      return rawStreamAllMatches(new Object[]{pElement});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<MultipleCommunicationLinks.Match> getOneArbitraryMatch(final CommunicatingElement pElement) {
-      return rawGetOneArbitraryMatch(new Object[]{pElement});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final CommunicatingElement pElement) {
-      return rawHasMatch(new Object[]{pElement});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final CommunicatingElement pElement) {
-      return rawCountMatches(new Object[]{pElement});
-    }
-    
-    /**
-     * 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 pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final CommunicatingElement pElement, final Consumer<? super MultipleCommunicationLinks.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pElement}, processor);
-    }
-    
-    /**
-     * 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()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public MultipleCommunicationLinks.Match newMatch(final CommunicatingElement pElement) {
-      return MultipleCommunicationLinks.Match.newMatch(pElement);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<CommunicatingElement> rawStreamAllValuesOfElement(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_ELEMENT, parameters).map(CommunicatingElement.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray());
-    }
-    
-    @Override
-    protected MultipleCommunicationLinks.Match tupleToMatch(final Tuple t) {
-      try {
-          return MultipleCommunicationLinks.Match.newMatch((CommunicatingElement) t.get(POSITION_ELEMENT));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MultipleCommunicationLinks.Match arrayToMatch(final Object[] match) {
-      try {
-          return MultipleCommunicationLinks.Match.newMatch((CommunicatingElement) match[POSITION_ELEMENT]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected MultipleCommunicationLinks.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return MultipleCommunicationLinks.Match.newMutableMatch((CommunicatingElement) match[POSITION_ELEMENT]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<MultipleCommunicationLinks.Matcher> querySpecification() {
-      return MultipleCommunicationLinks.instance();
-    }
-  }
-  
-  private MultipleCommunicationLinks() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MultipleCommunicationLinks instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected MultipleCommunicationLinks.Matcher instantiate(final ViatraQueryEngine engine) {
-    return MultipleCommunicationLinks.Matcher.on(engine);
-  }
-  
-  @Override
-  public MultipleCommunicationLinks.Matcher instantiate() {
-    return MultipleCommunicationLinks.Matcher.create();
-  }
-  
-  @Override
-  public MultipleCommunicationLinks.Match newEmptyMatch() {
-    return MultipleCommunicationLinks.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public MultipleCommunicationLinks.Match newMatch(final Object... parameters) {
-    return MultipleCommunicationLinks.Match.newMatch((satellite.CommunicatingElement) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks (visibility: PUBLIC, simpleName: MultipleCommunicationLinks, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks (visibility: PUBLIC, simpleName: MultipleCommunicationLinks, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MultipleCommunicationLinks INSTANCE = new MultipleCommunicationLinks();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MultipleCommunicationLinks.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Element);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Element");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Element = body.getOrCreateVariableByName("Element");
-          PVariable var_Link1 = body.getOrCreateVariableByName("Link1");
-          PVariable var_Link2 = body.getOrCreateVariableByName("Link2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Element, parameter_Element)
-          ));
-          // 	CommunicatingElement.commSubsystem.communicationLink(Element, Link1)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_1_, var_Link1);
-          // 	CommunicatingElement.commSubsystem.communicationLink(Element, Link2)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_3_, var_Link2);
-          // 	Link1 != Link2
-          new Inequality(body, var_Link1, var_Link2);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("Element")
-                              }));
-          annotation.addAttribute("message", "Only one communication link is allowed per element.");
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
index 45952f33..598f3a6b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,7 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -476,7 +476,7 @@ public final class NoLinkToGroundStation extends BaseGeneratedEMFQuerySpecificat
   
   @Override
   public NoLinkToGroundStation.Match newMatch(final Object... parameters) {
-    return NoLinkToGroundStation.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return NoLinkToGroundStation.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -508,7 +508,7 @@ public final class NoLinkToGroundStation extends BaseGeneratedEMFQuerySpecificat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NoLinkToGroundStation.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
index 3366de46..1e8f8502 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,7 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class NoPotentialLinkToGroundStation extends BaseGeneratedEMFQueryS
   
   @Override
   public NoPotentialLinkToGroundStation.Match newMatch(final Object... parameters) {
-    return NoPotentialLinkToGroundStation.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return NoPotentialLinkToGroundStation.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class NoPotentialLinkToGroundStation extends BaseGeneratedEMFQueryS
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NoPotentialLinkToGroundStation.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
index bdd97100..d75dea5f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AtLeastTwoInterferometryPayloads;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +39,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.InterferometryMission;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
   
   @Override
   public NotEnoughInterferometryPayloads.Match newMatch(final Object... parameters) {
-    return NotEnoughInterferometryPayloads.Match.newMatch((satellite.InterferometryMission) parameters[0]);
+    return NotEnoughInterferometryPayloads.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NotEnoughInterferometryPayloads.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
index d7378783..c86761ce 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
@@ -3,13 +3,12 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
@@ -29,8 +28,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * in order to achieve better performance than one-by-one on-demand matcher initialization.
  * 
  * <p> From package hu.bme.mit.inf.dslreasoner.domains.satellite.queries, the group contains the definition of the following patterns: <ul>
- * <li>multipleCommunicationLinks</li>
- * <li>communicationLinkOfElement</li>
+ * <li>communicationLinkDoesNotStartAtContainingElement</li>
  * <li>notEnoughInterferometryPayloads</li>
  * <li>noLinkToGroundStation</li>
  * <li>noPotentialLinkToGroundStation</li>
@@ -68,8 +66,7 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
   private static SatelliteQueries INSTANCE;
   
   private SatelliteQueries() {
-    querySpecifications.add(MultipleCommunicationLinks.instance());
-    querySpecifications.add(CommunicationLinkOfElement.instance());
+    querySpecifications.add(CommunicationLinkDoesNotStartAtContainingElement.instance());
     querySpecifications.add(NotEnoughInterferometryPayloads.instance());
     querySpecifications.add(NoLinkToGroundStation.instance());
     querySpecifications.add(NoPotentialLinkToGroundStation.instance());
@@ -85,20 +82,12 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     querySpecifications.add(SpacecraftOfKind.instance());
   }
   
-  public MultipleCommunicationLinks getMultipleCommunicationLinks() {
-    return MultipleCommunicationLinks.instance();
+  public CommunicationLinkDoesNotStartAtContainingElement getCommunicationLinkDoesNotStartAtContainingElement() {
+    return CommunicationLinkDoesNotStartAtContainingElement.instance();
   }
   
-  public MultipleCommunicationLinks.Matcher getMultipleCommunicationLinks(final ViatraQueryEngine engine) {
-    return MultipleCommunicationLinks.Matcher.on(engine);
-  }
-  
-  public CommunicationLinkOfElement getCommunicationLinkOfElement() {
-    return CommunicationLinkOfElement.instance();
-  }
-  
-  public CommunicationLinkOfElement.Matcher getCommunicationLinkOfElement(final ViatraQueryEngine engine) {
-    return CommunicationLinkOfElement.Matcher.on(engine);
+  public CommunicationLinkDoesNotStartAtContainingElement.Matcher getCommunicationLinkDoesNotStartAtContainingElement(final ViatraQueryEngine engine) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.on(engine);
   }
   
   public NotEnoughInterferometryPayloads getNotEnoughInterferometryPayloads() {
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
index 4791740e..7bc497ab 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
@@ -64,11 +64,11 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private satellite.SmallSat fSat;
+    private hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat fSat;
     
     private static List<String> parameterNames = makeImmutableList("Sat");
     
-    private Match(final satellite.SmallSat pSat) {
+    private Match(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       this.fSat = pSat;
     }
     
@@ -78,7 +78,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
       return null;
     }
     
-    public satellite.SmallSat getSat() {
+    public hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat getSat() {
       return this.fSat;
     }
     
@@ -86,13 +86,13 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("Sat".equals(parameterName) ) {
-          this.fSat = (satellite.SmallSat) newValue;
+          this.fSat = (hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) newValue;
           return true;
       }
       return false;
     }
     
-    public void setSat(final satellite.SmallSat pSat) {
+    public void setSat(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fSat = pSat;
     }
@@ -173,7 +173,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static SmallSat.Match newMutableMatch(final satellite.SmallSat pSat) {
+    public static SmallSat.Match newMutableMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return new Mutable(pSat);
     }
     
@@ -185,12 +185,12 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the (partial) match object.
      * 
      */
-    public static SmallSat.Match newMatch(final satellite.SmallSat pSat) {
+    public static SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return new Immutable(pSat);
     }
     
     private static final class Mutable extends SmallSat.Match {
-      Mutable(final satellite.SmallSat pSat) {
+      Mutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
         super(pSat);
       }
       
@@ -201,7 +201,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     }
     
     private static final class Immutable extends SmallSat.Match {
-      Immutable(final satellite.SmallSat pSat) {
+      Immutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
         super(pSat);
       }
       
@@ -282,7 +282,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<SmallSat.Match> getAllMatches(final satellite.SmallSat pSat) {
+    public Collection<SmallSat.Match> getAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawStreamAllMatches(new Object[]{pSat}).collect(Collectors.toSet());
     }
     
@@ -296,7 +296,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<SmallSat.Match> streamAllMatches(final satellite.SmallSat pSat) {
+    public Stream<SmallSat.Match> streamAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawStreamAllMatches(new Object[]{pSat});
     }
     
@@ -307,7 +307,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<SmallSat.Match> getOneArbitraryMatch(final satellite.SmallSat pSat) {
+    public Optional<SmallSat.Match> getOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawGetOneArbitraryMatch(new Object[]{pSat});
     }
     
@@ -318,7 +318,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final satellite.SmallSat pSat) {
+    public boolean hasMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawHasMatch(new Object[]{pSat});
     }
     
@@ -328,7 +328,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final satellite.SmallSat pSat) {
+    public int countMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawCountMatches(new Object[]{pSat});
     }
     
@@ -340,7 +340,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final satellite.SmallSat pSat, final Consumer<? super SmallSat.Match> processor) {
+    public boolean forOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat, final Consumer<? super SmallSat.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pSat}, processor);
     }
     
@@ -352,7 +352,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the (partial) match object.
      * 
      */
-    public SmallSat.Match newMatch(final satellite.SmallSat pSat) {
+    public SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return SmallSat.Match.newMatch(pSat);
     }
     
@@ -361,8 +361,8 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<satellite.SmallSat> rawStreamAllValuesOfSat(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_SAT, parameters).map(satellite.SmallSat.class::cast);
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> rawStreamAllValuesOfSat(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SAT, parameters).map(hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat.class::cast);
     }
     
     /**
@@ -370,7 +370,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<satellite.SmallSat> getAllValuesOfSat() {
+    public Set<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> getAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -379,14 +379,14 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<satellite.SmallSat> streamAllValuesOfSat() {
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> streamAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray());
     }
     
     @Override
     protected SmallSat.Match tupleToMatch(final Tuple t) {
       try {
-          return SmallSat.Match.newMatch((satellite.SmallSat) t.get(POSITION_SAT));
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) t.get(POSITION_SAT));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -396,7 +396,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     @Override
     protected SmallSat.Match arrayToMatch(final Object[] match) {
       try {
-          return SmallSat.Match.newMatch((satellite.SmallSat) match[POSITION_SAT]);
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -406,7 +406,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     @Override
     protected SmallSat.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return SmallSat.Match.newMutableMatch((satellite.SmallSat) match[POSITION_SAT]);
+          return SmallSat.Match.newMutableMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -457,7 +457,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
   
   @Override
   public SmallSat.Match newMatch(final Object... parameters) {
-    return SmallSat.Match.newMatch((satellite.SmallSat) parameters[0]);
+    return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) parameters[0]);
   }
   
   /**
@@ -489,7 +489,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SmallSat.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.SmallSat", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "SmallSat")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "SmallSat")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
index ed0bd7dc..52602bb5 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -39,8 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
-import satellite.SpacecraftKind;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -628,7 +628,7 @@ public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecification<S
   
   @Override
   public SpacecraftOfKind.Match newMatch(final Object... parameters) {
-    return SpacecraftOfKind.Match.newMatch((satellite.Spacecraft) parameters[0], (satellite.SpacecraftKind) parameters[1]);
+    return SpacecraftOfKind.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind) parameters[1]);
   }
   
   /**
@@ -660,9 +660,9 @@ public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecification<S
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SpacecraftOfKind.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Kind = new PParameter("Kind", "satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
+    private final PParameter parameter_Kind = new PParameter("Kind", "hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Kind);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
index 51b224b1..6408033b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBandUhf;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.GroundStationNetwork;
 import java.util.Arrays;
@@ -41,7 +42,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CubeSat3U;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -485,7 +485,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   
   @Override
   public ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final Object... parameters) {
-    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((satellite.CubeSat3U) parameters[0]);
+    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U) parameters[0]);
   }
   
   /**
@@ -517,7 +517,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final ThreeUCubeSatWithNonUhfCrossLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
index 99e472ea..62222ded 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainLow;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -483,7 +483,7 @@ public final class UhfAntennaGainNotLow extends BaseGeneratedEMFQuerySpecificati
   
   @Override
   public UhfAntennaGainNotLow.Match newMatch(final Object... parameters) {
-    return UhfAntennaGainNotLow.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return UhfAntennaGainNotLow.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -515,7 +515,7 @@ public final class UhfAntennaGainNotLow extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final UhfAntennaGainNotLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
index b50962c5..dbe6d26e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainMedium;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -477,7 +477,7 @@ public final class XAntennaGainNotMedium extends BaseGeneratedEMFQuerySpecificat
   
   @Override
   public XAntennaGainNotMedium.Match newMatch(final Object... parameters) {
-    return XAntennaGainNotMedium.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return XAntennaGainNotMedium.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -509,7 +509,7 @@ public final class XAntennaGainNotMedium extends BaseGeneratedEMFQuerySpecificat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final XAntennaGainNotMedium.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
index 58e7e183..d560ac93 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
@@ -88,7 +88,7 @@ public final class AtLeastTwoInterferometryPayloads extends BaseGeneratedEMFQuer
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final AtLeastTwoInterferometryPayloads.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
index 609e0b93..a0009587 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
@@ -87,9 +87,9 @@ public final class CommSubsystemBand extends BaseGeneratedEMFQuerySpecificationW
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemBand.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Band = new PParameter("Band", "satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
+    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm, parameter_Band);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
index bc25ea59..51175ce3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
@@ -88,7 +88,7 @@ public final class CommSubsystemBandUhf extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemBandUhf.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
index 69793a96..e2e0e2a1 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
@@ -87,9 +87,9 @@ public final class CommSubsystemGain extends BaseGeneratedEMFQuerySpecificationW
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGain.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Gain = new PParameter("Gain", "satellite.AntennaGain", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "AntennaGain")), PParameterDirection.INOUT);
+    private final PParameter parameter_Gain = new PParameter("Gain", "hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "AntennaGain")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm, parameter_Gain);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
index fd24f163..04ee67da 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
@@ -88,7 +88,7 @@ public final class CommSubsystemGainLow extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGainLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
index 82b77bbc..4b3bc03b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
@@ -88,7 +88,7 @@ public final class CommSubsystemGainMedium extends BaseGeneratedEMFQuerySpecific
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGainMedium.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
index acc60475..fe789893 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
@@ -83,7 +83,7 @@ public final class CubeSat3U extends BaseGeneratedEMFQuerySpecificationWithGener
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CubeSat3U.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
index a2123354..d6f5c53b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
@@ -88,9 +88,9 @@ public final class DirectCommunicationLink extends BaseGeneratedEMFQuerySpecific
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final DirectCommunicationLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Source = new PParameter("Source", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Source = new PParameter("Source", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Target = new PParameter("Target", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Target = new PParameter("Target", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Source, parameter_Target);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
index 606cdfed..93b1a01b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
@@ -83,7 +83,7 @@ public final class GroundStationNetwork extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final GroundStationNetwork.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Network = new PParameter("Network", "satellite.GroundStationNetwork", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "GroundStationNetwork")), PParameterDirection.INOUT);
+    private final PParameter parameter_Network = new PParameter("Network", "hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "GroundStationNetwork")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Network);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
index dee8a83c..6d5e475c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
@@ -85,9 +85,9 @@ public final class IndirectCommunicationLink extends BaseGeneratedEMFQuerySpecif
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IndirectCommunicationLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Source = new PParameter("Source", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Source = new PParameter("Source", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Target = new PParameter("Target", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Target = new PParameter("Target", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Source, parameter_Target);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
index 31381a09..27648bf3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
@@ -85,9 +85,9 @@ public final class IndirectLinkAllowed extends BaseGeneratedEMFQuerySpecificatio
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IndirectLinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
index 7118d657..e7529aa2 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
@@ -96,9 +96,9 @@ public final class LinkAllowed extends BaseGeneratedEMFQuerySpecificationWithGen
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final LinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
index 3a52ad1d..b4f0d9e9 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
@@ -90,11 +90,11 @@ public final class MatchingAntenna extends BaseGeneratedEMFQuerySpecificationWit
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final MatchingAntenna.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Band = new PParameter("Band", "satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
+    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To, parameter_Band);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
index 591215cd..36fa4557 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
@@ -3,13 +3,12 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
 
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
@@ -40,8 +39,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <p>A private group that includes private patterns as well. Only intended use case is for pattern testing.
  * 
  * <p> From package hu.bme.mit.inf.dslreasoner.domains.satellite.queries, the group contains the definition of the following patterns: <ul>
- * <li>multipleCommunicationLinks</li>
- * <li>communicationLinkOfElement</li>
+ * <li>communicationLinkDoesNotStartAtContainingElement</li>
  * <li>notEnoughInterferometryPayloads</li>
  * <li>atLeastTwoInterferometryPayloads</li>
  * <li>spacecraftWithInterferometryPayload</li>
@@ -93,8 +91,7 @@ public final class SatelliteQueriesAll extends BaseGeneratedPatternGroup {
   private static SatelliteQueriesAll INSTANCE;
   
   private SatelliteQueriesAll() {
-    querySpecifications.add(MultipleCommunicationLinks.instance());
-    querySpecifications.add(CommunicationLinkOfElement.instance());
+    querySpecifications.add(CommunicationLinkDoesNotStartAtContainingElement.instance());
     querySpecifications.add(NotEnoughInterferometryPayloads.instance());
     querySpecifications.add(AtLeastTwoInterferometryPayloads.instance());
     querySpecifications.add(SpacecraftWithInterferometryPayload.instance());
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
index 9566c4c5..f8e6ca4f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
@@ -87,9 +87,9 @@ public final class SpacecraftWithInterferometryPayload extends BaseGeneratedEMFQ
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SpacecraftWithInterferometryPayload.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.ConstellationMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "ConstellationMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "ConstellationMission")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Spacecraft);
     
-- 
cgit v1.2.3-70-g09d2