From 5e618f95f1eca1253b5f6f71deb0ceba4c8663aa Mon Sep 17 00:00:00 2001
From: Artem Tikhomirov <tikhomirov.artem@gmail.com>
Date: Tue, 3 May 2016 19:11:16 +0200
Subject: [PATCH] SModelInternal, engaged languages: run migration to update
 model imports to serialize SLanguage rather than SModuleReference.

---
 .mps/migration.xml                                              | 1 +
 .../runtime/jetbrains/mps/baseLanguage/closures/runtime.mps     | 2 +-
 .../jetbrains/mps/baseLanguage/closures/runtime/generated       | 2 +-
 .../jetbrains/mps/baseLanguage/collections/trove/runtime.mps    | 2 +-
 .../mps/baseLanguage/collections/trove/runtime/generated        | 2 +-
 .../runtime/jetbrains/mps/baseLanguage/tuples/runtime.mps       | 2 +-
 .../jetbrains/mps/baseLanguage/tuples/runtime/generated         | 2 +-
 .../lang/dataFlow/analyzers/generator/template/main/generated   | 2 +-
 .../analyzers/generator/template/main@generator.mps             | 2 +-
 languages/languageDesign/textGen/models/editor.mps              | 2 +-
 languages/languageDesign/textGen/models/structure.mps           | 2 +-
 .../jetbrains/mps/lang/textGen/editor/generated                 | 2 +-
 .../source_gen.caches/jetbrains/mps/lang/textGen/generated      | 2 +-
 .../jetbrains/mps/lang/textGen/structure/generated              | 2 +-
 .../models/jetbrains/mps/migration/component/plugin.mps         | 2 +-
 .../jetbrains/mps/migration/component/plugin/generated          | 2 +-
 .../platform/models/jetbrains/mps/ide/java/sourceStubsUI.mps    | 2 +-
 .../jetbrains/mps/ide/java/sourceStubsUI/generated              | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test1.mps  | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test2.mps  | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test3.mps  | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test4.mps  | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test5.mps  | 2 +-
 .../jetbrains/mps/samples/generator_demo/test_models/test6.mps  | 2 +-
 .../mps/samples/generator_demo/test_models/test1/generated      | 2 +-
 .../mps/samples/generator_demo/test_models/test2/generated      | 2 +-
 .../mps/samples/generator_demo/test_models/test3/generated      | 2 +-
 .../mps/samples/generator_demo/test_models/test4/generated      | 2 +-
 .../mps/samples/generator_demo/test_models/test5/generated      | 2 +-
 .../mps/samples/generator_demo/test_models/test6/generated      | 2 +-
 .../baseLanguage/math/generator/template/operations/generated   | 2 +-
 samples/math/generator/template/operations@generator.mps        | 2 +-
 32 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.mps/migration.xml b/.mps/migration.xml
index 5c18e5484966..1fb0e89ad8ae 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -7,6 +7,7 @@
     <entry key="jetbrains.mps.fixLangVersions" value="executed" />
     <entry key="jetbrains.mps.fixMig_33_331" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id" value="executed" />
diff --git a/languages/baseLanguage/closures/runtime/jetbrains/mps/baseLanguage/closures/runtime.mps b/languages/baseLanguage/closures/runtime/jetbrains/mps/baseLanguage/closures/runtime.mps
index 38402c5c1d94..e027d0bcfed3 100644
--- a/languages/baseLanguage/closures/runtime/jetbrains/mps/baseLanguage/closures/runtime.mps
+++ b/languages/baseLanguage/closures/runtime/jetbrains/mps/baseLanguage/closures/runtime.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <generationPart ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" />
+    <engage id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/baseLanguage/closures/runtime/source_gen.caches/jetbrains/mps/baseLanguage/closures/runtime/generated b/languages/baseLanguage/closures/runtime/source_gen.caches/jetbrains/mps/baseLanguage/closures/runtime/generated
index 1dbe237c2a3c..d5e34cdaf65c 100644
--- a/languages/baseLanguage/closures/runtime/source_gen.caches/jetbrains/mps/baseLanguage/closures/runtime/generated
+++ b/languages/baseLanguage/closures/runtime/source_gen.caches/jetbrains/mps/baseLanguage/closures/runtime/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-d2asovg1b448s4z1xu75gux52zvpsp0" />
+<dependencies version="2" modelHash="-4nfobz4j9icmk5odj0ykk1h1xmqgxa7" />
 
diff --git a/languages/baseLanguage/collections/languages/trove/runtime/jetbrains/mps/baseLanguage/collections/trove/runtime.mps b/languages/baseLanguage/collections/languages/trove/runtime/jetbrains/mps/baseLanguage/collections/trove/runtime.mps
index 2de49889a9bf..4aa752267c1d 100644
--- a/languages/baseLanguage/collections/languages/trove/runtime/jetbrains/mps/baseLanguage/collections/trove/runtime.mps
+++ b/languages/baseLanguage/collections/languages/trove/runtime/jetbrains/mps/baseLanguage/collections/trove/runtime.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
-    <generationPart ref="73736c50-f124-433b-b789-2828a15a0adc(jetbrains.mps.baseLanguage.collections.trove)" />
+    <engage id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" />
   </languages>
   <imports />
   <registry />
diff --git a/languages/baseLanguage/collections/languages/trove/runtime/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/runtime/generated b/languages/baseLanguage/collections/languages/trove/runtime/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/runtime/generated
index 461cf803704b..008732dbe5ef 100644
--- a/languages/baseLanguage/collections/languages/trove/runtime/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/runtime/generated
+++ b/languages/baseLanguage/collections/languages/trove/runtime/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/runtime/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-3tfaleolezuxge2adoyx79c8dgejjhg" />
+<dependencies version="2" modelHash="d4nqdt5gskc4d4hlyzmlrpo1qrs1lfo" />
 
diff --git a/languages/baseLanguage/tuples/runtime/jetbrains/mps/baseLanguage/tuples/runtime.mps b/languages/baseLanguage/tuples/runtime/jetbrains/mps/baseLanguage/tuples/runtime.mps
index f02615c42e36..349c53165afd 100644
--- a/languages/baseLanguage/tuples/runtime/jetbrains/mps/baseLanguage/tuples/runtime.mps
+++ b/languages/baseLanguage/tuples/runtime/jetbrains/mps/baseLanguage/tuples/runtime.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <generationPart ref="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" />
+    <engage id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/languages/baseLanguage/tuples/runtime/source_gen.caches/jetbrains/mps/baseLanguage/tuples/runtime/generated b/languages/baseLanguage/tuples/runtime/source_gen.caches/jetbrains/mps/baseLanguage/tuples/runtime/generated
index 84f1c7245462..db4a9d8977fe 100644
--- a/languages/baseLanguage/tuples/runtime/source_gen.caches/jetbrains/mps/baseLanguage/tuples/runtime/generated
+++ b/languages/baseLanguage/tuples/runtime/source_gen.caches/jetbrains/mps/baseLanguage/tuples/runtime/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="9dsvnu133ti5p9jnfmnf4gu1hb2ijsq" />
+<dependencies version="2" modelHash="94lqy3oyybobg2bqvqyuznz05rhh1et" />
 
diff --git a/languages/languageDesign/analyzers/generator/source_gen.caches/jetbrains/mps/lang/dataFlow/analyzers/generator/template/main/generated b/languages/languageDesign/analyzers/generator/source_gen.caches/jetbrains/mps/lang/dataFlow/analyzers/generator/template/main/generated
index ab5bf555794e..7ca65af08961 100644
--- a/languages/languageDesign/analyzers/generator/source_gen.caches/jetbrains/mps/lang/dataFlow/analyzers/generator/template/main/generated
+++ b/languages/languageDesign/analyzers/generator/source_gen.caches/jetbrains/mps/lang/dataFlow/analyzers/generator/template/main/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9nksoea7gtq4tftpejm87sv0fh0tde5" />
+<dependencies version="2" modelHash="-728se9fdaqrwpdyxwezuqnoxr59a5dq" />
 
diff --git a/languages/languageDesign/analyzers/generator/template/main@generator.mps b/languages/languageDesign/analyzers/generator/template/main@generator.mps
index 0e184c917a0f..3511c687e2ad 100644
--- a/languages/languageDesign/analyzers/generator/template/main@generator.mps
+++ b/languages/languageDesign/analyzers/generator/template/main@generator.mps
@@ -14,7 +14,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <generationPart ref="d4615e3b-d671-4ba9-af01-2b78369b0ba7(jetbrains.mps.lang.pattern)" />
+    <engage id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/languages/languageDesign/textGen/models/editor.mps b/languages/languageDesign/textGen/models/editor.mps
index 02f4300cbd38..1886f1381fd6 100644
--- a/languages/languageDesign/textGen/models/editor.mps
+++ b/languages/languageDesign/textGen/models/editor.mps
@@ -6,7 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <generationPart ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" />
+    <engage id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" />
   </languages>
   <imports>
     <import index="2omo" ref="r:de0d3c0c-d049-41cf-bbf9-a920ba513cd3(jetbrains.mps.lang.textGen.structure)" />
diff --git a/languages/languageDesign/textGen/models/structure.mps b/languages/languageDesign/textGen/models/structure.mps
index c8ddbf97e404..1a3f5d1bad89 100644
--- a/languages/languageDesign/textGen/models/structure.mps
+++ b/languages/languageDesign/textGen/models/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="2" />
-    <generationPart ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" />
+    <engage id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" />
   </languages>
   <imports>
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
diff --git a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/editor/generated b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/editor/generated
index ea70ba325047..7492d2afa6e6 100644
--- a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/editor/generated
+++ b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/editor/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="37z54p0lmza1nxa12y6uem93v0yez8v" />
+<dependencies version="2" modelHash="-7wz6tvgwiyrmcf9o2uwy6sujc15uatp" />
 
diff --git a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/generated b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/generated
index 9140c8fdf89e..9d5a9a4b2d74 100644
--- a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/generated
+++ b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-azotlnlc56vctuc4668inyays2w5ggh" />
+<dependencies version="2" modelHash="5p6ca4cnvbffck32q49r0mqviu43fh2" />
 
diff --git a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/structure/generated b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/structure/generated
index 0a13d74d3a86..c83b7d3b2e2e 100644
--- a/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/structure/generated
+++ b/languages/languageDesign/textGen/source_gen.caches/jetbrains/mps/lang/textGen/structure/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-14x3nfqcbvm8yhsecvlcebsk2p8d5k5" />
+<dependencies version="2" modelHash="-7dv8fq3tme1fxr8mia50i1atd8yi2bm" />
 
diff --git a/plugins/migrationAssistant/solutions/component/models/jetbrains/mps/migration/component/plugin.mps b/plugins/migrationAssistant/solutions/component/models/jetbrains/mps/migration/component/plugin.mps
index d312d4a2955c..d7353d27c9f9 100644
--- a/plugins/migrationAssistant/solutions/component/models/jetbrains/mps/migration/component/plugin.mps
+++ b/plugins/migrationAssistant/solutions/component/models/jetbrains/mps/migration/component/plugin.mps
@@ -18,7 +18,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
     <use id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <generationPart ref="ef7bf5ac-d06c-4342-b11d-e42104eb9343(jetbrains.mps.lang.plugin.standalone)" />
+    <engage id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" />
   </languages>
   <imports>
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
diff --git a/plugins/migrationAssistant/solutions/component/source_gen.caches/jetbrains/mps/migration/component/plugin/generated b/plugins/migrationAssistant/solutions/component/source_gen.caches/jetbrains/mps/migration/component/plugin/generated
index c7233a6ee3fe..0b935ea80172 100644
--- a/plugins/migrationAssistant/solutions/component/source_gen.caches/jetbrains/mps/migration/component/plugin/generated
+++ b/plugins/migrationAssistant/solutions/component/source_gen.caches/jetbrains/mps/migration/component/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="dko6nvo3yrn4rngiu6fjb7yomjgn8bp" />
+<dependencies version="2" modelHash="3ur4kpfq5113jr4vkbtcsw5x7889oky" />
 
diff --git a/plugins/mpsjava/platform/models/jetbrains/mps/ide/java/sourceStubsUI.mps b/plugins/mpsjava/platform/models/jetbrains/mps/ide/java/sourceStubsUI.mps
index 3bdb9bfbf55c..57a0b55308c0 100644
--- a/plugins/mpsjava/platform/models/jetbrains/mps/ide/java/sourceStubsUI.mps
+++ b/plugins/mpsjava/platform/models/jetbrains/mps/ide/java/sourceStubsUI.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <generationPart ref="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" />
+    <engage id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" />
   </languages>
   <imports>
     <import index="a66d" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.persistence(MPS.Platform/)" />
diff --git a/plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/sourceStubsUI/generated b/plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/sourceStubsUI/generated
index a111cf3f24d8..9173d94d7b6e 100644
--- a/plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/sourceStubsUI/generated
+++ b/plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/sourceStubsUI/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-95l6dadc223ljwfwckn2go3fl55yph8" />
+<dependencies version="2" modelHash="-e62oxd8m0wccc6e8ijfwgsh4vfsre4v" />
 
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test1.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test1.mps
index fc2de706f14f..2bcb6011520a 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test1.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test1.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
-    <generationPart ref="fae29102-8774-4e55-af5d-93fa67387f38(jetbrains.mps.samples.generator_demo.demoLang1)" />
+    <engage id="fae29102-8774-4e55-af5d-93fa67387f38" name="jetbrains.mps.samples.generator_demo.demoLang1" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test2.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test2.mps
index 066d3aafe6b1..0ef56781c781 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test2.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test2.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
-    <generationPart ref="ef47f5be-76c4-4166-8925-2b415ec6b840(jetbrains.mps.samples.generator_demo.demoLang2)" />
+    <engage id="ef47f5be-76c4-4166-8925-2b415ec6b840" name="jetbrains.mps.samples.generator_demo.demoLang2" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test3.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test3.mps
index 7a75af733627..78b8220c7ca7 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test3.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test3.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
-    <generationPart ref="7a4dedfe-9c99-4610-b299-d4a37832823b(jetbrains.mps.samples.generator_demo.demoLang3)" />
+    <engage id="7a4dedfe-9c99-4610-b299-d4a37832823b" name="jetbrains.mps.samples.generator_demo.demoLang3" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test4.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test4.mps
index e5080410b7c0..c6ace145a2f1 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test4.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test4.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
-    <generationPart ref="1409a436-ea24-4d03-a196-53795139ce8d(jetbrains.mps.samples.generator_demo.demoLang4)" />
+    <engage id="1409a436-ea24-4d03-a196-53795139ce8d" name="jetbrains.mps.samples.generator_demo.demoLang4" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test5.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test5.mps
index e2306714f38a..fe6a40966aa5 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test5.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test5.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
-    <generationPart ref="594bd850-39e3-46a5-9ef2-40c70d782c8c(jetbrains.mps.samples.generator_demo.demoLang5)" />
+    <engage id="594bd850-39e3-46a5-9ef2-40c70d782c8c" name="jetbrains.mps.samples.generator_demo.demoLang5" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test6.mps b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test6.mps
index d756f0823075..a7a23f3ac10b 100644
--- a/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test6.mps
+++ b/samples/generator_demo/solutions/test_models/jetbrains/mps/samples/generator_demo/test_models/test6.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="772f6dcd-8c0d-48f7-869c-908e036f7c8e" name="jetbrains.mps.sampleXML" version="0" />
     <use id="82fb751d-f7fb-4b58-a16e-303356f8e0af" name="jetbrains.mps.samples.generator_demo.demoLang6" version="0" />
-    <generationPart ref="594bd850-39e3-46a5-9ef2-40c70d782c8c(jetbrains.mps.samples.generator_demo.demoLang5)" />
+    <engage id="594bd850-39e3-46a5-9ef2-40c70d782c8c" name="jetbrains.mps.samples.generator_demo.demoLang5" />
   </languages>
   <imports />
   <registry>
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test1/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test1/generated
index 85a999a83caa..f3376c595afd 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test1/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test1/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cdo10ovywlk7po97wpcr9v7uj269pag" />
+<dependencies version="2" modelHash="88ccghblz3n9esdbl3j8t47ggtf8fl1" />
 
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test2/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test2/generated
index 9a170188c995..de8a5b6808c2 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test2/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test2/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-818jhijq7y9d3tx1t4hz0ldwqk2mk6c" />
+<dependencies version="2" modelHash="atjhu06yz7euuniqiqpwjeeitl1xrsr" />
 
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test3/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test3/generated
index 9d5540bf5548..19c4e45458e2 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test3/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test3/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="1w5xvunpq8i2ri6ynki6qxblffeuf8x" />
+<dependencies version="2" modelHash="-erhk80h8afdz2ab70dfot4bjnl45dfe" />
 
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test4/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test4/generated
index c71945b1ec45..a42dd92f13a4 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test4/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test4/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="dd6wf5ofauzj7kdpc6xk2j9mrm10p0o" />
+<dependencies version="2" modelHash="8x7emcsllzz6q581eivmum70cgd34bf" />
 
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test5/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test5/generated
index 7666c010e4a7..0b27083d479a 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test5/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test5/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-betybmcqs3sp5gmrka4ln3uf9wind7z" />
+<dependencies version="2" modelHash="c1uirbli58m66smh8jom8prtxo5i0ww" />
 
diff --git a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test6/generated b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test6/generated
index e2591b9bcf01..a8f7da0605b6 100644
--- a/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test6/generated
+++ b/samples/generator_demo/solutions/test_models/source_gen.caches/jetbrains/mps/samples/generator_demo/test_models/test6/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9o9bgm6t02b08mrtgfw39g2wlnpyv60" />
+<dependencies version="2" modelHash="4z02fvab99ns1gyyivwp0gcg08f8ul8" />
 
diff --git a/samples/math/generator/source_gen.caches/jetbrains/mps/baseLanguage/math/generator/template/operations/generated b/samples/math/generator/source_gen.caches/jetbrains/mps/baseLanguage/math/generator/template/operations/generated
index 86c3fb7af2b8..232947292fbf 100644
--- a/samples/math/generator/source_gen.caches/jetbrains/mps/baseLanguage/math/generator/template/operations/generated
+++ b/samples/math/generator/source_gen.caches/jetbrains/mps/baseLanguage/math/generator/template/operations/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="41l9cydargqohh8k2wdka16tu0st14a" />
+<dependencies version="2" modelHash="-aeen524uv9s7nsl643b4vx5d1gchtz7" />
 
diff --git a/samples/math/generator/template/operations@generator.mps b/samples/math/generator/template/operations@generator.mps
index 2b041ee0f127..daabb68a5a23 100644
--- a/samples/math/generator/template/operations@generator.mps
+++ b/samples/math/generator/template/operations@generator.mps
@@ -13,7 +13,7 @@
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <generationPart ref="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" />
+    <engage id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>