diff --git a/Jenkinsfile b/Jenkinsfile
index c98cdc4..6cba09b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
     
     post {
     	always {
-    		archiveArtifacts 'com.incquerylabs.instaschema.performance/results/**, benchmark/**'
+    		archiveArtifacts 'com.incquerylabs.magicdraw.benchmark/results/**, benchmark/**'
     	}
         success {
             slackSend channel: "magicdraw-notificatio", 
diff --git a/MagicDraw with all plugins/META-INF/MANIFEST.MF b/MagicDraw with all plugins/META-INF/MANIFEST.MF
index c7d6f2f..d373e24 100644
--- a/MagicDraw with all plugins/META-INF/MANIFEST.MF	
+++ b/MagicDraw with all plugins/META-INF/MANIFEST.MF	
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.viatra.transformation.runtime.emf,
  org.eclipse.xtext.xbase.lib,
  eu.mondo.sam.bundle;bundle-version="0.1.0",
- com.incquerylabs.instaschema.performance;bundle-version="1.0.0"
+ com.incquerylabs.magicdraw.benchmark;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/benchmark/convert_results.sh b/benchmark/convert_results.sh
index c993e0e..1ba8a7a 100755
--- a/benchmark/convert_results.sh
+++ b/benchmark/convert_results.sh
@@ -5,7 +5,7 @@ cd "$( cd "$( dirname "$0" )" && pwd )"
 rm -rf ${WORKSPACE}/benchmark/results
 mkdir ${WORKSPACE}/benchmark/results
 
-cd ${WORKSPACE}/com.incquerylabs.instaschema.performance/results
+cd ${WORKSPACE}/com.incquerylabs.magicdraw.benchmark/results
 
 for i in $(ls -d */); do
   echo ${i};
@@ -15,7 +15,7 @@ for i in $(ls -d */); do
   else
     echo "PROCESS"
 	mkdir ${WORKSPACE}/benchmark/results/${i}
-	python3 ${WORKSPACE}/mondo-sam/reporting/convert_results.py --source ${WORKSPACE}/com.incquerylabs.instaschema.performance/results/${i} \
+	python3 ${WORKSPACE}/mondo-sam/reporting/convert_results.py --source ${WORKSPACE}/com.incquerylabs.magicdraw.benchmark/results/${i} \
 --jsonfile ${WORKSPACE}/benchmark/results/${i}results.json \
 --csvfile ${WORKSPACE}/benchmark/results/${i}results.csv
   fi
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/EngineImpl.java b/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/EngineImpl.java
deleted file mode 100644
index 2882dac..0000000
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/EngineImpl.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.incquerylabs.instaschema.performance;
-
-public enum EngineImpl {
-	RETE, LOCAL_SEARCH
-}
diff --git a/com.incquerylabs.instaschema.performance/.classpath b/com.incquerylabs.magicdraw.benchmark/.classpath
similarity index 100%
rename from com.incquerylabs.instaschema.performance/.classpath
rename to com.incquerylabs.magicdraw.benchmark/.classpath
diff --git a/com.incquerylabs.instaschema.performance/.gitignore b/com.incquerylabs.magicdraw.benchmark/.gitignore
similarity index 100%
rename from com.incquerylabs.instaschema.performance/.gitignore
rename to com.incquerylabs.magicdraw.benchmark/.gitignore
diff --git a/com.incquerylabs.instaschema.performance/.project b/com.incquerylabs.magicdraw.benchmark/.project
similarity index 94%
rename from com.incquerylabs.instaschema.performance/.project
rename to com.incquerylabs.magicdraw.benchmark/.project
index 39a2f5e..058b725 100644
--- a/com.incquerylabs.instaschema.performance/.project
+++ b/com.incquerylabs.magicdraw.benchmark/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.incquerylabs.instaschema.performance</name>
+	<name>com.incquerylabs.magicdraw.benchmark</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/com.incquerylabs.instaschema.performance/.settings/org.eclipse.core.resources.prefs b/com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from com.incquerylabs.instaschema.performance/.settings/org.eclipse.core.resources.prefs
rename to com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.core.resources.prefs
diff --git a/com.incquerylabs.instaschema.performance/.settings/org.eclipse.jdt.core.prefs b/com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.incquerylabs.instaschema.performance/.settings/org.eclipse.jdt.core.prefs
rename to com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.incquerylabs.instaschema.performance/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs b/com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
similarity index 100%
rename from com.incquerylabs.instaschema.performance/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
rename to com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
diff --git a/com.incquerylabs.instaschema.performance/META-INF/MANIFEST.MF b/com.incquerylabs.magicdraw.benchmark/META-INF/MANIFEST.MF
similarity index 83%
rename from com.incquerylabs.instaschema.performance/META-INF/MANIFEST.MF
rename to com.incquerylabs.magicdraw.benchmark/META-INF/MANIFEST.MF
index fb9f2ab..e5de47f 100644
--- a/com.incquerylabs.instaschema.performance/META-INF/MANIFEST.MF
+++ b/com.incquerylabs.magicdraw.benchmark/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Validation
-Bundle-SymbolicName: com.incquerylabs.instaschema.performance;singleton:=true
+Bundle-SymbolicName: com.incquerylabs.magicdraw.benchmark;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
-Export-Package: com.incquerylabs.instaschema.performance
+Export-Package: com.incquerylabs.magicdraw.benchmark
 Require-Bundle: org.eclipse.viatra.query.runtime;bundle-version="1.6.0",
  org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.6.0",
  com.nomagic.magicdraw;bundle-version="17.0.5",
diff --git a/com.incquerylabs.instaschema.performance/Run Benchmark.launch b/com.incquerylabs.magicdraw.benchmark/Run Benchmark.launch
similarity index 100%
rename from com.incquerylabs.instaschema.performance/Run Benchmark.launch
rename to com.incquerylabs.magicdraw.benchmark/Run Benchmark.launch
diff --git a/com.incquerylabs.instaschema.performance/build.properties b/com.incquerylabs.magicdraw.benchmark/build.properties
similarity index 100%
rename from com.incquerylabs.instaschema.performance/build.properties
rename to com.incquerylabs.magicdraw.benchmark/build.properties
diff --git a/com.incquerylabs.instaschema.performance/plugin.xml b/com.incquerylabs.magicdraw.benchmark/plugin.xml
similarity index 91%
rename from com.incquerylabs.instaschema.performance/plugin.xml
rename to com.incquerylabs.magicdraw.benchmark/plugin.xml
index e7ae3fb..86b5d8b 100644
--- a/com.incquerylabs.instaschema.performance/plugin.xml
+++ b/com.incquerylabs.magicdraw.benchmark/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin 
-	class="com.incquerylabs.instaschema.performance.InstaSchemaPerformancePlugin" 
+	class="com.incquerylabs.magicdraw.benchmark.PerformanceBenchmarkRunner" 
 	class-lookup="GlobalFirst" 
-	id="com.incquerylabs.instaschema.performance" 
+	id="com.incquerylabs.magicdraw.benchmark" 
 	name="VIATRA Query Benchmark Performance" 
 	provider-name="IncQuery Labs ltd." 
 	version="1.0"
diff --git a/com.incquerylabs.instaschema.performance/pom.xml b/com.incquerylabs.magicdraw.benchmark/pom.xml
similarity index 99%
rename from com.incquerylabs.instaschema.performance/pom.xml
rename to com.incquerylabs.magicdraw.benchmark/pom.xml
index 479ccda..6f68c17 100644
--- a/com.incquerylabs.instaschema.performance/pom.xml
+++ b/com.incquerylabs.magicdraw.benchmark/pom.xml
@@ -10,7 +10,6 @@
 
 
 	<groupId>com.incquerylabs.magicdraw</groupId>
-	<artifactId>benchmark.performance</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -460,4 +459,5 @@
 		</dependency>
 		
 	</dependencies>
+	<artifactId>com.incquerylabs.instaschema.performance</artifactId>
 </project>
\ No newline at end of file
diff --git a/com.incquerylabs.instaschema.performance/results/.gitignore b/com.incquerylabs.magicdraw.benchmark/results/.gitignore
similarity index 100%
rename from com.incquerylabs.instaschema.performance/results/.gitignore
rename to com.incquerylabs.magicdraw.benchmark/results/.gitignore
diff --git a/com.incquerylabs.instaschema.performance/run.sh b/com.incquerylabs.magicdraw.benchmark/run.sh
similarity index 98%
rename from com.incquerylabs.instaschema.performance/run.sh
rename to com.incquerylabs.magicdraw.benchmark/run.sh
index 713a63f..00a4eca 100755
--- a/com.incquerylabs.instaschema.performance/run.sh
+++ b/com.incquerylabs.magicdraw.benchmark/run.sh
@@ -86,7 +86,7 @@ do
 					-Dlogback.configurationFile="$MD_HOME/data/logback.xml" \
 					-Dmd.plugins.dir="$MD_HOME/plugins${cp_delim}target/plugin-release/files/plugins${cp_delim}../com.incquerylabs.benchmark.performance/target/plugin-release/files/plugins" \
 					-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher \
-					-Dcom.nomagic.magicdraw.commandline.action=com.incquerylabs.instaschema.performance.benchmark.PerformanceBenchmarkRunner \
+					-Dcom.nomagic.magicdraw.commandline.action=com.incquerylabs.magicdraw.benchmark.PerformanceBenchmarkRunner \
 					-cp "$CP" \
 					com.nomagic.osgi.launcher.ProductionFrameworkLauncher "$@ -engine $engine -query $query -index $runIndex -size $size -model '${MD_HOME}/performance/inputs/TMT$size.mdzip' -warmup '${MD_HOME}/performance/inputs/Warmup.mdzip' -output '${OUTPUT_DIR}'"
 			done
diff --git a/com.incquerylabs.instaschema.performance/src-gen/.gitignore b/com.incquerylabs.magicdraw.benchmark/src-gen/.gitignore
similarity index 100%
rename from com.incquerylabs.instaschema.performance/src-gen/.gitignore
rename to com.incquerylabs.magicdraw.benchmark/src-gen/.gitignore
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BackendSelection.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BackendSelection.java
similarity index 87%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BackendSelection.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BackendSelection.java
index c132cf6..f182d13 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BackendSelection.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BackendSelection.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.util.Objects;
 
@@ -13,12 +13,11 @@
 import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
 
-import com.incquerylabs.instaschema.performance.EngineImpl;
-import com.incquerylabs.instaschema.performance.incrementalqueries.IncrementalQueries;
-import com.incquerylabs.instaschema.performance.incrementalqueries.util.ParentStateQuerySpecification;
-import com.incquerylabs.instaschema.performance.queries.APerformanceQueries;
-import com.incquerylabs.instaschema.performance.queries.util.IncomingTransitionsQuerySpecification;
-import com.incquerylabs.instaschema.performance.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.IncrementalQueries;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.util.ParentStateQuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.queries.APerformanceQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.util.IncomingTransitionsQuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
 
 public enum BackendSelection {
 
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BenchmarkParameters.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BenchmarkParameters.java
similarity index 97%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BenchmarkParameters.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BenchmarkParameters.java
index c7637f7..1811996 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/BenchmarkParameters.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/BenchmarkParameters.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 import java.util.Objects;
diff --git a/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/EngineImpl.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/EngineImpl.java
new file mode 100644
index 0000000..3689b7a
--- /dev/null
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/EngineImpl.java
@@ -0,0 +1,5 @@
+package com.incquerylabs.magicdraw.benchmark;
+
+public enum EngineImpl {
+	RETE, LOCAL_SEARCH
+}
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/InstaSchemaPerformancePlugin.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/InstaSchemaPerformancePlugin.java
similarity index 97%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/InstaSchemaPerformancePlugin.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/InstaSchemaPerformancePlugin.java
index 6dc0902..45cabb2 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/InstaSchemaPerformancePlugin.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/InstaSchemaPerformancePlugin.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -51,11 +51,10 @@
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
 
 import com.google.common.base.Stopwatch;
-import com.incquerylabs.instaschema.performance.benchmark.PerformanceBenchmarkRunner;
-import com.incquerylabs.instaschema.performance.incrementalqueries.IncrementalQueries;
-import com.incquerylabs.instaschema.performance.queries.APerformanceQueries;
-import com.incquerylabs.instaschema.performance.queries.WarmUpQueries;
-import com.incquerylabs.instaschema.performance.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
+import com.incquerylabs.magicdraw.benchmark.incrementalqueries.IncrementalQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.APerformanceQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.WarmUpQueries;
+import com.incquerylabs.magicdraw.benchmark.queries.util.TransitiveSubstatesWithCheck3QuerySpecification;
 import com.nomagic.actions.AMConfigurator;
 import com.nomagic.actions.ActionsManager;
 import com.nomagic.magicdraw.actions.ActionsConfiguratorsManager;
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/MeasurementData.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MeasurementData.java
similarity index 96%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/MeasurementData.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MeasurementData.java
index 44283b6..d1c4b4b 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/MeasurementData.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MeasurementData.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/MondoSamRunner.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MondoSamRunner.java
similarity index 93%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/MondoSamRunner.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MondoSamRunner.java
index d66c304..31fc03b 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/MondoSamRunner.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/MondoSamRunner.java
@@ -1,11 +1,11 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
 
-import com.incquerylabs.instaschema.mondo.sam.QueryMatcherToken;
-import com.incquerylabs.instaschema.mondo.sam.SingleQueryScenario;
+import com.incquerylabs.magicdraw.benchmark.mondo.sam.QueryMatcherToken;
+import com.incquerylabs.magicdraw.benchmark.mondo.sam.SingleQueryScenario;
 import com.nomagic.magicdraw.core.Application;
 import com.nomagic.magicdraw.core.project.ProjectDescriptor;
 import com.nomagic.magicdraw.core.project.ProjectDescriptorsFactory;
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/PerformanceBenchmarkRunner.java b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/PerformanceBenchmarkRunner.java
similarity index 98%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/PerformanceBenchmarkRunner.java
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/PerformanceBenchmarkRunner.java
index c7ba9d7..daa4a04 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/benchmark/PerformanceBenchmarkRunner.java
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/PerformanceBenchmarkRunner.java
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.benchmark;
+package com.incquerylabs.magicdraw.benchmark;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/incrementalqueries/IncrementalQueries.vql b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/incrementalqueries/IncrementalQueries.vql
similarity index 79%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/incrementalqueries/IncrementalQueries.vql
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/incrementalqueries/IncrementalQueries.vql
index 0c11145..10aec21 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/incrementalqueries/IncrementalQueries.vql
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/incrementalqueries/IncrementalQueries.vql
@@ -1,9 +1,9 @@
-package com.incquerylabs.instaschema.performance.incrementalqueries
+package com.incquerylabs.magicdraw.benchmark.incrementalqueries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
-import com.incquerylabs.instaschema.performance.queries.statesWithShortNames
-import com.incquerylabs.instaschema.performance.queries.incomingTransitions
-import com.incquerylabs.instaschema.performance.queries.statesWithMoreIncomingTransitions
+import com.incquerylabs.magicdraw.benchmark.queries.statesWithShortNames
+import com.incquerylabs.magicdraw.benchmark.queries.incomingTransitions
+import com.incquerylabs.magicdraw.benchmark.queries.statesWithMoreIncomingTransitions
 
 /**
  * Simple pattern for transitive closures marked incremental.
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/InitPhase.xtend b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/InitPhase.xtend
similarity index 92%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/InitPhase.xtend
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/InitPhase.xtend
index b5c892f..44b0855 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/InitPhase.xtend
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/InitPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import eu.mondo.sam.core.phases.AtomicPhase
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/MatcherInitPhase.xtend b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/MatcherInitPhase.xtend
similarity index 99%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/MatcherInitPhase.xtend
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/MatcherInitPhase.xtend
index 4aa17a8..b02b088 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/MatcherInitPhase.xtend
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/MatcherInitPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import com.google.common.collect.ImmutableSet
 import eu.mondo.sam.core.DataToken
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/QueryMatcherToken.xtend b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/QueryMatcherToken.xtend
similarity index 97%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/QueryMatcherToken.xtend
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/QueryMatcherToken.xtend
index d104432..0fba847 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/QueryMatcherToken.xtend
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/QueryMatcherToken.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import org.eclipse.emf.ecore.EReference
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/ResultSetRetrievalPhase.xtend b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/ResultSetRetrievalPhase.xtend
similarity index 70%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/ResultSetRetrievalPhase.xtend
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/ResultSetRetrievalPhase.xtend
index abf74ec..6d09d23 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/ResultSetRetrievalPhase.xtend
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/ResultSetRetrievalPhase.xtend
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
 import eu.mondo.sam.core.DataToken
 import eu.mondo.sam.core.metrics.ScalarMetric
@@ -17,17 +17,17 @@ class ResultSetRetrievalPhase extends AtomicPhase {
 	}
 	
 	override execute(DataToken token, PhaseResult phaseResult) {
-		val logger = Logger.getLogger("org.eclipse.viatra.query");
+		val logger = Logger.getLogger("com.incquerylabs.magicdraw.benchmark");
 		val myToken = token as QueryMatcherToken
 
 		// Time and memory are measured
 		val timer = new TimeMetric("Time")
 		
-//		val queryBackend = myToken.engine.getQueryBackend(LocalSearchBackendFactory.INSTANCE)
-//		val profiler = new LocalSearchProfilerAdapter()
-//		if(queryBackend instanceof LocalSearchBackend){
-//			queryBackend.addAdapter(profiler)	
-//		}
+		val queryBackend = myToken.engine.getQueryBackend(LocalSearchBackendFactory.INSTANCE)
+		val profiler = new LocalSearchProfilerAdapter()
+		if(queryBackend instanceof LocalSearchBackend){
+			queryBackend.addAdapter(profiler)	
+		}
 		
 		
 		timer.startMeasure
@@ -41,9 +41,9 @@ class ResultSetRetrievalPhase extends AtomicPhase {
 		
 		phaseResult.addMetrics(timer, matchSetSize)
 		
-//		if(queryBackend instanceof LocalSearchBackend){
-//			logger.info(profiler)
-//		}		
+		if(queryBackend instanceof LocalSearchBackend){
+			logger.info(profiler)
+} 		
 	}	
 	
 }
\ No newline at end of file
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/SingleQueryScenario.xtend b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/SingleQueryScenario.xtend
similarity index 94%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/SingleQueryScenario.xtend
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/SingleQueryScenario.xtend
index 62f18d9..f5fec7a 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/mondo/sam/SingleQueryScenario.xtend
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/mondo/sam/SingleQueryScenario.xtend
@@ -1,6 +1,6 @@
-package com.incquerylabs.instaschema.mondo.sam
+package com.incquerylabs.magicdraw.benchmark.mondo.sam
 
-import com.incquerylabs.instaschema.performance.EngineImpl
+import com.incquerylabs.magicdraw.benchmark.EngineImpl
 import eu.mondo.sam.core.phases.SequencePhase
 import eu.mondo.sam.core.results.CaseDescriptor
 import eu.mondo.sam.core.scenarios.BenchmarkScenario
@@ -51,7 +51,7 @@ class SingleQueryScenario extends BenchmarkScenario {
 			it.size = this.size
 			it.runIndex = this.runIndex
 			it.scenario = this.getName
-			it.tool = this.getToolName
+			it.tool = this.toolName
 		]
 		return descriptor
 	}
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/APerformanceQueries.vql b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/APerformanceQueries.vql
similarity index 99%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/APerformanceQueries.vql
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/APerformanceQueries.vql
index c91cfcb..366e747 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/APerformanceQueries.vql
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/APerformanceQueries.vql
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.queries
+package com.incquerylabs.magicdraw.benchmark.queries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
 
diff --git a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/WarmUpQueries.vql b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/WarmUpQueries.vql
similarity index 92%
rename from com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/WarmUpQueries.vql
rename to com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/WarmUpQueries.vql
index d980e0d..26bf1b4 100644
--- a/com.incquerylabs.instaschema.performance/src/com/incquerylabs/instaschema/performance/queries/WarmUpQueries.vql
+++ b/com.incquerylabs.magicdraw.benchmark/src/com/incquerylabs/magicdraw/benchmark/queries/WarmUpQueries.vql
@@ -1,4 +1,4 @@
-package com.incquerylabs.instaschema.performance.queries
+package com.incquerylabs.magicdraw.benchmark.queries
 
 import "http://www.nomagic.com/magicdraw/UML/2.5.0"
 
diff --git a/com.incquerylabs.instaschema.performance/xtend-gen/.gitignore b/com.incquerylabs.magicdraw.benchmark/xtend-gen/.gitignore
similarity index 100%
rename from com.incquerylabs.instaschema.performance/xtend-gen/.gitignore
rename to com.incquerylabs.magicdraw.benchmark/xtend-gen/.gitignore
diff --git a/pom.xml b/pom.xml
index dd377d7..3feba91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	</properties>
 
 	<modules>
-		<module>com.incquerylabs.instaschema.performance</module>
+		<module>com.incquerylabs.magicdraw.benchmark</module>
 		
 		<module>com.incquerylabs.benchmark.generator</module>
 	</modules>