Pre-realisticBranchCreation Commit

82 files changed, 283 insertions, 1207 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index 3ab0ceba..3f997d1e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index 3d2fc82c..fd411426 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
index 599f4b11..ec6f2b5e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
index 39db4d8f..142268cc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
index 261f76db..83816584 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index 23282723..ef0e981f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
index df1b5191..7ec5c9c6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
index 712d5877..0efc1f64 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
index 52de9434..35e9ce12 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
index 5074417c..90005e11 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
index 9411e824..8e4e1612 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
index bc079ba9..cc1180a8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
index 2f3d05aa..8a562c45 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
index 62275f93..fb30c8b3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
index c5c4ea67..bc26963e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
index 45665484..d83995ca 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index cab2b7ec..43712734 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index 677cb718..b395b0c5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index d071aa8a..3e571f5b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index 48090814..6c116851 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index 154e42a2..7ba8f303 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index 61774e26..ad62b1f9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index 2798d324..150ac835 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index 5f3f349b..c181e53c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index 787c44a2..68d8cfb3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index b6e94088..1bef8bd1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index cd1b994d..9c4555e0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index 2cc7c421..7bd6797c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
index 25a165b1..6a10d85a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
index 8697d473..26460f68 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
index be45a301..518acc99 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
@@ -2,7 +2,6 @@
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">

   <viewpoint:DAnalysis uid="_e7vq8FybEemc87q3iJlCgw" selectedViews="_feFjAFybEemc87q3iJlCgw _feTlcFybEemc87q3iJlCgw _feUzkFybEemc87q3iJlCgw _feWBsFybEemc87q3iJlCgw" version="14.1.0.201810161215">

     <semanticResources>yakindu.ecore</semanticResources>

-    <semanticResources>yakindu.genmodel</semanticResources>

     <ownedViews xmi:type="viewpoint:DView" uid="_feFjAFybEemc87q3iJlCgw">

       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>

       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_gE_K8FybEemc87q3iJlCgw" name="yakindu class diagram" repPath="#_gDD4UFybEemc87q3iJlCgw">

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.ecore b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.ecore
index 0c944db8..0e800e4a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.ecore
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.ecore
@@ -1,26 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="yakindu" nsURI="YakinduMetamodel" nsPrefix="yakindu">

-  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" abstract="true" eSuperTypes="//Vertex"/>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="yakindu" nsURI="YakinduMetamodel" nsPrefix="yakindu">

+  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" abstract="true" eSuperTypes="#//Vertex"/>

   <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingTransitions" ordered="false" upperBound="-1" eType="//Transition" eOpposite="//Transition/target"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingTransitions" ordered="false" upperBound="-1" eType="//Transition" containment="true" eOpposite="//Transition/source"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingTransitions" ordered="false"

+        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingTransitions" ordered="false"

+        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/source"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Region">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false" upperBound="-1" eType="//Vertex" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false"

+        upperBound="-1" eType="#//Vertex" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Transition">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false" lowerBound="1" eType="//Vertex" eOpposite="//Vertex/incomingTransitions"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false" eType="//Vertex" eOpposite="//Vertex/outgoingTransitions"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

+        lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/incomingTransitions"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

+        eType="#//Vertex" eOpposite="#//Vertex/outgoingTransitions"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Statechart" eSuperTypes="//CompositeElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="//Pseudostate"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Synchronization" eSuperTypes="//Pseudostate"/>

-  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="//RegularState //CompositeElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="RegularState" abstract="true" eSuperTypes="//Vertex"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Statechart" eSuperTypes="#//CompositeElement"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="#//Pseudostate"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Synchronization" eSuperTypes="#//Pseudostate"/>

+  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//RegularState #//CompositeElement"/>

+  <eClassifiers xsi:type="ecore:EClass" name="RegularState" abstract="true" eSuperTypes="#//Vertex"/>

   <eClassifiers xsi:type="ecore:EClass" name="CompositeElement" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="regions" upperBound="-1" eType="//Region" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="regions" upperBound="-1"

+        eType="#//Region" containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Choice" eSuperTypes="//Pseudostate"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="//Pseudostate"/>

-  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="//RegularState"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Choice" eSuperTypes="#//Pseudostate"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="#//Pseudostate"/>

+  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//RegularState"/>

 </ecore:EPackage>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel
index b1f75d76..46801b3e 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel
@@ -5,7 +5,7 @@
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">

   <foreignModel>yakindu.ecore</foreignModel>

-  <genPackages prefix="yakindu" basePackage="ca.mcgill.ecse.dslreasoner.standalone.test"

+  <genPackages prefix="Yakindu" basePackage="ca.mcgill.ecse.dslreasoner.standalone.test"

       disposableProviderFactory="true" ecorePackage="yakindu.ecore#/">

     <genClasses image="false" ecoreClass="yakindu.ecore#//Pseudostate"/>

     <genClasses image="false" ecoreClass="yakindu.ecore#//Vertex">

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel_ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel_
new file mode 100644
index 00000000..b1f75d76
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.genmodel_
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/ca.mcgill.ecse.dslreasoner.standalone.test/src"

+    modelPluginID="ca.mcgill.ecse.dslreasoner.standalone.test" modelName="Yakindu"

+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">

+  <foreignModel>yakindu.ecore</foreignModel>

+  <genPackages prefix="yakindu" basePackage="ca.mcgill.ecse.dslreasoner.standalone.test"

+      disposableProviderFactory="true" ecorePackage="yakindu.ecore#/">

+    <genClasses image="false" ecoreClass="yakindu.ecore#//Pseudostate"/>

+    <genClasses image="false" ecoreClass="yakindu.ecore#//Vertex">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu.ecore#//Vertex/incomingTransitions"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu.ecore#//Vertex/outgoingTransitions"/>

+    </genClasses>

+    <genClasses ecoreClass="yakindu.ecore#//Region">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu.ecore#//Region/vertices"/>

+    </genClasses>

+    <genClasses ecoreClass="yakindu.ecore#//Transition">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu.ecore#//Transition/target"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference yakindu.ecore#//Transition/source"/>

+    </genClasses>

+    <genClasses ecoreClass="yakindu.ecore#//Statechart"/>

+    <genClasses ecoreClass="yakindu.ecore#//Entry"/>

+    <genClasses ecoreClass="yakindu.ecore#//Synchronization"/>

+    <genClasses ecoreClass="yakindu.ecore#//State"/>

+    <genClasses image="false" ecoreClass="yakindu.ecore#//RegularState"/>

+    <genClasses image="false" ecoreClass="yakindu.ecore#//CompositeElement">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu.ecore#//CompositeElement/regions"/>

+    </genClasses>

+    <genClasses ecoreClass="yakindu.ecore#//Choice"/>

+    <genClasses ecoreClass="yakindu.ecore#//Exit"/>

+    <genClasses ecoreClass="yakindu.ecore#//FinalState"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
index a2a573fc..0335dc9f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
@@ -5,10 +5,6 @@
     <package class="ca.mcgill.ecse.dslreasoner.standalone.test.fam.famPackage" genModel="metamodels/fam.genmodel" uri="FamMetamodel"/>

   </extension>

   <extension point="org.eclipse.emf.ecore.generated_package">

-    <!-- @generated yakindu -->

-    <package class="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage" genModel="metamodels/yakindu.genmodel" uri="YakinduMetamodel"/>

-  </extension>

-  <extension point="org.eclipse.emf.ecore.generated_package">

     <!-- @generated filesystem -->

     <package class="ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage" genModel="metamodels/filesystem.genmodel" uri="FileSystemMetamodel"/>

   </extension>

@@ -34,74 +30,6 @@
       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries.contentInNotLive"/>

     </group>

   </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduMutatedPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduMutatedPatterns" id="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduMutatedPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry_5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing_M6"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming_M6"/>

-    </group>

-  </extension>

   <extension id="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduPatterns" id="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduPatterns">

       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion"/>

@@ -129,6 +57,8 @@
       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleRegions"/>

       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchThree"/>

       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.twoSynch"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noSynch"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synch"/>

     </group>

   </extension>

   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

@@ -140,4 +70,8 @@
   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

   </extension>

+  <extension point="org.eclipse.emf.ecore.generated_package">

+    <!-- @generated yakindu -->

+    <package class="ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage" genModel="metamodels/yakindu.genmodel" uri="YakinduMetamodel"/>

+  </extension>

 </plugin>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduMutatedPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduMutatedPatterns.vql_
index 2e498670..2e498670 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduMutatedPatterns.vql
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduMutatedPatterns.vql_
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql
index 597b1691..ea8184de 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql
@@ -217,11 +217,11 @@ pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {
 /**

  * Model generation task: at least one synch

  */

-//@Constraint(severity="error", message="error", key = {s})

-//pattern noSynch(s:Statechart) {

-//      Statechart(s);

-//      neg find synch(_);

-//}

-//pattern synch(s:Synchronization) {

-//      Synchronization(s);

-//}
\ No newline at end of file
+@Constraint(severity="error", message="error", key = {s})

+pattern noSynch(s:Statechart) {

+        Statechart(s);

+        neg find synch(_);

+}

+pattern synch(s:Synchronization) {

+        Synchronization(s);

+}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/.gitignore
deleted file mode 100644
index a9786e0f..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/.DirectSupertype.java._trace
-/.Ecore.java._trace
-/.LoopInInheritence.java._trace
-/.NonSymmetricOpposite.java._trace
-/.Opposite.java._trace
-/.OppositeDifferentClass.java._trace
-/.EcorePatterns.java._trace
-/DirectSupertype.java
-/EcorePatterns.java
-/LoopInInheritence.java
-/NonSymmetricOpposite.java
-/Opposite.java
-/OppositeDifferentClass.java
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/.gitignore
deleted file mode 100644
index 60f1891b..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/.FamPatterns.java._trace
-/.Model.java._trace
-/.Parent.java._trace
-/.RootElements.java._trace
-/.TerminatorAndInformation.java._trace
-/.Type.java._trace
-/FamPatterns.java
-/Model.java
-/Parent.java
-/RootElements.java
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/Type.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/Type.java
deleted file mode 100644
index bc3230c5..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/Type.java
+++ /dev/null
@@ -1,770 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.Function;

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.FunctionType;

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.Parent;

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.RootElements;

-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.emf.ecore.EDataType;

-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.EDataTypeInSlotsKey;

-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.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-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 @}QueryBasedFeature 

- *         pattern type(This : Function, Target : FunctionType) = {

- *              find rootElements(_Model, This);

- *              Target == FunctionType::Root;

- *         } or {

- *              neg find parent(_Child, This);

- *              neg find rootElements(_Model, This);

- *              Target == FunctionType::Leaf;

- *         } or  {

- *              find parent(This, _Par);

- *              find parent(_Child, This);

- *              Target == FunctionType::Intermediate;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class Type extends BaseGeneratedEMFQuerySpecification<Type.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type 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 Function fThis;

-    

-    private FunctionType fTarget;

-    

-    private static List<String> parameterNames = makeImmutableList("This", "Target");

-    

-    private Match(final Function pThis, final FunctionType pTarget) {

-      this.fThis = pThis;

-      this.fTarget = pTarget;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("This".equals(parameterName)) return this.fThis;

-      if ("Target".equals(parameterName)) return this.fTarget;

-      return null;

-    }

-    

-    public Function getThis() {

-      return this.fThis;

-    }

-    

-    public FunctionType getTarget() {

-      return this.fTarget;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("This".equals(parameterName) ) {

-          this.fThis = (Function) newValue;

-          return true;

-      }

-      if ("Target".equals(parameterName) ) {

-          this.fTarget = (FunctionType) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setThis(final Function pThis) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fThis = pThis;

-    }

-    

-    public void setTarget(final FunctionType pTarget) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fTarget = pTarget;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return Type.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fThis, fTarget};

-    }

-    

-    @Override

-    public Type.Match toImmutable() {

-      return isMutable() ? newMatch(fThis, fTarget) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"This\"=" + prettyPrintValue(fThis) + ", ");

-      result.append("\"Target\"=" + prettyPrintValue(fTarget));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fThis, fTarget);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof Type.Match)) {

-          Type.Match other = (Type.Match) obj;

-          return Objects.equals(fThis, other.fThis) && Objects.equals(fTarget, other.fTarget);

-      } 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 Type specification() {

-      return Type.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 Type.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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static Type.Match newMutableMatch(final Function pThis, final FunctionType pTarget) {

-      return new Mutable(pThis, pTarget);

-    }

-    

-    /**

-     * 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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static Type.Match newMatch(final Function pThis, final FunctionType pTarget) {

-      return new Immutable(pThis, pTarget);

-    }

-    

-    private static final class Mutable extends Type.Match {

-      Mutable(final Function pThis, final FunctionType pTarget) {

-        super(pThis, pTarget);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends Type.Match {

-      Immutable(final Function pThis, final FunctionType pTarget) {

-        super(pThis, pTarget);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type 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 

-   * pattern type(This : Function, Target : FunctionType) = {

-   *    find rootElements(_Model, This);

-   *    Target == FunctionType::Root;

-   * } or {

-   *    neg find parent(_Child, This);

-   *    neg find rootElements(_Model, This);

-   *    Target == FunctionType::Leaf;

-   * } or  {

-   *    find parent(This, _Par);

-   *    find parent(_Child, This);

-   *    Target == FunctionType::Intermediate;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see Type

-   * 

-   */

-  public static class Matcher extends BaseMatcher<Type.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 Type.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 Type.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_THIS = 0;

-    

-    private final static int POSITION_TARGET = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Type.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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<Type.Match> getAllMatches(final Function pThis, final FunctionType pTarget) {

-      return rawStreamAllMatches(new Object[]{pThis, pTarget}).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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<Type.Match> streamAllMatches(final Function pThis, final FunctionType pTarget) {

-      return rawStreamAllMatches(new Object[]{pThis, pTarget});

-    }

-    

-    /**

-     * 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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<Type.Match> getOneArbitraryMatch(final Function pThis, final FunctionType pTarget) {

-      return rawGetOneArbitraryMatch(new Object[]{pThis, pTarget});

-    }

-    

-    /**

-     * 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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Function pThis, final FunctionType pTarget) {

-      return rawHasMatch(new Object[]{pThis, pTarget});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Function pThis, final FunctionType pTarget) {

-      return rawCountMatches(new Object[]{pThis, pTarget});

-    }

-    

-    /**

-     * 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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, 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 Function pThis, final FunctionType pTarget, final Consumer<? super Type.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pThis, pTarget}, 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 pThis the fixed value of pattern parameter This, or null if not bound.

-     * @param pTarget the fixed value of pattern parameter Target, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public Type.Match newMatch(final Function pThis, final FunctionType pTarget) {

-      return Type.Match.newMatch(pThis, pTarget);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Function> rawStreamAllValuesOfThis(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_THIS, parameters).map(Function.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Function> getAllValuesOfThis() {

-      return rawStreamAllValuesOfThis(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Function> streamAllValuesOfThis() {

-      return rawStreamAllValuesOfThis(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * </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<Function> streamAllValuesOfThis(final Type.Match partialMatch) {

-      return rawStreamAllValuesOfThis(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * </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<Function> streamAllValuesOfThis(final FunctionType pTarget) {

-      return rawStreamAllValuesOfThis(new Object[]{null, pTarget});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Function> getAllValuesOfThis(final Type.Match partialMatch) {

-      return rawStreamAllValuesOfThis(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for This.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Function> getAllValuesOfThis(final FunctionType pTarget) {

-      return rawStreamAllValuesOfThis(new Object[]{null, pTarget}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<FunctionType> rawStreamAllValuesOfTarget(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TARGET, parameters).map(FunctionType.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FunctionType> getAllValuesOfTarget() {

-      return rawStreamAllValuesOfTarget(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FunctionType> streamAllValuesOfTarget() {

-      return rawStreamAllValuesOfTarget(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * </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<FunctionType> streamAllValuesOfTarget(final Type.Match partialMatch) {

-      return rawStreamAllValuesOfTarget(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * </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<FunctionType> streamAllValuesOfTarget(final Function pThis) {

-      return rawStreamAllValuesOfTarget(new Object[]{pThis, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FunctionType> getAllValuesOfTarget(final Type.Match partialMatch) {

-      return rawStreamAllValuesOfTarget(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for Target.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FunctionType> getAllValuesOfTarget(final Function pThis) {

-      return rawStreamAllValuesOfTarget(new Object[]{pThis, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected Type.Match tupleToMatch(final Tuple t) {

-      try {

-          return Type.Match.newMatch((Function) t.get(POSITION_THIS), (FunctionType) t.get(POSITION_TARGET));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Type.Match arrayToMatch(final Object[] match) {

-      try {

-          return Type.Match.newMatch((Function) match[POSITION_THIS], (FunctionType) match[POSITION_TARGET]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Type.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return Type.Match.newMutableMatch((Function) match[POSITION_THIS], (FunctionType) match[POSITION_TARGET]);

-      } 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<Type.Matcher> querySpecification() {

-      return Type.instance();

-    }

-  }

-  

-  private Type() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static Type instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected Type.Matcher instantiate(final ViatraQueryEngine engine) {

-    return Type.Matcher.on(engine);

-  }

-  

-  @Override

-  public Type.Matcher instantiate() {

-    return Type.Matcher.create();

-  }

-  

-  @Override

-  public Type.Match newEmptyMatch() {

-    return Type.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public Type.Match newMatch(final Object... parameters) {

-    return Type.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.fam.Function) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.fam.FunctionType) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.Type (visibility: PUBLIC, simpleName: Type, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.Type, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.fam.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: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.Type (visibility: PUBLIC, simpleName: Type, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.Type, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static Type INSTANCE = new Type();

-    

-    /**

-     * 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 final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static Type.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_This = new PParameter("This", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.Function", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FamMetamodel", "Function")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_Target = new PParameter("Target", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.FunctionType", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("FamMetamodel", "FunctionType")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_This, parameter_Target);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("This","Target");

-    }

-    

-    @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_This = body.getOrCreateVariableByName("This");

-          PVariable var_Target = body.getOrCreateVariableByName("Target");

-          PVariable var__Model = body.getOrCreateVariableByName("_Model");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_This), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "Function")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("FamMetamodel", "FunctionType")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_This, parameter_This),

-             new ExportedParameter(body, var_Target, parameter_Target)

-          ));

-          //    find rootElements(_Model, This)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var__Model, var_This), RootElements.instance().getInternalQueryRepresentation());

-          //    Target == FunctionType::Root

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("FamMetamodel", "FunctionType", "Root").getInstance());

-          new Equality(body, var_Target, var__virtual_0_);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_This = body.getOrCreateVariableByName("This");

-          PVariable var_Target = body.getOrCreateVariableByName("Target");

-          PVariable var__Child = body.getOrCreateVariableByName("_Child");

-          PVariable var__Model = body.getOrCreateVariableByName("_Model");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_This), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "Function")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("FamMetamodel", "FunctionType")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_This, parameter_This),

-             new ExportedParameter(body, var_Target, parameter_Target)

-          ));

-          //    neg find parent(_Child, This)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var__Child, var_This), Parent.instance().getInternalQueryRepresentation());

-          //    neg find rootElements(_Model, This)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var__Model, var_This), RootElements.instance().getInternalQueryRepresentation());

-          //    Target == FunctionType::Leaf

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("FamMetamodel", "FunctionType", "Leaf").getInstance());

-          new Equality(body, var_Target, var__virtual_0_);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_This = body.getOrCreateVariableByName("This");

-          PVariable var_Target = body.getOrCreateVariableByName("Target");

-          PVariable var__Par = body.getOrCreateVariableByName("_Par");

-          PVariable var__Child = body.getOrCreateVariableByName("_Child");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_This), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "Function")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("FamMetamodel", "FunctionType")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_This, parameter_This),

-             new ExportedParameter(body, var_Target, parameter_Target)

-          ));

-          //    find parent(This, _Par)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_This, var__Par), Parent.instance().getInternalQueryRepresentation());

-          //    find parent(_Child, This)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var__Child, var_This), Parent.instance().getInternalQueryRepresentation());

-          //    Target == FunctionType::Intermediate

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("FamMetamodel", "FunctionType", "Intermediate").getInstance());

-          new Equality(body, var_Target, var__virtual_0_);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("QueryBasedFeature");

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Choice.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Choice.java
index cc4049c4..fc2f0328 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Choice.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Choice.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getChoice()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getChoice()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/CompositeElement.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/CompositeElement.java
index 037b1b3c..b0e38bcf 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/CompositeElement.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/CompositeElement.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement#getRegions <em>Regions</em>}</li>

  * </ul>

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getCompositeElement()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getCompositeElement()

  * @model abstract="true"

  * @generated

  */

@@ -33,7 +33,7 @@ public interface CompositeElement extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Regions</em>' containment reference list.

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getCompositeElement_Regions()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getCompositeElement_Regions()

          * @model containment="true"

          * @generated

          */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
index da40c481..c8adb603 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getEntry()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getEntry()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Exit.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Exit.java
index 9f8e12d3..b134c14f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Exit.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Exit.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getExit()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getExit()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/FinalState.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/FinalState.java
index 33703d36..5ec2a16a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/FinalState.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/FinalState.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getFinalState()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getFinalState()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java
index e6a003f9..670a172a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getPseudostate()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getPseudostate()

  * @model abstract="true"

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Region.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Region.java
index f4c3f114..84081ae8 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Region.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Region.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region#getVertices <em>Vertices</em>}</li>

  * </ul>

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getRegion()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getRegion()

  * @model

  * @generated

  */

@@ -33,7 +33,7 @@ public interface Region extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Vertices</em>' containment reference list.

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getRegion_Vertices()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getRegion_Vertices()

          * @model containment="true" ordered="false"

          * @generated

          */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/RegularState.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/RegularState.java
index 7db584e5..4ad05644 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/RegularState.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/RegularState.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getRegularState()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getRegularState()

  * @model abstract="true"

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/State.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/State.java
index 3c65be40..09667a01 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/State.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/State.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getState()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getState()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Statechart.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Statechart.java
index 33a1dd7a..0f8e383d 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Statechart.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Statechart.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getStatechart()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getStatechart()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
index f1294200..a06bc066 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
@@ -9,7 +9,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
  * <!-- end-user-doc -->

  *

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getSynchronization()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getSynchronization()

  * @model

  * @generated

  */

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Transition.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Transition.java
index 543cc73b..c90c8d23 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Transition.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Transition.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition#getSource <em>Source</em>}</li>

  * </ul>

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getTransition()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getTransition()

  * @model

  * @generated

  */

@@ -33,7 +33,7 @@ public interface Transition extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Target</em>' reference.

          * @see #setTarget(Vertex)

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getTransition_Target()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getTransition_Target()

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex#getIncomingTransitions

          * @model opposite="incomingTransitions" required="true" ordered="false"

          * @generated

@@ -61,7 +61,7 @@ public interface Transition extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Source</em>' container reference.

          * @see #setSource(Vertex)

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getTransition_Source()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getTransition_Source()

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex#getOutgoingTransitions

          * @model opposite="outgoingTransitions" transient="false" ordered="false"

          * @generated

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Vertex.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Vertex.java
index 6005a550..e4631e42 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Vertex.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Vertex.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex#getOutgoingTransitions <em>Outgoing Transitions</em>}</li>

  * </ul>

  *

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getVertex()

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getVertex()

  * @model abstract="true"

  * @generated

  */

@@ -35,7 +35,7 @@ public interface Vertex extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Incoming Transitions</em>' reference list.

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getVertex_IncomingTransitions()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getVertex_IncomingTransitions()

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition#getTarget

          * @model opposite="target" ordered="false"

          * @generated

@@ -53,7 +53,7 @@ public interface Vertex extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Outgoing Transitions</em>' containment reference list.

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#getVertex_OutgoingTransitions()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getVertex_OutgoingTransitions()

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition#getSource

          * @model opposite="source" containment="true" ordered="false"

          * @generated

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/yakinduFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduFactory.java
index 6d437ecb..53afae22 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/yakinduFactory.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduFactory.java
@@ -9,17 +9,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage

  * @generated

  */

-public interface yakinduFactory extends EFactory {

+public interface YakinduFactory extends EFactory {

         /**

          * The singleton instance of the factory.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          */

-        yakinduFactory eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduFactoryImpl.init();

+        YakinduFactory eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduFactoryImpl.init();

 

         /**

          * Returns a new object of class '<em>Region</em>'.

@@ -109,6 +109,6 @@ public interface yakinduFactory extends EFactory {
          * @return the package supported by this factory.

          * @generated

          */

-        yakinduPackage getyakinduPackage();

+        YakinduPackage getYakinduPackage();

 

-} //yakinduFactory

+} //YakinduFactory

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/yakinduPackage.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduPackage.java
index b3b14944..7fbe176c 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/yakinduPackage.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduPackage.java
@@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduFactory

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduFactory

  * @model kind="package"

  * @generated

  */

-public interface yakinduPackage extends EPackage {

+public interface YakinduPackage extends EPackage {

         /**

          * The package name.

          * <!-- begin-user-doc -->

@@ -53,14 +53,14 @@ public interface yakinduPackage extends EPackage {
          * <!-- end-user-doc -->

          * @generated

          */

-        yakinduPackage eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl.init();

+        YakinduPackage eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl.init();

 

         /**

          * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.VertexImpl <em>Vertex</em>}' class.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.VertexImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getVertex()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getVertex()

          * @generated

          */

         int VERTEX = 1;

@@ -106,7 +106,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.PseudostateImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getPseudostate()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getPseudostate()

          * @generated

          */

         int PSEUDOSTATE = 0;

@@ -152,7 +152,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.RegionImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getRegion()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getRegion()

          * @generated

          */

         int REGION = 2;

@@ -189,7 +189,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.TransitionImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getTransition()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getTransition()

          * @generated

          */

         int TRANSITION = 3;

@@ -235,7 +235,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.CompositeElementImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getCompositeElement()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getCompositeElement()

          * @generated

          */

         int COMPOSITE_ELEMENT = 9;

@@ -272,7 +272,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.StatechartImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getStatechart()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getStatechart()

          * @generated

          */

         int STATECHART = 4;

@@ -309,7 +309,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.EntryImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getEntry()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getEntry()

          * @generated

          */

         int ENTRY = 5;

@@ -355,7 +355,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.SynchronizationImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getSynchronization()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getSynchronization()

          * @generated

          */

         int SYNCHRONIZATION = 6;

@@ -401,7 +401,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.RegularStateImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getRegularState()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getRegularState()

          * @generated

          */

         int REGULAR_STATE = 8;

@@ -447,7 +447,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.StateImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getState()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getState()

          * @generated

          */

         int STATE = 7;

@@ -502,7 +502,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.ChoiceImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getChoice()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getChoice()

          * @generated

          */

         int CHOICE = 10;

@@ -548,7 +548,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.ExitImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getExit()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getExit()

          * @generated

          */

         int EXIT = 11;

@@ -594,7 +594,7 @@ public interface yakinduPackage extends EPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.FinalStateImpl

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getFinalState()

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getFinalState()

          * @generated

          */

         int FINAL_STATE = 12;

@@ -839,7 +839,7 @@ public interface yakinduPackage extends EPackage {
          * @return the factory that creates the instances of the model.

          * @generated

          */

-        yakinduFactory getyakinduFactory();

+        YakinduFactory getYakinduFactory();

 

         /**

          * <!-- begin-user-doc -->

@@ -860,7 +860,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.PseudostateImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getPseudostate()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getPseudostate()

                  * @generated

                  */

                 EClass PSEUDOSTATE = eINSTANCE.getPseudostate();

@@ -870,7 +870,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.VertexImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getVertex()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getVertex()

                  * @generated

                  */

                 EClass VERTEX = eINSTANCE.getVertex();

@@ -896,7 +896,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.RegionImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getRegion()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getRegion()

                  * @generated

                  */

                 EClass REGION = eINSTANCE.getRegion();

@@ -914,7 +914,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.TransitionImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getTransition()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getTransition()

                  * @generated

                  */

                 EClass TRANSITION = eINSTANCE.getTransition();

@@ -940,7 +940,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.StatechartImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getStatechart()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getStatechart()

                  * @generated

                  */

                 EClass STATECHART = eINSTANCE.getStatechart();

@@ -950,7 +950,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.EntryImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getEntry()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getEntry()

                  * @generated

                  */

                 EClass ENTRY = eINSTANCE.getEntry();

@@ -960,7 +960,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.SynchronizationImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getSynchronization()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getSynchronization()

                  * @generated

                  */

                 EClass SYNCHRONIZATION = eINSTANCE.getSynchronization();

@@ -970,7 +970,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.StateImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getState()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getState()

                  * @generated

                  */

                 EClass STATE = eINSTANCE.getState();

@@ -980,7 +980,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.RegularStateImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getRegularState()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getRegularState()

                  * @generated

                  */

                 EClass REGULAR_STATE = eINSTANCE.getRegularState();

@@ -990,7 +990,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.CompositeElementImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getCompositeElement()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getCompositeElement()

                  * @generated

                  */

                 EClass COMPOSITE_ELEMENT = eINSTANCE.getCompositeElement();

@@ -1008,7 +1008,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.ChoiceImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getChoice()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getChoice()

                  * @generated

                  */

                 EClass CHOICE = eINSTANCE.getChoice();

@@ -1018,7 +1018,7 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.ExitImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getExit()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getExit()

                  * @generated

                  */

                 EClass EXIT = eINSTANCE.getExit();

@@ -1028,11 +1028,11 @@ public interface yakinduPackage extends EPackage {
                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

                  * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.FinalStateImpl

-                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.yakinduPackageImpl#getFinalState()

+                 * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduPackageImpl#getFinalState()

                  * @generated

                  */

                 EClass FINAL_STATE = eINSTANCE.getFinalState();

 

         }

 

-} //yakinduPackage

+} //YakinduPackage

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ChoiceImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ChoiceImpl.java
index 8fc4883b..b757b42f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ChoiceImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ChoiceImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class ChoiceImpl extends PseudostateImpl implements Choice {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.CHOICE;

+                return YakinduPackage.Literals.CHOICE;

         }

 

 } //ChoiceImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/CompositeElementImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/CompositeElementImpl.java
index 0218f9c7..8441ed27 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/CompositeElementImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/CompositeElementImpl.java
@@ -4,7 +4,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import java.util.Collection;

 

@@ -60,7 +60,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.COMPOSITE_ELEMENT;

+                return YakinduPackage.Literals.COMPOSITE_ELEMENT;

         }

 

         /**

@@ -70,7 +70,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
          */

         public EList<Region> getRegions() {

                 if (regions == null) {

-                        regions = new EObjectContainmentEList<Region>(Region.class, this, yakinduPackage.COMPOSITE_ELEMENT__REGIONS);

+                        regions = new EObjectContainmentEList<Region>(Region.class, this, YakinduPackage.COMPOSITE_ELEMENT__REGIONS);

                 }

                 return regions;

         }

@@ -83,7 +83,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.COMPOSITE_ELEMENT__REGIONS:

+                        case YakinduPackage.COMPOSITE_ELEMENT__REGIONS:

                                 return ((InternalEList<?>)getRegions()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -97,7 +97,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case yakinduPackage.COMPOSITE_ELEMENT__REGIONS:

+                        case YakinduPackage.COMPOSITE_ELEMENT__REGIONS:

                                 return getRegions();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -112,7 +112,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case yakinduPackage.COMPOSITE_ELEMENT__REGIONS:

+                        case YakinduPackage.COMPOSITE_ELEMENT__REGIONS:

                                 getRegions().clear();

                                 getRegions().addAll((Collection<? extends Region>)newValue);

                                 return;

@@ -128,7 +128,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.COMPOSITE_ELEMENT__REGIONS:

+                        case YakinduPackage.COMPOSITE_ELEMENT__REGIONS:

                                 getRegions().clear();

                                 return;

                 }

@@ -143,7 +143,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.COMPOSITE_ELEMENT__REGIONS:

+                        case YakinduPackage.COMPOSITE_ELEMENT__REGIONS:

                                 return regions != null && !regions.isEmpty();

                 }

                 return super.eIsSet(featureID);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
index d0334475..0603c2a4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class EntryImpl extends PseudostateImpl implements Entry {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.ENTRY;

+                return YakinduPackage.Literals.ENTRY;

         }

 

 } //EntryImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ExitImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ExitImpl.java
index d1448776..4859ef03 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ExitImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/ExitImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Exit;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class ExitImpl extends PseudostateImpl implements Exit {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.EXIT;

+                return YakinduPackage.Literals.EXIT;

         }

 

 } //ExitImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/FinalStateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/FinalStateImpl.java
index 716c096e..c4d4e157 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/FinalStateImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/FinalStateImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.FinalState;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class FinalStateImpl extends RegularStateImpl implements FinalState {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.FINAL_STATE;

+                return YakinduPackage.Literals.FINAL_STATE;

         }

 

 } //FinalStateImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/PseudostateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/PseudostateImpl.java
index b9fc27f3..56c44b78 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/PseudostateImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/PseudostateImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Pseudostate;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public abstract class PseudostateImpl extends VertexImpl implements Pseudostate
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.PSEUDOSTATE;

+                return YakinduPackage.Literals.PSEUDOSTATE;

         }

 

 } //PseudostateImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java
index fa873aeb..fa529ad6 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java
@@ -4,7 +4,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import java.util.Collection;

 

@@ -60,7 +60,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.REGION;

+                return YakinduPackage.Literals.REGION;

         }

 

         /**

@@ -70,7 +70,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
          */

         public EList<Vertex> getVertices() {

                 if (vertices == null) {

-                        vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, yakinduPackage.REGION__VERTICES);

+                        vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakinduPackage.REGION__VERTICES);

                 }

                 return vertices;

         }

@@ -83,7 +83,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.REGION__VERTICES:

+                        case YakinduPackage.REGION__VERTICES:

                                 return ((InternalEList<?>)getVertices()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -97,7 +97,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case yakinduPackage.REGION__VERTICES:

+                        case YakinduPackage.REGION__VERTICES:

                                 return getVertices();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -112,7 +112,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case yakinduPackage.REGION__VERTICES:

+                        case YakinduPackage.REGION__VERTICES:

                                 getVertices().clear();

                                 getVertices().addAll((Collection<? extends Vertex>)newValue);

                                 return;

@@ -128,7 +128,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.REGION__VERTICES:

+                        case YakinduPackage.REGION__VERTICES:

                                 getVertices().clear();

                                 return;

                 }

@@ -143,7 +143,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.REGION__VERTICES:

+                        case YakinduPackage.REGION__VERTICES:

                                 return vertices != null && !vertices.isEmpty();

                 }

                 return super.eIsSet(featureID);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegularStateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegularStateImpl.java
index bbe21a14..5361d4d5 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegularStateImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegularStateImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.RegularState;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public abstract class RegularStateImpl extends VertexImpl implements RegularStat
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.REGULAR_STATE;

+                return YakinduPackage.Literals.REGULAR_STATE;

         }

 

 } //RegularStateImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StateImpl.java
index 66ab2a8f..85938d63 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StateImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StateImpl.java
@@ -5,7 +5,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.State;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import java.util.Collection;

 

@@ -59,7 +59,7 @@ public class StateImpl extends RegularStateImpl implements State {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.STATE;

+                return YakinduPackage.Literals.STATE;

         }

 

         /**

@@ -69,7 +69,7 @@ public class StateImpl extends RegularStateImpl implements State {
          */

         public EList<Region> getRegions() {

                 if (regions == null) {

-                        regions = new EObjectContainmentEList<Region>(Region.class, this, yakinduPackage.STATE__REGIONS);

+                        regions = new EObjectContainmentEList<Region>(Region.class, this, YakinduPackage.STATE__REGIONS);

                 }

                 return regions;

         }

@@ -82,7 +82,7 @@ public class StateImpl extends RegularStateImpl implements State {
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.STATE__REGIONS:

+                        case YakinduPackage.STATE__REGIONS:

                                 return ((InternalEList<?>)getRegions()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -96,7 +96,7 @@ public class StateImpl extends RegularStateImpl implements State {
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case yakinduPackage.STATE__REGIONS:

+                        case YakinduPackage.STATE__REGIONS:

                                 return getRegions();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -111,7 +111,7 @@ public class StateImpl extends RegularStateImpl implements State {
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case yakinduPackage.STATE__REGIONS:

+                        case YakinduPackage.STATE__REGIONS:

                                 getRegions().clear();

                                 getRegions().addAll((Collection<? extends Region>)newValue);

                                 return;

@@ -127,7 +127,7 @@ public class StateImpl extends RegularStateImpl implements State {
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.STATE__REGIONS:

+                        case YakinduPackage.STATE__REGIONS:

                                 getRegions().clear();

                                 return;

                 }

@@ -142,7 +142,7 @@ public class StateImpl extends RegularStateImpl implements State {
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.STATE__REGIONS:

+                        case YakinduPackage.STATE__REGIONS:

                                 return regions != null && !regions.isEmpty();

                 }

                 return super.eIsSet(featureID);

@@ -157,7 +157,7 @@ public class StateImpl extends RegularStateImpl implements State {
         public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

                 if (baseClass == CompositeElement.class) {

                         switch (derivedFeatureID) {

-                                case yakinduPackage.STATE__REGIONS: return yakinduPackage.COMPOSITE_ELEMENT__REGIONS;

+                                case YakinduPackage.STATE__REGIONS: return YakinduPackage.COMPOSITE_ELEMENT__REGIONS;

                                 default: return -1;

                         }

                 }

@@ -173,7 +173,7 @@ public class StateImpl extends RegularStateImpl implements State {
         public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

                 if (baseClass == CompositeElement.class) {

                         switch (baseFeatureID) {

-                                case yakinduPackage.COMPOSITE_ELEMENT__REGIONS: return yakinduPackage.STATE__REGIONS;

+                                case YakinduPackage.COMPOSITE_ELEMENT__REGIONS: return YakinduPackage.STATE__REGIONS;

                                 default: return -1;

                         }

                 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StatechartImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StatechartImpl.java
index 056820ca..a74110da 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StatechartImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StatechartImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Statechart;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class StatechartImpl extends CompositeElementImpl implements Statechart {
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.STATECHART;

+                return YakinduPackage.Literals.STATECHART;

         }

 

 } //StatechartImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java
index 28ef69ea..3b6cd8eb 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java
@@ -3,7 +3,7 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 

@@ -31,7 +31,7 @@ public class SynchronizationImpl extends PseudostateImpl implements Synchronizat
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.SYNCHRONIZATION;

+                return YakinduPackage.Literals.SYNCHRONIZATION;

         }

 

 } //SynchronizationImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/TransitionImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/TransitionImpl.java
index ea1677ee..dfbca048 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/TransitionImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/TransitionImpl.java
@@ -4,7 +4,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

@@ -58,7 +58,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.TRANSITION;

+                return YakinduPackage.Literals.TRANSITION;

         }

 

         /**

@@ -72,7 +72,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
                         target = (Vertex)eResolveProxy(oldTarget);

                         if (target != oldTarget) {

                                 if (eNotificationRequired())

-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, yakinduPackage.TRANSITION__TARGET, oldTarget, target));

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, YakinduPackage.TRANSITION__TARGET, oldTarget, target));

                         }

                 }

                 return target;

@@ -96,7 +96,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
                 Vertex oldTarget = target;

                 target = newTarget;

                 if (eNotificationRequired()) {

-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, yakinduPackage.TRANSITION__TARGET, oldTarget, newTarget);

+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, YakinduPackage.TRANSITION__TARGET, oldTarget, newTarget);

                         if (msgs == null) msgs = notification; else msgs.add(notification);

                 }

                 return msgs;

@@ -111,14 +111,14 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
                 if (newTarget != target) {

                         NotificationChain msgs = null;

                         if (target != null)

-                                msgs = ((InternalEObject)target).eInverseRemove(this, yakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

+                                msgs = ((InternalEObject)target).eInverseRemove(this, YakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

                         if (newTarget != null)

-                                msgs = ((InternalEObject)newTarget).eInverseAdd(this, yakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

+                                msgs = ((InternalEObject)newTarget).eInverseAdd(this, YakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

                         msgs = basicSetTarget(newTarget, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

                 else if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, yakinduPackage.TRANSITION__TARGET, newTarget, newTarget));

+                        eNotify(new ENotificationImpl(this, Notification.SET, YakinduPackage.TRANSITION__TARGET, newTarget, newTarget));

         }

 

         /**

@@ -127,7 +127,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * @generated

          */

         public Vertex getSource() {

-                if (eContainerFeatureID() != yakinduPackage.TRANSITION__SOURCE) return null;

+                if (eContainerFeatureID() != YakinduPackage.TRANSITION__SOURCE) return null;

                 return (Vertex)eInternalContainer();

         }

 

@@ -137,7 +137,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * @generated

          */

         public NotificationChain basicSetSource(Vertex newSource, NotificationChain msgs) {

-                msgs = eBasicSetContainer((InternalEObject)newSource, yakinduPackage.TRANSITION__SOURCE, msgs);

+                msgs = eBasicSetContainer((InternalEObject)newSource, YakinduPackage.TRANSITION__SOURCE, msgs);

                 return msgs;

         }

 

@@ -147,19 +147,19 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * @generated

          */

         public void setSource(Vertex newSource) {

-                if (newSource != eInternalContainer() || (eContainerFeatureID() != yakinduPackage.TRANSITION__SOURCE && newSource != null)) {

+                if (newSource != eInternalContainer() || (eContainerFeatureID() != YakinduPackage.TRANSITION__SOURCE && newSource != null)) {

                         if (EcoreUtil.isAncestor(this, newSource))

                                 throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

                         NotificationChain msgs = null;

                         if (eInternalContainer() != null)

                                 msgs = eBasicRemoveFromContainer(msgs);

                         if (newSource != null)

-                                msgs = ((InternalEObject)newSource).eInverseAdd(this, yakinduPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);

+                                msgs = ((InternalEObject)newSource).eInverseAdd(this, YakinduPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);

                         msgs = basicSetSource(newSource, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

                 else if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, yakinduPackage.TRANSITION__SOURCE, newSource, newSource));

+                        eNotify(new ENotificationImpl(this, Notification.SET, YakinduPackage.TRANSITION__SOURCE, newSource, newSource));

         }

 

         /**

@@ -170,11 +170,11 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 if (target != null)

-                                        msgs = ((InternalEObject)target).eInverseRemove(this, yakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

+                                        msgs = ((InternalEObject)target).eInverseRemove(this, YakinduPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);

                                 return basicSetTarget((Vertex)otherEnd, msgs);

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 if (eInternalContainer() != null)

                                         msgs = eBasicRemoveFromContainer(msgs);

                                 return basicSetSource((Vertex)otherEnd, msgs);

@@ -190,9 +190,9 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 return basicSetTarget(null, msgs);

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 return basicSetSource(null, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -206,8 +206,8 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

                 switch (eContainerFeatureID()) {

-                        case yakinduPackage.TRANSITION__SOURCE:

-                                return eInternalContainer().eInverseRemove(this, yakinduPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);

+                        case YakinduPackage.TRANSITION__SOURCE:

+                                return eInternalContainer().eInverseRemove(this, YakinduPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);

                 }

                 return super.eBasicRemoveFromContainerFeature(msgs);

         }

@@ -220,10 +220,10 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 if (resolve) return getTarget();

                                 return basicGetTarget();

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 return getSource();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -237,10 +237,10 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 setTarget((Vertex)newValue);

                                 return;

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 setSource((Vertex)newValue);

                                 return;

                 }

@@ -255,10 +255,10 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 setTarget((Vertex)null);

                                 return;

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 setSource((Vertex)null);

                                 return;

                 }

@@ -273,9 +273,9 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.TRANSITION__TARGET:

+                        case YakinduPackage.TRANSITION__TARGET:

                                 return target != null;

-                        case yakinduPackage.TRANSITION__SOURCE:

+                        case YakinduPackage.TRANSITION__SOURCE:

                                 return getSource() != null;

                 }

                 return super.eIsSet(featureID);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/VertexImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/VertexImpl.java
index 6f5b9ed3..6384fb51 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/VertexImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/VertexImpl.java
@@ -4,7 +4,7 @@ package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import java.util.Collection;

 

@@ -72,7 +72,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          */

         @Override

         protected EClass eStaticClass() {

-                return yakinduPackage.Literals.VERTEX;

+                return YakinduPackage.Literals.VERTEX;

         }

 

         /**

@@ -82,7 +82,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          */

         public EList<Transition> getIncomingTransitions() {

                 if (incomingTransitions == null) {

-                        incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, yakinduPackage.VERTEX__INCOMING_TRANSITIONS, yakinduPackage.TRANSITION__TARGET);

+                        incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, YakinduPackage.VERTEX__INCOMING_TRANSITIONS, YakinduPackage.TRANSITION__TARGET);

                 }

                 return incomingTransitions;

         }

@@ -94,7 +94,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          */

         public EList<Transition> getOutgoingTransitions() {

                 if (outgoingTransitions == null) {

-                        outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, yakinduPackage.VERTEX__OUTGOING_TRANSITIONS, yakinduPackage.TRANSITION__SOURCE);

+                        outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, YakinduPackage.VERTEX__OUTGOING_TRANSITIONS, YakinduPackage.TRANSITION__SOURCE);

                 }

                 return outgoingTransitions;

         }

@@ -108,9 +108,9 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncomingTransitions()).basicAdd(otherEnd, msgs);

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutgoingTransitions()).basicAdd(otherEnd, msgs);

                 }

                 return super.eInverseAdd(otherEnd, featureID, msgs);

@@ -124,9 +124,9 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 return ((InternalEList<?>)getIncomingTransitions()).basicRemove(otherEnd, msgs);

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 return ((InternalEList<?>)getOutgoingTransitions()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -140,9 +140,9 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 return getIncomingTransitions();

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 return getOutgoingTransitions();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -157,11 +157,11 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 getIncomingTransitions().clear();

                                 getIncomingTransitions().addAll((Collection<? extends Transition>)newValue);

                                 return;

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 getOutgoingTransitions().clear();

                                 getOutgoingTransitions().addAll((Collection<? extends Transition>)newValue);

                                 return;

@@ -177,10 +177,10 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 getIncomingTransitions().clear();

                                 return;

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 getOutgoingTransitions().clear();

                                 return;

                 }

@@ -195,9 +195,9 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case yakinduPackage.VERTEX__INCOMING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__INCOMING_TRANSITIONS:

                                 return incomingTransitions != null && !incomingTransitions.isEmpty();

-                        case yakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

+                        case YakinduPackage.VERTEX__OUTGOING_TRANSITIONS:

                                 return outgoingTransitions != null && !outgoingTransitions.isEmpty();

                 }

                 return super.eIsSet(featureID);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/yakinduFactoryImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/YakinduFactoryImpl.java
index 5d004565..bd5ee1bd 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/yakinduFactoryImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/YakinduFactoryImpl.java
@@ -18,24 +18,24 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * <!-- end-user-doc -->

  * @generated

  */

-public class yakinduFactoryImpl extends EFactoryImpl implements yakinduFactory {

+public class YakinduFactoryImpl extends EFactoryImpl implements YakinduFactory {

         /**

          * Creates the default factory implementation.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          */

-        public static yakinduFactory init() {

+        public static YakinduFactory init() {

                 try {

-                        yakinduFactory theyakinduFactory = (yakinduFactory)EPackage.Registry.INSTANCE.getEFactory(yakinduPackage.eNS_URI);

-                        if (theyakinduFactory != null) {

-                                return theyakinduFactory;

+                        YakinduFactory theYakinduFactory = (YakinduFactory)EPackage.Registry.INSTANCE.getEFactory(YakinduPackage.eNS_URI);

+                        if (theYakinduFactory != null) {

+                                return theYakinduFactory;

                         }

                 }

                 catch (Exception exception) {

                         EcorePlugin.INSTANCE.log(exception);

                 }

-                return new yakinduFactoryImpl();

+                return new YakinduFactoryImpl();

         }

 

         /**

@@ -44,7 +44,7 @@ public class yakinduFactoryImpl extends EFactoryImpl implements yakinduFactory {
          * <!-- end-user-doc -->

          * @generated

          */

-        public yakinduFactoryImpl() {

+        public YakinduFactoryImpl() {

                 super();

         }

 

@@ -56,15 +56,15 @@ public class yakinduFactoryImpl extends EFactoryImpl implements yakinduFactory {
         @Override

         public EObject create(EClass eClass) {

                 switch (eClass.getClassifierID()) {

-                        case yakinduPackage.REGION: return createRegion();

-                        case yakinduPackage.TRANSITION: return createTransition();

-                        case yakinduPackage.STATECHART: return createStatechart();

-                        case yakinduPackage.ENTRY: return createEntry();

-                        case yakinduPackage.SYNCHRONIZATION: return createSynchronization();

-                        case yakinduPackage.STATE: return createState();

-                        case yakinduPackage.CHOICE: return createChoice();

-                        case yakinduPackage.EXIT: return createExit();

-                        case yakinduPackage.FINAL_STATE: return createFinalState();

+                        case YakinduPackage.REGION: return createRegion();

+                        case YakinduPackage.TRANSITION: return createTransition();

+                        case YakinduPackage.STATECHART: return createStatechart();

+                        case YakinduPackage.ENTRY: return createEntry();

+                        case YakinduPackage.SYNCHRONIZATION: return createSynchronization();

+                        case YakinduPackage.STATE: return createState();

+                        case YakinduPackage.CHOICE: return createChoice();

+                        case YakinduPackage.EXIT: return createExit();

+                        case YakinduPackage.FINAL_STATE: return createFinalState();

                         default:

                                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

                 }

@@ -165,8 +165,8 @@ public class yakinduFactoryImpl extends EFactoryImpl implements yakinduFactory {
          * <!-- end-user-doc -->

          * @generated

          */

-        public yakinduPackage getyakinduPackage() {

-                return (yakinduPackage)getEPackage();

+        public YakinduPackage getYakinduPackage() {

+                return (YakinduPackage)getEPackage();

         }

 

         /**

@@ -176,8 +176,8 @@ public class yakinduFactoryImpl extends EFactoryImpl implements yakinduFactory {
          * @generated

          */

         @Deprecated

-        public static yakinduPackage getPackage() {

-                return yakinduPackage.eINSTANCE;

+        public static YakinduPackage getPackage() {

+                return YakinduPackage.eINSTANCE;

         }

 

-} //yakinduFactoryImpl

+} //YakinduFactoryImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/yakinduPackageImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/YakinduPackageImpl.java
index 2213e07f..0796c5d8 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/yakinduPackageImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/YakinduPackageImpl.java
@@ -15,8 +15,8 @@ import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Statechart;
 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

 import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduFactory;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduFactory;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  * <!-- end-user-doc -->

  * @generated

  */

-public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {

+public class YakinduPackageImpl extends EPackageImpl implements YakinduPackage {

         /**

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -133,12 +133,12 @@ public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {
          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @see org.eclipse.emf.ecore.EPackage.Registry

-         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage#eNS_URI

+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#eNS_URI

          * @see #init()

          * @generated

          */

-        private yakinduPackageImpl() {

-                super(eNS_URI, yakinduFactory.eINSTANCE);

+        private YakinduPackageImpl() {

+                super(eNS_URI, YakinduFactory.eINSTANCE);

         }

 

         /**

@@ -150,8 +150,8 @@ public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {
 

         /**

          * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-         * 

-         * <p>This method is used to initialize {@link yakinduPackage#eINSTANCE} when that field is accessed.

+         *

+         * <p>This method is used to initialize {@link YakinduPackage#eINSTANCE} when that field is accessed.

          * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -160,27 +160,27 @@ public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {
          * @see #initializePackageContents()

          * @generated

          */

-        public static yakinduPackage init() {

-                if (isInited) return (yakinduPackage)EPackage.Registry.INSTANCE.getEPackage(yakinduPackage.eNS_URI);

+        public static YakinduPackage init() {

+                if (isInited) return (YakinduPackage)EPackage.Registry.INSTANCE.getEPackage(YakinduPackage.eNS_URI);

 

                 // Obtain or create and register package

-                yakinduPackageImpl theyakinduPackage = (yakinduPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof yakinduPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new yakinduPackageImpl());

+                Object registeredYakinduPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                YakinduPackageImpl theYakinduPackage = registeredYakinduPackage instanceof YakinduPackageImpl ? (YakinduPackageImpl)registeredYakinduPackage : new YakinduPackageImpl();

 

                 isInited = true;

 

                 // Create package meta-data objects

-                theyakinduPackage.createPackageContents();

+                theYakinduPackage.createPackageContents();

 

                 // Initialize created meta-data

-                theyakinduPackage.initializePackageContents();

+                theYakinduPackage.initializePackageContents();

 

                 // Mark meta-data to indicate it can't be changed

-                theyakinduPackage.freeze();

+                theYakinduPackage.freeze();

 

-  

                 // Update the registry and return the package

-                EPackage.Registry.INSTANCE.put(yakinduPackage.eNS_URI, theyakinduPackage);

-                return theyakinduPackage;

+                EPackage.Registry.INSTANCE.put(YakinduPackage.eNS_URI, theYakinduPackage);

+                return theYakinduPackage;

         }

 

         /**

@@ -359,8 +359,8 @@ public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {
          * <!-- end-user-doc -->

          * @generated

          */

-        public yakinduFactory getyakinduFactory() {

-                return (yakinduFactory)getEFactoryInstance();

+        public YakinduFactory getYakinduFactory() {

+                return (YakinduFactory)getEFactoryInstance();

         }

 

         /**

@@ -491,4 +491,4 @@ public class yakinduPackageImpl extends EPackageImpl implements yakinduPackage {
                 createResource(eNS_URI);

         }

 

-} //yakinduPackageImpl

+} //YakinduPackageImpl

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/yakinduAdapterFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/YakinduAdapterFactory.java
index b8fafb35..566f01e5 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/yakinduAdapterFactory.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/YakinduAdapterFactory.java
@@ -16,17 +16,17 @@ import org.eclipse.emf.ecore.EObject;
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage

  * @generated

  */

-public class yakinduAdapterFactory extends AdapterFactoryImpl {

+public class YakinduAdapterFactory extends AdapterFactoryImpl {

         /**

          * The cached model package.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          */

-        protected static yakinduPackage modelPackage;

+        protected static YakinduPackage modelPackage;

 

         /**

          * Creates an instance of the adapter factory.

@@ -34,9 +34,9 @@ public class yakinduAdapterFactory extends AdapterFactoryImpl {
          * <!-- end-user-doc -->

          * @generated

          */

-        public yakinduAdapterFactory() {

+        public YakinduAdapterFactory() {

                 if (modelPackage == null) {

-                        modelPackage = yakinduPackage.eINSTANCE;

+                        modelPackage = YakinduPackage.eINSTANCE;

                 }

         }

 

@@ -65,8 +65,8 @@ public class yakinduAdapterFactory extends AdapterFactoryImpl {
          * <!-- end-user-doc -->

          * @generated

          */

-        protected yakinduSwitch<Adapter> modelSwitch =

-                new yakinduSwitch<Adapter>() {

+        protected YakinduSwitch<Adapter> modelSwitch =

+                new YakinduSwitch<Adapter>() {

                         @Override

                         public Adapter casePseudostate(Pseudostate object) {

                                 return createPseudostateAdapter();

@@ -333,4 +333,4 @@ public class yakinduAdapterFactory extends AdapterFactoryImpl {
                 return null;

         }

 

-} //yakinduAdapterFactory

+} //YakinduAdapterFactory

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/yakinduSwitch.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/YakinduSwitch.java
index fbc6f821..fdaff54d 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/yakinduSwitch.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/util/YakinduSwitch.java
@@ -19,17 +19,17 @@ import org.eclipse.emf.ecore.util.Switch;
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage

  * @generated

  */

-public class yakinduSwitch<T> extends Switch<T> {

+public class YakinduSwitch<T> extends Switch<T> {

         /**

          * The cached model package

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          */

-        protected static yakinduPackage modelPackage;

+        protected static YakinduPackage modelPackage;

 

         /**

          * Creates an instance of the switch.

@@ -37,9 +37,9 @@ public class yakinduSwitch<T> extends Switch<T> {
          * <!-- end-user-doc -->

          * @generated

          */

-        public yakinduSwitch() {

+        public YakinduSwitch() {

                 if (modelPackage == null) {

-                        modelPackage = yakinduPackage.eINSTANCE;

+                        modelPackage = YakinduPackage.eINSTANCE;

                 }

         }

 

@@ -66,39 +66,39 @@ public class yakinduSwitch<T> extends Switch<T> {
         @Override

         protected T doSwitch(int classifierID, EObject theEObject) {

                 switch (classifierID) {

-                        case yakinduPackage.PSEUDOSTATE: {

+                        case YakinduPackage.PSEUDOSTATE: {

                                 Pseudostate pseudostate = (Pseudostate)theEObject;

                                 T result = casePseudostate(pseudostate);

                                 if (result == null) result = caseVertex(pseudostate);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.VERTEX: {

+                        case YakinduPackage.VERTEX: {

                                 Vertex vertex = (Vertex)theEObject;

                                 T result = caseVertex(vertex);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.REGION: {

+                        case YakinduPackage.REGION: {

                                 Region region = (Region)theEObject;

                                 T result = caseRegion(region);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.TRANSITION: {

+                        case YakinduPackage.TRANSITION: {

                                 Transition transition = (Transition)theEObject;

                                 T result = caseTransition(transition);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.STATECHART: {

+                        case YakinduPackage.STATECHART: {

                                 Statechart statechart = (Statechart)theEObject;

                                 T result = caseStatechart(statechart);

                                 if (result == null) result = caseCompositeElement(statechart);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.ENTRY: {

+                        case YakinduPackage.ENTRY: {

                                 Entry entry = (Entry)theEObject;

                                 T result = caseEntry(entry);

                                 if (result == null) result = casePseudostate(entry);

@@ -106,7 +106,7 @@ public class yakinduSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.SYNCHRONIZATION: {

+                        case YakinduPackage.SYNCHRONIZATION: {

                                 Synchronization synchronization = (Synchronization)theEObject;

                                 T result = caseSynchronization(synchronization);

                                 if (result == null) result = casePseudostate(synchronization);

@@ -114,7 +114,7 @@ public class yakinduSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.STATE: {

+                        case YakinduPackage.STATE: {

                                 State state = (State)theEObject;

                                 T result = caseState(state);

                                 if (result == null) result = caseRegularState(state);

@@ -123,20 +123,20 @@ public class yakinduSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.REGULAR_STATE: {

+                        case YakinduPackage.REGULAR_STATE: {

                                 RegularState regularState = (RegularState)theEObject;

                                 T result = caseRegularState(regularState);

                                 if (result == null) result = caseVertex(regularState);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.COMPOSITE_ELEMENT: {

+                        case YakinduPackage.COMPOSITE_ELEMENT: {

                                 CompositeElement compositeElement = (CompositeElement)theEObject;

                                 T result = caseCompositeElement(compositeElement);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.CHOICE: {

+                        case YakinduPackage.CHOICE: {

                                 Choice choice = (Choice)theEObject;

                                 T result = caseChoice(choice);

                                 if (result == null) result = casePseudostate(choice);

@@ -144,7 +144,7 @@ public class yakinduSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.EXIT: {

+                        case YakinduPackage.EXIT: {

                                 Exit exit = (Exit)theEObject;

                                 T result = caseExit(exit);

                                 if (result == null) result = casePseudostate(exit);

@@ -152,7 +152,7 @@ public class yakinduSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case yakinduPackage.FINAL_STATE: {

+                        case YakinduPackage.FINAL_STATE: {

                                 FinalState finalState = (FinalState)theEObject;

                                 T result = caseFinalState(finalState);

                                 if (result == null) result = caseRegularState(finalState);

@@ -375,4 +375,4 @@ public class yakinduSwitch<T> extends Switch<T> {
                 return null;

         }

 

-} //yakinduSwitch

+} //YakinduSwitch

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
index f8fc4d59..33dc7485 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
@@ -236,7 +236,4 @@
   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.vampire.queries.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

   </extension>

-  <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

-    <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

-  </extension>

 </plugin>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 7e2c1f12..890872ea 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 9ef2b1a0..8d7947e1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index 468a5b6f..91741fb2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index ecbaed63..e1fba1c4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index bed2786b..22b54964 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
index f0d7d924..f8502439 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -1,112 +1,10 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

-import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

-import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

-import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

-import java.util.HashMap;

-import java.util.Map;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

-import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.ObjectExtensions;

-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

-

 @SuppressWarnings("all")

 public class YakinduTest {

   public static void main(final String[] args) {

-    try {

-      final Ecore2Logic ecore2Logic = new Ecore2Logic();

-      final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);

-      final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();

-      StringConcatenation _builder = new StringConcatenation();

-      _builder.append("initialModels/");

-      final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

-      StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/YakinduTest/");

-      final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

-      workspace.initAndClear();

-      final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

-      final Map<String, Object> map = reg.getExtensionToFactoryMap();

-      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

-      map.put("logicproblem", _xMIResourceFactoryImpl);

-      InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(yakinduPackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/yakinduinstance.xmi");

-      final Object queries = null;

-      InputOutput.<String>println("DSL loaded");

-      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

-      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

-      LogicProblem problem = modelGenerationProblem.getOutput();

-      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

-      workspace.writeModel(problem, "Yakindu.logicproblem");

-      InputOutput.<String>println("Problem created");

-      long startTime = System.currentTimeMillis();

-      LogicReasoner reasoner = null;

-      VampireSolver _vampireSolver = new VampireSolver();

-      reasoner = _vampireSolver;

-      final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

-      classMapMin.put(Region.class, Integer.valueOf(1));

-      classMapMin.put(Transition.class, Integer.valueOf(2));

-      classMapMin.put(CompositeElement.class, Integer.valueOf(3));

-      final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

-      final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

-      classMapMax.put(Region.class, Integer.valueOf(5));

-      classMapMax.put(Transition.class, Integer.valueOf(2));

-      classMapMax.put(Synchronization.class, Integer.valueOf(4));

-      final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

-      VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

-      final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

-        it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 20;

-        it.typeScopes.maxNewElements = 30;

-        int _size = typeMapMin.size();

-        boolean _notEquals = (_size != 0);

-        if (_notEquals) {

-          it.typeScopes.minNewElementsByType = typeMapMin;

-        }

-        int _size_1 = typeMapMin.size();

-        boolean _notEquals_1 = (_size_1 != 0);

-        if (_notEquals_1) {

-          it.typeScopes.maxNewElementsByType = typeMapMax;

-        }

-        it.contCycleLevel = 5;

-        it.uniquenessDuplicates = false;

-      };

-      final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

-      LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);

-      long _currentTimeMillis = System.currentTimeMillis();

-      long _minus = (_currentTimeMillis - startTime);

-      long totalTimeMin = (_minus / 60000);

-      long _currentTimeMillis_1 = System.currentTimeMillis();

-      long _minus_1 = (_currentTimeMillis_1 - startTime);

-      long _divide = (_minus_1 / 1000);

-      long totalTimeSec = (_divide % 60);

-      InputOutput.<String>println("Problem solved");

-      InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

-    }

+    throw new Error("Unresolved compilation problems:"

+      + "\nThe method or field yakinduPackage is undefined"

+      + "\neINSTANCE cannot be resolved");

   }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 1bcd0a44..c33ed958 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index 6272497d..9fecf93f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index 2f327d75..7b5be981 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin