c_src: regenerate

[nit.git] / c_src / nitc__model.sep.2.c

diff --git a/c_src/nit__model.sep.2.c b/c_src/nitc__model.sep.2.c
similarity index 55%
rename from c_src/nit__model.sep.2.c
rename to c_src/nitc__model.sep.2.c
index 3628c3f..8fdce07 100644 (file)
--- a/c_src/nit__model.sep.2.c
+++ b/c_src/nitc__model.sep.2.c
@@ -1,6 +1,276 @@
-#include "nit__model.sep.0.h"
+#include "nitc__model.sep.0.h"
+/* method model#MVirtualType#full_name for (self: MVirtualType): String */
+val* nitc___nitc__MVirtualType___nitc__model_base__MEntity__full_name(val* self) {
+val* var /* : String */;
+val* var1 /* : MVirtualTypeProp */;
+val* var3 /* : MVirtualTypeProp */;
+val* var4 /* : String */;
+{
+{ /* Inline model#MVirtualType#mproperty (self) on <self:MVirtualType> */
+var3 = self->attrs[COLOR_nitc__model__MVirtualType___mproperty].val; /* _mproperty on <self:MVirtualType> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1369);
+fatal_exit(1);
+}
+var1 = var3;
+RET_LABEL2:(void)0;
+}
+}
+{
+var4 = nitc___nitc__MProperty___nitc__model_base__MEntity__full_name(var1);
+}
+var = var4;
+goto RET_LABEL;
+RET_LABEL:;
+return var;
+}
+/* method model#MVirtualType#c_name for (self: MVirtualType): String */
+val* nitc___nitc__MVirtualType___nitc__model_base__MEntity__c_name(val* self) {
+val* var /* : String */;
+val* var1 /* : MVirtualTypeProp */;
+val* var3 /* : MVirtualTypeProp */;
+val* var4 /* : String */;
+{
+{ /* Inline model#MVirtualType#mproperty (self) on <self:MVirtualType> */
+var3 = self->attrs[COLOR_nitc__model__MVirtualType___mproperty].val; /* _mproperty on <self:MVirtualType> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1369);
+fatal_exit(1);
+}
+var1 = var3;
+RET_LABEL2:(void)0;
+}
+}
+{
+var4 = nitc___nitc__MProperty___nitc__model_base__MEntity__c_name(var1);
+}
+var = var4;
+goto RET_LABEL;
+RET_LABEL:;
+return var;
+}
+/* method model#MVirtualType#init for (self: MVirtualType) */
+void nitc___nitc__MVirtualType___core__kernel__Object__init(val* self) {
+{
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MVirtualType___core__kernel__Object__init]))(self); /* init on <self:MVirtualType>*/
+}
+RET_LABEL:;
+}
+/* method model#MParameterType#mclass for (self: MParameterType): MClass */
+val* nitc___nitc__MParameterType___mclass(val* self) {
+val* var /* : MClass */;
+val* var1 /* : MClass */;
+var1 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+if (unlikely(var1 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
+fatal_exit(1);
+}
+var = var1;
+RET_LABEL:;
+return var;
+}
+/* method model#MParameterType#mclass= for (self: MParameterType, MClass) */
+void nitc___nitc__MParameterType___mclass_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MParameterType___mclass].val = p0; /* _mclass on <self:MParameterType> */
+RET_LABEL:;
+}
+/* method model#MParameterType#model for (self: MParameterType): Model */
+val* nitc___nitc__MParameterType___nitc__model_base__MEntity__model(val* self) {
+val* var /* : Model */;
+val* var1 /* : MClass */;
+val* var3 /* : MClass */;
+val* var4 /* : MModule */;
+val* var6 /* : MModule */;
+val* var7 /* : Model */;
+val* var9 /* : Model */;
+{
+{ /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
+var3 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
+fatal_exit(1);
+}
+var1 = var3;
+RET_LABEL2:(void)0;
+}
+}
+{
+{ /* Inline model#MClass#intro_mmodule (var1) on <var1:MClass> */
+var6 = var1->attrs[COLOR_nitc__model__MClass___intro_mmodule].val; /* _intro_mmodule on <var1:MClass> */
+if (unlikely(var6 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mmodule");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 380);
+fatal_exit(1);
+}
+var4 = var6;
+RET_LABEL5:(void)0;
+}
+}
+{
+{ /* Inline mmodule#MModule#model (var4) on <var4:MModule> */
+var9 = var4->attrs[COLOR_nitc__mmodule__MModule___model].val; /* _model on <var4:MModule> */
+if (unlikely(var9 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 78);
+fatal_exit(1);
+}
+var7 = var9;
+RET_LABEL8:(void)0;
+}
+}
+var = var7;
+goto RET_LABEL;
+RET_LABEL:;
+return var;
+}
+/* method model#MParameterType#rank for (self: MParameterType): Int */
+long nitc___nitc__MParameterType___rank(val* self) {
+long var /* : Int */;
+long var1 /* : Int */;
+var1 = self->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
+var = var1;
+RET_LABEL:;
+return var;
+}
+/* method model#MParameterType#rank= for (self: MParameterType, Int) */
+void nitc___nitc__MParameterType___rank_61d(val* self, long p0) {
+self->attrs[COLOR_nitc__model__MParameterType___rank].l = p0; /* _rank on <self:MParameterType> */
+RET_LABEL:;
+}
+/* method model#MParameterType#name for (self: MParameterType): String */
+val* nitc___nitc__MParameterType___nitc__model_base__MEntity__name(val* self) {
+val* var /* : String */;
+val* var1 /* : String */;
+var1 = self->attrs[COLOR_nitc__model__MParameterType___name].val; /* _name on <self:MParameterType> */
+if (unlikely(var1 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1507);
+fatal_exit(1);
+}
+var = var1;
+RET_LABEL:;
+return var;
+}
+/* method model#MParameterType#name= for (self: MParameterType, String) */
+void nitc___nitc__MParameterType___name_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MParameterType___name].val = p0; /* _name on <self:MParameterType> */
+RET_LABEL:;
+}
+/* method model#MParameterType#to_s for (self: MParameterType): String */
+val* nitc___nitc__MParameterType___core__abstract_text__Object__to_s(val* self) {
+val* var /* : String */;
+val* var1 /* : String */;
+val* var3 /* : String */;
+{
+{ /* Inline model#MParameterType#name (self) on <self:MParameterType> */
+var3 = self->attrs[COLOR_nitc__model__MParameterType___name].val; /* _name on <self:MParameterType> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1507);
+fatal_exit(1);
+}
+var1 = var3;
+RET_LABEL2:(void)0;
+}
+}
+var = var1;
+goto RET_LABEL;
+RET_LABEL:;
+return var;
+}
+/* method model#MParameterType#full_name for (self: MParameterType): String */
+val* nitc___nitc__MParameterType___nitc__model_base__MEntity__full_name(val* self) {
+val* var /* : String */;
+short int var1 /* : Bool */;
+val* var2 /* : String */;
+val* var3 /* : String */;
+val* var5 /* : NativeArray[String] */;
+static val* varonce;
+static val* varonce6;
+val* var7 /* : String */;
+char* var8 /* : NativeString */;
+val* var9 /* : String */;
+val* var10 /* : MClass */;
+val* var12 /* : MClass */;
+val* var13 /* : String */;
+val* var14 /* : String */;
+val* var16 /* : String */;
+val* var17 /* : String */;
+var1 = self->attrs[COLOR_nitc__model__MParameterType___full_name].val != NULL; /* _full_name on <self:MParameterType> */
+if(likely(var1)) {
+var2 = self->attrs[COLOR_nitc__model__MParameterType___full_name].val; /* _full_name on <self:MParameterType> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _full_name");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1511);
+fatal_exit(1);
+}
+} else {
+{
+if (unlikely(varonce==NULL)) {
+var5 = NEW_core__NativeArray(3l, &type_core__NativeArray__core__String);
+if (likely(varonce6!=NULL)) {
+var7 = varonce6;
+} else {
+var8 = "::";
+var9 = core__flat___NativeString___to_s_full(var8, 2l, 2l);
+var7 = var9;
+varonce6 = var7;
+}
+((struct instance_core__NativeArray*)var5)->values[1]=var7;
+} else {
+var5 = varonce;
+varonce = NULL;
+}
+{
+{ /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
+var12 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+if (unlikely(var12 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
+fatal_exit(1);
+}
+var10 = var12;
+RET_LABEL11:(void)0;
+}
+}
+{
+var13 = nitc___nitc__MClass___nitc__model_base__MEntity__full_name(var10);
+}
+((struct instance_core__NativeArray*)var5)->values[0]=var13;
+{
+{ /* Inline model#MParameterType#name (self) on <self:MParameterType> */
+var16 = self->attrs[COLOR_nitc__model__MParameterType___name].val; /* _name on <self:MParameterType> */
+if (unlikely(var16 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1507);
+fatal_exit(1);
+}
+var14 = var16;
+RET_LABEL15:(void)0;
+}
+}
+((struct instance_core__NativeArray*)var5)->values[2]=var14;
+{
+var17 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+}
+varonce = var5;
+var3 = var17;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
+}
+self->attrs[COLOR_nitc__model__MParameterType___full_name].val = var3; /* _full_name on <self:MParameterType> */
+var2 = var3;
+}
+var = var2;
+RET_LABEL:;
+return var;
+}
 /* method model#MParameterType#c_name for (self: MParameterType): String */
-val* nit___nit__MParameterType___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MParameterType___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -11,35 +281,35 @@ val* var8 /* : String */;
 static val* varonce;
 val* var9 /* : String */;
 char* var10 /* : NativeString */;
-val* var11 /* : FlatString */;
+val* var11 /* : String */;
 val* var12 /* : String */;
 val* var14 /* : NativeArray[String] */;
 static val* varonce13;
 static val* varonce15;
 val* var16 /* : String */;
 char* var17 /* : NativeString */;
-val* var18 /* : FlatString */;
+val* var18 /* : String */;
 val* var19 /* : String */;
 val* var21 /* : String */;
 val* var22 /* : String */;
 val* var23 /* : String */;
 val* var24 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MParameterType___c_name].val != NULL; /* _c_name on <self:MParameterType> */
+var1 = self->attrs[COLOR_nitc__model__MParameterType___c_name].val != NULL; /* _c_name on <self:MParameterType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MParameterType___c_name].val; /* _c_name on <self:MParameterType> */
+var2 = self->attrs[COLOR_nitc__model__MParameterType___c_name].val; /* _c_name on <self:MParameterType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1487);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1513);
 fatal_exit(1);
 }
 } else {
 {
 {
 { /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
-var7 = self->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+var7 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
 var5 = var7;
@@ -47,62 +317,62 @@ RET_LABEL6:(void)0;
 }
 }
 {
-var8 = nit___nit__MClass___nit__model_base__MEntity__c_name(var5);
+var8 = nitc___nitc__MClass___nitc__model_base__MEntity__c_name(var5);
 }
 if (likely(varonce!=NULL)) {
 var9 = varonce;
 } else {
 var10 = "__";
-var11 = standard___standard__NativeString___to_s_with_length(var10, 2l);
+var11 = core__flat___NativeString___to_s_full(var10, 2l, 2l);
 var9 = var11;
 varonce = var9;
 }
 {
-var12 = ((val*(*)(val* self, val* p0))(var8->class->vft[COLOR_standard__string__String___43d]))(var8, var9); /* + on <var8:String>*/
+var12 = ((val*(*)(val* self, val* p0))(var8->class->vft[COLOR_core__abstract_text__String___43d]))(var8, var9); /* + on <var8:String>*/
 }
 if (unlikely(varonce13==NULL)) {
-var14 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var14 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce15!=NULL)) {
 var16 = varonce15;
 } else {
 var17 = "#";
-var18 = standard___standard__NativeString___to_s_with_length(var17, 1l);
+var18 = core__flat___NativeString___to_s_full(var17, 1l, 1l);
 var16 = var18;
 varonce15 = var16;
 }
-((struct instance_standard__NativeArray*)var14)->values[0]=var16;
+((struct instance_core__NativeArray*)var14)->values[0]=var16;
 } else {
 var14 = varonce13;
 varonce13 = NULL;
 }
 {
 { /* Inline model#MParameterType#name (self) on <self:MParameterType> */
-var21 = self->attrs[COLOR_nit__model__MParameterType___name].val; /* _name on <self:MParameterType> */
+var21 = self->attrs[COLOR_nitc__model__MParameterType___name].val; /* _name on <self:MParameterType> */
 if (unlikely(var21 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1481);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1507);
 fatal_exit(1);
 }
 var19 = var21;
 RET_LABEL20:(void)0;
 }
 }
-((struct instance_standard__NativeArray*)var14)->values[1]=var19;
+((struct instance_core__NativeArray*)var14)->values[1]=var19;
 {
-var22 = ((val*(*)(val* self))(var14->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var14); /* native_to_s on <var14:NativeArray[String]>*/
+var22 = ((val*(*)(val* self))(var14->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var14); /* native_to_s on <var14:NativeArray[String]>*/
 }
 varonce13 = var14;
 {
-var23 = standard___standard__Text___to_cmangle(var22);
+var23 = core___core__Text___to_cmangle(var22);
 }
 {
-var24 = ((val*(*)(val* self, val* p0))(var12->class->vft[COLOR_standard__string__String___43d]))(var12, var23); /* + on <var12:String>*/
+var24 = ((val*(*)(val* self, val* p0))(var12->class->vft[COLOR_core__abstract_text__String___43d]))(var12, var23); /* + on <var12:String>*/
 }
 var3 = var24;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MParameterType___c_name].val = var3; /* _c_name on <self:MParameterType> */
+self->attrs[COLOR_nitc__model__MParameterType___c_name].val = var3; /* _c_name on <self:MParameterType> */
 var2 = var3;
 }
 var = var2;
@@ -110,7 +380,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameterType#lookup_bound for (self: MParameterType, MModule, MType): MType */
-val* nit___nit__MParameterType___MType__lookup_bound(val* self, val* p0, val* p1) {
+val* nitc___nitc__MParameterType___MType__lookup_bound(val* self, val* p0, val* p1) {
 val* var /* : MType */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_resolved_receiver /* var resolved_receiver: MType */;
@@ -154,21 +424,21 @@ val* var_res /* var res: MType */;
 var_mmodule = p0;
 var_resolved_receiver = p1;
 {
-var1 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:MType>*/
+var1 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:MType>*/
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1491);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1517);
 fatal_exit(1);
 }
 {
-var3 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__undecorate]))(var_resolved_receiver); /* undecorate on <var_resolved_receiver:MType>*/
+var3 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__undecorate]))(var_resolved_receiver); /* undecorate on <var_resolved_receiver:MType>*/
 }
 var_resolved_receiver = var3;
 /* <var_resolved_receiver:MType> isa MClassType */
-cltype = type_nit__MClassType.color;
-idtype = type_nit__MClassType.id;
+cltype = type_nitc__MClassType.color;
+idtype = type_nitc__MClassType.id;
 if(cltype >= var_resolved_receiver->type->table_size) {
 var4 = 0;
 } else {
@@ -176,15 +446,15 @@ var4 = var_resolved_receiver->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1493);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1519);
 fatal_exit(1);
 }
 {
 { /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
-var7 = self->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+var7 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
 var5 = var7;
@@ -194,10 +464,10 @@ RET_LABEL6:(void)0;
 var_goalclass = var5;
 {
 { /* Inline model#MClassType#mclass (var_resolved_receiver) on <var_resolved_receiver:MType(MClassType)> */
-var10 = var_resolved_receiver->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:MType(MClassType)> */
+var10 = var_resolved_receiver->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:MType(MClassType)> */
 if (unlikely(var10 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var8 = var10;
@@ -222,46 +492,49 @@ RET_LABEL12:(void)0;
 }
 if (var11){
 {
-var16 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MClassType__arguments]))(var_resolved_receiver); /* arguments on <var_resolved_receiver:MType(MClassType)>*/
+var16 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MClassType__arguments]))(var_resolved_receiver); /* arguments on <var_resolved_receiver:MType(MClassType)>*/
 }
 {
 { /* Inline model#MParameterType#rank (self) on <self:MParameterType> */
-var19 = self->attrs[COLOR_nit__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
+var19 = self->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
 var17 = var19;
 RET_LABEL18:(void)0;
 }
 }
 {
-var20 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var16, var17);
+var20 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var16, var17);
 }
 var = var20;
 goto RET_LABEL;
 } else {
 }
 {
-var21 = nit___nit__MClassType___MType__collect_mtypes(var_resolved_receiver, var_mmodule);
+var21 = nitc___nitc__MClassType___MType__collect_mtypes(var_resolved_receiver, var_mmodule);
 }
 var_supertypes = var21;
 var_ = var_supertypes;
 {
-var22 = ((val*(*)(val* self))((((long)var_&3)?class_info[((long)var_&3)]:var_->class)->vft[COLOR_standard__abstract_collection__Collection__iterator]))(var_); /* iterator on <var_:Set[MClassType]>*/
+var22 = ((val*(*)(val* self))((((long)var_&3)?class_info[((long)var_&3)]:var_->class)->vft[COLOR_core__abstract_collection__Collection__iterator]))(var_); /* iterator on <var_:Set[MClassType]>*/
 }
 var_23 = var22;
 for(;;) {
 {
-var24 = ((short int(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_standard__abstract_collection__Iterator__is_ok]))(var_23); /* is_ok on <var_23:Iterator[MClassType]>*/
+var24 = ((short int(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_23); /* is_ok on <var_23:Iterator[MClassType]>*/
 }
 if (var24){
+} else {
+goto BREAK_label;
+}
 {
-var25 = ((val*(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_standard__abstract_collection__Iterator__item]))(var_23); /* item on <var_23:Iterator[MClassType]>*/
+var25 = ((val*(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_23); /* item on <var_23:Iterator[MClassType]>*/
 }
 var_t = var25;
 {
 { /* Inline model#MClassType#mclass (var_t) on <var_t:MClassType> */
-var28 = var_t->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_t:MClassType> */
+var28 = var_t->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_t:MClassType> */
 if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var26 = var28;
@@ -286,17 +559,17 @@ RET_LABEL30:(void)0;
 }
 if (var29){
 {
-var34 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nit__model__MClassType__arguments]))(var_t); /* arguments on <var_t:MClassType>*/
+var34 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nitc__model__MClassType__arguments]))(var_t); /* arguments on <var_t:MClassType>*/
 }
 {
 { /* Inline model#MParameterType#rank (self) on <self:MParameterType> */
-var37 = self->attrs[COLOR_nit__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
+var37 = self->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
 var35 = var37;
 RET_LABEL36:(void)0;
 }
 }
 {
-var38 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var34, var35);
+var38 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var34, var35);
 }
 var_res = var38;
 var = var_res;
@@ -304,24 +577,21 @@ goto RET_LABEL;
 } else {
 }
 {
-((void(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_standard__abstract_collection__Iterator__next]))(var_23); /* next on <var_23:Iterator[MClassType]>*/
-}
-} else {
-goto BREAK_label;
+((void(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_23); /* next on <var_23:Iterator[MClassType]>*/
 }
 }
 BREAK_label: (void)0;
 {
-((void(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_standard__abstract_collection__Iterator__finish]))(var_23); /* finish on <var_23:Iterator[MClassType]>*/
+((void(*)(val* self))((((long)var_23&3)?class_info[((long)var_23&3)]:var_23->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_23); /* finish on <var_23:Iterator[MClassType]>*/
 }
 PRINT_ERROR("Runtime error: %s", "Aborted");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1507);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1533);
 fatal_exit(1);
 RET_LABEL:;
 return var;
 }
 /* method model#MParameterType#lookup_fixed for (self: MParameterType, MModule, MType): MType */
-val* nit___nit__MParameterType___MType__lookup_fixed(val* self, val* p0, val* p1) {
+val* nitc___nitc__MParameterType___MType__lookup_fixed(val* self, val* p0, val* p1) {
 val* var /* : MType */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_resolved_receiver /* var resolved_receiver: MType */;
@@ -340,21 +610,21 @@ val* var_res /* var res: MType */;
 var_mmodule = p0;
 var_resolved_receiver = p1;
 {
-var1 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:MType>*/
+var1 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:MType>*/
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1519);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1545);
 fatal_exit(1);
 }
 {
-var3 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__undecorate]))(var_resolved_receiver); /* undecorate on <var_resolved_receiver:MType>*/
+var3 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__undecorate]))(var_resolved_receiver); /* undecorate on <var_resolved_receiver:MType>*/
 }
 var_resolved_receiver = var3;
 /* <var_resolved_receiver:MType> isa MClassType */
-cltype = type_nit__MClassType.color;
-idtype = type_nit__MClassType.id;
+cltype = type_nitc__MClassType.color;
+idtype = type_nitc__MClassType.id;
 if(cltype >= var_resolved_receiver->type->table_size) {
 var4 = 0;
 } else {
@@ -362,15 +632,15 @@ var4 = var_resolved_receiver->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1521);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1547);
 fatal_exit(1);
 }
 {
 { /* Inline model#MClassType#mclass (var_resolved_receiver) on <var_resolved_receiver:MType(MClassType)> */
-var7 = var_resolved_receiver->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:MType(MClassType)> */
+var7 = var_resolved_receiver->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:MType(MClassType)> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var5 = var7;
@@ -379,10 +649,10 @@ RET_LABEL6:(void)0;
 }
 {
 { /* Inline model#MClass#mclass_type (var5) on <var5:MClass> */
-var10 = var5->attrs[COLOR_nit__model__MClass___mclass_type].val; /* _mclass_type on <var5:MClass> */
+var10 = var5->attrs[COLOR_nitc__model__MClass___mclass_type].val; /* _mclass_type on <var5:MClass> */
 if (unlikely(var10 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 484);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 507);
 fatal_exit(1);
 }
 var8 = var10;
@@ -390,7 +660,7 @@ RET_LABEL9:(void)0;
 }
 }
 {
-var11 = nit___nit__MParameterType___MType__resolve_for(self, var8, var_resolved_receiver, var_mmodule, 0);
+var11 = nitc___nitc__MParameterType___MType__resolve_for(self, var8, var_resolved_receiver, var_mmodule, 0);
 }
 var_res = var11;
 var = var_res;
@@ -399,7 +669,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameterType#resolve_for for (self: MParameterType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MParameterType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MParameterType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -468,62 +738,66 @@ val* var68 /* : MType */;
 short int var69 /* : Bool */;
 int cltype70;
 int idtype71;
-val* var72 /* : MClass */;
-val* var74 /* : MClass */;
-val* var75 /* : MClass */;
+short int var72 /* : Bool */;
+short int var73 /* : Bool */;
+short int var75 /* : Bool */;
+short int var76 /* : Bool */;
 val* var77 /* : MClass */;
-short int var78 /* : Bool */;
-short int var80 /* : Bool */;
-short int var82 /* : Bool */;
-val* var83 /* : Array[MType] */;
-long var84 /* : Int */;
-long var86 /* : Int */;
-val* var87 /* : nullable Object */;
-short int var88 /* : Bool */;
-int cltype89;
-int idtype90;
-val* var91 /* : MType */;
-val* var93 /* : MType */;
-short int var94 /* : Bool */;
-int cltype95;
-int idtype96;
-val* var97 /* : MClass */;
-val* var99 /* : MClass */;
-val* var100 /* : MClass */;
+val* var79 /* : MClass */;
+val* var80 /* : MClass */;
+val* var82 /* : MClass */;
+short int var83 /* : Bool */;
+short int var85 /* : Bool */;
+short int var87 /* : Bool */;
+val* var88 /* : Array[MType] */;
+long var89 /* : Int */;
+long var91 /* : Int */;
+val* var92 /* : nullable Object */;
+short int var93 /* : Bool */;
+int cltype94;
+int idtype95;
+val* var96 /* : MType */;
+val* var98 /* : MType */;
+short int var99 /* : Bool */;
+int cltype100;
+int idtype101;
 val* var102 /* : MClass */;
-short int var103 /* : Bool */;
-short int var105 /* : Bool */;
-short int var107 /* : Bool */;
-val* var108 /* : Array[MType] */;
-long var109 /* : Int */;
-long var111 /* : Int */;
-val* var112 /* : nullable Object */;
-val* var_res113 /* var res: MType */;
-short int var114 /* : Bool */;
-short int var115 /* : Bool */;
-short int var116 /* : Bool */;
-short int var118 /* : Bool */;
+val* var104 /* : MClass */;
+val* var105 /* : MClass */;
+val* var107 /* : MClass */;
+short int var108 /* : Bool */;
+short int var110 /* : Bool */;
+short int var112 /* : Bool */;
+val* var113 /* : Array[MType] */;
+long var114 /* : Int */;
+long var116 /* : Int */;
+val* var117 /* : nullable Object */;
+val* var_res118 /* var res: MType */;
 short int var119 /* : Bool */;
-val* var120 /* : MType */;
-val* var121 /* : MType */;
+short int var120 /* : Bool */;
+short int var121 /* : Bool */;
+short int var123 /* : Bool */;
+short int var124 /* : Bool */;
+val* var125 /* : MType */;
+val* var126 /* : MType */;
 val* var_verbatim_bound /* var verbatim_bound: MType */;
-val* var122 /* : MType */;
-val* var_res123 /* var res: MType */;
+val* var127 /* : MType */;
+val* var_res128 /* var res: MType */;
 var_mtype = p0;
 var_anchor = p1;
 var_mmodule = p2;
 var_cleanup_virtual = p3;
 {
-var1 = nit___nit__MParameterType___MType__can_resolve_for(self, var_mtype, var_anchor, var_mmodule);
+var1 = nitc___nitc__MParameterType___MType__can_resolve_for(self, var_mtype, var_anchor, var_mmodule);
 }
 if (unlikely(!var1)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1528);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1554);
 fatal_exit(1);
 }
 /* <var_mtype:MType> isa MGenericType */
-cltype = type_nit__MGenericType.color;
-idtype = type_nit__MGenericType.id;
+cltype = type_nitc__MGenericType.color;
+idtype = type_nitc__MGenericType.id;
 if(cltype >= var_mtype->type->table_size) {
 var3 = 0;
 } else {
@@ -533,10 +807,10 @@ var_ = var3;
 if (var3){
 {
 { /* Inline model#MClassType#mclass (var_mtype) on <var_mtype:MType(MGenericType)> */
-var6 = var_mtype->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_mtype:MType(MGenericType)> */
+var6 = var_mtype->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_mtype:MType(MGenericType)> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var4 = var6;
@@ -545,10 +819,10 @@ RET_LABEL5:(void)0;
 }
 {
 { /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
-var9 = self->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+var9 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
 if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
 var7 = var9;
@@ -578,10 +852,10 @@ var2 = var_;
 if (var2){
 {
 { /* Inline model#MGenericType#arguments (var_mtype) on <var_mtype:MType(MGenericType)> */
-var17 = var_mtype->attrs[COLOR_nit__model__MGenericType___arguments].val; /* _arguments on <var_mtype:MType(MGenericType)> */
+var17 = var_mtype->attrs[COLOR_nitc__model__MGenericType___arguments].val; /* _arguments on <var_mtype:MType(MGenericType)> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _arguments");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1244);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1269);
 fatal_exit(1);
 }
 var15 = var17;
@@ -590,13 +864,13 @@ RET_LABEL16:(void)0;
 }
 {
 { /* Inline model#MParameterType#rank (self) on <self:MParameterType> */
-var20 = self->attrs[COLOR_nit__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
+var20 = self->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
 var18 = var20;
 RET_LABEL19:(void)0;
 }
 }
 {
-var21 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var15, var18);
+var21 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var15, var18);
 }
 var_res = var21;
 if (var_anchor == NULL) {
@@ -608,7 +882,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_anchor,((val*)NULL)) on <var_anchor:nullable MClassType> */
 var_other26 = ((val*)NULL);
 {
-var27 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
+var27 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
 }
 var28 = !var27;
 var24 = var28;
@@ -620,7 +894,7 @@ var23 = var24;
 var_29 = var23;
 if (var23){
 {
-var30 = ((short int(*)(val* self))(var_res->class->vft[COLOR_nit__model__MType__need_anchor]))(var_res); /* need_anchor on <var_res:MType>*/
+var30 = ((short int(*)(val* self))(var_res->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_res); /* need_anchor on <var_res:MType>*/
 }
 var22 = var30;
 } else {
@@ -628,12 +902,12 @@ var22 = var_29;
 }
 if (var22){
 {
-var31 = ((val*(*)(val* self, val* p0, val* p1))(var_res->class->vft[COLOR_nit__model__MType__anchor_to]))(var_res, var_mmodule, var_anchor); /* anchor_to on <var_res:MType>*/
+var31 = ((val*(*)(val* self, val* p0, val* p1))(var_res->class->vft[COLOR_nitc__model__MType__anchor_to]))(var_res, var_mmodule, var_anchor); /* anchor_to on <var_res:MType>*/
 }
 var_r2 = var31;
 /* <var_r2:MType> isa MClassType */
-cltype34 = type_nit__MClassType.color;
-idtype35 = type_nit__MClassType.id;
+cltype34 = type_nitc__MClassType.color;
+idtype35 = type_nitc__MClassType.id;
 if(cltype34 >= var_r2->type->table_size) {
 var33 = 0;
 } else {
@@ -643,10 +917,10 @@ var_36 = var33;
 if (var33){
 {
 { /* Inline model#MClassType#mclass (var_r2) on <var_r2:MType(MClassType)> */
-var39 = var_r2->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_r2:MType(MClassType)> */
+var39 = var_r2->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_r2:MType(MClassType)> */
 if (unlikely(var39 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var37 = var39;
@@ -655,10 +929,10 @@ RET_LABEL38:(void)0;
 }
 {
 { /* Inline model#MClass#kind (var37) on <var37:MClass> */
-var42 = var37->attrs[COLOR_nit__model__MClass___kind].val; /* _kind on <var37:MClass> */
+var42 = var37->attrs[COLOR_nitc__model__MClass___kind].val; /* _kind on <var37:MClass> */
 if (unlikely(var42 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _kind");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 436);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 459);
 fatal_exit(1);
 }
 var40 = var42;
@@ -667,7 +941,7 @@ RET_LABEL41:(void)0;
 }
 var43 = glob_sys;
 {
-var44 = nit__model___standard__Sys___enum_kind(var43);
+var44 = nitc__model___core__Sys___enum_kind(var43);
 }
 {
 { /* Inline kernel#Object#== (var40,var44) on <var40:MClassKind> */
@@ -701,7 +975,7 @@ goto RET_LABEL;
 } else {
 }
 {
-var50 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var50 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 if (var50){
 if (var_anchor == NULL) {
@@ -713,7 +987,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_anchor,((val*)NULL)) on <var_anchor:nullable MClassType> */
 var_other26 = ((val*)NULL);
 {
-var54 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
+var54 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
 }
 var55 = !var54;
 var52 = var55;
@@ -724,15 +998,15 @@ var51 = var52;
 }
 if (unlikely(!var51)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1547);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1573);
 fatal_exit(1);
 }
 {
 { /* Inline model#MClassType#mclass (var_anchor) on <var_anchor:nullable MClassType(MClassType)> */
-var58 = var_anchor->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_anchor:nullable MClassType(MClassType)> */
+var58 = var_anchor->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_anchor:nullable MClassType(MClassType)> */
 if (unlikely(var58 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
 var56 = var58;
@@ -741,10 +1015,10 @@ RET_LABEL57:(void)0;
 }
 {
 { /* Inline model#MClass#mclass_type (var56) on <var56:MClass> */
-var61 = var56->attrs[COLOR_nit__model__MClass___mclass_type].val; /* _mclass_type on <var56:MClass> */
+var61 = var56->attrs[COLOR_nitc__model__MClass___mclass_type].val; /* _mclass_type on <var56:MClass> */
 if (unlikely(var61 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 484);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 507);
 fatal_exit(1);
 }
 var59 = var61;
@@ -752,15 +1026,15 @@ RET_LABEL60:(void)0;
 }
 }
 {
-var62 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_mtype->class->vft[COLOR_nit__model__MType__resolve_for]))(var_mtype, var59, var_anchor, var_mmodule, 1); /* resolve_for on <var_mtype:MType>*/
+var62 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_mtype->class->vft[COLOR_nitc__model__MType__resolve_for]))(var_mtype, var59, var_anchor, var_mmodule, 1); /* resolve_for on <var_mtype:MType>*/
 }
 var_resolved_receiver = var62;
 } else {
 var_resolved_receiver = var_mtype;
 }
 /* <var_resolved_receiver:nullable Object(MType)> isa MNullableType */
-cltype64 = type_nit__MNullableType.color;
-idtype65 = type_nit__MNullableType.id;
+cltype64 = type_nitc__MNullableType.color;
+idtype65 = type_nitc__MNullableType.id;
 if(cltype64 >= var_resolved_receiver->type->table_size) {
 var63 = 0;
 } else {
@@ -769,10 +1043,10 @@ var63 = var_resolved_receiver->type->type_table[cltype64] == idtype65;
 if (var63){
 {
 { /* Inline model#MProxyType#mtype (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MNullableType)> */
-var68 = var_resolved_receiver->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <var_resolved_receiver:nullable Object(MNullableType)> */
+var68 = var_resolved_receiver->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <var_resolved_receiver:nullable Object(MNullableType)> */
 if (unlikely(var68 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var66 = var68;
@@ -783,232 +1057,242 @@ var_resolved_receiver = var66;
 } else {
 }
 /* <var_resolved_receiver:nullable Object(MType)> isa MParameterType */
-cltype70 = type_nit__MParameterType.color;
-idtype71 = type_nit__MParameterType.id;
+cltype70 = type_nitc__MParameterType.color;
+idtype71 = type_nitc__MParameterType.id;
 if(cltype70 >= var_resolved_receiver->type->table_size) {
 var69 = 0;
 } else {
 var69 = var_resolved_receiver->type->type_table[cltype70] == idtype71;
 }
 if (var69){
+if (var_anchor == NULL) {
+var72 = 0; /* is null */
+} else {
+var72 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_anchor,((val*)NULL)) on <var_anchor:nullable MClassType> */
+var_other26 = ((val*)NULL);
 {
-{ /* Inline model#MParameterType#mclass (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MParameterType)> */
-var74 = var_resolved_receiver->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <var_resolved_receiver:nullable Object(MParameterType)> */
-if (unlikely(var74 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
-fatal_exit(1);
+var75 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
 }
-var72 = var74;
-RET_LABEL73:(void)0;
+var76 = !var75;
+var73 = var76;
+goto RET_LABEL74;
+RET_LABEL74:(void)0;
 }
+var72 = var73;
 }
-if (var_anchor == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1554);
-fatal_exit(1);
-} else {
-{ /* Inline model#MClassType#mclass (var_anchor) on <var_anchor:nullable MClassType> */
-if (unlikely(var_anchor == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+if (unlikely(!var72)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1580);
 fatal_exit(1);
 }
-var77 = var_anchor->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_anchor:nullable MClassType> */
-if (unlikely(var77 == NULL)) {
+{
+{ /* Inline model#MParameterType#mclass (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MParameterType)> */
+var79 = var_resolved_receiver->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <var_resolved_receiver:nullable Object(MParameterType)> */
+if (unlikely(var79 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
-var75 = var77;
-RET_LABEL76:(void)0;
+var77 = var79;
+RET_LABEL78:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var72,var75) on <var72:MClass> */
-var_other = var75;
-{
-{ /* Inline kernel#Object#is_same_instance (var72,var_other) on <var72:MClass> */
-var82 = var72 == var_other;
+{ /* Inline model#MClassType#mclass (var_anchor) on <var_anchor:nullable MClassType(MClassType)> */
+var82 = var_anchor->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_anchor:nullable MClassType(MClassType)> */
+if (unlikely(var82 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
+fatal_exit(1);
+}
 var80 = var82;
-goto RET_LABEL81;
 RET_LABEL81:(void)0;
 }
 }
-var78 = var80;
-goto RET_LABEL79;
-RET_LABEL79:(void)0;
+{
+{ /* Inline kernel#Object#== (var77,var80) on <var77:MClass> */
+var_other = var80;
+{
+{ /* Inline kernel#Object#is_same_instance (var77,var_other) on <var77:MClass> */
+var87 = var77 == var_other;
+var85 = var87;
+goto RET_LABEL86;
+RET_LABEL86:(void)0;
+}
+}
+var83 = var85;
+goto RET_LABEL84;
+RET_LABEL84:(void)0;
 }
 }
-if (unlikely(!var78)) {
+if (unlikely(!var83)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1554);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1581);
 fatal_exit(1);
 }
-if (var_anchor == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1555);
-fatal_exit(1);
-} else {
-var83 = ((val*(*)(val* self))(var_anchor->class->vft[COLOR_nit__model__MClassType__arguments]))(var_anchor); /* arguments on <var_anchor:nullable MClassType>*/
+{
+var88 = ((val*(*)(val* self))(var_anchor->class->vft[COLOR_nitc__model__MClassType__arguments]))(var_anchor); /* arguments on <var_anchor:nullable MClassType(MClassType)>*/
 }
 {
 { /* Inline model#MParameterType#rank (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MParameterType)> */
-var86 = var_resolved_receiver->attrs[COLOR_nit__model__MParameterType___rank].l; /* _rank on <var_resolved_receiver:nullable Object(MParameterType)> */
-var84 = var86;
-RET_LABEL85:(void)0;
+var91 = var_resolved_receiver->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <var_resolved_receiver:nullable Object(MParameterType)> */
+var89 = var91;
+RET_LABEL90:(void)0;
 }
 }
 {
-var87 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var83, var84);
+var92 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var88, var89);
 }
-var_resolved_receiver = var87;
+var_resolved_receiver = var92;
 /* <var_resolved_receiver:nullable Object(MType)> isa MNullableType */
-cltype89 = type_nit__MNullableType.color;
-idtype90 = type_nit__MNullableType.id;
-if(cltype89 >= var_resolved_receiver->type->table_size) {
-var88 = 0;
+cltype94 = type_nitc__MNullableType.color;
+idtype95 = type_nitc__MNullableType.id;
+if(cltype94 >= var_resolved_receiver->type->table_size) {
+var93 = 0;
 } else {
-var88 = var_resolved_receiver->type->type_table[cltype89] == idtype90;
+var93 = var_resolved_receiver->type->type_table[cltype94] == idtype95;
 }
-if (var88){
+if (var93){
 {
 { /* Inline model#MProxyType#mtype (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MNullableType)> */
-var93 = var_resolved_receiver->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <var_resolved_receiver:nullable Object(MNullableType)> */
-if (unlikely(var93 == NULL)) {
+var98 = var_resolved_receiver->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <var_resolved_receiver:nullable Object(MNullableType)> */
+if (unlikely(var98 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
-var91 = var93;
-RET_LABEL92:(void)0;
+var96 = var98;
+RET_LABEL97:(void)0;
 }
 }
-var_resolved_receiver = var91;
+var_resolved_receiver = var96;
 } else {
 }
 } else {
 }
 /* <var_resolved_receiver:nullable Object(MType)> isa MClassType */
-cltype95 = type_nit__MClassType.color;
-idtype96 = type_nit__MClassType.id;
-if(cltype95 >= var_resolved_receiver->type->table_size) {
-var94 = 0;
+cltype100 = type_nitc__MClassType.color;
+idtype101 = type_nitc__MClassType.id;
+if(cltype100 >= var_resolved_receiver->type->table_size) {
+var99 = 0;
 } else {
-var94 = var_resolved_receiver->type->type_table[cltype95] == idtype96;
+var99 = var_resolved_receiver->type->type_table[cltype100] == idtype101;
 }
-if (unlikely(!var94)) {
+if (unlikely(!var99)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1558);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1585);
 fatal_exit(1);
 }
 {
 { /* Inline model#MClassType#mclass (var_resolved_receiver) on <var_resolved_receiver:nullable Object(MClassType)> */
-var99 = var_resolved_receiver->attrs[COLOR_nit__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:nullable Object(MClassType)> */
-if (unlikely(var99 == NULL)) {
+var104 = var_resolved_receiver->attrs[COLOR_nitc__model__MClassType___mclass].val; /* _mclass on <var_resolved_receiver:nullable Object(MClassType)> */
+if (unlikely(var104 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1138);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1163);
 fatal_exit(1);
 }
-var97 = var99;
-RET_LABEL98:(void)0;
+var102 = var104;
+RET_LABEL103:(void)0;
 }
 }
 {
 { /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
-var102 = self->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
-if (unlikely(var102 == NULL)) {
+var107 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+if (unlikely(var107 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
-var100 = var102;
-RET_LABEL101:(void)0;
+var105 = var107;
+RET_LABEL106:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var97,var100) on <var97:MClass> */
-var_other = var100;
+{ /* Inline kernel#Object#== (var102,var105) on <var102:MClass> */
+var_other = var105;
 {
-{ /* Inline kernel#Object#is_same_instance (var97,var_other) on <var97:MClass> */
-var107 = var97 == var_other;
-var105 = var107;
-goto RET_LABEL106;
-RET_LABEL106:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var102,var_other) on <var102:MClass> */
+var112 = var102 == var_other;
+var110 = var112;
+goto RET_LABEL111;
+RET_LABEL111:(void)0;
 }
 }
-var103 = var105;
-goto RET_LABEL104;
-RET_LABEL104:(void)0;
+var108 = var110;
+goto RET_LABEL109;
+RET_LABEL109:(void)0;
 }
 }
-if (var103){
+if (var108){
 {
-var108 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MClassType__arguments]))(var_resolved_receiver); /* arguments on <var_resolved_receiver:nullable Object(MClassType)>*/
+var113 = ((val*(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MClassType__arguments]))(var_resolved_receiver); /* arguments on <var_resolved_receiver:nullable Object(MClassType)>*/
 }
 {
 { /* Inline model#MParameterType#rank (self) on <self:MParameterType> */
-var111 = self->attrs[COLOR_nit__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
-var109 = var111;
-RET_LABEL110:(void)0;
+var116 = self->attrs[COLOR_nitc__model__MParameterType___rank].l; /* _rank on <self:MParameterType> */
+var114 = var116;
+RET_LABEL115:(void)0;
 }
 }
 {
-var112 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var108, var109);
+var117 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var113, var114);
 }
-var_res113 = var112;
-var = var_res113;
+var_res118 = var117;
+var = var_res118;
 goto RET_LABEL;
 } else {
 }
 {
-var114 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:nullable Object(MClassType)>*/
+var119 = ((short int(*)(val* self))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_resolved_receiver); /* need_anchor on <var_resolved_receiver:nullable Object(MClassType)>*/
 }
-if (var114){
+if (var119){
 if (var_anchor == NULL) {
-var115 = 0; /* is null */
+var120 = 0; /* is null */
 } else {
-var115 = 1; /* arg is null and recv is not */
+var120 = 1; /* arg is null and recv is not */
 }
 if (0) {
 { /* Inline kernel#Object#!= (var_anchor,((val*)NULL)) on <var_anchor:nullable MClassType> */
 var_other26 = ((val*)NULL);
 {
-var118 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
+var123 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_anchor, var_other26); /* == on <var_anchor:nullable MClassType(MClassType)>*/
 }
-var119 = !var118;
-var116 = var119;
-goto RET_LABEL117;
-RET_LABEL117:(void)0;
+var124 = !var123;
+var121 = var124;
+goto RET_LABEL122;
+RET_LABEL122:(void)0;
 }
-var115 = var116;
+var120 = var121;
 }
-if (unlikely(!var115)) {
+if (unlikely(!var120)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1569);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1596);
 fatal_exit(1);
 }
 {
-var120 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_resolved_receiver->class->vft[COLOR_nit__model__MType__resolve_for]))(var_resolved_receiver, var_anchor, ((val*)NULL), var_mmodule, 0); /* resolve_for on <var_resolved_receiver:nullable Object(MClassType)>*/
+var125 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_resolved_receiver->class->vft[COLOR_nitc__model__MType__resolve_for]))(var_resolved_receiver, var_anchor, ((val*)NULL), var_mmodule, 0); /* resolve_for on <var_resolved_receiver:nullable Object(MClassType)>*/
 }
-var_resolved_receiver = var120;
+var_resolved_receiver = var125;
 } else {
 }
 {
-var121 = nit___nit__MParameterType___MType__lookup_bound(self, var_mmodule, var_resolved_receiver);
+var126 = nitc___nitc__MParameterType___MType__lookup_bound(self, var_mmodule, var_resolved_receiver);
 }
-var_verbatim_bound = var121;
+var_verbatim_bound = var126;
 {
-var122 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_verbatim_bound->class->vft[COLOR_nit__model__MType__resolve_for]))(var_verbatim_bound, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var_verbatim_bound:MType>*/
+var127 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_verbatim_bound->class->vft[COLOR_nitc__model__MType__resolve_for]))(var_verbatim_bound, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var_verbatim_bound:MType>*/
 }
-var_res123 = var122;
-var = var_res123;
+var_res128 = var127;
+var = var_res128;
 goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
 /* method model#MParameterType#can_resolve_for for (self: MParameterType, MType, nullable MClassType, MModule): Bool */
-short int nit___nit__MParameterType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
+short int nitc___nitc__MParameterType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
 short int var /* : Bool */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -1030,7 +1314,7 @@ var_mtype = p0;
 var_anchor = p1;
 var_mmodule = p2;
 {
-var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 if (var1){
 if (var_anchor == NULL) {
@@ -1042,7 +1326,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_anchor,((val*)NULL)) on <var_anchor:nullable MClassType> */
 var_other = ((val*)NULL);
 {
-var5 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_anchor, var_other); /* == on <var_anchor:nullable MClassType(MClassType)>*/
+var5 = ((short int(*)(val* self, val* p0))(var_anchor->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_anchor, var_other); /* == on <var_anchor:nullable MClassType(MClassType)>*/
 }
 var6 = !var5;
 var3 = var6;
@@ -1053,24 +1337,24 @@ var2 = var3;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1585);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1612);
 fatal_exit(1);
 }
 {
-var7 = ((val*(*)(val* self, val* p0, val* p1))(var_mtype->class->vft[COLOR_nit__model__MType__anchor_to]))(var_mtype, var_mmodule, var_anchor); /* anchor_to on <var_mtype:MType>*/
+var7 = ((val*(*)(val* self, val* p0, val* p1))(var_mtype->class->vft[COLOR_nitc__model__MType__anchor_to]))(var_mtype, var_mmodule, var_anchor); /* anchor_to on <var_mtype:MType>*/
 }
 var_mtype = var7;
 } else {
 }
 {
-var8 = ((val*(*)(val* self, val* p0))(var_mtype->class->vft[COLOR_nit__model__MType__collect_mclassdefs]))(var_mtype, var_mmodule); /* collect_mclassdefs on <var_mtype:MType>*/
+var8 = ((val*(*)(val* self, val* p0))(var_mtype->class->vft[COLOR_nitc__model__MType__collect_mclassdefs]))(var_mtype, var_mmodule); /* collect_mclassdefs on <var_mtype:MType>*/
 }
 {
 { /* Inline model#MParameterType#mclass (self) on <self:MParameterType> */
-var11 = self->attrs[COLOR_nit__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
+var11 = self->attrs[COLOR_nitc__model__MParameterType___mclass].val; /* _mclass on <self:MParameterType> */
 if (unlikely(var11 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1472);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1498);
 fatal_exit(1);
 }
 var9 = var11;
@@ -1079,10 +1363,10 @@ RET_LABEL10:(void)0;
 }
 {
 { /* Inline model#MClass#intro (var9) on <var9:MClass> */
-var14 = var9->attrs[COLOR_nit__model__MClass___intro].val; /* _intro on <var9:MClass> */
+var14 = var9->attrs[COLOR_nitc__model__MClass___intro].val; /* _intro on <var9:MClass> */
 if (unlikely(var14 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 460);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 483);
 fatal_exit(1);
 }
 var12 = var14;
@@ -1090,7 +1374,7 @@ RET_LABEL13:(void)0;
 }
 }
 {
-var15 = ((short int(*)(val* self, val* p0))((((long)var8&3)?class_info[((long)var8&3)]:var8->class)->vft[COLOR_standard__abstract_collection__Collection__has]))(var8, var12); /* has on <var8:Set[MClassDef]>*/
+var15 = ((short int(*)(val* self, val* p0))((((long)var8&3)?class_info[((long)var8&3)]:var8->class)->vft[COLOR_core__abstract_collection__Collection__has]))(var8, var12); /* has on <var8:Set[MClassDef]>*/
 }
 var = var15;
 goto RET_LABEL;
@@ -1098,20 +1382,20 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameterType#init for (self: MParameterType) */
-void nit___nit__MParameterType___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MParameterType___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MParameterType___standard__kernel__Object__init]))(self); /* init on <self:MParameterType>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MParameterType___core__kernel__Object__init]))(self); /* init on <self:MParameterType>*/
 }
 RET_LABEL:;
 }
 /* method model#MProxyType#mtype for (self: MProxyType): MType */
-val* nit___nit__MProxyType___mtype(val* self) {
+val* nitc___nitc__MProxyType___mtype(val* self) {
 val* var /* : MType */;
 val* var1 /* : MType */;
-var1 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var1 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var = var1;
@@ -1119,22 +1403,22 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#mtype= for (self: MProxyType, MType) */
-void nit___nit__MProxyType___mtype_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MProxyType___mtype].val = p0; /* _mtype on <self:MProxyType> */
+void nitc___nitc__MProxyType___mtype_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MProxyType___mtype].val = p0; /* _mtype on <self:MProxyType> */
 RET_LABEL:;
 }
 /* method model#MProxyType#model for (self: MProxyType): Model */
-val* nit___nit__MProxyType___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MProxyType___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 val* var4 /* : Model */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1142,7 +1426,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nit__model_base__MEntity__model]))(var1); /* model on <var1:MType>*/
+var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nitc__model_base__MEntity__model]))(var1); /* model on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1150,17 +1434,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#need_anchor for (self: MProxyType): Bool */
-short int nit___nit__MProxyType___MType__need_anchor(val* self) {
+short int nitc___nitc__MProxyType___MType__need_anchor(val* self) {
 short int var /* : Bool */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 short int var4 /* : Bool */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1168,7 +1452,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((short int(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__need_anchor]))(var1); /* need_anchor on <var1:MType>*/
+var4 = ((short int(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__need_anchor]))(var1); /* need_anchor on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1176,17 +1460,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#as_nullable for (self: MProxyType): MType */
-val* nit___nit__MProxyType___MType__as_nullable(val* self) {
+val* nitc___nitc__MProxyType___MType__as_nullable(val* self) {
 val* var /* : MType */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 val* var4 /* : MType */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1194,7 +1478,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__as_nullable]))(var1); /* as_nullable on <var1:MType>*/
+var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__as_nullable]))(var1); /* as_nullable on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1202,17 +1486,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#as_notnull for (self: MProxyType): MType */
-val* nit___nit__MProxyType___MType__as_notnull(val* self) {
+val* nitc___nitc__MProxyType___MType__as_notnull(val* self) {
 val* var /* : MType */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 val* var4 /* : MType */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1220,7 +1504,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__as_notnull]))(var1); /* as_notnull on <var1:MType>*/
+var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__as_notnull]))(var1); /* as_notnull on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1228,17 +1512,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#undecorate for (self: MProxyType): MType */
-val* nit___nit__MProxyType___MType__undecorate(val* self) {
+val* nitc___nitc__MProxyType___MType__undecorate(val* self) {
 val* var /* : MType */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 val* var4 /* : MType */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1246,7 +1530,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__undecorate]))(var1); /* undecorate on <var1:MType>*/
+var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__undecorate]))(var1); /* undecorate on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1254,7 +1538,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#resolve_for for (self: MProxyType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MProxyType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MProxyType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -1270,10 +1554,10 @@ var_mmodule = p2;
 var_cleanup_virtual = p3;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1281,7 +1565,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var1->class->vft[COLOR_nit__model__MType__resolve_for]))(var1, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var1:MType>*/
+var4 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var1->class->vft[COLOR_nitc__model__MType__resolve_for]))(var1, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var1:MType>*/
 }
 var_res = var4;
 var = var_res;
@@ -1290,7 +1574,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#can_resolve_for for (self: MProxyType, MType, nullable MClassType, MModule): Bool */
-short int nit___nit__MProxyType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
+short int nitc___nitc__MProxyType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
 short int var /* : Bool */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -1303,10 +1587,10 @@ var_anchor = p1;
 var_mmodule = p2;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1314,7 +1598,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((short int(*)(val* self, val* p0, val* p1, val* p2))(var1->class->vft[COLOR_nit__model__MType__can_resolve_for]))(var1, var_mtype, var_anchor, var_mmodule); /* can_resolve_for on <var1:MType>*/
+var4 = ((short int(*)(val* self, val* p0, val* p1, val* p2))(var1->class->vft[COLOR_nitc__model__MType__can_resolve_for]))(var1, var_mtype, var_anchor, var_mmodule); /* can_resolve_for on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1322,7 +1606,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#lookup_fixed for (self: MProxyType, MModule, MType): MType */
-val* nit___nit__MProxyType___MType__lookup_fixed(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProxyType___MType__lookup_fixed(val* self, val* p0, val* p1) {
 val* var /* : MType */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_resolved_receiver /* var resolved_receiver: MType */;
@@ -1334,10 +1618,10 @@ var_mmodule = p0;
 var_resolved_receiver = p1;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1345,7 +1629,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self, val* p0, val* p1))(var1->class->vft[COLOR_nit__model__MType__lookup_fixed]))(var1, var_mmodule, var_resolved_receiver); /* lookup_fixed on <var1:MType>*/
+var4 = ((val*(*)(val* self, val* p0, val* p1))(var1->class->vft[COLOR_nitc__model__MType__lookup_fixed]))(var1, var_mmodule, var_resolved_receiver); /* lookup_fixed on <var1:MType>*/
 }
 var_t = var4;
 var = var_t;
@@ -1354,17 +1638,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#length for (self: MProxyType): Int */
-long nit___nit__MProxyType___MType__length(val* self) {
+long nitc___nitc__MProxyType___MType__length(val* self) {
 long var /* : Int */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 long var4 /* : Int */;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var3 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var3 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var1 = var3;
@@ -1372,7 +1656,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((long(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__length]))(var1); /* length on <var1:MType>*/
+var4 = ((long(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__length]))(var1); /* length on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -1380,7 +1664,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#collect_mclassdefs for (self: MProxyType, MModule): Set[MClassDef] */
-val* nit___nit__MProxyType___MType__collect_mclassdefs(val* self, val* p0) {
+val* nitc___nitc__MProxyType___MType__collect_mclassdefs(val* self, val* p0) {
 val* var /* : Set[MClassDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 short int var1 /* : Bool */;
@@ -1390,20 +1674,20 @@ val* var5 /* : MType */;
 val* var6 /* : Set[MClassDef] */;
 var_mmodule = p0;
 {
-var1 = nit___nit__MProxyType___MType__need_anchor(self);
+var1 = nitc___nitc__MProxyType___MType__need_anchor(self);
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1629);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1656);
 fatal_exit(1);
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var5 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var5 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var3 = var5;
@@ -1411,7 +1695,7 @@ RET_LABEL4:(void)0;
 }
 }
 {
-var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nit__model__MType__collect_mclassdefs]))(var3, var_mmodule); /* collect_mclassdefs on <var3:MType>*/
+var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nitc__model__MType__collect_mclassdefs]))(var3, var_mmodule); /* collect_mclassdefs on <var3:MType>*/
 }
 var = var6;
 goto RET_LABEL;
@@ -1419,7 +1703,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#collect_mclasses for (self: MProxyType, MModule): Set[MClass] */
-val* nit___nit__MProxyType___MType__collect_mclasses(val* self, val* p0) {
+val* nitc___nitc__MProxyType___MType__collect_mclasses(val* self, val* p0) {
 val* var /* : Set[MClass] */;
 val* var_mmodule /* var mmodule: MModule */;
 short int var1 /* : Bool */;
@@ -1429,20 +1713,20 @@ val* var5 /* : MType */;
 val* var6 /* : Set[MClass] */;
 var_mmodule = p0;
 {
-var1 = nit___nit__MProxyType___MType__need_anchor(self);
+var1 = nitc___nitc__MProxyType___MType__need_anchor(self);
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1635);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1662);
 fatal_exit(1);
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var5 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var5 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var3 = var5;
@@ -1450,7 +1734,7 @@ RET_LABEL4:(void)0;
 }
 }
 {
-var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nit__model__MType__collect_mclasses]))(var3, var_mmodule); /* collect_mclasses on <var3:MType>*/
+var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nitc__model__MType__collect_mclasses]))(var3, var_mmodule); /* collect_mclasses on <var3:MType>*/
 }
 var = var6;
 goto RET_LABEL;
@@ -1458,7 +1742,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#collect_mtypes for (self: MProxyType, MModule): Set[MClassType] */
-val* nit___nit__MProxyType___MType__collect_mtypes(val* self, val* p0) {
+val* nitc___nitc__MProxyType___MType__collect_mtypes(val* self, val* p0) {
 val* var /* : Set[MClassType] */;
 val* var_mmodule /* var mmodule: MModule */;
 short int var1 /* : Bool */;
@@ -1468,20 +1752,20 @@ val* var5 /* : MType */;
 val* var6 /* : Set[MClassType] */;
 var_mmodule = p0;
 {
-var1 = nit___nit__MProxyType___MType__need_anchor(self);
+var1 = nitc___nitc__MProxyType___MType__need_anchor(self);
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1641);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1668);
 fatal_exit(1);
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MProxyType> */
-var5 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
+var5 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MProxyType> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var3 = var5;
@@ -1489,7 +1773,7 @@ RET_LABEL4:(void)0;
 }
 }
 {
-var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nit__model__MType__collect_mtypes]))(var3, var_mmodule); /* collect_mtypes on <var3:MType>*/
+var6 = ((val*(*)(val* self, val* p0))(var3->class->vft[COLOR_nitc__model__MType__collect_mtypes]))(var3, var_mmodule); /* collect_mtypes on <var3:MType>*/
 }
 var = var6;
 goto RET_LABEL;
@@ -1497,48 +1781,48 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProxyType#init for (self: MProxyType) */
-void nit___nit__MProxyType___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MProxyType___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MProxyType___standard__kernel__Object__init]))(self); /* init on <self:MProxyType>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MProxyType___core__kernel__Object__init]))(self); /* init on <self:MProxyType>*/
 }
 RET_LABEL:;
 }
 /* method model#MNullableType#init for (self: MNullableType) */
-void nit___nit__MNullableType___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MNullableType___core__kernel__Object__init(val* self) {
 val* var /* : NativeArray[String] */;
 static val* varonce;
 static val* varonce1;
 val* var2 /* : String */;
 char* var3 /* : NativeString */;
-val* var4 /* : FlatString */;
+val* var4 /* : String */;
 val* var5 /* : MType */;
 val* var7 /* : MType */;
 val* var8 /* : String */;
 val* var9 /* : String */;
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MNullableType___standard__kernel__Object__init]))(self); /* init on <self:MNullableType>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MNullableType___core__kernel__Object__init]))(self); /* init on <self:MNullableType>*/
 }
 if (unlikely(varonce==NULL)) {
-var = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce1!=NULL)) {
 var2 = varonce1;
 } else {
 var3 = "nullable ";
-var4 = standard___standard__NativeString___to_s_with_length(var3, 9l);
+var4 = core__flat___NativeString___to_s_full(var3, 9l, 9l);
 var2 = var4;
 varonce1 = var2;
 }
-((struct instance_standard__NativeArray*)var)->values[0]=var2;
+((struct instance_core__NativeArray*)var)->values[0]=var2;
 } else {
 var = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNullableType> */
-var7 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
+var7 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var5 = var7;
@@ -1546,29 +1830,29 @@ RET_LABEL6:(void)0;
 }
 }
 {
-var8 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__Object__to_s]))(var5); /* to_s on <var5:MType>*/
+var8 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__Object__to_s]))(var5); /* to_s on <var5:MType>*/
 }
-((struct instance_standard__NativeArray*)var)->values[1]=var8;
+((struct instance_core__NativeArray*)var)->values[1]=var8;
 {
-var9 = ((val*(*)(val* self))(var->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var); /* native_to_s on <var:NativeArray[String]>*/
+var9 = ((val*(*)(val* self))(var->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var); /* native_to_s on <var:NativeArray[String]>*/
 }
 varonce = var;
 {
 { /* Inline model#MNullableType#to_s= (self,var9) on <self:MNullableType> */
-self->attrs[COLOR_nit__model__MNullableType___to_s].val = var9; /* _to_s on <self:MNullableType> */
+self->attrs[COLOR_nitc__model__MNullableType___to_s].val = var9; /* _to_s on <self:MNullableType> */
 RET_LABEL10:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method model#MNullableType#to_s for (self: MNullableType): String */
-val* nit___nit__MNullableType___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MNullableType___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MNullableType___to_s].val; /* _to_s on <self:MNullableType> */
+var1 = self->attrs[COLOR_nitc__model__MNullableType___to_s].val; /* _to_s on <self:MNullableType> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _to_s");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1655);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1682);
 fatal_exit(1);
 }
 var = var1;
@@ -1576,12 +1860,12 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullableType#to_s= for (self: MNullableType, String) */
-void nit___nit__MNullableType___to_s_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MNullableType___to_s].val = p0; /* _to_s on <self:MNullableType> */
+void nitc___nitc__MNullableType___to_s_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MNullableType___to_s].val = p0; /* _to_s on <self:MNullableType> */
 RET_LABEL:;
 }
 /* method model#MNullableType#full_name for (self: MNullableType): String */
-val* nit___nit__MNullableType___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MNullableType___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -1591,42 +1875,42 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 val* var10 /* : MType */;
 val* var12 /* : MType */;
 val* var13 /* : String */;
 val* var14 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MNullableType___full_name].val != NULL; /* _full_name on <self:MNullableType> */
+var1 = self->attrs[COLOR_nitc__model__MNullableType___full_name].val != NULL; /* _full_name on <self:MNullableType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MNullableType___full_name].val; /* _full_name on <self:MNullableType> */
+var2 = self->attrs[COLOR_nitc__model__MNullableType___full_name].val; /* _full_name on <self:MNullableType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _full_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1657);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1684);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "nullable ";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 9l);
+var9 = core__flat___NativeString___to_s_full(var8, 9l, 9l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var7;
+((struct instance_core__NativeArray*)var5)->values[0]=var7;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNullableType> */
-var12 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
+var12 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var10 = var12;
@@ -1634,18 +1918,18 @@ RET_LABEL11:(void)0;
 }
 }
 {
-var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nit__model_base__MEntity__full_name]))(var10); /* full_name on <var10:MType>*/
+var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nitc__model_base__MEntity__full_name]))(var10); /* full_name on <var10:MType>*/
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var13;
+((struct instance_core__NativeArray*)var5)->values[1]=var13;
 {
-var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var14;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MNullableType___full_name].val = var3; /* _full_name on <self:MNullableType> */
+self->attrs[COLOR_nitc__model__MNullableType___full_name].val = var3; /* _full_name on <self:MNullableType> */
 var2 = var3;
 }
 var = var2;
@@ -1653,7 +1937,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullableType#c_name for (self: MNullableType): String */
-val* nit___nit__MNullableType___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MNullableType___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -1663,42 +1947,42 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 val* var10 /* : MType */;
 val* var12 /* : MType */;
 val* var13 /* : String */;
 val* var14 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MNullableType___c_name].val != NULL; /* _c_name on <self:MNullableType> */
+var1 = self->attrs[COLOR_nitc__model__MNullableType___c_name].val != NULL; /* _c_name on <self:MNullableType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MNullableType___c_name].val; /* _c_name on <self:MNullableType> */
+var2 = self->attrs[COLOR_nitc__model__MNullableType___c_name].val; /* _c_name on <self:MNullableType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1659);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1686);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "nullable__";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 10l);
+var9 = core__flat___NativeString___to_s_full(var8, 10l, 10l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var7;
+((struct instance_core__NativeArray*)var5)->values[0]=var7;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNullableType> */
-var12 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
+var12 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var10 = var12;
@@ -1706,18 +1990,18 @@ RET_LABEL11:(void)0;
 }
 }
 {
-var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nit__model_base__MEntity__c_name]))(var10); /* c_name on <var10:MType>*/
+var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nitc__model_base__MEntity__c_name]))(var10); /* c_name on <var10:MType>*/
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var13;
+((struct instance_core__NativeArray*)var5)->values[1]=var13;
 {
-var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var14;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MNullableType___c_name].val = var3; /* _c_name on <self:MNullableType> */
+self->attrs[COLOR_nitc__model__MNullableType___c_name].val = var3; /* _c_name on <self:MNullableType> */
 var2 = var3;
 }
 var = var2;
@@ -1725,7 +2009,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullableType#as_nullable for (self: MNullableType): MType */
-val* nit___nit__MNullableType___MType__as_nullable(val* self) {
+val* nitc___nitc__MNullableType___MType__as_nullable(val* self) {
 val* var /* : MType */;
 var = self;
 goto RET_LABEL;
@@ -1733,7 +2017,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullableType#resolve_for for (self: MNullableType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MNullableType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MNullableType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -1747,11 +2031,11 @@ var_anchor = p1;
 var_mmodule = p2;
 var_cleanup_virtual = p3;
 {
-var1 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(self->class->vft[COLOR_nit___nit__MNullableType___MType__resolve_for]))(self, p0, p1, p2, p3); /* resolve_for on <self:MNullableType>*/
+var1 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(self->class->vft[COLOR_nitc___nitc__MNullableType___MType__resolve_for]))(self, p0, p1, p2, p3); /* resolve_for on <self:MNullableType>*/
 }
 var_res = var1;
 {
-var2 = ((val*(*)(val* self))(var_res->class->vft[COLOR_nit__model__MType__as_nullable]))(var_res); /* as_nullable on <var_res:MType>*/
+var2 = ((val*(*)(val* self))(var_res->class->vft[COLOR_nitc__model__MType__as_nullable]))(var_res); /* as_nullable on <var_res:MType>*/
 }
 var = var2;
 goto RET_LABEL;
@@ -1759,7 +2043,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullableType#lookup_fixed for (self: MNullableType, MModule, MType): MType */
-val* nit___nit__MNullableType___MType__lookup_fixed(val* self, val* p0, val* p1) {
+val* nitc___nitc__MNullableType___MType__lookup_fixed(val* self, val* p0, val* p1) {
 val* var /* : MType */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_resolved_receiver /* var resolved_receiver: MType */;
@@ -1775,15 +2059,15 @@ val* var10 /* : MType */;
 var_mmodule = p0;
 var_resolved_receiver = p1;
 {
-var1 = ((val*(*)(val* self, val* p0, val* p1))(self->class->vft[COLOR_nit___nit__MNullableType___MType__lookup_fixed]))(self, p0, p1); /* lookup_fixed on <self:MNullableType>*/
+var1 = ((val*(*)(val* self, val* p0, val* p1))(self->class->vft[COLOR_nitc___nitc__MNullableType___MType__lookup_fixed]))(self, p0, p1); /* lookup_fixed on <self:MNullableType>*/
 }
 var_t = var1;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNullableType> */
-var4 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
+var4 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNullableType> */
 if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var2 = var4;
@@ -1812,7 +2096,7 @@ goto RET_LABEL;
 } else {
 }
 {
-var10 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nit__model__MType__as_nullable]))(var_t); /* as_nullable on <var_t:MType>*/
+var10 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nitc__model__MType__as_nullable]))(var_t); /* as_nullable on <var_t:MType>*/
 }
 var = var10;
 goto RET_LABEL;
@@ -1820,39 +2104,39 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#to_s for (self: MNotNullType): String */
-val* nit___nit__MNotNullType___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MNotNullType___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : NativeArray[String] */;
 static val* varonce;
 static val* varonce2;
 val* var3 /* : String */;
 char* var4 /* : NativeString */;
-val* var5 /* : FlatString */;
+val* var5 /* : String */;
 val* var6 /* : MType */;
 val* var8 /* : MType */;
 val* var9 /* : String */;
 val* var10 /* : String */;
 if (unlikely(varonce==NULL)) {
-var1 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var1 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce2!=NULL)) {
 var3 = varonce2;
 } else {
 var4 = "not null ";
-var5 = standard___standard__NativeString___to_s_with_length(var4, 9l);
+var5 = core__flat___NativeString___to_s_full(var4, 9l, 9l);
 var3 = var5;
 varonce2 = var3;
 }
-((struct instance_standard__NativeArray*)var1)->values[0]=var3;
+((struct instance_core__NativeArray*)var1)->values[0]=var3;
 } else {
 var1 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNotNullType> */
-var8 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
+var8 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
 if (unlikely(var8 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var6 = var8;
@@ -1860,11 +2144,11 @@ RET_LABEL7:(void)0;
 }
 }
 {
-var9 = ((val*(*)(val* self))(var6->class->vft[COLOR_standard__string__Object__to_s]))(var6); /* to_s on <var6:MType>*/
+var9 = ((val*(*)(val* self))(var6->class->vft[COLOR_core__abstract_text__Object__to_s]))(var6); /* to_s on <var6:MType>*/
 }
-((struct instance_standard__NativeArray*)var1)->values[1]=var9;
+((struct instance_core__NativeArray*)var1)->values[1]=var9;
 {
-var10 = ((val*(*)(val* self))(var1->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var1); /* native_to_s on <var1:NativeArray[String]>*/
+var10 = ((val*(*)(val* self))(var1->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var1); /* native_to_s on <var1:NativeArray[String]>*/
 }
 varonce = var1;
 var = var10;
@@ -1873,7 +2157,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#full_name for (self: MNotNullType): String */
-val* nit___nit__MNotNullType___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MNotNullType___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -1883,42 +2167,42 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 val* var10 /* : MType */;
 val* var12 /* : MType */;
 val* var13 /* : String */;
 val* var14 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MNotNullType___full_name].val != NULL; /* _full_name on <self:MNotNullType> */
+var1 = self->attrs[COLOR_nitc__model__MNotNullType___full_name].val != NULL; /* _full_name on <self:MNotNullType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MNotNullType___full_name].val; /* _full_name on <self:MNotNullType> */
+var2 = self->attrs[COLOR_nitc__model__MNotNullType___full_name].val; /* _full_name on <self:MNotNullType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _full_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1684);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1711);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "not null ";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 9l);
+var9 = core__flat___NativeString___to_s_full(var8, 9l, 9l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var7;
+((struct instance_core__NativeArray*)var5)->values[0]=var7;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNotNullType> */
-var12 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
+var12 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var10 = var12;
@@ -1926,18 +2210,18 @@ RET_LABEL11:(void)0;
 }
 }
 {
-var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nit__model_base__MEntity__full_name]))(var10); /* full_name on <var10:MType>*/
+var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nitc__model_base__MEntity__full_name]))(var10); /* full_name on <var10:MType>*/
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var13;
+((struct instance_core__NativeArray*)var5)->values[1]=var13;
 {
-var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var14;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MNotNullType___full_name].val = var3; /* _full_name on <self:MNotNullType> */
+self->attrs[COLOR_nitc__model__MNotNullType___full_name].val = var3; /* _full_name on <self:MNotNullType> */
 var2 = var3;
 }
 var = var2;
@@ -1945,7 +2229,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#c_name for (self: MNotNullType): String */
-val* nit___nit__MNotNullType___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MNotNullType___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -1955,42 +2239,42 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 val* var10 /* : MType */;
 val* var12 /* : MType */;
 val* var13 /* : String */;
 val* var14 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MNotNullType___c_name].val != NULL; /* _c_name on <self:MNotNullType> */
+var1 = self->attrs[COLOR_nitc__model__MNotNullType___c_name].val != NULL; /* _c_name on <self:MNotNullType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MNotNullType___c_name].val; /* _c_name on <self:MNotNullType> */
+var2 = self->attrs[COLOR_nitc__model__MNotNullType___c_name].val; /* _c_name on <self:MNotNullType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1685);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1712);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "notnull__";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 9l);
+var9 = core__flat___NativeString___to_s_full(var8, 9l, 9l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var7;
+((struct instance_core__NativeArray*)var5)->values[0]=var7;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNotNullType> */
-var12 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
+var12 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var10 = var12;
@@ -1998,18 +2282,18 @@ RET_LABEL11:(void)0;
 }
 }
 {
-var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nit__model_base__MEntity__c_name]))(var10); /* c_name on <var10:MType>*/
+var13 = ((val*(*)(val* self))(var10->class->vft[COLOR_nitc__model_base__MEntity__c_name]))(var10); /* c_name on <var10:MType>*/
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var13;
+((struct instance_core__NativeArray*)var5)->values[1]=var13;
 {
-var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var14 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var14;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MNotNullType___c_name].val = var3; /* _c_name on <self:MNotNullType> */
+self->attrs[COLOR_nitc__model__MNotNullType___c_name].val = var3; /* _c_name on <self:MNotNullType> */
 var2 = var3;
 }
 var = var2;
@@ -2017,7 +2301,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#as_notnull for (self: MNotNullType): MType */
-val* nit___nit__MNotNullType___MType__as_notnull(val* self) {
+val* nitc___nitc__MNotNullType___MType__as_notnull(val* self) {
 val* var /* : MType */;
 var = self;
 goto RET_LABEL;
@@ -2025,7 +2309,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#resolve_for for (self: MNotNullType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MNotNullType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MNotNullType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -2039,11 +2323,11 @@ var_anchor = p1;
 var_mmodule = p2;
 var_cleanup_virtual = p3;
 {
-var1 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(self->class->vft[COLOR_nit___nit__MNotNullType___MType__resolve_for]))(self, p0, p1, p2, p3); /* resolve_for on <self:MNotNullType>*/
+var1 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(self->class->vft[COLOR_nitc___nitc__MNotNullType___MType__resolve_for]))(self, p0, p1, p2, p3); /* resolve_for on <self:MNotNullType>*/
 }
 var_res = var1;
 {
-var2 = ((val*(*)(val* self))(var_res->class->vft[COLOR_nit__model__MType__as_notnull]))(var_res); /* as_notnull on <var_res:MType>*/
+var2 = ((val*(*)(val* self))(var_res->class->vft[COLOR_nitc__model__MType__as_notnull]))(var_res); /* as_notnull on <var_res:MType>*/
 }
 var = var2;
 goto RET_LABEL;
@@ -2051,7 +2335,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNotNullType#lookup_fixed for (self: MNotNullType, MModule, MType): MType */
-val* nit___nit__MNotNullType___MType__lookup_fixed(val* self, val* p0, val* p1) {
+val* nitc___nitc__MNotNullType___MType__lookup_fixed(val* self, val* p0, val* p1) {
 val* var /* : MType */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_resolved_receiver /* var resolved_receiver: MType */;
@@ -2067,15 +2351,15 @@ val* var10 /* : MType */;
 var_mmodule = p0;
 var_resolved_receiver = p1;
 {
-var1 = ((val*(*)(val* self, val* p0, val* p1))(self->class->vft[COLOR_nit___nit__MNotNullType___MType__lookup_fixed]))(self, p0, p1); /* lookup_fixed on <self:MNotNullType>*/
+var1 = ((val*(*)(val* self, val* p0, val* p1))(self->class->vft[COLOR_nitc___nitc__MNotNullType___MType__lookup_fixed]))(self, p0, p1); /* lookup_fixed on <self:MNotNullType>*/
 }
 var_t = var1;
 {
 { /* Inline model#MProxyType#mtype (self) on <self:MNotNullType> */
-var4 = self->attrs[COLOR_nit__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
+var4 = self->attrs[COLOR_nitc__model__MProxyType___mtype].val; /* _mtype on <self:MNotNullType> */
 if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1625);
 fatal_exit(1);
 }
 var2 = var4;
@@ -2104,7 +2388,7 @@ goto RET_LABEL;
 } else {
 }
 {
-var10 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nit__model__MType__as_notnull]))(var_t); /* as_notnull on <var_t:MType>*/
+var10 = ((val*(*)(val* self))(var_t->class->vft[COLOR_nitc__model__MType__as_notnull]))(var_t); /* as_notnull on <var_t:MType>*/
 }
 var = var10;
 goto RET_LABEL;
@@ -2112,13 +2396,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#model for (self: MNullType): Model */
-val* nit___nit__MNullType___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MNullType___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : Model */;
-var1 = self->attrs[COLOR_nit__model__MNullType___model].val; /* _model on <self:MNullType> */
+var1 = self->attrs[COLOR_nitc__model__MNullType___model].val; /* _model on <self:MNullType> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1709);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1736);
 fatal_exit(1);
 }
 var = var1;
@@ -2126,22 +2410,22 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#model= for (self: MNullType, Model) */
-void nit___nit__MNullType___model_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MNullType___model].val = p0; /* _model on <self:MNullType> */
+void nitc___nitc__MNullType___model_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MNullType___model].val = p0; /* _model on <self:MNullType> */
 RET_LABEL:;
 }
 /* method model#MNullType#to_s for (self: MNullType): String */
-val* nit___nit__MNullType___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MNullType___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "null";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 4l);
+var3 = core__flat___NativeString___to_s_full(var2, 4l, 4l);
 var1 = var3;
 varonce = var1;
 }
@@ -2151,17 +2435,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#full_name for (self: MNullType): String */
-val* nit___nit__MNullType___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MNullType___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "null";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 4l);
+var3 = core__flat___NativeString___to_s_full(var2, 4l, 4l);
 var1 = var3;
 varonce = var1;
 }
@@ -2171,17 +2455,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#c_name for (self: MNullType): String */
-val* nit___nit__MNullType___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MNullType___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "null";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 4l);
+var3 = core__flat___NativeString___to_s_full(var2, 4l, 4l);
 var1 = var3;
 varonce = var1;
 }
@@ -2191,7 +2475,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#as_nullable for (self: MNullType): MType */
-val* nit___nit__MNullType___MType__as_nullable(val* self) {
+val* nitc___nitc__MNullType___MType__as_nullable(val* self) {
 val* var /* : MType */;
 var = self;
 goto RET_LABEL;
@@ -2199,29 +2483,29 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#as_notnull for (self: MNullType): MType */
-val* nit___nit__MNullType___MType__as_notnull(val* self) {
+val* nitc___nitc__MNullType___MType__as_notnull(val* self) {
 val* var /* : MType */;
 short int var1 /* : Bool */;
 val* var2 /* : MType */;
 val* var3 /* : MBottomType */;
 val* var4 /* : Model */;
 val* var6 /* : Model */;
-var1 = self->attrs[COLOR_nit__model__MNullType___as_notnull].val != NULL; /* _as_notnull on <self:MNullType> */
+var1 = self->attrs[COLOR_nitc__model__MNullType___as_notnull].val != NULL; /* _as_notnull on <self:MNullType> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MNullType___as_notnull].val; /* _as_notnull on <self:MNullType> */
+var2 = self->attrs[COLOR_nitc__model__MNullType___as_notnull].val; /* _as_notnull on <self:MNullType> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _as_notnull");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1715);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1742);
 fatal_exit(1);
 }
 } else {
-var3 = NEW_nit__MBottomType(&type_nit__MBottomType);
+var3 = NEW_nitc__MBottomType(&type_nitc__MBottomType);
 {
 { /* Inline model#MNullType#model (self) on <self:MNullType> */
-var6 = self->attrs[COLOR_nit__model__MNullType___model].val; /* _model on <self:MNullType> */
+var6 = self->attrs[COLOR_nitc__model__MNullType___model].val; /* _model on <self:MNullType> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1709);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1736);
 fatal_exit(1);
 }
 var4 = var6;
@@ -2229,12 +2513,12 @@ RET_LABEL5:(void)0;
 }
 }
 {
-((void(*)(val* self, val* p0))(var3->class->vft[COLOR_nit__model__MBottomType__model_61d]))(var3, var4); /* model= on <var3:MBottomType>*/
+((void(*)(val* self, val* p0))(var3->class->vft[COLOR_nitc__model__MBottomType__model_61d]))(var3, var4); /* model= on <var3:MBottomType>*/
 }
 {
-((void(*)(val* self))(var3->class->vft[COLOR_standard__kernel__Object__init]))(var3); /* init on <var3:MBottomType>*/
+((void(*)(val* self))(var3->class->vft[COLOR_core__kernel__Object__init]))(var3); /* init on <var3:MBottomType>*/
 }
-self->attrs[COLOR_nit__model__MNullType___as_notnull].val = var3; /* _as_notnull on <self:MNullType> */
+self->attrs[COLOR_nitc__model__MNullType___as_notnull].val = var3; /* _as_notnull on <self:MNullType> */
 var2 = var3;
 }
 var = var2;
@@ -2242,7 +2526,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#need_anchor for (self: MNullType): Bool */
-short int nit___nit__MNullType___MType__need_anchor(val* self) {
+short int nitc___nitc__MNullType___MType__need_anchor(val* self) {
 short int var /* : Bool */;
 var = 0;
 goto RET_LABEL;
@@ -2250,7 +2534,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#resolve_for for (self: MNullType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MNullType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MNullType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -2266,7 +2550,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#can_resolve_for for (self: MNullType, MType, nullable MClassType, MModule): Bool */
-short int nit___nit__MNullType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
+short int nitc___nitc__MNullType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
 short int var /* : Bool */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -2280,14 +2564,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#collect_mclassdefs for (self: MNullType, MModule): Set[MClassDef] */
-val* nit___nit__MNullType___MType__collect_mclassdefs(val* self, val* p0) {
+val* nitc___nitc__MNullType___MType__collect_mclassdefs(val* self, val* p0) {
 val* var /* : Set[MClassDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClassDef] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClassDef);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClassDef);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassDef]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassDef]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2295,14 +2579,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#collect_mclasses for (self: MNullType, MModule): Set[MClass] */
-val* nit___nit__MNullType___MType__collect_mclasses(val* self, val* p0) {
+val* nitc___nitc__MNullType___MType__collect_mclasses(val* self, val* p0) {
 val* var /* : Set[MClass] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClass] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClass);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClass);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClass]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClass]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2310,14 +2594,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#collect_mtypes for (self: MNullType, MModule): Set[MClassType] */
-val* nit___nit__MNullType___MType__collect_mtypes(val* self, val* p0) {
+val* nitc___nitc__MNullType___MType__collect_mtypes(val* self, val* p0) {
 val* var /* : Set[MClassType] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClassType] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClassType);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClassType);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassType]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassType]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2325,20 +2609,20 @@ RET_LABEL:;
 return var;
 }
 /* method model#MNullType#init for (self: MNullType) */
-void nit___nit__MNullType___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MNullType___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MNullType___standard__kernel__Object__init]))(self); /* init on <self:MNullType>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MNullType___core__kernel__Object__init]))(self); /* init on <self:MNullType>*/
 }
 RET_LABEL:;
 }
 /* method model#MBottomType#model for (self: MBottomType): Model */
-val* nit___nit__MBottomType___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MBottomType___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : Model */;
-var1 = self->attrs[COLOR_nit__model__MBottomType___model].val; /* _model on <self:MBottomType> */
+var1 = self->attrs[COLOR_nitc__model__MBottomType___model].val; /* _model on <self:MBottomType> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1735);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1762);
 fatal_exit(1);
 }
 var = var1;
@@ -2346,22 +2630,22 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#model= for (self: MBottomType, Model) */
-void nit___nit__MBottomType___model_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MBottomType___model].val = p0; /* _model on <self:MBottomType> */
+void nitc___nitc__MBottomType___model_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MBottomType___model].val = p0; /* _model on <self:MBottomType> */
 RET_LABEL:;
 }
 /* method model#MBottomType#to_s for (self: MBottomType): String */
-val* nit___nit__MBottomType___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MBottomType___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "bottom";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 6l);
+var3 = core__flat___NativeString___to_s_full(var2, 6l, 6l);
 var1 = var3;
 varonce = var1;
 }
@@ -2371,17 +2655,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#full_name for (self: MBottomType): String */
-val* nit___nit__MBottomType___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MBottomType___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "bottom";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 6l);
+var3 = core__flat___NativeString___to_s_full(var2, 6l, 6l);
 var1 = var3;
 varonce = var1;
 }
@@ -2391,17 +2675,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#c_name for (self: MBottomType): String */
-val* nit___nit__MBottomType___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MBottomType___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 static val* varonce;
 val* var1 /* : String */;
 char* var2 /* : NativeString */;
-val* var3 /* : FlatString */;
+val* var3 /* : String */;
 if (likely(varonce!=NULL)) {
 var1 = varonce;
 } else {
 var2 = "bottom";
-var3 = standard___standard__NativeString___to_s_with_length(var2, 6l);
+var3 = core__flat___NativeString___to_s_full(var2, 6l, 6l);
 var1 = var3;
 varonce = var1;
 }
@@ -2411,7 +2695,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#as_nullable for (self: MBottomType): MType */
-val* nit___nit__MBottomType___MType__as_nullable(val* self) {
+val* nitc___nitc__MBottomType___MType__as_nullable(val* self) {
 val* var /* : MType */;
 val* var1 /* : Model */;
 val* var3 /* : Model */;
@@ -2419,10 +2703,10 @@ val* var4 /* : MNullType */;
 val* var6 /* : MNullType */;
 {
 { /* Inline model#MBottomType#model (self) on <self:MBottomType> */
-var3 = self->attrs[COLOR_nit__model__MBottomType___model].val; /* _model on <self:MBottomType> */
+var3 = self->attrs[COLOR_nitc__model__MBottomType___model].val; /* _model on <self:MBottomType> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1735);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1762);
 fatal_exit(1);
 }
 var1 = var3;
@@ -2431,10 +2715,10 @@ RET_LABEL2:(void)0;
 }
 {
 { /* Inline model#Model#null_type (var1) on <var1:Model> */
-var6 = var1->attrs[COLOR_nit__model__Model___null_type].val; /* _null_type on <var1:Model> */
+var6 = var1->attrs[COLOR_nitc__model__Model___null_type].val; /* _null_type on <var1:Model> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _null_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 94);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 94);
 fatal_exit(1);
 }
 var4 = var6;
@@ -2447,7 +2731,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#as_notnull for (self: MBottomType): MType */
-val* nit___nit__MBottomType___MType__as_notnull(val* self) {
+val* nitc___nitc__MBottomType___MType__as_notnull(val* self) {
 val* var /* : MType */;
 var = self;
 goto RET_LABEL;
@@ -2455,7 +2739,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#need_anchor for (self: MBottomType): Bool */
-short int nit___nit__MBottomType___MType__need_anchor(val* self) {
+short int nitc___nitc__MBottomType___MType__need_anchor(val* self) {
 short int var /* : Bool */;
 var = 0;
 goto RET_LABEL;
@@ -2463,7 +2747,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#resolve_for for (self: MBottomType, MType, nullable MClassType, MModule, Bool): MType */
-val* nit___nit__MBottomType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MBottomType___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MType */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -2479,7 +2763,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#can_resolve_for for (self: MBottomType, MType, nullable MClassType, MModule): Bool */
-short int nit___nit__MBottomType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
+short int nitc___nitc__MBottomType___MType__can_resolve_for(val* self, val* p0, val* p1, val* p2) {
 short int var /* : Bool */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -2493,14 +2777,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#collect_mclassdefs for (self: MBottomType, MModule): Set[MClassDef] */
-val* nit___nit__MBottomType___MType__collect_mclassdefs(val* self, val* p0) {
+val* nitc___nitc__MBottomType___MType__collect_mclassdefs(val* self, val* p0) {
 val* var /* : Set[MClassDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClassDef] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClassDef);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClassDef);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassDef]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassDef]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2508,14 +2792,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#collect_mclasses for (self: MBottomType, MModule): Set[MClass] */
-val* nit___nit__MBottomType___MType__collect_mclasses(val* self, val* p0) {
+val* nitc___nitc__MBottomType___MType__collect_mclasses(val* self, val* p0) {
 val* var /* : Set[MClass] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClass] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClass);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClass);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClass]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClass]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2523,14 +2807,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#collect_mtypes for (self: MBottomType, MModule): Set[MClassType] */
-val* nit___nit__MBottomType___MType__collect_mtypes(val* self, val* p0) {
+val* nitc___nitc__MBottomType___MType__collect_mtypes(val* self, val* p0) {
 val* var /* : Set[MClassType] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var1 /* : HashSet[MClassType] */;
 var_mmodule = p0;
-var1 = NEW_standard__HashSet(&type_standard__HashSet__nit__MClassType);
+var1 = NEW_core__HashSet(&type_core__HashSet__nitc__MClassType);
 {
-standard___standard__HashSet___standard__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassType]>*/
+core___core__HashSet___core__kernel__Object__init(var1); /* Direct call hash_collection#HashSet#init on <var1:HashSet[MClassType]>*/
 }
 var = var1;
 goto RET_LABEL;
@@ -2538,20 +2822,20 @@ RET_LABEL:;
 return var;
 }
 /* method model#MBottomType#init for (self: MBottomType) */
-void nit___nit__MBottomType___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MBottomType___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MBottomType___standard__kernel__Object__init]))(self); /* init on <self:MBottomType>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MBottomType___core__kernel__Object__init]))(self); /* init on <self:MBottomType>*/
 }
 RET_LABEL:;
 }
 /* method model#MSignature#mparameters for (self: MSignature): Array[MParameter] */
-val* nit___nit__MSignature___mparameters(val* self) {
+val* nitc___nitc__MSignature___mparameters(val* self) {
 val* var /* : Array[MParameter] */;
 val* var1 /* : Array[MParameter] */;
-var1 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var1 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var = var1;
@@ -2559,19 +2843,19 @@ RET_LABEL:;
 return var;
 }
 /* method model#MSignature#mparameters= for (self: MSignature, Array[MParameter]) */
-void nit___nit__MSignature___mparameters_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MSignature___mparameters].val = p0; /* _mparameters on <self:MSignature> */
+void nitc___nitc__MSignature___mparameters_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MSignature___mparameters].val = p0; /* _mparameters on <self:MSignature> */
 RET_LABEL:;
 }
 /* method model#MSignature#mparameter_by_name for (self: MSignature, String): nullable MParameter */
-val* nit___nit__MSignature___mparameter_by_name(val* self, val* p0) {
+val* nitc___nitc__MSignature___mparameter_by_name(val* self, val* p0) {
 val* var /* : nullable MParameter */;
 val* var_name /* var name: String */;
 val* var1 /* : Array[MParameter] */;
 val* var3 /* : Array[MParameter] */;
 val* var_ /* var : Array[MParameter] */;
-val* var4 /* : ArrayIterator[nullable Object] */;
-val* var_5 /* var : ArrayIterator[MParameter] */;
+val* var4 /* : IndexedIterator[nullable Object] */;
+val* var_5 /* var : IndexedIterator[MParameter] */;
 short int var6 /* : Bool */;
 val* var7 /* : nullable Object */;
 val* var_p /* var p: MParameter */;
@@ -2581,10 +2865,10 @@ short int var11 /* : Bool */;
 var_name = p0;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var3 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var3 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var1 = var3;
@@ -2593,24 +2877,27 @@ RET_LABEL2:(void)0;
 }
 var_ = var1;
 {
-var4 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var4 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_5 = var4;
 for(;;) {
 {
-var6 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_5);
+var6 = ((short int(*)(val* self))((((long)var_5&3)?class_info[((long)var_5&3)]:var_5->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_5); /* is_ok on <var_5:IndexedIterator[MParameter]>*/
 }
 if (var6){
+} else {
+goto BREAK_label;
+}
 {
-var7 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_5);
+var7 = ((val*(*)(val* self))((((long)var_5&3)?class_info[((long)var_5&3)]:var_5->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_5); /* item on <var_5:IndexedIterator[MParameter]>*/
 }
 var_p = var7;
 {
 { /* Inline model#MParameter#name (var_p) on <var_p:MParameter> */
-var10 = var_p->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <var_p:MParameter> */
+var10 = var_p->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <var_p:MParameter> */
 if (unlikely(var10 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var8 = var10;
@@ -2618,7 +2905,7 @@ RET_LABEL9:(void)0;
 }
 }
 {
-var11 = ((short int(*)(val* self, val* p0))(var8->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var8, var_name); /* == on <var8:String>*/
+var11 = ((short int(*)(val* self, val* p0))(var8->class->vft[COLOR_core__kernel__Object___61d_61d]))(var8, var_name); /* == on <var8:String>*/
 }
 if (var11){
 var = var_p;
@@ -2626,15 +2913,12 @@ goto RET_LABEL;
 } else {
 }
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_5); /* Direct call array#ArrayIterator#next on <var_5:ArrayIterator[MParameter]>*/
-}
-} else {
-goto BREAK_label;
+((void(*)(val* self))((((long)var_5&3)?class_info[((long)var_5&3)]:var_5->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_5); /* next on <var_5:IndexedIterator[MParameter]>*/
 }
 }
 BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_5); /* Direct call array#ArrayIterator#finish on <var_5:ArrayIterator[MParameter]>*/
+((void(*)(val* self))((((long)var_5&3)?class_info[((long)var_5&3)]:var_5->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_5); /* finish on <var_5:IndexedIterator[MParameter]>*/
 }
 var = ((val*)NULL);
 goto RET_LABEL;
@@ -2642,21 +2926,21 @@ RET_LABEL:;
 return var;
 }
 /* method model#MSignature#return_mtype for (self: MSignature): nullable MType */
-val* nit___nit__MSignature___return_mtype(val* self) {
+val* nitc___nitc__MSignature___return_mtype(val* self) {
 val* var /* : nullable MType */;
 val* var1 /* : nullable MType */;
-var1 = self->attrs[COLOR_nit__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
+var1 = self->attrs[COLOR_nitc__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MSignature#return_mtype= for (self: MSignature, nullable MType) */
-void nit___nit__MSignature___return_mtype_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MSignature___return_mtype].val = p0; /* _return_mtype on <self:MSignature> */
+void nitc___nitc__MSignature___return_mtype_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MSignature___return_mtype].val = p0; /* _return_mtype on <self:MSignature> */
 RET_LABEL:;
 }
 /* method model#MSignature#length for (self: MSignature): Int */
-long nit___nit__MSignature___MType__length(val* self) {
+long nitc___nitc__MSignature___MType__length(val* self) {
 long var /* : Int */;
 long var_res /* var res: Int */;
 val* var1 /* : nullable MType */;
@@ -2677,8 +2961,8 @@ long var13 /* : Int */;
 val* var14 /* : Array[MParameter] */;
 val* var16 /* : Array[MParameter] */;
 val* var_ /* var : Array[MParameter] */;
-val* var17 /* : ArrayIterator[nullable Object] */;
-val* var_18 /* var : ArrayIterator[MParameter] */;
+val* var17 /* : IndexedIterator[nullable Object] */;
+val* var_18 /* var : IndexedIterator[MParameter] */;
 short int var19 /* : Bool */;
 val* var20 /* : nullable Object */;
 val* var_p /* var p: MParameter */;
@@ -2694,7 +2978,7 @@ long var31 /* : Int */;
 var_res = 1l;
 {
 { /* Inline model#MSignature#return_mtype (self) on <self:MSignature> */
-var3 = self->attrs[COLOR_nit__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
+var3 = self->attrs[COLOR_nitc__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
 var1 = var3;
 RET_LABEL2:(void)0;
 }
@@ -2709,7 +2993,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_t,((val*)NULL)) on <var_t:nullable MType> */
 var_other = ((val*)NULL);
 {
-var7 = ((short int(*)(val* self, val* p0))(var_t->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_t, var_other); /* == on <var_t:nullable MType(MType)>*/
+var7 = ((short int(*)(val* self, val* p0))(var_t->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_t, var_other); /* == on <var_t:nullable MType(MType)>*/
 }
 var8 = !var7;
 var5 = var8;
@@ -2720,7 +3004,7 @@ var4 = var5;
 }
 if (var4){
 {
-var9 = ((long(*)(val* self))(var_t->class->vft[COLOR_nit__model__MType__length]))(var_t); /* length on <var_t:nullable MType(MType)>*/
+var9 = ((long(*)(val* self))(var_t->class->vft[COLOR_nitc__model__MType__length]))(var_t); /* length on <var_t:nullable MType(MType)>*/
 }
 {
 { /* Inline kernel#Int#+ (var_res,var9) on <var_res:Int> */
@@ -2728,9 +3012,9 @@ var9 = ((long(*)(val* self))(var_t->class->vft[COLOR_nit__model__MType__length])
 /* <var9:Int> isa OTHER */
 var12 = 1; /* easy <var9:Int> isa OTHER*/
 if (unlikely(!var12)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 537);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var13 = var_res + var9;
@@ -2744,10 +3028,10 @@ var_res = var10;
 }
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var16 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var16 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var14 = var16;
@@ -2756,24 +3040,27 @@ RET_LABEL15:(void)0;
 }
 var_ = var14;
 {
-var17 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var17 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_18 = var17;
 for(;;) {
 {
-var19 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_18);
+var19 = ((short int(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_18); /* is_ok on <var_18:IndexedIterator[MParameter]>*/
 }
 if (var19){
+} else {
+goto BREAK_label;
+}
 {
-var20 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_18);
+var20 = ((val*(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_18); /* item on <var_18:IndexedIterator[MParameter]>*/
 }
 var_p = var20;
 {
 { /* Inline model#MParameter#mtype (var_p) on <var_p:MParameter> */
-var23 = var_p->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <var_p:MParameter> */
+var23 = var_p->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <var_p:MParameter> */
 if (unlikely(var23 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var21 = var23;
@@ -2781,7 +3068,7 @@ RET_LABEL22:(void)0;
 }
 }
 {
-var24 = ((long(*)(val* self))(var21->class->vft[COLOR_nit__model__MType__length]))(var21); /* length on <var21:MType>*/
+var24 = ((long(*)(val* self))(var21->class->vft[COLOR_nitc__model__MType__length]))(var21); /* length on <var21:MType>*/
 }
 {
 { /* Inline kernel#Int#+ (var_res,var24) on <var_res:Int> */
@@ -2789,9 +3076,9 @@ var24 = ((long(*)(val* self))(var21->class->vft[COLOR_nit__model__MType__length]
 /* <var24:Int> isa OTHER */
 var27 = 1; /* easy <var24:Int> isa OTHER*/
 if (unlikely(!var27)) {
-var_class_name30 = type_standard__Int.name;
+var_class_name30 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name30);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 537);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var31 = var_res + var24;
@@ -2802,15 +3089,12 @@ RET_LABEL26:(void)0;
 }
 var_res = var25;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_18); /* Direct call array#ArrayIterator#next on <var_18:ArrayIterator[MParameter]>*/
-}
-} else {
-goto BREAK_label;
+((void(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_18); /* next on <var_18:IndexedIterator[MParameter]>*/
 }
 }
 BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_18); /* Direct call array#ArrayIterator#finish on <var_18:ArrayIterator[MParameter]>*/
+((void(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_18); /* finish on <var_18:IndexedIterator[MParameter]>*/
 }
 var = var_res;
 goto RET_LABEL;
@@ -2818,7 +3102,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MSignature#init for (self: MSignature) */
-void nit___nit__MSignature___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MSignature___core__kernel__Object__init(val* self) {
 long var /* : Int */;
 long var2 /* : Int */;
 long var_vararg_rank /* var vararg_rank: Int */;
@@ -2840,13 +3124,17 @@ val* var16 /* : nullable Object */;
 val* var_parameter /* var parameter: MParameter */;
 short int var17 /* : Bool */;
 short int var19 /* : Bool */;
-long var20 /* : Int */;
-long var22 /* : Int */;
-short int var23 /* : Bool */;
-short int var25 /* : Bool */;
-long var26 /* : Int */;
+short int var20 /* : Bool */;
+short int var22 /* : Bool */;
+int cltype23;
+int idtype24;
+const char* var_class_name25;
+short int var26 /* : Bool */;
+long var27 /* : Int */;
+long var29 /* : Int */;
+long var30 /* : Int */;
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MSignature___standard__kernel__Object__init]))(self); /* init on <self:MSignature>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MSignature___core__kernel__Object__init]))(self); /* init on <self:MSignature>*/
 }
 {
 { /* Inline kernel#Int#unary - (1l) on <1l:Int> */
@@ -2860,10 +3148,10 @@ var_vararg_rank = var;
 var_i = 0l;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var5 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var5 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var3 = var5;
@@ -2872,7 +3160,7 @@ RET_LABEL4:(void)0;
 }
 {
 { /* Inline array#AbstractArrayRead#length (var3) on <var3:Array[MParameter]> */
-var8 = var3->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var3:Array[MParameter]> */
+var8 = var3->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var3:Array[MParameter]> */
 var6 = var8;
 RET_LABEL7:(void)0;
 }
@@ -2885,9 +3173,9 @@ for(;;) {
 /* <var_:Int> isa OTHER */
 var11 = 1; /* easy <var_:Int> isa OTHER*/
 if (unlikely(!var11)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 534);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var12 = var_i < var_;
@@ -2897,12 +3185,15 @@ RET_LABEL10:(void)0;
 }
 }
 if (var9){
+} else {
+goto BREAK_label;
+}
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var15 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var15 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var15 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var13 = var15;
@@ -2910,74 +3201,80 @@ RET_LABEL14:(void)0;
 }
 }
 {
-var16 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var13, var_i);
+var16 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var13, var_i);
 }
 var_parameter = var16;
 {
 { /* Inline model#MParameter#is_vararg (var_parameter) on <var_parameter:MParameter> */
-var19 = var_parameter->attrs[COLOR_nit__model__MParameter___is_vararg].s; /* _is_vararg on <var_parameter:MParameter> */
+var19 = var_parameter->attrs[COLOR_nitc__model__MParameter___is_vararg].s; /* _is_vararg on <var_parameter:MParameter> */
 var17 = var19;
 RET_LABEL18:(void)0;
 }
 }
 if (var17){
 {
-{ /* Inline kernel#Int#unary - (1l) on <1l:Int> */
-var22 = -1l;
-var20 = var22;
+{ /* Inline kernel#Int#>= (var_vararg_rank,0l) on <var_vararg_rank:Int> */
+/* Covariant cast for argument 0 (i) <0l:Int> isa OTHER */
+/* <0l:Int> isa OTHER */
+var22 = 1; /* easy <0l:Int> isa OTHER*/
+if (unlikely(!var22)) {
+var_class_name25 = type_core__Int.name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name25);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 729);
+fatal_exit(1);
+}
+var26 = var_vararg_rank >= 0l;
+var20 = var26;
 goto RET_LABEL21;
 RET_LABEL21:(void)0;
 }
 }
+if (var20){
 {
-{ /* Inline kernel#Int#== (var_vararg_rank,var20) on <var_vararg_rank:Int> */
-var25 = var_vararg_rank == var20;
-var23 = var25;
-goto RET_LABEL24;
-RET_LABEL24:(void)0;
+{ /* Inline kernel#Int#unary - (1l) on <1l:Int> */
+var29 = -1l;
+var27 = var29;
+goto RET_LABEL28;
+RET_LABEL28:(void)0;
 }
 }
-if (unlikely(!var23)) {
-PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1801);
-fatal_exit(1);
+var_vararg_rank = var27;
+goto BREAK_label;
+} else {
 }
 var_vararg_rank = var_i;
 } else {
 }
 {
-var26 = standard___standard__Int___Discrete__successor(var_i, 1l);
-}
-var_i = var26;
-} else {
-goto BREAK_label;
+var30 = core___core__Int___Discrete__successor(var_i, 1l);
 }
+var_i = var30;
 }
 BREAK_label: (void)0;
 {
 { /* Inline model#MSignature#vararg_rank= (self,var_vararg_rank) on <self:MSignature> */
-self->attrs[COLOR_nit__model__MSignature___vararg_rank].l = var_vararg_rank; /* _vararg_rank on <self:MSignature> */
-RET_LABEL27:(void)0;
+self->attrs[COLOR_nitc__model__MSignature___vararg_rank].l = var_vararg_rank; /* _vararg_rank on <self:MSignature> */
+RET_LABEL31:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method model#MSignature#vararg_rank for (self: MSignature): Int */
-long nit___nit__MSignature___vararg_rank(val* self) {
+long nitc___nitc__MSignature___vararg_rank(val* self) {
 long var /* : Int */;
 long var1 /* : Int */;
-var1 = self->attrs[COLOR_nit__model__MSignature___vararg_rank].l; /* _vararg_rank on <self:MSignature> */
+var1 = self->attrs[COLOR_nitc__model__MSignature___vararg_rank].l; /* _vararg_rank on <self:MSignature> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MSignature#vararg_rank= for (self: MSignature, Int) */
-void nit___nit__MSignature___vararg_rank_61d(val* self, long p0) {
-self->attrs[COLOR_nit__model__MSignature___vararg_rank].l = p0; /* _vararg_rank on <self:MSignature> */
+void nitc___nitc__MSignature___vararg_rank_61d(val* self, long p0) {
+self->attrs[COLOR_nitc__model__MSignature___vararg_rank].l = p0; /* _vararg_rank on <self:MSignature> */
 RET_LABEL:;
 }
 /* method model#MSignature#arity for (self: MSignature): Int */
-long nit___nit__MSignature___arity(val* self) {
+long nitc___nitc__MSignature___arity(val* self) {
 long var /* : Int */;
 val* var1 /* : Array[MParameter] */;
 val* var3 /* : Array[MParameter] */;
@@ -2985,10 +3282,10 @@ long var4 /* : Int */;
 long var6 /* : Int */;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var3 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var3 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var1 = var3;
@@ -2997,7 +3294,7 @@ RET_LABEL2:(void)0;
 }
 {
 { /* Inline array#AbstractArrayRead#length (var1) on <var1:Array[MParameter]> */
-var6 = var1->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var1:Array[MParameter]> */
+var6 = var1->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var1:Array[MParameter]> */
 var4 = var6;
 RET_LABEL5:(void)0;
 }
@@ -3007,141 +3304,8 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method model#MSignature#min_arity for (self: MSignature): Int */
-long nit___nit__MSignature___min_arity(val* self) {
-long var /* : Int */;
-long var1 /* : Int */;
-long var3 /* : Int */;
-long var4 /* : Int */;
-long var6 /* : Int */;
-short int var7 /* : Bool */;
-short int var9 /* : Bool */;
-short int var10 /* : Bool */;
-long var11 /* : Int */;
-long var_res /* var res: Int */;
-val* var12 /* : Array[MParameter] */;
-val* var14 /* : Array[MParameter] */;
-val* var_ /* var : Array[MParameter] */;
-val* var15 /* : ArrayIterator[nullable Object] */;
-val* var_16 /* var : ArrayIterator[MParameter] */;
-short int var17 /* : Bool */;
-val* var18 /* : nullable Object */;
-val* var_p /* var p: MParameter */;
-short int var19 /* : Bool */;
-short int var21 /* : Bool */;
-short int var22 /* : Bool */;
-long var23 /* : Int */;
-short int var25 /* : Bool */;
-int cltype;
-int idtype;
-const char* var_class_name;
-long var26 /* : Int */;
-{
-{ /* Inline model#MSignature#vararg_rank (self) on <self:MSignature> */
-var3 = self->attrs[COLOR_nit__model__MSignature___vararg_rank].l; /* _vararg_rank on <self:MSignature> */
-var1 = var3;
-RET_LABEL2:(void)0;
-}
-}
-{
-{ /* Inline kernel#Int#unary - (1l) on <1l:Int> */
-var6 = -1l;
-var4 = var6;
-goto RET_LABEL5;
-RET_LABEL5:(void)0;
-}
-}
-{
-{ /* Inline kernel#Int#!= (var1,var4) on <var1:Int> */
-var9 = var1 == var4;
-var10 = !var9;
-var7 = var10;
-goto RET_LABEL8;
-RET_LABEL8:(void)0;
-}
-}
-if (var7){
-{
-var11 = nit___nit__MSignature___arity(self);
-}
-var = var11;
-goto RET_LABEL;
-} else {
-}
-var_res = 0l;
-{
-{ /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var14 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
-if (unlikely(var14 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
-fatal_exit(1);
-}
-var12 = var14;
-RET_LABEL13:(void)0;
-}
-}
-var_ = var12;
-{
-var15 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
-}
-var_16 = var15;
-for(;;) {
-{
-var17 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_16);
-}
-if (var17){
-{
-var18 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_16);
-}
-var_p = var18;
-{
-{ /* Inline model#MParameter#is_default (var_p) on <var_p:MParameter> */
-var21 = var_p->attrs[COLOR_nit__model__MParameter___is_default].s; /* _is_default on <var_p:MParameter> */
-var19 = var21;
-RET_LABEL20:(void)0;
-}
-}
-var22 = !var19;
-if (var22){
-{
-{ /* Inline kernel#Int#+ (var_res,1l) on <var_res:Int> */
-/* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
-/* <1l:Int> isa OTHER */
-var25 = 1; /* easy <1l:Int> isa OTHER*/
-if (unlikely(!var25)) {
-var_class_name = type_standard__Int.name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 537);
-fatal_exit(1);
-}
-var26 = var_res + 1l;
-var23 = var26;
-goto RET_LABEL24;
-RET_LABEL24:(void)0;
-}
-}
-var_res = var23;
-} else {
-}
-{
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_16); /* Direct call array#ArrayIterator#next on <var_16:ArrayIterator[MParameter]>*/
-}
-} else {
-goto BREAK_label;
-}
-}
-BREAK_label: (void)0;
-{
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_16); /* Direct call array#ArrayIterator#finish on <var_16:ArrayIterator[MParameter]>*/
-}
-var = var_res;
-goto RET_LABEL;
-RET_LABEL:;
-return var;
-}
 /* method model#MSignature#to_s for (self: MSignature): String */
-val* nit___nit__MSignature___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MSignature___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : FlatBuffer */;
 val* var_b /* var b: FlatBuffer */;
@@ -3152,7 +3316,7 @@ short int var7 /* : Bool */;
 static val* varonce;
 val* var8 /* : String */;
 char* var9 /* : NativeString */;
-val* var10 /* : FlatString */;
+val* var10 /* : String */;
 long var_i /* var i: Int */;
 val* var11 /* : Array[MParameter] */;
 val* var13 /* : Array[MParameter] */;
@@ -3178,13 +3342,13 @@ short int var31 /* : Bool */;
 static val* varonce32;
 val* var33 /* : String */;
 char* var34 /* : NativeString */;
-val* var35 /* : FlatString */;
+val* var35 /* : String */;
 val* var36 /* : String */;
 val* var38 /* : String */;
 static val* varonce39;
 val* var40 /* : String */;
 char* var41 /* : NativeString */;
-val* var42 /* : FlatString */;
+val* var42 /* : String */;
 val* var43 /* : MType */;
 val* var45 /* : MType */;
 val* var46 /* : String */;
@@ -3193,12 +3357,12 @@ short int var49 /* : Bool */;
 static val* varonce50;
 val* var51 /* : String */;
 char* var52 /* : NativeString */;
-val* var53 /* : FlatString */;
+val* var53 /* : String */;
 long var54 /* : Int */;
 static val* varonce55;
 val* var56 /* : String */;
 char* var57 /* : NativeString */;
-val* var58 /* : FlatString */;
+val* var58 /* : String */;
 val* var59 /* : nullable MType */;
 val* var61 /* : nullable MType */;
 val* var_ret /* var ret: nullable MType */;
@@ -3210,14 +3374,14 @@ short int var66 /* : Bool */;
 static val* varonce67;
 val* var68 /* : String */;
 char* var69 /* : NativeString */;
-val* var70 /* : FlatString */;
+val* var70 /* : String */;
 val* var71 /* : String */;
 val* var72 /* : String */;
-var1 = NEW_standard__FlatBuffer(&type_standard__FlatBuffer);
+var1 = NEW_core__FlatBuffer(&type_core__FlatBuffer);
 {
-{ /* Inline string#FlatBuffer#init (var1) on <var1:FlatBuffer> */
+{ /* Inline flat#FlatBuffer#init (var1) on <var1:FlatBuffer> */
 {
-((void(*)(val* self))(var1->class->vft[COLOR_standard___standard__FlatBuffer___standard__kernel__Object__init]))(var1); /* init on <var1:FlatBuffer>*/
+((void(*)(val* self))(var1->class->vft[COLOR_core___core__FlatBuffer___core__kernel__Object__init]))(var1); /* init on <var1:FlatBuffer>*/
 }
 RET_LABEL2:(void)0;
 }
@@ -3225,10 +3389,10 @@ RET_LABEL2:(void)0;
 var_b = var1;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var5 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var5 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var3 = var5;
@@ -3236,7 +3400,7 @@ RET_LABEL4:(void)0;
 }
 }
 {
-var6 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__is_empty(var3);
+var6 = core___core__AbstractArrayRead___core__abstract_collection__Collection__is_empty(var3);
 }
 var7 = !var6;
 if (var7){
@@ -3244,20 +3408,20 @@ if (likely(varonce!=NULL)) {
 var8 = varonce;
 } else {
 var9 = "(";
-var10 = standard___standard__NativeString___to_s_with_length(var9, 1l);
+var10 = core__flat___NativeString___to_s_full(var9, 1l, 1l);
 var8 = var10;
 varonce = var8;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var8); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var8); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 var_i = 0l;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var13 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var13 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var13 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var11 = var13;
@@ -3266,7 +3430,7 @@ RET_LABEL12:(void)0;
 }
 {
 { /* Inline array#AbstractArrayRead#length (var11) on <var11:Array[MParameter]> */
-var16 = var11->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var11:Array[MParameter]> */
+var16 = var11->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var11:Array[MParameter]> */
 var14 = var16;
 RET_LABEL15:(void)0;
 }
@@ -3279,9 +3443,9 @@ for(;;) {
 /* <var_:Int> isa OTHER */
 var19 = 1; /* easy <var_:Int> isa OTHER*/
 if (unlikely(!var19)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 534);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var20 = var_i < var_;
@@ -3291,12 +3455,15 @@ RET_LABEL18:(void)0;
 }
 }
 if (var17){
+} else {
+goto BREAK_label;
+}
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var23 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var23 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var23 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var21 = var23;
@@ -3304,7 +3471,7 @@ RET_LABEL22:(void)0;
 }
 }
 {
-var24 = standard___standard__Array___standard__abstract_collection__SequenceRead___91d_93d(var21, var_i);
+var24 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var21, var_i);
 }
 var_mparameter = var24;
 {
@@ -3313,9 +3480,9 @@ var_mparameter = var24;
 /* <0l:Int> isa OTHER */
 var27 = 1; /* easy <0l:Int> isa OTHER*/
 if (unlikely(!var27)) {
-var_class_name30 = type_standard__Int.name;
+var_class_name30 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name30);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 536);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 730);
 fatal_exit(1);
 }
 var31 = var_i > 0l;
@@ -3329,21 +3496,21 @@ if (likely(varonce32!=NULL)) {
 var33 = varonce32;
 } else {
 var34 = ", ";
-var35 = standard___standard__NativeString___to_s_with_length(var34, 2l);
+var35 = core__flat___NativeString___to_s_full(var34, 2l, 2l);
 var33 = var35;
 varonce32 = var33;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var33); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var33); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 } else {
 }
 {
 { /* Inline model#MParameter#name (var_mparameter) on <var_mparameter:MParameter> */
-var38 = var_mparameter->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <var_mparameter:MParameter> */
+var38 = var_mparameter->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <var_mparameter:MParameter> */
 if (unlikely(var38 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var36 = var38;
@@ -3351,25 +3518,25 @@ RET_LABEL37:(void)0;
 }
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var36); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var36); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 if (likely(varonce39!=NULL)) {
 var40 = varonce39;
 } else {
 var41 = ": ";
-var42 = standard___standard__NativeString___to_s_with_length(var41, 2l);
+var42 = core__flat___NativeString___to_s_full(var41, 2l, 2l);
 var40 = var42;
 varonce39 = var40;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var40); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var40); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 {
 { /* Inline model#MParameter#mtype (var_mparameter) on <var_mparameter:MParameter> */
-var45 = var_mparameter->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <var_mparameter:MParameter> */
+var45 = var_mparameter->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <var_mparameter:MParameter> */
 if (unlikely(var45 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var43 = var45;
@@ -3377,14 +3544,14 @@ RET_LABEL44:(void)0;
 }
 }
 {
-var46 = ((val*(*)(val* self))(var43->class->vft[COLOR_standard__string__Object__to_s]))(var43); /* to_s on <var43:MType>*/
+var46 = ((val*(*)(val* self))(var43->class->vft[COLOR_core__abstract_text__Object__to_s]))(var43); /* to_s on <var43:MType>*/
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var46); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var46); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 {
 { /* Inline model#MParameter#is_vararg (var_mparameter) on <var_mparameter:MParameter> */
-var49 = var_mparameter->attrs[COLOR_nit__model__MParameter___is_vararg].s; /* _is_vararg on <var_mparameter:MParameter> */
+var49 = var_mparameter->attrs[COLOR_nitc__model__MParameter___is_vararg].s; /* _is_vararg on <var_mparameter:MParameter> */
 var47 = var49;
 RET_LABEL48:(void)0;
 }
@@ -3394,40 +3561,37 @@ if (likely(varonce50!=NULL)) {
 var51 = varonce50;
 } else {
 var52 = "...";
-var53 = standard___standard__NativeString___to_s_with_length(var52, 3l);
+var53 = core__flat___NativeString___to_s_full(var52, 3l, 3l);
 var51 = var53;
 varonce50 = var51;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var51); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var51); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 } else {
 }
 {
-var54 = standard___standard__Int___Discrete__successor(var_i, 1l);
+var54 = core___core__Int___Discrete__successor(var_i, 1l);
 }
 var_i = var54;
-} else {
-goto BREAK_label;
-}
 }
 BREAK_label: (void)0;
 if (likely(varonce55!=NULL)) {
 var56 = varonce55;
 } else {
 var57 = ")";
-var58 = standard___standard__NativeString___to_s_with_length(var57, 1l);
+var58 = core__flat___NativeString___to_s_full(var57, 1l, 1l);
 var56 = var58;
 varonce55 = var56;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var56); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var56); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 } else {
 }
 {
 { /* Inline model#MSignature#return_mtype (self) on <self:MSignature> */
-var61 = self->attrs[COLOR_nit__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
+var61 = self->attrs[COLOR_nitc__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
 var59 = var61;
 RET_LABEL60:(void)0;
 }
@@ -3442,7 +3606,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_ret,((val*)NULL)) on <var_ret:nullable MType> */
 var_other = ((val*)NULL);
 {
-var65 = ((short int(*)(val* self, val* p0))(var_ret->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_ret, var_other); /* == on <var_ret:nullable MType(MType)>*/
+var65 = ((short int(*)(val* self, val* p0))(var_ret->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_ret, var_other); /* == on <var_ret:nullable MType(MType)>*/
 }
 var66 = !var65;
 var63 = var66;
@@ -3456,23 +3620,23 @@ if (likely(varonce67!=NULL)) {
 var68 = varonce67;
 } else {
 var69 = ": ";
-var70 = standard___standard__NativeString___to_s_with_length(var69, 2l);
+var70 = core__flat___NativeString___to_s_full(var69, 2l, 2l);
 var68 = var70;
 varonce67 = var68;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var68); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var68); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 {
-var71 = ((val*(*)(val* self))(var_ret->class->vft[COLOR_standard__string__Object__to_s]))(var_ret); /* to_s on <var_ret:nullable MType(MType)>*/
+var71 = ((val*(*)(val* self))(var_ret->class->vft[COLOR_core__abstract_text__Object__to_s]))(var_ret); /* to_s on <var_ret:nullable MType(MType)>*/
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_b, var71); /* Direct call string#FlatBuffer#append on <var_b:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_b, var71); /* Direct call flat#FlatBuffer#append on <var_b:FlatBuffer>*/
 }
 } else {
 }
 {
-var72 = standard___standard__FlatBuffer___Object__to_s(var_b);
+var72 = core___core__FlatBuffer___core__abstract_text__Object__to_s(var_b);
 }
 var = var72;
 goto RET_LABEL;
@@ -3480,7 +3644,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MSignature#resolve_for for (self: MSignature, MType, nullable MClassType, MModule, Bool): MSignature */
-val* nit___nit__MSignature___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MSignature___MType__resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MSignature */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -3491,8 +3655,8 @@ val* var_params /* var params: Array[MParameter] */;
 val* var2 /* : Array[MParameter] */;
 val* var4 /* : Array[MParameter] */;
 val* var_ /* var : Array[MParameter] */;
-val* var5 /* : ArrayIterator[nullable Object] */;
-val* var_6 /* var : ArrayIterator[MParameter] */;
+val* var5 /* : IndexedIterator[nullable Object] */;
+val* var_6 /* var : IndexedIterator[MParameter] */;
 short int var7 /* : Bool */;
 val* var8 /* : nullable Object */;
 val* var_p /* var p: MParameter */;
@@ -3512,17 +3676,17 @@ var_mtype = p0;
 var_anchor = p1;
 var_mmodule = p2;
 var_cleanup_virtual = p3;
-var1 = NEW_standard__Array(&type_standard__Array__nit__MParameter);
+var1 = NEW_core__Array(&type_core__Array__nitc__MParameter);
 {
-standard___standard__Array___standard__kernel__Object__init(var1); /* Direct call array#Array#init on <var1:Array[MParameter]>*/
+core___core__Array___core__kernel__Object__init(var1); /* Direct call array#Array#init on <var1:Array[MParameter]>*/
 }
 var_params = var1;
 {
 { /* Inline model#MSignature#mparameters (self) on <self:MSignature> */
-var4 = self->attrs[COLOR_nit__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
+var4 = self->attrs[COLOR_nitc__model__MSignature___mparameters].val; /* _mparameters on <self:MSignature> */
 if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mparameters");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1756);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1783);
 fatal_exit(1);
 }
 var2 = var4;
@@ -3531,38 +3695,38 @@ RET_LABEL3:(void)0;
 }
 var_ = var2;
 {
-var5 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var5 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_6 = var5;
 for(;;) {
 {
-var7 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_6);
+var7 = ((short int(*)(val* self))((((long)var_6&3)?class_info[((long)var_6&3)]:var_6->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_6); /* is_ok on <var_6:IndexedIterator[MParameter]>*/
 }
 if (var7){
+} else {
+goto BREAK_label;
+}
 {
-var8 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_6);
+var8 = ((val*(*)(val* self))((((long)var_6&3)?class_info[((long)var_6&3)]:var_6->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_6); /* item on <var_6:IndexedIterator[MParameter]>*/
 }
 var_p = var8;
 {
-var9 = nit___nit__MParameter___resolve_for(var_p, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual);
+var9 = nitc___nitc__MParameter___resolve_for(var_p, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual);
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_params, var9); /* Direct call array#Array#add on <var_params:Array[MParameter]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var_params, var9); /* Direct call array#Array#add on <var_params:Array[MParameter]>*/
 }
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_6); /* Direct call array#ArrayIterator#next on <var_6:ArrayIterator[MParameter]>*/
-}
-} else {
-goto BREAK_label;
+((void(*)(val* self))((((long)var_6&3)?class_info[((long)var_6&3)]:var_6->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_6); /* next on <var_6:IndexedIterator[MParameter]>*/
 }
 }
 BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_6); /* Direct call array#ArrayIterator#finish on <var_6:ArrayIterator[MParameter]>*/
+((void(*)(val* self))((((long)var_6&3)?class_info[((long)var_6&3)]:var_6->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_6); /* finish on <var_6:IndexedIterator[MParameter]>*/
 }
 {
 { /* Inline model#MSignature#return_mtype (self) on <self:MSignature> */
-var12 = self->attrs[COLOR_nit__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
+var12 = self->attrs[COLOR_nitc__model__MSignature___return_mtype].val; /* _return_mtype on <self:MSignature> */
 var10 = var12;
 RET_LABEL11:(void)0;
 }
@@ -3577,7 +3741,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_ret,((val*)NULL)) on <var_ret:nullable MType> */
 var_other = ((val*)NULL);
 {
-var16 = ((short int(*)(val* self, val* p0))(var_ret->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_ret, var_other); /* == on <var_ret:nullable MType(MType)>*/
+var16 = ((short int(*)(val* self, val* p0))(var_ret->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_ret, var_other); /* == on <var_ret:nullable MType(MType)>*/
 }
 var17 = !var16;
 var14 = var17;
@@ -3588,20 +3752,20 @@ var13 = var14;
 }
 if (var13){
 {
-var18 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_ret->class->vft[COLOR_nit__model__MType__resolve_for]))(var_ret, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var_ret:nullable MType(MType)>*/
+var18 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var_ret->class->vft[COLOR_nitc__model__MType__resolve_for]))(var_ret, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var_ret:nullable MType(MType)>*/
 }
 var_ret = var18;
 } else {
 }
-var19 = NEW_nit__MSignature(&type_nit__MSignature);
+var19 = NEW_nitc__MSignature(&type_nitc__MSignature);
 {
-((void(*)(val* self, val* p0))(var19->class->vft[COLOR_nit__model__MSignature__mparameters_61d]))(var19, var_params); /* mparameters= on <var19:MSignature>*/
+((void(*)(val* self, val* p0))(var19->class->vft[COLOR_nitc__model__MSignature__mparameters_61d]))(var19, var_params); /* mparameters= on <var19:MSignature>*/
 }
 {
-((void(*)(val* self, val* p0))(var19->class->vft[COLOR_nit__model__MSignature__return_mtype_61d]))(var19, var_ret); /* return_mtype= on <var19:MSignature>*/
+((void(*)(val* self, val* p0))(var19->class->vft[COLOR_nitc__model__MSignature__return_mtype_61d]))(var19, var_ret); /* return_mtype= on <var19:MSignature>*/
 }
 {
-((void(*)(val* self))(var19->class->vft[COLOR_standard__kernel__Object__init]))(var19); /* init on <var19:MSignature>*/
+((void(*)(val* self))(var19->class->vft[COLOR_core__kernel__Object__init]))(var19); /* init on <var19:MSignature>*/
 }
 var_res = var19;
 var = var_res;
@@ -3610,13 +3774,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#name for (self: MParameter): String */
-val* nit___nit__MParameter___nit__model_base__MEntity__name(val* self) {
+val* nitc___nitc__MParameter___nitc__model_base__MEntity__name(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <self:MParameter> */
+var1 = self->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <self:MParameter> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var = var1;
@@ -3624,18 +3788,18 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#name= for (self: MParameter, String) */
-void nit___nit__MParameter___name_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MParameter___name].val = p0; /* _name on <self:MParameter> */
+void nitc___nitc__MParameter___name_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MParameter___name].val = p0; /* _name on <self:MParameter> */
 RET_LABEL:;
 }
 /* method model#MParameter#mtype for (self: MParameter): MType */
-val* nit___nit__MParameter___mtype(val* self) {
+val* nitc___nitc__MParameter___mtype(val* self) {
 val* var /* : MType */;
 val* var1 /* : MType */;
-var1 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var1 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var = var1;
@@ -3643,40 +3807,26 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#mtype= for (self: MParameter, MType) */
-void nit___nit__MParameter___mtype_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MParameter___mtype].val = p0; /* _mtype on <self:MParameter> */
+void nitc___nitc__MParameter___mtype_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MParameter___mtype].val = p0; /* _mtype on <self:MParameter> */
 RET_LABEL:;
 }
 /* method model#MParameter#is_vararg for (self: MParameter): Bool */
-short int nit___nit__MParameter___is_vararg(val* self) {
+short int nitc___nitc__MParameter___is_vararg(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
+var1 = self->attrs[COLOR_nitc__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MParameter#is_vararg= for (self: MParameter, Bool) */
-void nit___nit__MParameter___is_vararg_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MParameter___is_vararg].s = p0; /* _is_vararg on <self:MParameter> */
-RET_LABEL:;
-}
-/* method model#MParameter#is_default for (self: MParameter): Bool */
-short int nit___nit__MParameter___is_default(val* self) {
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MParameter___is_default].s; /* _is_default on <self:MParameter> */
-var = var1;
-RET_LABEL:;
-return var;
-}
-/* method model#MParameter#is_default= for (self: MParameter, Bool) */
-void nit___nit__MParameter___is_default_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MParameter___is_default].s = p0; /* _is_default on <self:MParameter> */
+void nitc___nitc__MParameter___is_vararg_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MParameter___is_vararg].s = p0; /* _is_vararg on <self:MParameter> */
 RET_LABEL:;
 }
 /* method model#MParameter#to_s for (self: MParameter): String */
-val* nit___nit__MParameter___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MParameter___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 short int var3 /* : Bool */;
@@ -3685,11 +3835,11 @@ static val* varonce;
 static val* varonce5;
 val* var6 /* : String */;
 char* var7 /* : NativeString */;
-val* var8 /* : FlatString */;
+val* var8 /* : String */;
 static val* varonce9;
 val* var10 /* : String */;
 char* var11 /* : NativeString */;
-val* var12 /* : FlatString */;
+val* var12 /* : String */;
 val* var13 /* : String */;
 val* var15 /* : String */;
 val* var16 /* : MType */;
@@ -3701,7 +3851,7 @@ static val* varonce21;
 static val* varonce23;
 val* var24 /* : String */;
 char* var25 /* : NativeString */;
-val* var26 /* : FlatString */;
+val* var26 /* : String */;
 val* var27 /* : String */;
 val* var29 /* : String */;
 val* var30 /* : MType */;
@@ -3710,55 +3860,55 @@ val* var33 /* : String */;
 val* var34 /* : String */;
 {
 { /* Inline model#MParameter#is_vararg (self) on <self:MParameter> */
-var3 = self->attrs[COLOR_nit__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
+var3 = self->attrs[COLOR_nitc__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
 var1 = var3;
 RET_LABEL2:(void)0;
 }
 }
 if (var1){
 if (unlikely(varonce==NULL)) {
-var4 = NEW_standard__NativeArray(4l, &type_standard__NativeArray__standard__String);
+var4 = NEW_core__NativeArray(4l, &type_core__NativeArray__core__String);
 if (likely(varonce5!=NULL)) {
 var6 = varonce5;
 } else {
 var7 = ": ";
-var8 = standard___standard__NativeString___to_s_with_length(var7, 2l);
+var8 = core__flat___NativeString___to_s_full(var7, 2l, 2l);
 var6 = var8;
 varonce5 = var6;
 }
-((struct instance_standard__NativeArray*)var4)->values[1]=var6;
+((struct instance_core__NativeArray*)var4)->values[1]=var6;
 if (likely(varonce9!=NULL)) {
 var10 = varonce9;
 } else {
 var11 = "...";
-var12 = standard___standard__NativeString___to_s_with_length(var11, 3l);
+var12 = core__flat___NativeString___to_s_full(var11, 3l, 3l);
 var10 = var12;
 varonce9 = var10;
 }
-((struct instance_standard__NativeArray*)var4)->values[3]=var10;
+((struct instance_core__NativeArray*)var4)->values[3]=var10;
 } else {
 var4 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MParameter#name (self) on <self:MParameter> */
-var15 = self->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <self:MParameter> */
+var15 = self->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <self:MParameter> */
 if (unlikely(var15 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var13 = var15;
 RET_LABEL14:(void)0;
 }
 }
-((struct instance_standard__NativeArray*)var4)->values[0]=var13;
+((struct instance_core__NativeArray*)var4)->values[0]=var13;
 {
 { /* Inline model#MParameter#mtype (self) on <self:MParameter> */
-var18 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var18 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var18 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var16 = var18;
@@ -3766,50 +3916,50 @@ RET_LABEL17:(void)0;
 }
 }
 {
-var19 = ((val*(*)(val* self))(var16->class->vft[COLOR_standard__string__Object__to_s]))(var16); /* to_s on <var16:MType>*/
+var19 = ((val*(*)(val* self))(var16->class->vft[COLOR_core__abstract_text__Object__to_s]))(var16); /* to_s on <var16:MType>*/
 }
-((struct instance_standard__NativeArray*)var4)->values[2]=var19;
+((struct instance_core__NativeArray*)var4)->values[2]=var19;
 {
-var20 = ((val*(*)(val* self))(var4->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var4); /* native_to_s on <var4:NativeArray[String]>*/
+var20 = ((val*(*)(val* self))(var4->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var4); /* native_to_s on <var4:NativeArray[String]>*/
 }
 varonce = var4;
 var = var20;
 goto RET_LABEL;
 } else {
 if (unlikely(varonce21==NULL)) {
-var22 = NEW_standard__NativeArray(3l, &type_standard__NativeArray__standard__String);
+var22 = NEW_core__NativeArray(3l, &type_core__NativeArray__core__String);
 if (likely(varonce23!=NULL)) {
 var24 = varonce23;
 } else {
 var25 = ": ";
-var26 = standard___standard__NativeString___to_s_with_length(var25, 2l);
+var26 = core__flat___NativeString___to_s_full(var25, 2l, 2l);
 var24 = var26;
 varonce23 = var24;
 }
-((struct instance_standard__NativeArray*)var22)->values[1]=var24;
+((struct instance_core__NativeArray*)var22)->values[1]=var24;
 } else {
 var22 = varonce21;
 varonce21 = NULL;
 }
 {
 { /* Inline model#MParameter#name (self) on <self:MParameter> */
-var29 = self->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <self:MParameter> */
+var29 = self->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <self:MParameter> */
 if (unlikely(var29 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var27 = var29;
 RET_LABEL28:(void)0;
 }
 }
-((struct instance_standard__NativeArray*)var22)->values[0]=var27;
+((struct instance_core__NativeArray*)var22)->values[0]=var27;
 {
 { /* Inline model#MParameter#mtype (self) on <self:MParameter> */
-var32 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var32 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var32 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var30 = var32;
@@ -3817,11 +3967,11 @@ RET_LABEL31:(void)0;
 }
 }
 {
-var33 = ((val*(*)(val* self))(var30->class->vft[COLOR_standard__string__Object__to_s]))(var30); /* to_s on <var30:MType>*/
+var33 = ((val*(*)(val* self))(var30->class->vft[COLOR_core__abstract_text__Object__to_s]))(var30); /* to_s on <var30:MType>*/
 }
-((struct instance_standard__NativeArray*)var22)->values[2]=var33;
+((struct instance_core__NativeArray*)var22)->values[2]=var33;
 {
-var34 = ((val*(*)(val* self))(var22->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var22); /* native_to_s on <var22:NativeArray[String]>*/
+var34 = ((val*(*)(val* self))(var22->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var22); /* native_to_s on <var22:NativeArray[String]>*/
 }
 varonce21 = var22;
 var = var34;
@@ -3831,7 +3981,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#resolve_for for (self: MParameter, MType, nullable MClassType, MModule, Bool): MParameter */
-val* nit___nit__MParameter___resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
+val* nitc___nitc__MParameter___resolve_for(val* self, val* p0, val* p1, val* p2, short int p3) {
 val* var /* : MParameter */;
 val* var_mtype /* var mtype: MType */;
 val* var_anchor /* var anchor: nullable MClassType */;
@@ -3850,8 +4000,6 @@ val* var11 /* : String */;
 val* var13 /* : String */;
 short int var14 /* : Bool */;
 short int var16 /* : Bool */;
-short int var17 /* : Bool */;
-short int var19 /* : Bool */;
 val* var_res /* var res: MParameter */;
 var_mtype = p0;
 var_anchor = p1;
@@ -3859,10 +4007,10 @@ var_mmodule = p2;
 var_cleanup_virtual = p3;
 {
 { /* Inline model#MParameter#mtype (self) on <self:MParameter> */
-var3 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var3 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var1 = var3;
@@ -3870,7 +4018,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((short int(*)(val* self))(var1->class->vft[COLOR_nit__model__MType__need_anchor]))(var1); /* need_anchor on <var1:MType>*/
+var4 = ((short int(*)(val* self))(var1->class->vft[COLOR_nitc__model__MType__need_anchor]))(var1); /* need_anchor on <var1:MType>*/
 }
 var5 = !var4;
 if (var5){
@@ -3880,10 +4028,10 @@ goto RET_LABEL;
 }
 {
 { /* Inline model#MParameter#mtype (self) on <self:MParameter> */
-var8 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var8 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var8 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var6 = var8;
@@ -3891,16 +4039,16 @@ RET_LABEL7:(void)0;
 }
 }
 {
-var9 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var6->class->vft[COLOR_nit__model__MType__resolve_for]))(var6, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var6:MType>*/
+var9 = ((val*(*)(val* self, val* p0, val* p1, val* p2, short int p3))(var6->class->vft[COLOR_nitc__model__MType__resolve_for]))(var6, var_mtype, var_anchor, var_mmodule, var_cleanup_virtual); /* resolve_for on <var6:MType>*/
 }
 var_newtype = var9;
-var10 = NEW_nit__MParameter(&type_nit__MParameter);
+var10 = NEW_nitc__MParameter(&type_nitc__MParameter);
 {
 { /* Inline model#MParameter#name (self) on <self:MParameter> */
-var13 = self->attrs[COLOR_nit__model__MParameter___name].val; /* _name on <self:MParameter> */
+var13 = self->attrs[COLOR_nitc__model__MParameter___name].val; /* _name on <self:MParameter> */
 if (unlikely(var13 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1876);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1897);
 fatal_exit(1);
 }
 var11 = var13;
@@ -3909,32 +4057,22 @@ RET_LABEL12:(void)0;
 }
 {
 { /* Inline model#MParameter#is_vararg (self) on <self:MParameter> */
-var16 = self->attrs[COLOR_nit__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
+var16 = self->attrs[COLOR_nitc__model__MParameter___is_vararg].s; /* _is_vararg on <self:MParameter> */
 var14 = var16;
 RET_LABEL15:(void)0;
 }
 }
 {
-{ /* Inline model#MParameter#is_default (self) on <self:MParameter> */
-var19 = self->attrs[COLOR_nit__model__MParameter___is_default].s; /* _is_default on <self:MParameter> */
-var17 = var19;
-RET_LABEL18:(void)0;
-}
-}
-{
-((void(*)(val* self, val* p0))(var10->class->vft[COLOR_nit__model__MParameter__name_61d]))(var10, var11); /* name= on <var10:MParameter>*/
-}
-{
-((void(*)(val* self, val* p0))(var10->class->vft[COLOR_nit__model__MParameter__mtype_61d]))(var10, var_newtype); /* mtype= on <var10:MParameter>*/
+((void(*)(val* self, val* p0))(var10->class->vft[COLOR_nitc__model__MParameter__name_61d]))(var10, var11); /* name= on <var10:MParameter>*/
 }
 {
-((void(*)(val* self, short int p0))(var10->class->vft[COLOR_nit__model__MParameter__is_vararg_61d]))(var10, var14); /* is_vararg= on <var10:MParameter>*/
+((void(*)(val* self, val* p0))(var10->class->vft[COLOR_nitc__model__MParameter__mtype_61d]))(var10, var_newtype); /* mtype= on <var10:MParameter>*/
 }
 {
-((void(*)(val* self, short int p0))(var10->class->vft[COLOR_nit__model__MParameter__is_default_61d]))(var10, var17); /* is_default= on <var10:MParameter>*/
+((void(*)(val* self, short int p0))(var10->class->vft[COLOR_nitc__model__MParameter__is_vararg_61d]))(var10, var14); /* is_vararg= on <var10:MParameter>*/
 }
 {
-((void(*)(val* self))(var10->class->vft[COLOR_standard__kernel__Object__init]))(var10); /* init on <var10:MParameter>*/
+((void(*)(val* self))(var10->class->vft[COLOR_core__kernel__Object__init]))(var10); /* init on <var10:MParameter>*/
 }
 var_res = var10;
 var = var_res;
@@ -3943,17 +4081,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#model for (self: MParameter): Model */
-val* nit___nit__MParameter___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MParameter___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : MType */;
 val* var3 /* : MType */;
 val* var4 /* : Model */;
 {
 { /* Inline model#MParameter#mtype (self) on <self:MParameter> */
-var3 = self->attrs[COLOR_nit__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
+var3 = self->attrs[COLOR_nitc__model__MParameter___mtype].val; /* _mtype on <self:MParameter> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1879);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1900);
 fatal_exit(1);
 }
 var1 = var3;
@@ -3961,7 +4099,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nit__model_base__MEntity__model]))(var1); /* model on <var1:MType>*/
+var4 = ((val*(*)(val* self))(var1->class->vft[COLOR_nitc__model_base__MEntity__model]))(var1); /* model on <var1:MType>*/
 }
 var = var4;
 goto RET_LABEL;
@@ -3969,20 +4107,20 @@ RET_LABEL:;
 return var;
 }
 /* method model#MParameter#init for (self: MParameter) */
-void nit___nit__MParameter___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MParameter___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MParameter___standard__kernel__Object__init]))(self); /* init on <self:MParameter>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MParameter___core__kernel__Object__init]))(self); /* init on <self:MParameter>*/
 }
 RET_LABEL:;
 }
 /* method model#MProperty#intro_mclassdef for (self: MProperty): MClassDef */
-val* nit___nit__MProperty___intro_mclassdef(val* self) {
+val* nitc___nitc__MProperty___intro_mclassdef(val* self) {
 val* var /* : MClassDef */;
 val* var1 /* : MClassDef */;
-var1 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var = var1;
@@ -3990,18 +4128,18 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#intro_mclassdef= for (self: MProperty, MClassDef) */
-void nit___nit__MProperty___intro_mclassdef_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val = p0; /* _intro_mclassdef on <self:MProperty> */
+void nitc___nitc__MProperty___intro_mclassdef_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val = p0; /* _intro_mclassdef on <self:MProperty> */
 RET_LABEL:;
 }
 /* method model#MProperty#name for (self: MProperty): String */
-val* nit___nit__MProperty___nit__model_base__MEntity__name(val* self) {
+val* nitc___nitc__MProperty___nitc__model_base__MEntity__name(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var = var1;
@@ -4009,12 +4147,12 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#name= for (self: MProperty, String) */
-void nit___nit__MProperty___name_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MProperty___name].val = p0; /* _name on <self:MProperty> */
+void nitc___nitc__MProperty___name_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MProperty___name].val = p0; /* _name on <self:MProperty> */
 RET_LABEL:;
 }
 /* method model#MProperty#full_name for (self: MProperty): String */
-val* nit___nit__MProperty___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MProperty___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -4024,11 +4162,11 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 static val* varonce10;
 val* var11 /* : String */;
 char* var12 /* : NativeString */;
-val* var13 /* : FlatString */;
+val* var13 /* : String */;
 val* var14 /* : MClassDef */;
 val* var16 /* : MClassDef */;
 val* var17 /* : MModule */;
@@ -4045,46 +4183,46 @@ val* var32 /* : String */;
 val* var33 /* : String */;
 val* var35 /* : String */;
 val* var36 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MProperty___full_name].val != NULL; /* _full_name on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___full_name].val != NULL; /* _full_name on <self:MProperty> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MProperty___full_name].val; /* _full_name on <self:MProperty> */
+var2 = self->attrs[COLOR_nitc__model__MProperty___full_name].val; /* _full_name on <self:MProperty> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _full_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1936);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1954);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(5l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(5l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "::";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 2l);
+var9 = core__flat___NativeString___to_s_full(var8, 2l, 2l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var7;
+((struct instance_core__NativeArray*)var5)->values[1]=var7;
 if (likely(varonce10!=NULL)) {
 var11 = varonce10;
 } else {
 var12 = "::";
-var13 = standard___standard__NativeString___to_s_with_length(var12, 2l);
+var13 = core__flat___NativeString___to_s_full(var12, 2l, 2l);
 var11 = var13;
 varonce10 = var11;
 }
-((struct instance_standard__NativeArray*)var5)->values[3]=var11;
+((struct instance_core__NativeArray*)var5)->values[3]=var11;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var16 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var16 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var14 = var16;
@@ -4093,10 +4231,10 @@ RET_LABEL15:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var14) on <var14:MClassDef> */
-var19 = var14->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var14:MClassDef> */
+var19 = var14->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var14:MClassDef> */
 if (unlikely(var19 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var17 = var19;
@@ -4105,10 +4243,10 @@ RET_LABEL18:(void)0;
 }
 {
 { /* Inline model#MProperty#visibility (self) on <self:MProperty> */
-var22 = self->attrs[COLOR_nit__model__MProperty___visibility].val; /* _visibility on <self:MProperty> */
+var22 = self->attrs[COLOR_nitc__model__MProperty___visibility].val; /* _visibility on <self:MProperty> */
 if (unlikely(var22 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _visibility");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1949);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1967);
 fatal_exit(1);
 }
 var20 = var22;
@@ -4116,15 +4254,15 @@ RET_LABEL21:(void)0;
 }
 }
 {
-var23 = nit___nit__MModule___namespace_for(var17, var20);
+var23 = nitc___nitc__MModule___namespace_for(var17, var20);
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var23;
+((struct instance_core__NativeArray*)var5)->values[0]=var23;
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var26 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var26 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var26 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var24 = var26;
@@ -4133,10 +4271,10 @@ RET_LABEL25:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var24) on <var24:MClassDef> */
-var29 = var24->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var24:MClassDef> */
+var29 = var24->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var24:MClassDef> */
 if (unlikely(var29 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var27 = var29;
@@ -4145,39 +4283,39 @@ RET_LABEL28:(void)0;
 }
 {
 { /* Inline model#MClass#name (var27) on <var27:MClass> */
-var32 = var27->attrs[COLOR_nit__model__MClass___name].val; /* _name on <var27:MClass> */
+var32 = var27->attrs[COLOR_nitc__model__MClass___name].val; /* _name on <var27:MClass> */
 if (unlikely(var32 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 362);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 385);
 fatal_exit(1);
 }
 var30 = var32;
 RET_LABEL31:(void)0;
 }
 }
-((struct instance_standard__NativeArray*)var5)->values[2]=var30;
+((struct instance_core__NativeArray*)var5)->values[2]=var30;
 {
 { /* Inline model#MProperty#name (self) on <self:MProperty> */
-var35 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MProperty> */
+var35 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MProperty> */
 if (unlikely(var35 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var33 = var35;
 RET_LABEL34:(void)0;
 }
 }
-((struct instance_standard__NativeArray*)var5)->values[4]=var33;
+((struct instance_core__NativeArray*)var5)->values[4]=var33;
 {
-var36 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var36 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var36;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MProperty___full_name].val = var3; /* _full_name on <self:MProperty> */
+self->attrs[COLOR_nitc__model__MProperty___full_name].val = var3; /* _full_name on <self:MProperty> */
 var2 = var3;
 }
 var = var2;
@@ -4185,7 +4323,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#c_name for (self: MProperty): String */
-val* nit___nit__MProperty___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MProperty___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -4195,11 +4333,11 @@ static val* varonce;
 static val* varonce6;
 val* var7 /* : String */;
 char* var8 /* : NativeString */;
-val* var9 /* : FlatString */;
+val* var9 /* : String */;
 static val* varonce10;
 val* var11 /* : String */;
 char* var12 /* : NativeString */;
-val* var13 /* : FlatString */;
+val* var13 /* : String */;
 val* var14 /* : MClassDef */;
 val* var16 /* : MClassDef */;
 val* var17 /* : MModule */;
@@ -4216,46 +4354,46 @@ val* var31 /* : String */;
 val* var33 /* : String */;
 val* var34 /* : String */;
 val* var35 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MProperty___c_name].val != NULL; /* _c_name on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___c_name].val != NULL; /* _c_name on <self:MProperty> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MProperty___c_name].val; /* _c_name on <self:MProperty> */
+var2 = self->attrs[COLOR_nitc__model__MProperty___c_name].val; /* _c_name on <self:MProperty> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1944);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1962);
 fatal_exit(1);
 }
 } else {
 {
 if (unlikely(varonce==NULL)) {
-var5 = NEW_standard__NativeArray(5l, &type_standard__NativeArray__standard__String);
+var5 = NEW_core__NativeArray(5l, &type_core__NativeArray__core__String);
 if (likely(varonce6!=NULL)) {
 var7 = varonce6;
 } else {
 var8 = "__";
-var9 = standard___standard__NativeString___to_s_with_length(var8, 2l);
+var9 = core__flat___NativeString___to_s_full(var8, 2l, 2l);
 var7 = var9;
 varonce6 = var7;
 }
-((struct instance_standard__NativeArray*)var5)->values[1]=var7;
+((struct instance_core__NativeArray*)var5)->values[1]=var7;
 if (likely(varonce10!=NULL)) {
 var11 = varonce10;
 } else {
 var12 = "__";
-var13 = standard___standard__NativeString___to_s_with_length(var12, 2l);
+var13 = core__flat___NativeString___to_s_full(var12, 2l, 2l);
 var11 = var13;
 varonce10 = var11;
 }
-((struct instance_standard__NativeArray*)var5)->values[3]=var11;
+((struct instance_core__NativeArray*)var5)->values[3]=var11;
 } else {
 var5 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var16 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var16 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var14 = var16;
@@ -4264,10 +4402,10 @@ RET_LABEL15:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var14) on <var14:MClassDef> */
-var19 = var14->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var14:MClassDef> */
+var19 = var14->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var14:MClassDef> */
 if (unlikely(var19 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var17 = var19;
@@ -4275,15 +4413,15 @@ RET_LABEL18:(void)0;
 }
 }
 {
-var20 = nit___nit__MModule___nit__model_base__MEntity__c_name(var17);
+var20 = nitc___nitc__MModule___nitc__model_base__MEntity__c_name(var17);
 }
-((struct instance_standard__NativeArray*)var5)->values[0]=var20;
+((struct instance_core__NativeArray*)var5)->values[0]=var20;
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var23 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var23 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var23 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var21 = var23;
@@ -4292,10 +4430,10 @@ RET_LABEL22:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var21) on <var21:MClassDef> */
-var26 = var21->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var21:MClassDef> */
+var26 = var21->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var21:MClassDef> */
 if (unlikely(var26 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var24 = var26;
@@ -4304,10 +4442,10 @@ RET_LABEL25:(void)0;
 }
 {
 { /* Inline model#MClass#name (var24) on <var24:MClass> */
-var29 = var24->attrs[COLOR_nit__model__MClass___name].val; /* _name on <var24:MClass> */
+var29 = var24->attrs[COLOR_nitc__model__MClass___name].val; /* _name on <var24:MClass> */
 if (unlikely(var29 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 362);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 385);
 fatal_exit(1);
 }
 var27 = var29;
@@ -4315,15 +4453,15 @@ RET_LABEL28:(void)0;
 }
 }
 {
-var30 = standard___standard__Text___to_cmangle(var27);
+var30 = core___core__Text___to_cmangle(var27);
 }
-((struct instance_standard__NativeArray*)var5)->values[2]=var30;
+((struct instance_core__NativeArray*)var5)->values[2]=var30;
 {
 { /* Inline model#MProperty#name (self) on <self:MProperty> */
-var33 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MProperty> */
+var33 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MProperty> */
 if (unlikely(var33 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var31 = var33;
@@ -4331,18 +4469,18 @@ RET_LABEL32:(void)0;
 }
 }
 {
-var34 = standard___standard__Text___to_cmangle(var31);
+var34 = core___core__Text___to_cmangle(var31);
 }
-((struct instance_standard__NativeArray*)var5)->values[4]=var34;
+((struct instance_core__NativeArray*)var5)->values[4]=var34;
 {
-var35 = ((val*(*)(val* self))(var5->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
+var35 = ((val*(*)(val* self))(var5->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var5); /* native_to_s on <var5:NativeArray[String]>*/
 }
 varonce = var5;
 var3 = var35;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MProperty___c_name].val = var3; /* _c_name on <self:MProperty> */
+self->attrs[COLOR_nitc__model__MProperty___c_name].val = var3; /* _c_name on <self:MProperty> */
 var2 = var3;
 }
 var = var2;
@@ -4350,13 +4488,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#visibility for (self: MProperty): MVisibility */
-val* nit___nit__MProperty___visibility(val* self) {
+val* nitc___nitc__MProperty___visibility(val* self) {
 val* var /* : MVisibility */;
 val* var1 /* : MVisibility */;
-var1 = self->attrs[COLOR_nit__model__MProperty___visibility].val; /* _visibility on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___visibility].val; /* _visibility on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _visibility");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1949);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1967);
 fatal_exit(1);
 }
 var = var1;
@@ -4364,26 +4502,26 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#visibility= for (self: MProperty, MVisibility) */
-void nit___nit__MProperty___visibility_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MProperty___visibility].val = p0; /* _visibility on <self:MProperty> */
+void nitc___nitc__MProperty___visibility_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MProperty___visibility].val = p0; /* _visibility on <self:MProperty> */
 RET_LABEL:;
 }
 /* method model#MProperty#is_autoinit for (self: MProperty): Bool */
-short int nit___nit__MProperty___is_autoinit(val* self) {
+short int nitc___nitc__MProperty___is_autoinit(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MProperty___is_autoinit].s; /* _is_autoinit on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___is_autoinit].s; /* _is_autoinit on <self:MProperty> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MProperty#is_autoinit= for (self: MProperty, Bool) */
-void nit___nit__MProperty___is_autoinit_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MProperty___is_autoinit].s = p0; /* _is_autoinit on <self:MProperty> */
+void nitc___nitc__MProperty___is_autoinit_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MProperty___is_autoinit].s = p0; /* _is_autoinit on <self:MProperty> */
 RET_LABEL:;
 }
 /* method model#MProperty#init for (self: MProperty) */
-void nit___nit__MProperty___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MProperty___core__kernel__Object__init(val* self) {
 val* var /* : MClassDef */;
 val* var2 /* : MClassDef */;
 val* var3 /* : Array[MProperty] */;
@@ -4402,14 +4540,14 @@ val* var20 /* : String */;
 val* var21 /* : Array[MProperty] */;
 val* var23 /* : Array[MProperty] */;
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MProperty___standard__kernel__Object__init]))(self); /* init on <self:MProperty>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MProperty___core__kernel__Object__init]))(self); /* init on <self:MProperty>*/
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var2 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var2 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var = var2;
@@ -4418,10 +4556,10 @@ RET_LABEL1:(void)0;
 }
 {
 { /* Inline model#MClassDef#intro_mproperties (var) on <var:MClassDef> */
-var5 = var->attrs[COLOR_nit__model__MClassDef___intro_mproperties].val; /* _intro_mproperties on <var:MClassDef> */
+var5 = var->attrs[COLOR_nitc__model__MClassDef___intro_mproperties].val; /* _intro_mproperties on <var:MClassDef> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mproperties");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 681);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 704);
 fatal_exit(1);
 }
 var3 = var5;
@@ -4429,14 +4567,14 @@ RET_LABEL4:(void)0;
 }
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array#Array#add on <var3:Array[MProperty]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array#Array#add on <var3:Array[MProperty]>*/
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (self) on <self:MProperty> */
-var8 = self->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
+var8 = self->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <self:MProperty> */
 if (unlikely(var8 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var6 = var8;
@@ -4445,10 +4583,10 @@ RET_LABEL7:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var6) on <var6:MClassDef> */
-var11 = var6->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var6:MClassDef> */
+var11 = var6->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var6:MClassDef> */
 if (unlikely(var11 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var9 = var11;
@@ -4457,10 +4595,10 @@ RET_LABEL10:(void)0;
 }
 {
 { /* Inline mmodule#MModule#model (var9) on <var9:MModule> */
-var14 = var9->attrs[COLOR_nit__mmodule__MModule___model].val; /* _model on <var9:MModule> */
+var14 = var9->attrs[COLOR_nitc__mmodule__MModule___model].val; /* _model on <var9:MModule> */
 if (unlikely(var14 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 73);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 78);
 fatal_exit(1);
 }
 var12 = var14;
@@ -4470,10 +4608,10 @@ RET_LABEL13:(void)0;
 var_model = var12;
 {
 { /* Inline model#Model#mproperties_by_name (var_model) on <var_model:Model> */
-var17 = var_model->attrs[COLOR_nit__model__Model___mproperties_by_name].val; /* _mproperties_by_name on <var_model:Model> */
+var17 = var_model->attrs[COLOR_nitc__model__Model___mproperties_by_name].val; /* _mproperties_by_name on <var_model:Model> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperties_by_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 80);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 80);
 fatal_exit(1);
 }
 var15 = var17;
@@ -4482,10 +4620,10 @@ RET_LABEL16:(void)0;
 }
 {
 { /* Inline model#MProperty#name (self) on <self:MProperty> */
-var20 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MProperty> */
+var20 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MProperty> */
 if (unlikely(var20 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var18 = var20;
@@ -4497,10 +4635,10 @@ more_collections___more_collections__MultiHashMap___add_one(var15, var18, self);
 }
 {
 { /* Inline model#Model#mproperties (var_model) on <var_model:Model> */
-var23 = var_model->attrs[COLOR_nit__model__Model___mproperties].val; /* _mproperties on <var_model:Model> */
+var23 = var_model->attrs[COLOR_nitc__model__Model___mproperties].val; /* _mproperties on <var_model:Model> */
 if (unlikely(var23 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperties");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 37);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 37);
 fatal_exit(1);
 }
 var21 = var23;
@@ -4508,18 +4646,18 @@ RET_LABEL22:(void)0;
 }
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var21, self); /* Direct call array#Array#add on <var21:Array[MProperty]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var21, self); /* Direct call array#Array#add on <var21:Array[MProperty]>*/
 }
 RET_LABEL:;
 }
 /* method model#MProperty#mpropdefs for (self: MProperty): Array[MPropDef] */
-val* nit___nit__MProperty___mpropdefs(val* self) {
+val* nitc___nitc__MProperty___mpropdefs(val* self) {
 val* var /* : Array[MPropDef] */;
 val* var1 /* : Array[MPropDef] */;
-var1 = self->attrs[COLOR_nit__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1963);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1981);
 fatal_exit(1);
 }
 var = var1;
@@ -4527,13 +4665,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#intro for (self: MProperty): MPropDef */
-val* nit___nit__MProperty___intro(val* self) {
+val* nitc___nitc__MProperty___intro(val* self) {
 val* var /* : MPropDef */;
 val* var1 /* : MPropDef */;
-var1 = self->attrs[COLOR_nit__model__MProperty___intro].val; /* _intro on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___intro].val; /* _intro on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1968);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1986);
 fatal_exit(1);
 }
 var = var1;
@@ -4541,7 +4679,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#intro= for (self: MProperty, MPropDef) */
-void nit___nit__MProperty___intro_61d(val* self, val* p0) {
+void nitc___nitc__MProperty___intro_61d(val* self, val* p0) {
 short int var /* : Bool */;
 int cltype;
 int idtype;
@@ -4549,7 +4687,7 @@ const struct type* type_struct;
 const char* var_class_name;
 /* Covariant cast for argument 0 (intro) <p0:MPropDef> isa MPROPDEF */
 /* <p0:MPropDef> isa MPROPDEF */
-type_struct = self->type->resolution_table->types[COLOR_nit__model__MProperty__MPROPDEF];
+type_struct = self->type->resolution_table->types[COLOR_nitc__model__MProperty__MPROPDEF];
 cltype = type_struct->color;
 idtype = type_struct->id;
 if(cltype >= p0->type->table_size) {
@@ -4560,24 +4698,24 @@ var = p0->type->type_table[cltype] == idtype;
 if (unlikely(!var)) {
 var_class_name = p0 == NULL ? "null" : p0->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "MPROPDEF", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1968);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1986);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__model__MProperty___intro].val = p0; /* _intro on <self:MProperty> */
+self->attrs[COLOR_nitc__model__MProperty___intro].val = p0; /* _intro on <self:MProperty> */
 RET_LABEL:;
 }
 /* method model#MProperty#model for (self: MProperty): Model */
-val* nit___nit__MProperty___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MProperty___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : MPropDef */;
 val* var3 /* : MPropDef */;
 val* var4 /* : Model */;
 {
 { /* Inline model#MProperty#intro (self) on <self:MProperty> */
-var3 = self->attrs[COLOR_nit__model__MProperty___intro].val; /* _intro on <self:MProperty> */
+var3 = self->attrs[COLOR_nitc__model__MProperty___intro].val; /* _intro on <self:MProperty> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1968);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1986);
 fatal_exit(1);
 }
 var1 = var3;
@@ -4585,7 +4723,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = nit___nit__MPropDef___nit__model_base__MEntity__model(var1);
+var4 = nitc___nitc__MPropDef___nitc__model_base__MEntity__model(var1);
 }
 var = var4;
 goto RET_LABEL;
@@ -4593,16 +4731,16 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#to_s for (self: MProperty): String */
-val* nit___nit__MProperty___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MProperty___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 val* var3 /* : String */;
 {
 { /* Inline model#MProperty#name (self) on <self:MProperty> */
-var3 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MProperty> */
+var3 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MProperty> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var1 = var3;
@@ -4615,7 +4753,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_definitions for (self: MProperty, MModule, MType): Array[MPropDef] */
-val* nit___nit__MProperty___lookup_definitions(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProperty___lookup_definitions(val* self, val* p0, val* p1) {
 val* var /* : Array[MPropDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_mtype /* var mtype: MType */;
@@ -4636,8 +4774,8 @@ val* var_candidates /* var candidates: Array[MPropDef] */;
 val* var14 /* : Array[MPropDef] */;
 val* var16 /* : Array[MPropDef] */;
 val* var_ /* var : Array[MPropDef] */;
-val* var17 /* : ArrayIterator[nullable Object] */;
-val* var_18 /* var : ArrayIterator[MPropDef] */;
+val* var17 /* : IndexedIterator[nullable Object] */;
+val* var_18 /* var : IndexedIterator[MPropDef] */;
 short int var19 /* : Bool */;
 val* var20 /* : nullable Object */;
 val* var_mpropdef /* var mpropdef: MPropDef */;
@@ -4649,12 +4787,12 @@ val* var27 /* : MModule */;
 val* var29 /* : MModule */;
 short int var30 /* : Bool */;
 short int var31 /* : Bool */;
-val* var32 /* : MClassDef */;
-val* var34 /* : MClassDef */;
-val* var35 /* : MClassType */;
-val* var37 /* : MClassType */;
-short int var38 /* : Bool */;
+val* var33 /* : MClassDef */;
+val* var35 /* : MClassDef */;
+val* var36 /* : MClassType */;
+val* var38 /* : MClassType */;
 short int var39 /* : Bool */;
+short int var40 /* : Bool */;
 long var41 /* : Int */;
 long var43 /* : Int */;
 short int var44 /* : Bool */;
@@ -4669,24 +4807,24 @@ val* var51 /* : Array[MPropDef] */;
 var_mmodule = p0;
 var_mtype = p1;
 {
-var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1990);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2008);
 fatal_exit(1);
 }
 {
-var3 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
+var3 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
 }
 var_mtype = var3;
 {
 { /* Inline model#MProperty#lookup_definitions_cache (self) on <self:MProperty> */
-var6 = self->attrs[COLOR_nit__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
+var6 = self->attrs[COLOR_nitc__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2017);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2035);
 fatal_exit(1);
 }
 var4 = var6;
@@ -4706,7 +4844,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_cache,((val*)NULL)) on <var_cache:nullable Array[MPropDef]> */
 var_other = ((val*)NULL);
 {
-var11 = ((short int(*)(val* self, val* p0))(var_cache->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_cache, var_other); /* == on <var_cache:nullable Array[MPropDef](Array[MPropDef])>*/
+var11 = ((short int(*)(val* self, val* p0))(var_cache->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_cache, var_other); /* == on <var_cache:nullable Array[MPropDef](Array[MPropDef])>*/
 }
 var12 = !var11;
 var9 = var12;
@@ -4720,17 +4858,17 @@ var = var_cache;
 goto RET_LABEL;
 } else {
 }
-var13 = NEW_standard__Array(self->type->resolution_table->types[COLOR_standard__Array__nit__model__MProperty__MPROPDEF]);
+var13 = NEW_core__Array(self->type->resolution_table->types[COLOR_core__Array__nitc__model__MProperty__MPROPDEF]);
 {
-standard___standard__Array___standard__kernel__Object__init(var13); /* Direct call array#Array#init on <var13:Array[MPropDef]>*/
+core___core__Array___core__kernel__Object__init(var13); /* Direct call array#Array#init on <var13:Array[MPropDef]>*/
 }
 var_candidates = var13;
 {
 { /* Inline model#MProperty#mpropdefs (self) on <self:MProperty> */
-var16 = self->attrs[COLOR_nit__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
+var16 = self->attrs[COLOR_nitc__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1963);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1981);
 fatal_exit(1);
 }
 var14 = var16;
@@ -4739,24 +4877,27 @@ RET_LABEL15:(void)0;
 }
 var_ = var14;
 {
-var17 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var17 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_18 = var17;
 for(;;) {
 {
-var19 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_18);
+var19 = ((short int(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_18); /* is_ok on <var_18:IndexedIterator[MPropDef]>*/
 }
 if (var19){
+} else {
+goto BREAK_label;
+}
 {
-var20 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_18);
+var20 = ((val*(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_18); /* item on <var_18:IndexedIterator[MPropDef]>*/
 }
 var_mpropdef = var20;
 {
 { /* Inline mmodule#MModule#in_importation (var_mmodule) on <var_mmodule:MModule> */
-var23 = var_mmodule->attrs[COLOR_nit__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
+var23 = var_mmodule->attrs[COLOR_nitc__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
 if (unlikely(var23 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_importation");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 96);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 104);
 fatal_exit(1);
 }
 var21 = var23;
@@ -4765,10 +4906,10 @@ RET_LABEL22:(void)0;
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var26 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+var26 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
 if (unlikely(var26 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var24 = var26;
@@ -4777,10 +4918,10 @@ RET_LABEL25:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var24) on <var24:MClassDef> */
-var29 = var24->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var24:MClassDef> */
+var29 = var24->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var24:MClassDef> */
 if (unlikely(var29 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var27 = var29;
@@ -4792,59 +4933,56 @@ var30 = poset___poset__POSetElement____60d_61d(var21, var27);
 }
 var31 = !var30;
 if (var31){
-goto BREAK_label;
+goto BREAK_label32;
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var34 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
-if (unlikely(var34 == NULL)) {
+var35 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+if (unlikely(var35 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var32 = var34;
-RET_LABEL33:(void)0;
+var33 = var35;
+RET_LABEL34:(void)0;
 }
 }
 {
-{ /* Inline model#MClassDef#bound_mtype (var32) on <var32:MClassDef> */
-var37 = var32->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var32:MClassDef> */
-if (unlikely(var37 == NULL)) {
+{ /* Inline model#MClassDef#bound_mtype (var33) on <var33:MClassDef> */
+var38 = var33->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var33:MClassDef> */
+if (unlikely(var38 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var35 = var37;
-RET_LABEL36:(void)0;
+var36 = var38;
+RET_LABEL37:(void)0;
 }
 }
 {
-var38 = nit___nit__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var35);
+var39 = nitc___nitc__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var36);
 }
-var39 = !var38;
-if (var39){
-goto BREAK_label;
+var40 = !var39;
+if (var40){
+goto BREAK_label32;
 } else {
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
 }
-BREAK_label: (void)0;
+BREAK_label32: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_18); /* Direct call array#ArrayIterator#next on <var_18:ArrayIterator[MPropDef]>*/
-}
-} else {
-goto BREAK_label40;
+((void(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_18); /* next on <var_18:IndexedIterator[MPropDef]>*/
 }
 }
-BREAK_label40: (void)0;
+BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_18); /* Direct call array#ArrayIterator#finish on <var_18:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_18&3)?class_info[((long)var_18&3)]:var_18->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_18); /* finish on <var_18:IndexedIterator[MPropDef]>*/
 }
 {
 { /* Inline array#AbstractArrayRead#length (var_candidates) on <var_candidates:Array[MPropDef]> */
-var43 = var_candidates->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
+var43 = var_candidates->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
 var41 = var43;
 RET_LABEL42:(void)0;
 }
@@ -4855,9 +4993,9 @@ RET_LABEL42:(void)0;
 /* <1l:Int> isa OTHER */
 var46 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var46)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 533);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var47 = var41 <= 1l;
@@ -4869,10 +5007,10 @@ RET_LABEL45:(void)0;
 if (var44){
 {
 { /* Inline model#MProperty#lookup_definitions_cache (self) on <self:MProperty> */
-var50 = self->attrs[COLOR_nit__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
+var50 = self->attrs[COLOR_nitc__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
 if (unlikely(var50 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2017);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2035);
 fatal_exit(1);
 }
 var48 = var50;
@@ -4887,7 +5025,7 @@ goto RET_LABEL;
 } else {
 }
 {
-var51 = nit___nit__MProperty___select_most_specific(self, var_mmodule, var_candidates);
+var51 = nitc___nitc__MProperty___select_most_specific(self, var_mmodule, var_candidates);
 }
 var = var51;
 goto RET_LABEL;
@@ -4895,13 +5033,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_definitions_cache for (self: MProperty): HashMap2[MModule, MType, Array[MPropDef]] */
-val* nit___nit__MProperty___lookup_definitions_cache(val* self) {
+val* nitc___nitc__MProperty___lookup_definitions_cache(val* self) {
 val* var /* : HashMap2[MModule, MType, Array[MPropDef]] */;
 val* var1 /* : HashMap2[MModule, MType, Array[MPropDef]] */;
-var1 = self->attrs[COLOR_nit__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___lookup_definitions_cache].val; /* _lookup_definitions_cache on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2017);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2035);
 fatal_exit(1);
 }
 var = var1;
@@ -4909,7 +5047,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_super_definitions for (self: MProperty, MModule, MType): Array[MPropDef] */
-val* nit___nit__MProperty___lookup_super_definitions(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProperty___lookup_super_definitions(val* self, val* p0, val* p1) {
 val* var /* : Array[MPropDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_mtype /* var mtype: MType */;
@@ -4921,8 +5059,8 @@ val* var_candidates /* var candidates: Array[MPropDef] */;
 val* var5 /* : Array[MPropDef] */;
 val* var7 /* : Array[MPropDef] */;
 val* var_ /* var : Array[MPropDef] */;
-val* var8 /* : ArrayIterator[nullable Object] */;
-val* var_9 /* var : ArrayIterator[MPropDef] */;
+val* var8 /* : IndexedIterator[nullable Object] */;
+val* var_9 /* var : IndexedIterator[MPropDef] */;
 short int var10 /* : Bool */;
 val* var11 /* : nullable Object */;
 val* var_mpropdef /* var mpropdef: MPropDef */;
@@ -4934,29 +5072,29 @@ val* var18 /* : MModule */;
 val* var20 /* : MModule */;
 short int var21 /* : Bool */;
 short int var22 /* : Bool */;
-val* var23 /* : MClassDef */;
-val* var25 /* : MClassDef */;
-val* var26 /* : MClassType */;
-val* var28 /* : MClassType */;
-short int var29 /* : Bool */;
+val* var24 /* : MClassDef */;
+val* var26 /* : MClassDef */;
+val* var27 /* : MClassType */;
+val* var29 /* : MClassType */;
 short int var30 /* : Bool */;
 short int var31 /* : Bool */;
-val* var32 /* : MClassDef */;
-val* var34 /* : MClassDef */;
-val* var35 /* : MClassType */;
-val* var37 /* : MClassType */;
-short int var38 /* : Bool */;
+short int var32 /* : Bool */;
+val* var33 /* : MClassDef */;
+val* var35 /* : MClassDef */;
+val* var36 /* : MClassType */;
+val* var38 /* : MClassType */;
+short int var39 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var40 /* : Bool */;
-short int var42 /* : Bool */;
-short int var_43 /* var : Bool */;
-val* var44 /* : MClassDef */;
-val* var46 /* : MClassDef */;
-val* var47 /* : MModule */;
-val* var49 /* : MModule */;
-short int var50 /* : Bool */;
-short int var52 /* : Bool */;
-short int var54 /* : Bool */;
+short int var41 /* : Bool */;
+short int var43 /* : Bool */;
+short int var_44 /* var : Bool */;
+val* var45 /* : MClassDef */;
+val* var47 /* : MClassDef */;
+val* var48 /* : MModule */;
+val* var50 /* : MModule */;
+short int var51 /* : Bool */;
+short int var53 /* : Bool */;
+short int var55 /* : Bool */;
 long var56 /* : Int */;
 long var58 /* : Int */;
 short int var59 /* : Bool */;
@@ -4969,29 +5107,29 @@ val* var63 /* : Array[MPropDef] */;
 var_mmodule = p0;
 var_mtype = p1;
 {
-var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2030);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2048);
 fatal_exit(1);
 }
 {
-var3 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
+var3 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
 }
 var_mtype = var3;
-var4 = NEW_standard__Array(self->type->resolution_table->types[COLOR_standard__Array__nit__model__MProperty__MPROPDEF]);
+var4 = NEW_core__Array(self->type->resolution_table->types[COLOR_core__Array__nitc__model__MProperty__MPROPDEF]);
 {
-standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[MPropDef]>*/
+core___core__Array___core__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[MPropDef]>*/
 }
 var_candidates = var4;
 {
 { /* Inline model#MProperty#mpropdefs (self) on <self:MProperty> */
-var7 = self->attrs[COLOR_nit__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
+var7 = self->attrs[COLOR_nitc__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1963);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1981);
 fatal_exit(1);
 }
 var5 = var7;
@@ -5000,24 +5138,27 @@ RET_LABEL6:(void)0;
 }
 var_ = var5;
 {
-var8 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var8 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_9 = var8;
 for(;;) {
 {
-var10 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_9);
+var10 = ((short int(*)(val* self))((((long)var_9&3)?class_info[((long)var_9&3)]:var_9->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_9); /* is_ok on <var_9:IndexedIterator[MPropDef]>*/
 }
 if (var10){
+} else {
+goto BREAK_label;
+}
 {
-var11 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_9);
+var11 = ((val*(*)(val* self))((((long)var_9&3)?class_info[((long)var_9&3)]:var_9->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_9); /* item on <var_9:IndexedIterator[MPropDef]>*/
 }
 var_mpropdef = var11;
 {
 { /* Inline mmodule#MModule#in_importation (var_mmodule) on <var_mmodule:MModule> */
-var14 = var_mmodule->attrs[COLOR_nit__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
+var14 = var_mmodule->attrs[COLOR_nitc__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
 if (unlikely(var14 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_importation");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 96);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 104);
 fatal_exit(1);
 }
 var12 = var14;
@@ -5026,10 +5167,10 @@ RET_LABEL13:(void)0;
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var17 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+var17 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var15 = var17;
@@ -5038,10 +5179,10 @@ RET_LABEL16:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var15) on <var15:MClassDef> */
-var20 = var15->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var15:MClassDef> */
+var20 = var15->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var15:MClassDef> */
 if (unlikely(var20 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var18 = var20;
@@ -5053,149 +5194,146 @@ var21 = poset___poset__POSetElement____60d_61d(var12, var18);
 }
 var22 = !var21;
 if (var22){
-goto BREAK_label;
+goto BREAK_label23;
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var25 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
-if (unlikely(var25 == NULL)) {
+var26 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+if (unlikely(var26 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var23 = var25;
-RET_LABEL24:(void)0;
+var24 = var26;
+RET_LABEL25:(void)0;
 }
 }
 {
-{ /* Inline model#MClassDef#bound_mtype (var23) on <var23:MClassDef> */
-var28 = var23->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var23:MClassDef> */
-if (unlikely(var28 == NULL)) {
+{ /* Inline model#MClassDef#bound_mtype (var24) on <var24:MClassDef> */
+var29 = var24->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var24:MClassDef> */
+if (unlikely(var29 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var26 = var28;
-RET_LABEL27:(void)0;
-}
+var27 = var29;
+RET_LABEL28:(void)0;
+}
 }
 {
-var29 = nit___nit__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var26);
+var30 = nitc___nitc__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var27);
 }
-var30 = !var29;
-if (var30){
-goto BREAK_label;
+var31 = !var30;
+if (var31){
+goto BREAK_label23;
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var34 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
-if (unlikely(var34 == NULL)) {
+var35 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+if (unlikely(var35 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var32 = var34;
-RET_LABEL33:(void)0;
+var33 = var35;
+RET_LABEL34:(void)0;
 }
 }
 {
-{ /* Inline model#MClassDef#bound_mtype (var32) on <var32:MClassDef> */
-var37 = var32->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var32:MClassDef> */
-if (unlikely(var37 == NULL)) {
+{ /* Inline model#MClassDef#bound_mtype (var33) on <var33:MClassDef> */
+var38 = var33->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var33:MClassDef> */
+if (unlikely(var38 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var35 = var37;
-RET_LABEL36:(void)0;
+var36 = var38;
+RET_LABEL37:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var_mtype,var35) on <var_mtype:MType> */
-var_other = var35;
+{ /* Inline kernel#Object#== (var_mtype,var36) on <var_mtype:MType> */
+var_other = var36;
 {
 { /* Inline kernel#Object#is_same_instance (var_mtype,var_other) on <var_mtype:MType> */
-var42 = var_mtype == var_other;
-var40 = var42;
-goto RET_LABEL41;
-RET_LABEL41:(void)0;
+var43 = var_mtype == var_other;
+var41 = var43;
+goto RET_LABEL42;
+RET_LABEL42:(void)0;
 }
 }
-var38 = var40;
-goto RET_LABEL39;
-RET_LABEL39:(void)0;
+var39 = var41;
+goto RET_LABEL40;
+RET_LABEL40:(void)0;
 }
 }
-var_43 = var38;
-if (var38){
+var_44 = var39;
+if (var39){
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var46 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
-if (unlikely(var46 == NULL)) {
+var47 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+if (unlikely(var47 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var44 = var46;
-RET_LABEL45:(void)0;
+var45 = var47;
+RET_LABEL46:(void)0;
 }
 }
 {
-{ /* Inline model#MClassDef#mmodule (var44) on <var44:MClassDef> */
-var49 = var44->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var44:MClassDef> */
-if (unlikely(var49 == NULL)) {
+{ /* Inline model#MClassDef#mmodule (var45) on <var45:MClassDef> */
+var50 = var45->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var45:MClassDef> */
+if (unlikely(var50 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
-var47 = var49;
-RET_LABEL48:(void)0;
+var48 = var50;
+RET_LABEL49:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var_mmodule,var47) on <var_mmodule:MModule> */
-var_other = var47;
+{ /* Inline kernel#Object#== (var_mmodule,var48) on <var_mmodule:MModule> */
+var_other = var48;
 {
 { /* Inline kernel#Object#is_same_instance (var_mmodule,var_other) on <var_mmodule:MModule> */
-var54 = var_mmodule == var_other;
-var52 = var54;
-goto RET_LABEL53;
-RET_LABEL53:(void)0;
+var55 = var_mmodule == var_other;
+var53 = var55;
+goto RET_LABEL54;
+RET_LABEL54:(void)0;
 }
 }
-var50 = var52;
-goto RET_LABEL51;
-RET_LABEL51:(void)0;
+var51 = var53;
+goto RET_LABEL52;
+RET_LABEL52:(void)0;
 }
 }
-var31 = var50;
+var32 = var51;
 } else {
-var31 = var_43;
+var32 = var_44;
 }
-if (var31){
-goto BREAK_label;
+if (var32){
+goto BREAK_label23;
 } else {
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
 }
-BREAK_label: (void)0;
+BREAK_label23: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_9); /* Direct call array#ArrayIterator#next on <var_9:ArrayIterator[MPropDef]>*/
-}
-} else {
-goto BREAK_label55;
+((void(*)(val* self))((((long)var_9&3)?class_info[((long)var_9&3)]:var_9->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_9); /* next on <var_9:IndexedIterator[MPropDef]>*/
 }
 }
-BREAK_label55: (void)0;
+BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_9); /* Direct call array#ArrayIterator#finish on <var_9:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_9&3)?class_info[((long)var_9&3)]:var_9->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_9); /* finish on <var_9:IndexedIterator[MPropDef]>*/
 }
 {
 { /* Inline array#AbstractArrayRead#length (var_candidates) on <var_candidates:Array[MPropDef]> */
-var58 = var_candidates->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
+var58 = var_candidates->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
 var56 = var58;
 RET_LABEL57:(void)0;
 }
@@ -5206,9 +5344,9 @@ RET_LABEL57:(void)0;
 /* <1l:Int> isa OTHER */
 var61 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var61)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 533);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var62 = var56 <= 1l;
@@ -5223,7 +5361,7 @@ goto RET_LABEL;
 } else {
 }
 {
-var63 = nit___nit__MProperty___select_most_specific(self, var_mmodule, var_candidates);
+var63 = nitc___nitc__MProperty___select_most_specific(self, var_mmodule, var_candidates);
 }
 var = var63;
 goto RET_LABEL;
@@ -5231,7 +5369,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#select_most_specific for (self: MProperty, MModule, Array[MPropDef]): Array[MPropDef] */
-val* nit___nit__MProperty___select_most_specific(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProperty___select_most_specific(val* self, val* p0, val* p1) {
 val* var /* : Array[MPropDef] */;
 short int var1 /* : Bool */;
 int cltype;
@@ -5243,8 +5381,8 @@ val* var_candidates /* var candidates: Array[MPropDef] */;
 val* var2 /* : Array[MPropDef] */;
 val* var_res /* var res: Array[MPropDef] */;
 val* var_ /* var : Array[MPropDef] */;
-val* var3 /* : ArrayIterator[nullable Object] */;
-val* var_4 /* var : ArrayIterator[MPropDef] */;
+val* var3 /* : IndexedIterator[nullable Object] */;
+val* var_4 /* var : IndexedIterator[MPropDef] */;
 short int var5 /* : Bool */;
 val* var6 /* : nullable Object */;
 val* var_pd1 /* var pd1: MPropDef */;
@@ -5256,50 +5394,50 @@ val* var12 /* : MClass */;
 val* var_c1 /* var c1: MClass */;
 short int var_keep /* var keep: Bool */;
 val* var_13 /* var : Array[MPropDef] */;
-val* var14 /* : ArrayIterator[nullable Object] */;
-val* var_15 /* var : ArrayIterator[MPropDef] */;
+val* var14 /* : IndexedIterator[nullable Object] */;
+val* var_15 /* var : IndexedIterator[MPropDef] */;
 short int var16 /* : Bool */;
-val* var17 /* : nullable Object */;
+val* var18 /* : nullable Object */;
 val* var_pd2 /* var pd2: MPropDef */;
-short int var18 /* : Bool */;
+short int var19 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var20 /* : Bool */;
-short int var22 /* : Bool */;
-val* var23 /* : MClassDef */;
+short int var21 /* : Bool */;
+short int var23 /* : Bool */;
 val* var25 /* : MClassDef */;
+val* var27 /* : MClassDef */;
 val* var_cd2 /* var cd2: MClassDef */;
-val* var26 /* : MClass */;
 val* var28 /* : MClass */;
+val* var30 /* : MClass */;
 val* var_c2 /* var c2: MClass */;
-val* var29 /* : MClassType */;
 val* var31 /* : MClassType */;
-val* var32 /* : MClassType */;
+val* var33 /* : MClassType */;
 val* var34 /* : MClassType */;
-short int var35 /* : Bool */;
+val* var36 /* : MClassType */;
 short int var37 /* : Bool */;
 short int var39 /* : Bool */;
-val* var40 /* : MModule */;
+short int var41 /* : Bool */;
 val* var42 /* : MModule */;
-val* var43 /* : POSetElement[MModule] */;
+val* var44 /* : MModule */;
 val* var45 /* : POSetElement[MModule] */;
-val* var46 /* : MModule */;
+val* var47 /* : POSetElement[MModule] */;
 val* var48 /* : MModule */;
-short int var49 /* : Bool */;
+val* var50 /* : MModule */;
 short int var51 /* : Bool */;
-val* var52 /* : MClassType */;
-val* var54 /* : MClassType */;
+short int var52 /* : Bool */;
+val* var53 /* : MClassType */;
 val* var55 /* : MClassType */;
-val* var57 /* : MClassType */;
-short int var58 /* : Bool */;
-short int var_59 /* var : Bool */;
-val* var60 /* : MClassType */;
-val* var62 /* : MClassType */;
+val* var56 /* : MClassType */;
+val* var58 /* : MClassType */;
+short int var59 /* : Bool */;
+short int var_60 /* var : Bool */;
+val* var61 /* : MClassType */;
 val* var63 /* : MClassType */;
-val* var65 /* : MClassType */;
-short int var66 /* : Bool */;
-val* var_other68 /* var other: nullable Object */;
-short int var69 /* : Bool */;
+val* var64 /* : MClassType */;
+val* var66 /* : MClassType */;
+short int var67 /* : Bool */;
+val* var_other69 /* var other: nullable Object */;
 short int var70 /* : Bool */;
+short int var71 /* : Bool */;
 short int var72 /* : Bool */;
 val* var73 /* : Sys */;
 val* var74 /* : NativeArray[String] */;
@@ -5307,16 +5445,16 @@ static val* varonce;
 static val* varonce75;
 val* var76 /* : String */;
 char* var77 /* : NativeString */;
-val* var78 /* : FlatString */;
+val* var78 /* : String */;
 static val* varonce79;
 val* var80 /* : String */;
 char* var81 /* : NativeString */;
-val* var82 /* : FlatString */;
+val* var82 /* : String */;
 val* var83 /* : String */;
 val* var84 /* : String */;
 /* Covariant cast for argument 1 (candidates) <p1:Array[MPropDef]> isa Array[MPROPDEF] */
 /* <p1:Array[MPropDef]> isa Array[MPROPDEF] */
-type_struct = self->type->resolution_table->types[COLOR_standard__Array__nit__model__MProperty__MPROPDEF];
+type_struct = self->type->resolution_table->types[COLOR_core__Array__nitc__model__MProperty__MPROPDEF];
 cltype = type_struct->color;
 idtype = type_struct->id;
 if(cltype >= p1->type->table_size) {
@@ -5327,36 +5465,39 @@ var1 = p1->type->type_table[cltype] == idtype;
 if (unlikely(!var1)) {
 var_class_name = p1 == NULL ? "null" : p1->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "Array[MPROPDEF]", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2052);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2070);
 fatal_exit(1);
 }
 var_mmodule = p0;
 var_candidates = p1;
-var2 = NEW_standard__Array(self->type->resolution_table->types[COLOR_standard__Array__nit__model__MProperty__MPROPDEF]);
+var2 = NEW_core__Array(self->type->resolution_table->types[COLOR_core__Array__nitc__model__MProperty__MPROPDEF]);
 {
-standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[MPropDef]>*/
+core___core__Array___core__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[MPropDef]>*/
 }
 var_res = var2;
 var_ = var_candidates;
 {
-var3 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var3 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_4 = var3;
 for(;;) {
 {
-var5 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_4);
+var5 = ((short int(*)(val* self))((((long)var_4&3)?class_info[((long)var_4&3)]:var_4->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_4); /* is_ok on <var_4:IndexedIterator[MPropDef]>*/
 }
 if (var5){
+} else {
+goto BREAK_label;
+}
 {
-var6 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_4);
+var6 = ((val*(*)(val* self))((((long)var_4&3)?class_info[((long)var_4&3)]:var_4->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_4); /* item on <var_4:IndexedIterator[MPropDef]>*/
 }
 var_pd1 = var6;
 {
 { /* Inline model#MPropDef#mclassdef (var_pd1) on <var_pd1:MPropDef> */
-var9 = var_pd1->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_pd1:MPropDef> */
+var9 = var_pd1->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_pd1:MPropDef> */
 if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var7 = var9;
@@ -5366,10 +5507,10 @@ RET_LABEL8:(void)0;
 var_cd1 = var7;
 {
 { /* Inline model#MClassDef#mclass (var_cd1) on <var_cd1:MClassDef> */
-var12 = var_cd1->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var_cd1:MClassDef> */
+var12 = var_cd1->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var_cd1:MClassDef> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var10 = var12;
@@ -5380,270 +5521,267 @@ var_c1 = var10;
 var_keep = 1;
 var_13 = var_candidates;
 {
-var14 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_13);
+var14 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_13);
 }
 var_15 = var14;
 for(;;) {
 {
-var16 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_15);
+var16 = ((short int(*)(val* self))((((long)var_15&3)?class_info[((long)var_15&3)]:var_15->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_15); /* is_ok on <var_15:IndexedIterator[MPropDef]>*/
 }
 if (var16){
+} else {
+goto BREAK_label17;
+}
 {
-var17 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_15);
+var18 = ((val*(*)(val* self))((((long)var_15&3)?class_info[((long)var_15&3)]:var_15->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_15); /* item on <var_15:IndexedIterator[MPropDef]>*/
 }
-var_pd2 = var17;
+var_pd2 = var18;
 {
 { /* Inline kernel#Object#== (var_pd2,var_pd1) on <var_pd2:MPropDef> */
 var_other = var_pd1;
 {
 { /* Inline kernel#Object#is_same_instance (var_pd2,var_other) on <var_pd2:MPropDef> */
-var22 = var_pd2 == var_other;
-var20 = var22;
-goto RET_LABEL21;
-RET_LABEL21:(void)0;
+var23 = var_pd2 == var_other;
+var21 = var23;
+goto RET_LABEL22;
+RET_LABEL22:(void)0;
 }
 }
-var18 = var20;
-goto RET_LABEL19;
-RET_LABEL19:(void)0;
+var19 = var21;
+goto RET_LABEL20;
+RET_LABEL20:(void)0;
 }
 }
-if (var18){
-goto BREAK_label;
+if (var19){
+goto BREAK_label24;
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_pd2) on <var_pd2:MPropDef> */
-var25 = var_pd2->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_pd2:MPropDef> */
-if (unlikely(var25 == NULL)) {
+var27 = var_pd2->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_pd2:MPropDef> */
+if (unlikely(var27 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var23 = var25;
-RET_LABEL24:(void)0;
+var25 = var27;
+RET_LABEL26:(void)0;
 }
 }
-var_cd2 = var23;
+var_cd2 = var25;
 {
 { /* Inline model#MClassDef#mclass (var_cd2) on <var_cd2:MClassDef> */
-var28 = var_cd2->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var_cd2:MClassDef> */
-if (unlikely(var28 == NULL)) {
+var30 = var_cd2->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var_cd2:MClassDef> */
+if (unlikely(var30 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
-var26 = var28;
-RET_LABEL27:(void)0;
+var28 = var30;
+RET_LABEL29:(void)0;
 }
 }
-var_c2 = var26;
+var_c2 = var28;
 {
 { /* Inline model#MClass#mclass_type (var_c2) on <var_c2:MClass> */
-var31 = var_c2->attrs[COLOR_nit__model__MClass___mclass_type].val; /* _mclass_type on <var_c2:MClass> */
-if (unlikely(var31 == NULL)) {
+var33 = var_c2->attrs[COLOR_nitc__model__MClass___mclass_type].val; /* _mclass_type on <var_c2:MClass> */
+if (unlikely(var33 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 484);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 507);
 fatal_exit(1);
 }
-var29 = var31;
-RET_LABEL30:(void)0;
+var31 = var33;
+RET_LABEL32:(void)0;
 }
 }
 {
 { /* Inline model#MClass#mclass_type (var_c1) on <var_c1:MClass> */
-var34 = var_c1->attrs[COLOR_nit__model__MClass___mclass_type].val; /* _mclass_type on <var_c1:MClass> */
-if (unlikely(var34 == NULL)) {
+var36 = var_c1->attrs[COLOR_nitc__model__MClass___mclass_type].val; /* _mclass_type on <var_c1:MClass> */
+if (unlikely(var36 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 484);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 507);
 fatal_exit(1);
 }
-var32 = var34;
-RET_LABEL33:(void)0;
+var34 = var36;
+RET_LABEL35:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var29,var32) on <var29:MClassType> */
-var_other = var32;
+{ /* Inline kernel#Object#== (var31,var34) on <var31:MClassType> */
+var_other = var34;
 {
-{ /* Inline kernel#Object#is_same_instance (var29,var_other) on <var29:MClassType> */
-var39 = var29 == var_other;
+{ /* Inline kernel#Object#is_same_instance (var31,var_other) on <var31:MClassType> */
+var41 = var31 == var_other;
+var39 = var41;
+goto RET_LABEL40;
+RET_LABEL40:(void)0;
+}
+}
 var37 = var39;
 goto RET_LABEL38;
 RET_LABEL38:(void)0;
 }
 }
-var35 = var37;
-goto RET_LABEL36;
-RET_LABEL36:(void)0;
-}
-}
-if (var35){
+if (var37){
 {
 { /* Inline model#MClassDef#mmodule (var_cd2) on <var_cd2:MClassDef> */
-var42 = var_cd2->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var_cd2:MClassDef> */
-if (unlikely(var42 == NULL)) {
+var44 = var_cd2->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var_cd2:MClassDef> */
+if (unlikely(var44 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
-var40 = var42;
-RET_LABEL41:(void)0;
+var42 = var44;
+RET_LABEL43:(void)0;
 }
 }
 {
-{ /* Inline mmodule#MModule#in_importation (var40) on <var40:MModule> */
-var45 = var40->attrs[COLOR_nit__mmodule__MModule___in_importation].val; /* _in_importation on <var40:MModule> */
-if (unlikely(var45 == NULL)) {
+{ /* Inline mmodule#MModule#in_importation (var42) on <var42:MModule> */
+var47 = var42->attrs[COLOR_nitc__mmodule__MModule___in_importation].val; /* _in_importation on <var42:MModule> */
+if (unlikely(var47 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_importation");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 96);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 104);
 fatal_exit(1);
 }
-var43 = var45;
-RET_LABEL44:(void)0;
+var45 = var47;
+RET_LABEL46:(void)0;
 }
 }
 {
 { /* Inline model#MClassDef#mmodule (var_cd1) on <var_cd1:MClassDef> */
-var48 = var_cd1->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var_cd1:MClassDef> */
-if (unlikely(var48 == NULL)) {
+var50 = var_cd1->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var_cd1:MClassDef> */
+if (unlikely(var50 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
-var46 = var48;
-RET_LABEL47:(void)0;
+var48 = var50;
+RET_LABEL49:(void)0;
 }
 }
 {
-var49 = poset___poset__POSetElement____60d(var43, var46);
+var51 = poset___poset__POSetElement____60d(var45, var48);
 }
-if (var49){
+if (var51){
 var_keep = 0;
-goto BREAK_label50;
+goto BREAK_label17;
 } else {
 }
 } else {
 {
 { /* Inline model#MClassDef#bound_mtype (var_cd2) on <var_cd2:MClassDef> */
-var54 = var_cd2->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd2:MClassDef> */
-if (unlikely(var54 == NULL)) {
+var55 = var_cd2->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd2:MClassDef> */
+if (unlikely(var55 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var52 = var54;
-RET_LABEL53:(void)0;
+var53 = var55;
+RET_LABEL54:(void)0;
 }
 }
 {
 { /* Inline model#MClassDef#bound_mtype (var_cd1) on <var_cd1:MClassDef> */
-var57 = var_cd1->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd1:MClassDef> */
-if (unlikely(var57 == NULL)) {
+var58 = var_cd1->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd1:MClassDef> */
+if (unlikely(var58 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var55 = var57;
-RET_LABEL56:(void)0;
+var56 = var58;
+RET_LABEL57:(void)0;
 }
 }
 {
-var58 = nit___nit__MType___is_subtype(var52, var_mmodule, ((val*)NULL), var55);
+var59 = nitc___nitc__MType___is_subtype(var53, var_mmodule, ((val*)NULL), var56);
 }
-var_59 = var58;
-if (var58){
+var_60 = var59;
+if (var59){
 {
 { /* Inline model#MClassDef#bound_mtype (var_cd2) on <var_cd2:MClassDef> */
-var62 = var_cd2->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd2:MClassDef> */
-if (unlikely(var62 == NULL)) {
+var63 = var_cd2->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd2:MClassDef> */
+if (unlikely(var63 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var60 = var62;
-RET_LABEL61:(void)0;
+var61 = var63;
+RET_LABEL62:(void)0;
 }
 }
 {
 { /* Inline model#MClassDef#bound_mtype (var_cd1) on <var_cd1:MClassDef> */
-var65 = var_cd1->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd1:MClassDef> */
-if (unlikely(var65 == NULL)) {
+var66 = var_cd1->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var_cd1:MClassDef> */
+if (unlikely(var66 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var63 = var65;
-RET_LABEL64:(void)0;
+var64 = var66;
+RET_LABEL65:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#!= (var60,var63) on <var60:MClassType> */
-var_other68 = var63;
+{ /* Inline kernel#Object#!= (var61,var64) on <var61:MClassType> */
+var_other69 = var64;
 {
-var69 = ((short int(*)(val* self, val* p0))(var60->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var60, var_other68); /* == on <var60:MClassType>*/
+var70 = ((short int(*)(val* self, val* p0))(var61->class->vft[COLOR_core__kernel__Object___61d_61d]))(var61, var_other69); /* == on <var61:MClassType>*/
 }
-var70 = !var69;
-var66 = var70;
-goto RET_LABEL67;
-RET_LABEL67:(void)0;
+var71 = !var70;
+var67 = var71;
+goto RET_LABEL68;
+RET_LABEL68:(void)0;
 }
 }
-var51 = var66;
+var52 = var67;
 } else {
-var51 = var_59;
+var52 = var_60;
 }
-if (var51){
+if (var52){
 var_keep = 0;
-goto BREAK_label50;
+goto BREAK_label17;
 } else {
 }
 }
-BREAK_label: (void)0;
+BREAK_label24: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_15); /* Direct call array#ArrayIterator#next on <var_15:ArrayIterator[MPropDef]>*/
-}
-} else {
-goto BREAK_label50;
+((void(*)(val* self))((((long)var_15&3)?class_info[((long)var_15&3)]:var_15->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_15); /* next on <var_15:IndexedIterator[MPropDef]>*/
 }
 }
-BREAK_label50: (void)0;
+BREAK_label17: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_15); /* Direct call array#ArrayIterator#finish on <var_15:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_15&3)?class_info[((long)var_15&3)]:var_15->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_15); /* finish on <var_15:IndexedIterator[MPropDef]>*/
 }
 if (var_keep){
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_res, var_pd1); /* Direct call array#Array#add on <var_res:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var_res, var_pd1); /* Direct call array#Array#add on <var_res:Array[MPropDef]>*/
 }
 } else {
 }
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_4); /* Direct call array#ArrayIterator#next on <var_4:ArrayIterator[MPropDef]>*/
-}
-} else {
-goto BREAK_label71;
+((void(*)(val* self))((((long)var_4&3)?class_info[((long)var_4&3)]:var_4->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_4); /* next on <var_4:IndexedIterator[MPropDef]>*/
 }
 }
-BREAK_label71: (void)0;
+BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_4); /* Direct call array#ArrayIterator#finish on <var_4:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_4&3)?class_info[((long)var_4&3)]:var_4->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_4); /* finish on <var_4:IndexedIterator[MPropDef]>*/
 }
 {
-var72 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__is_empty(var_res);
+var72 = core___core__AbstractArrayRead___core__abstract_collection__Collection__is_empty(var_res);
 }
 if (var72){
 var73 = glob_sys;
 if (unlikely(varonce==NULL)) {
-var74 = NEW_standard__NativeArray(2l, &type_standard__NativeArray__standard__String);
+var74 = NEW_core__NativeArray(2l, &type_core__NativeArray__core__String);
 if (likely(varonce75!=NULL)) {
 var76 = varonce75;
 } else {
 var77 = "All lost! ";
-var78 = standard___standard__NativeString___to_s_with_length(var77, 10l);
+var78 = core__flat___NativeString___to_s_full(var77, 10l, 10l);
 var76 = var78;
 varonce75 = var76;
 }
-((struct instance_standard__NativeArray*)var74)->values[0]=var76;
+((struct instance_core__NativeArray*)var74)->values[0]=var76;
 } else {
 var74 = varonce;
 varonce = NULL;
@@ -5652,20 +5790,20 @@ if (likely(varonce79!=NULL)) {
 var80 = varonce79;
 } else {
 var81 = ", ";
-var82 = standard___standard__NativeString___to_s_with_length(var81, 2l);
+var82 = core__flat___NativeString___to_s_full(var81, 2l, 2l);
 var80 = var82;
 varonce79 = var80;
 }
 {
-var83 = standard__string___Collection___join(var_candidates, var80);
+var83 = core__abstract_text___Collection___join(var_candidates, var80);
 }
-((struct instance_standard__NativeArray*)var74)->values[1]=var83;
+((struct instance_core__NativeArray*)var74)->values[1]=var83;
 {
-var84 = ((val*(*)(val* self))(var74->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var74); /* native_to_s on <var74:NativeArray[String]>*/
+var84 = ((val*(*)(val* self))(var74->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var74); /* native_to_s on <var74:NativeArray[String]>*/
 }
 varonce = var74;
 {
-standard__file___Sys___print(var73, var84); /* Direct call file#Sys#print on <var73:Sys>*/
+core__file___Sys___print(var73, var84); /* Direct call file#Sys#print on <var73:Sys>*/
 }
 } else {
 }
@@ -5675,7 +5813,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_first_definition for (self: MProperty, MModule, MType): MPropDef */
-val* nit___nit__MProperty___lookup_first_definition(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProperty___lookup_first_definition(val* self, val* p0, val* p1) {
 val* var /* : MPropDef */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_mtype /* var mtype: MType */;
@@ -5684,10 +5822,10 @@ val* var2 /* : nullable Object */;
 var_mmodule = p0;
 var_mtype = p1;
 {
-var1 = nit___nit__MProperty___lookup_all_definitions(self, var_mmodule, var_mtype);
+var1 = nitc___nitc__MProperty___lookup_all_definitions(self, var_mmodule, var_mtype);
 }
 {
-var2 = standard___standard__SequenceRead___Collection__first(var1);
+var2 = core___core__SequenceRead___Collection__first(var1);
 }
 var = var2;
 goto RET_LABEL;
@@ -5695,7 +5833,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_all_definitions for (self: MProperty, MModule, MType): Array[MPropDef] */
-val* nit___nit__MProperty___lookup_all_definitions(val* self, val* p0, val* p1) {
+val* nitc___nitc__MProperty___lookup_all_definitions(val* self, val* p0, val* p1) {
 val* var /* : Array[MPropDef] */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_mtype /* var mtype: MType */;
@@ -5717,8 +5855,8 @@ val* var_candidates /* var candidates: Array[MPropDef] */;
 val* var15 /* : Array[MPropDef] */;
 val* var17 /* : Array[MPropDef] */;
 val* var_ /* var : Array[MPropDef] */;
-val* var18 /* : ArrayIterator[nullable Object] */;
-val* var_19 /* var : ArrayIterator[MPropDef] */;
+val* var18 /* : IndexedIterator[nullable Object] */;
+val* var_19 /* var : IndexedIterator[MPropDef] */;
 short int var20 /* : Bool */;
 val* var21 /* : nullable Object */;
 val* var_mpropdef /* var mpropdef: MPropDef */;
@@ -5730,12 +5868,12 @@ val* var28 /* : MModule */;
 val* var30 /* : MModule */;
 short int var31 /* : Bool */;
 short int var32 /* : Bool */;
-val* var33 /* : MClassDef */;
-val* var35 /* : MClassDef */;
-val* var36 /* : MClassType */;
-val* var38 /* : MClassType */;
-short int var39 /* : Bool */;
+val* var34 /* : MClassDef */;
+val* var36 /* : MClassDef */;
+val* var37 /* : MClassType */;
+val* var39 /* : MClassType */;
 short int var40 /* : Bool */;
+short int var41 /* : Bool */;
 long var42 /* : Int */;
 long var44 /* : Int */;
 short int var45 /* : Bool */;
@@ -5752,15 +5890,15 @@ val* var55 /* : HashMap2[MModule, MType, Array[MPropDef]] */;
 var_mmodule = p0;
 var_mtype = p1;
 {
-var1 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
+var1 = ((val*(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__undecorate]))(var_mtype); /* undecorate on <var_mtype:MType>*/
 }
 var_mtype = var1;
 {
 { /* Inline model#MProperty#lookup_all_definitions_cache (self) on <self:MProperty> */
-var4 = self->attrs[COLOR_nit__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
+var4 = self->attrs[COLOR_nitc__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
 if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_all_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2140);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2158);
 fatal_exit(1);
 }
 var2 = var4;
@@ -5780,7 +5918,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_cache,((val*)NULL)) on <var_cache:nullable Array[MPropDef]> */
 var_other = ((val*)NULL);
 {
-var9 = ((short int(*)(val* self, val* p0))(var_cache->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_cache, var_other); /* == on <var_cache:nullable Array[MPropDef](Array[MPropDef])>*/
+var9 = ((short int(*)(val* self, val* p0))(var_cache->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_cache, var_other); /* == on <var_cache:nullable Array[MPropDef](Array[MPropDef])>*/
 }
 var10 = !var9;
 var7 = var10;
@@ -5795,33 +5933,33 @@ goto RET_LABEL;
 } else {
 }
 {
-var11 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var11 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 var12 = !var11;
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2114);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2132);
 fatal_exit(1);
 }
 {
-var13 = nit___nit__MType___has_mproperty(var_mtype, var_mmodule, self);
+var13 = nitc___nitc__MType___has_mproperty(var_mtype, var_mmodule, self);
 }
 if (unlikely(!var13)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2115);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2133);
 fatal_exit(1);
 }
-var14 = NEW_standard__Array(self->type->resolution_table->types[COLOR_standard__Array__nit__model__MProperty__MPROPDEF]);
+var14 = NEW_core__Array(self->type->resolution_table->types[COLOR_core__Array__nitc__model__MProperty__MPROPDEF]);
 {
-standard___standard__Array___standard__kernel__Object__init(var14); /* Direct call array#Array#init on <var14:Array[MPropDef]>*/
+core___core__Array___core__kernel__Object__init(var14); /* Direct call array#Array#init on <var14:Array[MPropDef]>*/
 }
 var_candidates = var14;
 {
 { /* Inline model#MProperty#mpropdefs (self) on <self:MProperty> */
-var17 = self->attrs[COLOR_nit__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
+var17 = self->attrs[COLOR_nitc__model__MProperty___mpropdefs].val; /* _mpropdefs on <self:MProperty> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1963);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1981);
 fatal_exit(1);
 }
 var15 = var17;
@@ -5830,24 +5968,27 @@ RET_LABEL16:(void)0;
 }
 var_ = var15;
 {
-var18 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
+var18 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_);
 }
 var_19 = var18;
 for(;;) {
 {
-var20 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_19);
+var20 = ((short int(*)(val* self))((((long)var_19&3)?class_info[((long)var_19&3)]:var_19->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_19); /* is_ok on <var_19:IndexedIterator[MPropDef]>*/
 }
 if (var20){
+} else {
+goto BREAK_label;
+}
 {
-var21 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_19);
+var21 = ((val*(*)(val* self))((((long)var_19&3)?class_info[((long)var_19&3)]:var_19->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_19); /* item on <var_19:IndexedIterator[MPropDef]>*/
 }
 var_mpropdef = var21;
 {
 { /* Inline mmodule#MModule#in_importation (var_mmodule) on <var_mmodule:MModule> */
-var24 = var_mmodule->attrs[COLOR_nit__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
+var24 = var_mmodule->attrs[COLOR_nitc__mmodule__MModule___in_importation].val; /* _in_importation on <var_mmodule:MModule> */
 if (unlikely(var24 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_importation");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 96);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 104);
 fatal_exit(1);
 }
 var22 = var24;
@@ -5856,10 +5997,10 @@ RET_LABEL23:(void)0;
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var27 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+var27 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
 if (unlikely(var27 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var25 = var27;
@@ -5868,10 +6009,10 @@ RET_LABEL26:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var25) on <var25:MClassDef> */
-var30 = var25->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var25:MClassDef> */
+var30 = var25->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var25:MClassDef> */
 if (unlikely(var30 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var28 = var30;
@@ -5883,59 +6024,56 @@ var31 = poset___poset__POSetElement____60d_61d(var22, var28);
 }
 var32 = !var31;
 if (var32){
-goto BREAK_label;
+goto BREAK_label33;
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (var_mpropdef) on <var_mpropdef:MPropDef> */
-var35 = var_mpropdef->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
-if (unlikely(var35 == NULL)) {
+var36 = var_mpropdef->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <var_mpropdef:MPropDef> */
+if (unlikely(var36 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
-var33 = var35;
-RET_LABEL34:(void)0;
+var34 = var36;
+RET_LABEL35:(void)0;
 }
 }
 {
-{ /* Inline model#MClassDef#bound_mtype (var33) on <var33:MClassDef> */
-var38 = var33->attrs[COLOR_nit__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var33:MClassDef> */
-if (unlikely(var38 == NULL)) {
+{ /* Inline model#MClassDef#bound_mtype (var34) on <var34:MClassDef> */
+var39 = var34->attrs[COLOR_nitc__model__MClassDef___bound_mtype].val; /* _bound_mtype on <var34:MClassDef> */
+if (unlikely(var39 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _bound_mtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 556);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 579);
 fatal_exit(1);
 }
-var36 = var38;
-RET_LABEL37:(void)0;
+var37 = var39;
+RET_LABEL38:(void)0;
 }
 }
 {
-var39 = nit___nit__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var36);
+var40 = nitc___nitc__MType___is_subtype(var_mtype, var_mmodule, ((val*)NULL), var37);
 }
-var40 = !var39;
-if (var40){
-goto BREAK_label;
+var41 = !var40;
+if (var41){
+goto BREAK_label33;
 } else {
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var_candidates, var_mpropdef); /* Direct call array#Array#add on <var_candidates:Array[MPropDef]>*/
 }
-BREAK_label: (void)0;
+BREAK_label33: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_19); /* Direct call array#ArrayIterator#next on <var_19:ArrayIterator[MPropDef]>*/
-}
-} else {
-goto BREAK_label41;
+((void(*)(val* self))((((long)var_19&3)?class_info[((long)var_19&3)]:var_19->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_19); /* next on <var_19:IndexedIterator[MPropDef]>*/
 }
 }
-BREAK_label41: (void)0;
+BREAK_label: (void)0;
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__finish(var_19); /* Direct call array#ArrayIterator#finish on <var_19:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_19&3)?class_info[((long)var_19&3)]:var_19->class)->vft[COLOR_core__abstract_collection__Iterator__finish]))(var_19); /* finish on <var_19:IndexedIterator[MPropDef]>*/
 }
 {
 { /* Inline array#AbstractArrayRead#length (var_candidates) on <var_candidates:Array[MPropDef]> */
-var44 = var_candidates->attrs[COLOR_standard__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
+var44 = var_candidates->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var_candidates:Array[MPropDef]> */
 var42 = var44;
 RET_LABEL43:(void)0;
 }
@@ -5946,9 +6084,9 @@ RET_LABEL43:(void)0;
 /* <1l:Int> isa OTHER */
 var47 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var47)) {
-var_class_name = type_standard__Int.name;
+var_class_name = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_standard__kernel, 533);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var48 = var42 <= 1l;
@@ -5960,10 +6098,10 @@ RET_LABEL46:(void)0;
 if (var45){
 {
 { /* Inline model#MProperty#lookup_all_definitions_cache (self) on <self:MProperty> */
-var51 = self->attrs[COLOR_nit__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
+var51 = self->attrs[COLOR_nitc__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
 if (unlikely(var51 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_all_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2140);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2158);
 fatal_exit(1);
 }
 var49 = var51;
@@ -5978,18 +6116,18 @@ goto RET_LABEL;
 } else {
 }
 {
-nit__model___MModule___linearize_mpropdefs(var_mmodule, var_candidates); /* Direct call model#MModule#linearize_mpropdefs on <var_mmodule:MModule>*/
+nitc__model___MModule___linearize_mpropdefs(var_mmodule, var_candidates); /* Direct call model#MModule#linearize_mpropdefs on <var_mmodule:MModule>*/
 }
 {
-var52 = standard___standard__AbstractArrayRead___reversed(var_candidates);
+var52 = core___core__AbstractArrayRead___reversed(var_candidates);
 }
 var_candidates = var52;
 {
 { /* Inline model#MProperty#lookup_all_definitions_cache (self) on <self:MProperty> */
-var55 = self->attrs[COLOR_nit__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
+var55 = self->attrs[COLOR_nitc__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
 if (unlikely(var55 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_all_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2140);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2158);
 fatal_exit(1);
 }
 var53 = var55;
@@ -6005,13 +6143,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MProperty#lookup_all_definitions_cache for (self: MProperty): HashMap2[MModule, MType, Array[MPropDef]] */
-val* nit___nit__MProperty___lookup_all_definitions_cache(val* self) {
+val* nitc___nitc__MProperty___lookup_all_definitions_cache(val* self) {
 val* var /* : HashMap2[MModule, MType, Array[MPropDef]] */;
 val* var1 /* : HashMap2[MModule, MType, Array[MPropDef]] */;
-var1 = self->attrs[COLOR_nit__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
+var1 = self->attrs[COLOR_nitc__model__MProperty___lookup_all_definitions_cache].val; /* _lookup_all_definitions_cache on <self:MProperty> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _lookup_all_definitions_cache");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2140);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2158);
 fatal_exit(1);
 }
 var = var1;
@@ -6019,63 +6157,63 @@ RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_toplevel for (self: MMethod): Bool */
-short int nit___nit__MMethod___is_toplevel(val* self) {
+short int nitc___nitc__MMethod___is_toplevel(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethod___is_toplevel].s; /* _is_toplevel on <self:MMethod> */
+var1 = self->attrs[COLOR_nitc__model__MMethod___is_toplevel].s; /* _is_toplevel on <self:MMethod> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_toplevel= for (self: MMethod, Bool) */
-void nit___nit__MMethod___is_toplevel_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethod___is_toplevel].s = p0; /* _is_toplevel on <self:MMethod> */
+void nitc___nitc__MMethod___is_toplevel_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethod___is_toplevel].s = p0; /* _is_toplevel on <self:MMethod> */
 RET_LABEL:;
 }
 /* method model#MMethod#is_init for (self: MMethod): Bool */
-short int nit___nit__MMethod___is_init(val* self) {
+short int nitc___nitc__MMethod___is_init(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethod___is_init].s; /* _is_init on <self:MMethod> */
+var1 = self->attrs[COLOR_nitc__model__MMethod___is_init].s; /* _is_init on <self:MMethod> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_init= for (self: MMethod, Bool) */
-void nit___nit__MMethod___is_init_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethod___is_init].s = p0; /* _is_init on <self:MMethod> */
+void nitc___nitc__MMethod___is_init_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethod___is_init].s = p0; /* _is_init on <self:MMethod> */
 RET_LABEL:;
 }
 /* method model#MMethod#is_root_init for (self: MMethod): Bool */
-short int nit___nit__MMethod___is_root_init(val* self) {
+short int nitc___nitc__MMethod___is_root_init(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethod___is_root_init].s; /* _is_root_init on <self:MMethod> */
+var1 = self->attrs[COLOR_nitc__model__MMethod___is_root_init].s; /* _is_root_init on <self:MMethod> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_root_init= for (self: MMethod, Bool) */
-void nit___nit__MMethod___is_root_init_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethod___is_root_init].s = p0; /* _is_root_init on <self:MMethod> */
+void nitc___nitc__MMethod___is_root_init_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethod___is_root_init].s = p0; /* _is_root_init on <self:MMethod> */
 RET_LABEL:;
 }
 /* method model#MMethod#is_new for (self: MMethod): Bool */
-short int nit___nit__MMethod___is_new(val* self) {
+short int nitc___nitc__MMethod___is_new(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethod___is_new].s; /* _is_new on <self:MMethod> */
+var1 = self->attrs[COLOR_nitc__model__MMethod___is_new].s; /* _is_new on <self:MMethod> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_new= for (self: MMethod, Bool) */
-void nit___nit__MMethod___is_new_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethod___is_new].s = p0; /* _is_new on <self:MMethod> */
+void nitc___nitc__MMethod___is_new_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethod___is_new].s = p0; /* _is_new on <self:MMethod> */
 RET_LABEL:;
 }
 /* method model#MMethod#is_init_for for (self: MMethod, MClass): Bool */
-short int nit___nit__MMethod___is_init_for(val* self, val* p0) {
+short int nitc___nitc__MMethod___is_init_for(val* self, val* p0) {
 short int var /* : Bool */;
 val* var_mclass /* var mclass: MClass */;
 short int var1 /* : Bool */;
@@ -6083,7 +6221,7 @@ short int var3 /* : Bool */;
 var_mclass = p0;
 {
 { /* Inline model#MMethod#is_init (self) on <self:MMethod> */
-var3 = self->attrs[COLOR_nit__model__MMethod___is_init].s; /* _is_init on <self:MMethod> */
+var3 = self->attrs[COLOR_nitc__model__MMethod___is_init].s; /* _is_init on <self:MMethod> */
 var1 = var3;
 RET_LABEL2:(void)0;
 }
@@ -6094,7 +6232,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MMethod#is_null_safe for (self: MMethod): Bool */
-short int nit___nit__MMethod___is_null_safe(val* self) {
+short int nitc___nitc__MMethod___is_null_safe(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 short int var2 /* : Bool */;
@@ -6103,7 +6241,7 @@ val* var5 /* : String */;
 static val* varonce;
 val* var6 /* : String */;
 char* var7 /* : NativeString */;
-val* var8 /* : FlatString */;
+val* var8 /* : String */;
 short int var9 /* : Bool */;
 short int var_ /* var : Bool */;
 val* var10 /* : String */;
@@ -6111,7 +6249,7 @@ val* var12 /* : String */;
 static val* varonce13;
 val* var14 /* : String */;
 char* var15 /* : NativeString */;
-val* var16 /* : FlatString */;
+val* var16 /* : String */;
 short int var17 /* : Bool */;
 short int var_18 /* var : Bool */;
 val* var19 /* : String */;
@@ -6119,14 +6257,14 @@ val* var21 /* : String */;
 static val* varonce22;
 val* var23 /* : String */;
 char* var24 /* : NativeString */;
-val* var25 /* : FlatString */;
+val* var25 /* : String */;
 short int var26 /* : Bool */;
 {
 { /* Inline model#MProperty#name (self) on <self:MMethod> */
-var5 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MMethod> */
+var5 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MMethod> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var3 = var5;
@@ -6137,12 +6275,12 @@ if (likely(varonce!=NULL)) {
 var6 = varonce;
 } else {
 var7 = "==";
-var8 = standard___standard__NativeString___to_s_with_length(var7, 2l);
+var8 = core__flat___NativeString___to_s_full(var7, 2l, 2l);
 var6 = var8;
 varonce = var6;
 }
 {
-var9 = ((short int(*)(val* self, val* p0))(var3->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var3, var6); /* == on <var3:String>*/
+var9 = ((short int(*)(val* self, val* p0))(var3->class->vft[COLOR_core__kernel__Object___61d_61d]))(var3, var6); /* == on <var3:String>*/
 }
 var_ = var9;
 if (var9){
@@ -6150,10 +6288,10 @@ var2 = var_;
 } else {
 {
 { /* Inline model#MProperty#name (self) on <self:MMethod> */
-var12 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MMethod> */
+var12 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MMethod> */
 if (unlikely(var12 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var10 = var12;
@@ -6164,12 +6302,12 @@ if (likely(varonce13!=NULL)) {
 var14 = varonce13;
 } else {
 var15 = "!=";
-var16 = standard___standard__NativeString___to_s_with_length(var15, 2l);
+var16 = core__flat___NativeString___to_s_full(var15, 2l, 2l);
 var14 = var16;
 varonce13 = var14;
 }
 {
-var17 = ((short int(*)(val* self, val* p0))(var10->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var10, var14); /* == on <var10:String>*/
+var17 = ((short int(*)(val* self, val* p0))(var10->class->vft[COLOR_core__kernel__Object___61d_61d]))(var10, var14); /* == on <var10:String>*/
 }
 var2 = var17;
 }
@@ -6179,10 +6317,10 @@ var1 = var_18;
 } else {
 {
 { /* Inline model#MProperty#name (self) on <self:MMethod> */
-var21 = self->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <self:MMethod> */
+var21 = self->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <self:MMethod> */
 if (unlikely(var21 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var19 = var21;
@@ -6193,12 +6331,12 @@ if (likely(varonce22!=NULL)) {
 var23 = varonce22;
 } else {
 var24 = "is_same_instance";
-var25 = standard___standard__NativeString___to_s_with_length(var24, 16l);
+var25 = core__flat___NativeString___to_s_full(var24, 16l, 16l);
 var23 = var25;
 varonce22 = var23;
 }
 {
-var26 = ((short int(*)(val* self, val* p0))(var19->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var19, var23); /* == on <var19:String>*/
+var26 = ((short int(*)(val* self, val* p0))(var19->class->vft[COLOR_core__kernel__Object___61d_61d]))(var19, var23); /* == on <var19:String>*/
 }
 var1 = var26;
 }
@@ -6208,13 +6346,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MVirtualTypeProp#mvirtualtype for (self: MVirtualTypeProp): MVirtualType */
-val* nit___nit__MVirtualTypeProp___mvirtualtype(val* self) {
+val* nitc___nitc__MVirtualTypeProp___mvirtualtype(val* self) {
 val* var /* : MVirtualType */;
 val* var1 /* : MVirtualType */;
-var1 = self->attrs[COLOR_nit__model__MVirtualTypeProp___mvirtualtype].val; /* _mvirtualtype on <self:MVirtualTypeProp> */
+var1 = self->attrs[COLOR_nitc__model__MVirtualTypeProp___mvirtualtype].val; /* _mvirtualtype on <self:MVirtualTypeProp> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mvirtualtype");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2191);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2209);
 fatal_exit(1);
 }
 var = var1;
@@ -6222,13 +6360,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#mclassdef for (self: MPropDef): MClassDef */
-val* nit___nit__MPropDef___mclassdef(val* self) {
+val* nitc___nitc__MPropDef___mclassdef(val* self) {
 val* var /* : MClassDef */;
 val* var1 /* : MClassDef */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var = var1;
@@ -6236,18 +6374,18 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#mclassdef= for (self: MPropDef, MClassDef) */
-void nit___nit__MPropDef___mclassdef_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MPropDef___mclassdef].val = p0; /* _mclassdef on <self:MPropDef> */
+void nitc___nitc__MPropDef___mclassdef_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val = p0; /* _mclassdef on <self:MPropDef> */
 RET_LABEL:;
 }
 /* method model#MPropDef#mproperty for (self: MPropDef): MProperty */
-val* nit___nit__MPropDef___mproperty(val* self) {
+val* nitc___nitc__MPropDef___mproperty(val* self) {
 val* var /* : MProperty */;
 val* var1 /* : MProperty */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var = var1;
@@ -6255,7 +6393,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#mproperty= for (self: MPropDef, MProperty) */
-void nit___nit__MPropDef___mproperty_61d(val* self, val* p0) {
+void nitc___nitc__MPropDef___mproperty_61d(val* self, val* p0) {
 short int var /* : Bool */;
 int cltype;
 int idtype;
@@ -6263,7 +6401,7 @@ const struct type* type_struct;
 const char* var_class_name;
 /* Covariant cast for argument 0 (mproperty) <p0:MProperty> isa MPROPERTY */
 /* <p0:MProperty> isa MPROPERTY */
-type_struct = self->type->resolution_table->types[COLOR_nit__model__MPropDef__MPROPERTY];
+type_struct = self->type->resolution_table->types[COLOR_nitc__model__MPropDef__MPROPERTY];
 cltype = type_struct->color;
 idtype = type_struct->id;
 if(cltype >= p0->type->table_size) {
@@ -6274,20 +6412,20 @@ var = p0->type->type_table[cltype] == idtype;
 if (unlikely(!var)) {
 var_class_name = p0 == NULL ? "null" : p0->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "MPROPERTY", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__model__MPropDef___mproperty].val = p0; /* _mproperty on <self:MPropDef> */
+self->attrs[COLOR_nitc__model__MPropDef___mproperty].val = p0; /* _mproperty on <self:MPropDef> */
 RET_LABEL:;
 }
 /* method model#MPropDef#location for (self: MPropDef): Location */
-val* nit___nit__MPropDef___location(val* self) {
+val* nitc___nitc__MPropDef___location(val* self) {
 val* var /* : Location */;
 val* var1 /* : Location */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___location].val; /* _location on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___location].val; /* _location on <self:MPropDef> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _location");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2215);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2233);
 fatal_exit(1);
 }
 var = var1;
@@ -6295,12 +6433,12 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#location= for (self: MPropDef, Location) */
-void nit___nit__MPropDef___location_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MPropDef___location].val = p0; /* _location on <self:MPropDef> */
+void nitc___nitc__MPropDef___location_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MPropDef___location].val = p0; /* _location on <self:MPropDef> */
 RET_LABEL:;
 }
 /* method model#MPropDef#init for (self: MPropDef) */
-void nit___nit__MPropDef___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MPropDef___core__kernel__Object__init(val* self) {
 val* var /* : MClassDef */;
 val* var2 /* : MClassDef */;
 val* var3 /* : Array[MPropDef] */;
@@ -6335,7 +6473,7 @@ static val* varonce;
 static val* varonce37;
 val* var38 /* : String */;
 char* var39 /* : NativeString */;
-val* var40 /* : FlatString */;
+val* var40 /* : String */;
 val* var41 /* : MClassDef */;
 val* var43 /* : MClassDef */;
 val* var44 /* : String */;
@@ -6344,14 +6482,14 @@ val* var47 /* : MProperty */;
 val* var48 /* : String */;
 val* var49 /* : String */;
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MPropDef___standard__kernel__Object__init]))(self); /* init on <self:MPropDef>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MPropDef___core__kernel__Object__init]))(self); /* init on <self:MPropDef>*/
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var2 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var2 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var = var2;
@@ -6360,10 +6498,10 @@ RET_LABEL1:(void)0;
 }
 {
 { /* Inline model#MClassDef#mpropdefs (var) on <var:MClassDef> */
-var5 = var->attrs[COLOR_nit__model__MClassDef___mpropdefs].val; /* _mpropdefs on <var:MClassDef> */
+var5 = var->attrs[COLOR_nitc__model__MClassDef___mpropdefs].val; /* _mpropdefs on <var:MClassDef> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 684);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 707);
 fatal_exit(1);
 }
 var3 = var5;
@@ -6371,14 +6509,14 @@ RET_LABEL4:(void)0;
 }
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array#Array#add on <var3:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array#Array#add on <var3:Array[MPropDef]>*/
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var8 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var8 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var8 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var6 = var8;
@@ -6387,10 +6525,10 @@ RET_LABEL7:(void)0;
 }
 {
 { /* Inline model#MProperty#mpropdefs (var6) on <var6:MProperty> */
-var11 = var6->attrs[COLOR_nit__model__MProperty___mpropdefs].val; /* _mpropdefs on <var6:MProperty> */
+var11 = var6->attrs[COLOR_nitc__model__MProperty___mpropdefs].val; /* _mpropdefs on <var6:MProperty> */
 if (unlikely(var11 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpropdefs");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1963);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1981);
 fatal_exit(1);
 }
 var9 = var11;
@@ -6398,14 +6536,14 @@ RET_LABEL10:(void)0;
 }
 }
 {
-standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var9, self); /* Direct call array#Array#add on <var9:Array[MPropDef]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var9, self); /* Direct call array#Array#add on <var9:Array[MPropDef]>*/
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var14 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var14 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var14 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var12 = var14;
@@ -6414,10 +6552,10 @@ RET_LABEL13:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var12) on <var12:MProperty> */
-var17 = var12->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var12:MProperty> */
+var17 = var12->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var12:MProperty> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var15 = var17;
@@ -6426,10 +6564,10 @@ RET_LABEL16:(void)0;
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var20 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var20 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var20 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var18 = var20;
@@ -6455,29 +6593,29 @@ RET_LABEL22:(void)0;
 if (var21){
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var28 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var28 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var26 = var28;
 RET_LABEL27:(void)0;
 }
 }
-var29 = var26->attrs[COLOR_nit__model__MProperty___intro].val != NULL; /* _intro on <var26:MProperty> */
+var29 = var26->attrs[COLOR_nitc__model__MProperty___intro].val != NULL; /* _intro on <var26:MProperty> */
 var30 = !var29;
 if (unlikely(!var30)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2223);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2241);
 fatal_exit(1);
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var33 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var33 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var33 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var31 = var33;
@@ -6488,7 +6626,7 @@ RET_LABEL32:(void)0;
 { /* Inline model#MProperty#intro= (var31,self) on <var31:MProperty> */
 /* Covariant cast for argument 0 (intro) <self:MPropDef> isa MPROPDEF */
 /* <self:MPropDef> isa MPROPDEF */
-type_struct = var31->type->resolution_table->types[COLOR_nit__model__MProperty__MPROPDEF];
+type_struct = var31->type->resolution_table->types[COLOR_nitc__model__MProperty__MPROPDEF];
 cltype = type_struct->color;
 idtype = type_struct->id;
 if(cltype >= self->type->table_size) {
@@ -6499,36 +6637,36 @@ var35 = self->type->type_table[cltype] == idtype;
 if (unlikely(!var35)) {
 var_class_name = self == NULL ? "null" : self->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "MPROPDEF", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1968);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1986);
 fatal_exit(1);
 }
-var31->attrs[COLOR_nit__model__MProperty___intro].val = self; /* _intro on <var31:MProperty> */
+var31->attrs[COLOR_nitc__model__MProperty___intro].val = self; /* _intro on <var31:MProperty> */
 RET_LABEL34:(void)0;
 }
 }
 } else {
 }
 if (unlikely(varonce==NULL)) {
-var36 = NEW_standard__NativeArray(3l, &type_standard__NativeArray__standard__String);
+var36 = NEW_core__NativeArray(3l, &type_core__NativeArray__core__String);
 if (likely(varonce37!=NULL)) {
 var38 = varonce37;
 } else {
 var39 = "#";
-var40 = standard___standard__NativeString___to_s_with_length(var39, 1l);
+var40 = core__flat___NativeString___to_s_full(var39, 1l, 1l);
 var38 = var40;
 varonce37 = var38;
 }
-((struct instance_standard__NativeArray*)var36)->values[1]=var38;
+((struct instance_core__NativeArray*)var36)->values[1]=var38;
 } else {
 var36 = varonce;
 varonce = NULL;
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var43 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var43 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var43 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var41 = var43;
@@ -6536,15 +6674,15 @@ RET_LABEL42:(void)0;
 }
 }
 {
-var44 = ((val*(*)(val* self))(var41->class->vft[COLOR_standard__string__Object__to_s]))(var41); /* to_s on <var41:MClassDef>*/
+var44 = ((val*(*)(val* self))(var41->class->vft[COLOR_core__abstract_text__Object__to_s]))(var41); /* to_s on <var41:MClassDef>*/
 }
-((struct instance_standard__NativeArray*)var36)->values[0]=var44;
+((struct instance_core__NativeArray*)var36)->values[0]=var44;
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var47 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var47 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var47 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var45 = var47;
@@ -6552,23 +6690,23 @@ RET_LABEL46:(void)0;
 }
 }
 {
-var48 = ((val*(*)(val* self))(var45->class->vft[COLOR_standard__string__Object__to_s]))(var45); /* to_s on <var45:MProperty>*/
+var48 = ((val*(*)(val* self))(var45->class->vft[COLOR_core__abstract_text__Object__to_s]))(var45); /* to_s on <var45:MProperty>*/
 }
-((struct instance_standard__NativeArray*)var36)->values[2]=var48;
+((struct instance_core__NativeArray*)var36)->values[2]=var48;
 {
-var49 = ((val*(*)(val* self))(var36->class->vft[COLOR_standard__string__NativeArray__native_to_s]))(var36); /* native_to_s on <var36:NativeArray[String]>*/
+var49 = ((val*(*)(val* self))(var36->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var36); /* native_to_s on <var36:NativeArray[String]>*/
 }
 varonce = var36;
 {
 { /* Inline model#MPropDef#to_s= (self,var49) on <self:MPropDef> */
-self->attrs[COLOR_nit__model__MPropDef___to_s].val = var49; /* _to_s on <self:MPropDef> */
+self->attrs[COLOR_nitc__model__MPropDef___to_s].val = var49; /* _to_s on <self:MPropDef> */
 RET_LABEL50:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method model#MPropDef#name for (self: MPropDef): String */
-val* nit___nit__MPropDef___nit__model_base__MEntity__name(val* self) {
+val* nitc___nitc__MPropDef___nitc__model_base__MEntity__name(val* self) {
 val* var /* : String */;
 val* var1 /* : MProperty */;
 val* var3 /* : MProperty */;
@@ -6576,10 +6714,10 @@ val* var4 /* : String */;
 val* var6 /* : String */;
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var3 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var3 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var1 = var3;
@@ -6588,10 +6726,10 @@ RET_LABEL2:(void)0;
 }
 {
 { /* Inline model#MProperty#name (var1) on <var1:MProperty> */
-var6 = var1->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <var1:MProperty> */
+var6 = var1->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <var1:MProperty> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var4 = var6;
@@ -6604,7 +6742,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#full_name for (self: MPropDef): String */
-val* nit___nit__MPropDef___nit__model_base__MEntity__full_name(val* self) {
+val* nitc___nitc__MPropDef___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -6617,7 +6755,7 @@ val* var10 /* : String */;
 static val* varonce;
 val* var11 /* : String */;
 char* var12 /* : NativeString */;
-val* var13 /* : FlatString */;
+val* var13 /* : String */;
 val* var14 /* : MClassDef */;
 val* var16 /* : MClassDef */;
 val* var17 /* : MClass */;
@@ -6637,14 +6775,14 @@ val* var35 /* : MClassDef */;
 val* var37 /* : MClassDef */;
 val* var38 /* : MModule */;
 val* var40 /* : MModule */;
-val* var41 /* : nullable MProject */;
+val* var41 /* : nullable MPackage */;
 val* var42 /* : MProperty */;
 val* var44 /* : MProperty */;
 val* var45 /* : MClassDef */;
 val* var47 /* : MClassDef */;
 val* var48 /* : MModule */;
 val* var50 /* : MModule */;
-val* var51 /* : nullable MProject */;
+val* var51 /* : nullable MPackage */;
 short int var52 /* : Bool */;
 short int var53 /* : Bool */;
 val* var_other55 /* var other: nullable Object */;
@@ -6660,7 +6798,7 @@ val* var67 /* : String */;
 static val* varonce68;
 val* var69 /* : String */;
 char* var70 /* : NativeString */;
-val* var71 /* : FlatString */;
+val* var71 /* : String */;
 val* var72 /* : MProperty */;
 val* var74 /* : MProperty */;
 val* var75 /* : MVisibility */;
@@ -6685,14 +6823,14 @@ val* var100 /* : MClassDef */;
 val* var102 /* : MClassDef */;
 val* var103 /* : MModule */;
 val* var105 /* : MModule */;
-val* var106 /* : nullable MProject */;
+val* var106 /* : nullable MPackage */;
 short int var107 /* : Bool */;
 short int var109 /* : Bool */;
 short int var110 /* : Bool */;
 static val* varonce111;
 val* var112 /* : String */;
 char* var113 /* : NativeString */;
-val* var114 /* : FlatString */;
+val* var114 /* : String */;
 val* var115 /* : MProperty */;
 val* var117 /* : MProperty */;
 val* var118 /* : MClassDef */;
@@ -6704,7 +6842,7 @@ val* var126 /* : String */;
 static val* varonce127;
 val* var128 /* : String */;
 char* var129 /* : NativeString */;
-val* var130 /* : FlatString */;
+val* var130 /* : String */;
 val* var131 /* : MClassDef */;
 val* var133 /* : MClassDef */;
 val* var134 /* : MClass */;
@@ -6726,27 +6864,27 @@ val* var156 /* : String */;
 static val* varonce157;
 val* var158 /* : String */;
 char* var159 /* : NativeString */;
-val* var160 /* : FlatString */;
+val* var160 /* : String */;
 val* var161 /* : MProperty */;
 val* var163 /* : MProperty */;
 val* var164 /* : String */;
 val* var166 /* : String */;
 val* var167 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___full_name].val != NULL; /* _full_name on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___full_name].val != NULL; /* _full_name on <self:MPropDef> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MPropDef___full_name].val; /* _full_name on <self:MPropDef> */
+var2 = self->attrs[COLOR_nitc__model__MPropDef___full_name].val; /* _full_name on <self:MPropDef> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _full_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2232);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2250);
 fatal_exit(1);
 }
 } else {
 {
-var5 = NEW_standard__FlatBuffer(&type_standard__FlatBuffer);
+var5 = NEW_core__FlatBuffer(&type_core__FlatBuffer);
 {
-{ /* Inline string#FlatBuffer#init (var5) on <var5:FlatBuffer> */
+{ /* Inline flat#FlatBuffer#init (var5) on <var5:FlatBuffer> */
 {
-((void(*)(val* self))(var5->class->vft[COLOR_standard___standard__FlatBuffer___standard__kernel__Object__init]))(var5); /* init on <var5:FlatBuffer>*/
+((void(*)(val* self))(var5->class->vft[COLOR_core___core__FlatBuffer___core__kernel__Object__init]))(var5); /* init on <var5:FlatBuffer>*/
 }
 RET_LABEL6:(void)0;
 }
@@ -6754,10 +6892,10 @@ RET_LABEL6:(void)0;
 var_res = var5;
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var9 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var9 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var7 = var9;
@@ -6765,28 +6903,28 @@ RET_LABEL8:(void)0;
 }
 }
 {
-var10 = nit___nit__MClassDef___nit__model_base__MEntity__full_name(var7);
+var10 = nitc___nitc__MClassDef___nitc__model_base__MEntity__full_name(var7);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var10); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var10); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce!=NULL)) {
 var11 = varonce;
 } else {
 var12 = "#";
-var13 = standard___standard__NativeString___to_s_with_length(var12, 1l);
+var13 = core__flat___NativeString___to_s_full(var12, 1l, 1l);
 var11 = var13;
 varonce = var11;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var11); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var11); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var16 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var16 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var14 = var16;
@@ -6795,10 +6933,10 @@ RET_LABEL15:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var14) on <var14:MClassDef> */
-var19 = var14->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var14:MClassDef> */
+var19 = var14->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var14:MClassDef> */
 if (unlikely(var19 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var17 = var19;
@@ -6807,10 +6945,10 @@ RET_LABEL18:(void)0;
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var22 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var22 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var22 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var20 = var22;
@@ -6819,10 +6957,10 @@ RET_LABEL21:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var20) on <var20:MProperty> */
-var25 = var20->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var20:MProperty> */
+var25 = var20->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var20:MProperty> */
 if (unlikely(var25 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var23 = var25;
@@ -6831,10 +6969,10 @@ RET_LABEL24:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var23) on <var23:MClassDef> */
-var28 = var23->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var23:MClassDef> */
+var28 = var23->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var23:MClassDef> */
 if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var26 = var28;
@@ -6859,18 +6997,18 @@ RET_LABEL30:(void)0;
 }
 if (var29){
 {
-var34 = nit___nit__MPropDef___nit__model_base__MEntity__name(self);
+var34 = nitc___nitc__MPropDef___nitc__model_base__MEntity__name(self);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var34); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var34); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var37 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var37 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var37 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var35 = var37;
@@ -6879,10 +7017,10 @@ RET_LABEL36:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var35) on <var35:MClassDef> */
-var40 = var35->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var35:MClassDef> */
+var40 = var35->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var35:MClassDef> */
 if (unlikely(var40 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var38 = var40;
@@ -6890,14 +7028,14 @@ RET_LABEL39:(void)0;
 }
 }
 {
-var41 = nit___nit__MModule___mproject(var38);
+var41 = nitc___nitc__MModule___mpackage(var38);
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var44 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var44 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var44 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var42 = var44;
@@ -6906,10 +7044,10 @@ RET_LABEL43:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var42) on <var42:MProperty> */
-var47 = var42->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var42:MProperty> */
+var47 = var42->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var42:MProperty> */
 if (unlikely(var47 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var45 = var47;
@@ -6918,10 +7056,10 @@ RET_LABEL46:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var45) on <var45:MClassDef> */
-var50 = var45->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var45:MClassDef> */
+var50 = var45->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var45:MClassDef> */
 if (unlikely(var50 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var48 = var50;
@@ -6929,15 +7067,15 @@ RET_LABEL49:(void)0;
 }
 }
 {
-var51 = nit___nit__MModule___mproject(var48);
+var51 = nitc___nitc__MModule___mpackage(var48);
 }
 if (var41 == NULL) {
 var52 = (var51 != NULL);
 } else {
-{ /* Inline kernel#Object#!= (var41,var51) on <var41:nullable MProject> */
+{ /* Inline kernel#Object#!= (var41,var51) on <var41:nullable MPackage> */
 var_other55 = var51;
 {
-var56 = ((short int(*)(val* self, val* p0))(var41->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var41, var_other55); /* == on <var41:nullable MProject(MProject)>*/
+var56 = ((short int(*)(val* self, val* p0))(var41->class->vft[COLOR_core__kernel__Object___61d_61d]))(var41, var_other55); /* == on <var41:nullable MPackage(MPackage)>*/
 }
 var57 = !var56;
 var53 = var57;
@@ -6949,10 +7087,10 @@ var52 = var53;
 if (var52){
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var60 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var60 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var60 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var58 = var60;
@@ -6961,10 +7099,10 @@ RET_LABEL59:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var58) on <var58:MProperty> */
-var63 = var58->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var58:MProperty> */
+var63 = var58->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var58:MProperty> */
 if (unlikely(var63 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var61 = var63;
@@ -6973,10 +7111,10 @@ RET_LABEL62:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var61) on <var61:MClassDef> */
-var66 = var61->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var61:MClassDef> */
+var66 = var61->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var61:MClassDef> */
 if (unlikely(var66 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var64 = var66;
@@ -6984,29 +7122,29 @@ RET_LABEL65:(void)0;
 }
 }
 {
-var67 = nit___nit__MModule___nit__model_base__MEntity__full_name(var64);
+var67 = nitc___nitc__MModule___nitc__model_base__MEntity__full_name(var64);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var67); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var67); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce68!=NULL)) {
 var69 = varonce68;
 } else {
 var70 = "::";
-var71 = standard___standard__NativeString___to_s_with_length(var70, 2l);
+var71 = core__flat___NativeString___to_s_full(var70, 2l, 2l);
 var69 = var71;
 varonce68 = var69;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var69); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var69); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var74 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var74 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var74 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var72 = var74;
@@ -7015,10 +7153,10 @@ RET_LABEL73:(void)0;
 }
 {
 { /* Inline model#MProperty#visibility (var72) on <var72:MProperty> */
-var77 = var72->attrs[COLOR_nit__model__MProperty___visibility].val; /* _visibility on <var72:MProperty> */
+var77 = var72->attrs[COLOR_nitc__model__MProperty___visibility].val; /* _visibility on <var72:MProperty> */
 if (unlikely(var77 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _visibility");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1949);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1967);
 fatal_exit(1);
 }
 var75 = var77;
@@ -7027,18 +7165,18 @@ RET_LABEL76:(void)0;
 }
 var78 = glob_sys;
 {
-var79 = nit__model_base___standard__Sys___private_visibility(var78);
+var79 = nitc__model_base___core__Sys___private_visibility(var78);
 }
 {
-var80 = standard___standard__Comparable____60d_61d(var75, var79);
+var80 = core___core__Comparable____60d_61d(var75, var79);
 }
 if (var80){
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var83 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var83 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var83 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var81 = var83;
@@ -7047,10 +7185,10 @@ RET_LABEL82:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var81) on <var81:MClassDef> */
-var86 = var81->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var81:MClassDef> */
+var86 = var81->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var81:MClassDef> */
 if (unlikely(var86 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var84 = var86;
@@ -7059,10 +7197,10 @@ RET_LABEL85:(void)0;
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var89 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var89 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var89 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var87 = var89;
@@ -7071,10 +7209,10 @@ RET_LABEL88:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var87) on <var87:MClassDef> */
-var92 = var87->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var87:MClassDef> */
+var92 = var87->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var87:MClassDef> */
 if (unlikely(var92 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var90 = var92;
@@ -7083,10 +7221,10 @@ RET_LABEL91:(void)0;
 }
 {
 { /* Inline model#MClass#visibility (var90) on <var90:MClass> */
-var95 = var90->attrs[COLOR_nit__model__MClass___visibility].val; /* _visibility on <var90:MClass> */
+var95 = var90->attrs[COLOR_nitc__model__MClass___visibility].val; /* _visibility on <var90:MClass> */
 if (unlikely(var95 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _visibility");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 440);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 463);
 fatal_exit(1);
 }
 var93 = var95;
@@ -7094,14 +7232,14 @@ RET_LABEL94:(void)0;
 }
 }
 {
-var96 = nit___nit__MModule___namespace_for(var84, var93);
+var96 = nitc___nitc__MModule___namespace_for(var84, var93);
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var99 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var99 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var99 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var97 = var99;
@@ -7110,10 +7248,10 @@ RET_LABEL98:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var97) on <var97:MProperty> */
-var102 = var97->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var97:MProperty> */
+var102 = var97->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var97:MProperty> */
 if (unlikely(var102 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var100 = var102;
@@ -7122,10 +7260,10 @@ RET_LABEL101:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var100) on <var100:MClassDef> */
-var105 = var100->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var100:MClassDef> */
+var105 = var100->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var100:MClassDef> */
 if (unlikely(var105 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var103 = var105;
@@ -7133,13 +7271,13 @@ RET_LABEL104:(void)0;
 }
 }
 {
-var106 = nit___nit__MModule___mproject(var103);
+var106 = nitc___nitc__MModule___mpackage(var103);
 }
 {
 { /* Inline kernel#Object#!= (var96,var106) on <var96:String> */
 var_other55 = var106;
 {
-var109 = ((short int(*)(val* self, val* p0))(var96->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var96, var_other55); /* == on <var96:String>*/
+var109 = ((short int(*)(val* self, val* p0))(var96->class->vft[COLOR_core__kernel__Object___61d_61d]))(var96, var_other55); /* == on <var96:String>*/
 }
 var110 = !var109;
 var107 = var110;
@@ -7152,19 +7290,19 @@ if (likely(varonce111!=NULL)) {
 var112 = varonce111;
 } else {
 var113 = "::";
-var114 = standard___standard__NativeString___to_s_with_length(var113, 2l);
+var114 = core__flat___NativeString___to_s_full(var113, 2l, 2l);
 var112 = var114;
 varonce111 = var112;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var112); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var112); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var117 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var117 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var117 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var115 = var117;
@@ -7173,10 +7311,10 @@ RET_LABEL116:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var115) on <var115:MProperty> */
-var120 = var115->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var115:MProperty> */
+var120 = var115->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var115:MProperty> */
 if (unlikely(var120 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var118 = var120;
@@ -7185,10 +7323,10 @@ RET_LABEL119:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var118) on <var118:MClassDef> */
-var123 = var118->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var118:MClassDef> */
+var123 = var118->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var118:MClassDef> */
 if (unlikely(var123 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var121 = var123;
@@ -7197,10 +7335,10 @@ RET_LABEL122:(void)0;
 }
 {
 { /* Inline mmodule#MModule#name (var121) on <var121:MModule> */
-var126 = var121->attrs[COLOR_nit__mmodule__MModule___name].val; /* _name on <var121:MModule> */
+var126 = var121->attrs[COLOR_nitc__mmodule__MModule___name].val; /* _name on <var121:MModule> */
 if (unlikely(var126 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__mmodule, 87);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mmodule, 95);
 fatal_exit(1);
 }
 var124 = var126;
@@ -7208,18 +7346,18 @@ RET_LABEL125:(void)0;
 }
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var124); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var124); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce127!=NULL)) {
 var128 = varonce127;
 } else {
 var129 = "::";
-var130 = standard___standard__NativeString___to_s_with_length(var129, 2l);
+var130 = core__flat___NativeString___to_s_full(var129, 2l, 2l);
 var128 = var130;
 varonce127 = var128;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var128); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var128); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 }
@@ -7228,10 +7366,10 @@ standard___standard__FlatBuffer___Buffer__append(var_res, var128); /* Direct cal
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var133 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var133 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var133 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var131 = var133;
@@ -7240,10 +7378,10 @@ RET_LABEL132:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var131) on <var131:MClassDef> */
-var136 = var131->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var131:MClassDef> */
+var136 = var131->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var131:MClassDef> */
 if (unlikely(var136 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var134 = var136;
@@ -7252,10 +7390,10 @@ RET_LABEL135:(void)0;
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var139 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var139 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var139 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var137 = var139;
@@ -7264,10 +7402,10 @@ RET_LABEL138:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var137) on <var137:MProperty> */
-var142 = var137->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var137:MProperty> */
+var142 = var137->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var137:MProperty> */
 if (unlikely(var142 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var140 = var142;
@@ -7276,10 +7414,10 @@ RET_LABEL141:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var140) on <var140:MClassDef> */
-var145 = var140->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var140:MClassDef> */
+var145 = var140->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var140:MClassDef> */
 if (unlikely(var145 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var143 = var145;
@@ -7290,7 +7428,7 @@ RET_LABEL144:(void)0;
 { /* Inline kernel#Object#!= (var134,var143) on <var134:MClass> */
 var_other55 = var143;
 {
-var148 = ((short int(*)(val* self, val* p0))(var134->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var134, var_other55); /* == on <var134:MClass>*/
+var148 = ((short int(*)(val* self, val* p0))(var134->class->vft[COLOR_core__kernel__Object___61d_61d]))(var134, var_other55); /* == on <var134:MClass>*/
 }
 var149 = !var148;
 var146 = var149;
@@ -7301,10 +7439,10 @@ RET_LABEL147:(void)0;
 if (var146){
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var152 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var152 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var152 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var150 = var152;
@@ -7313,10 +7451,10 @@ RET_LABEL151:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var150) on <var150:MProperty> */
-var155 = var150->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var150:MProperty> */
+var155 = var150->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var150:MProperty> */
 if (unlikely(var155 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var153 = var155;
@@ -7324,30 +7462,30 @@ RET_LABEL154:(void)0;
 }
 }
 {
-var156 = nit___nit__MClassDef___nit__model_base__MEntity__name(var153);
+var156 = nitc___nitc__MClassDef___nitc__model_base__MEntity__name(var153);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var156); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var156); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce157!=NULL)) {
 var158 = varonce157;
 } else {
 var159 = "::";
-var160 = standard___standard__NativeString___to_s_with_length(var159, 2l);
+var160 = core__flat___NativeString___to_s_full(var159, 2l, 2l);
 var158 = var160;
 varonce157 = var158;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var158); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var158); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var163 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var163 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var163 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var161 = var163;
@@ -7356,10 +7494,10 @@ RET_LABEL162:(void)0;
 }
 {
 { /* Inline model#MProperty#name (var161) on <var161:MProperty> */
-var166 = var161->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <var161:MProperty> */
+var166 = var161->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <var161:MProperty> */
 if (unlikely(var166 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var164 = var166;
@@ -7367,17 +7505,17 @@ RET_LABEL165:(void)0;
 }
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var164); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var164); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 }
 {
-var167 = standard___standard__FlatBuffer___Object__to_s(var_res);
+var167 = core___core__FlatBuffer___core__abstract_text__Object__to_s(var_res);
 }
 var3 = var167;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MPropDef___full_name].val = var3; /* _full_name on <self:MPropDef> */
+self->attrs[COLOR_nitc__model__MPropDef___full_name].val = var3; /* _full_name on <self:MPropDef> */
 var2 = var3;
 }
 var = var2;
@@ -7385,7 +7523,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#c_name for (self: MPropDef): String */
-val* nit___nit__MPropDef___nit__model_base__MEntity__c_name(val* self) {
+val* nitc___nitc__MPropDef___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
 val* var2 /* : String */;
@@ -7398,7 +7536,7 @@ val* var10 /* : String */;
 static val* varonce;
 val* var11 /* : String */;
 char* var12 /* : NativeString */;
-val* var13 /* : FlatString */;
+val* var13 /* : String */;
 val* var14 /* : MClassDef */;
 val* var16 /* : MClassDef */;
 val* var17 /* : MClass */;
@@ -7439,7 +7577,7 @@ val* var65 /* : String */;
 static val* varonce66;
 val* var67 /* : String */;
 char* var68 /* : NativeString */;
-val* var69 /* : FlatString */;
+val* var69 /* : String */;
 val* var70 /* : MClassDef */;
 val* var72 /* : MClassDef */;
 val* var73 /* : MClass */;
@@ -7462,28 +7600,28 @@ val* var96 /* : String */;
 static val* varonce97;
 val* var98 /* : String */;
 char* var99 /* : NativeString */;
-val* var100 /* : FlatString */;
+val* var100 /* : String */;
 val* var101 /* : MProperty */;
 val* var103 /* : MProperty */;
 val* var104 /* : String */;
 val* var106 /* : String */;
 val* var107 /* : String */;
 val* var108 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___c_name].val != NULL; /* _c_name on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___c_name].val != NULL; /* _c_name on <self:MPropDef> */
 if(likely(var1)) {
-var2 = self->attrs[COLOR_nit__model__MPropDef___c_name].val; /* _c_name on <self:MPropDef> */
+var2 = self->attrs[COLOR_nitc__model__MPropDef___c_name].val; /* _c_name on <self:MPropDef> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2281);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2299);
 fatal_exit(1);
 }
 } else {
 {
-var5 = NEW_standard__FlatBuffer(&type_standard__FlatBuffer);
+var5 = NEW_core__FlatBuffer(&type_core__FlatBuffer);
 {
-{ /* Inline string#FlatBuffer#init (var5) on <var5:FlatBuffer> */
+{ /* Inline flat#FlatBuffer#init (var5) on <var5:FlatBuffer> */
 {
-((void(*)(val* self))(var5->class->vft[COLOR_standard___standard__FlatBuffer___standard__kernel__Object__init]))(var5); /* init on <var5:FlatBuffer>*/
+((void(*)(val* self))(var5->class->vft[COLOR_core___core__FlatBuffer___core__kernel__Object__init]))(var5); /* init on <var5:FlatBuffer>*/
 }
 RET_LABEL6:(void)0;
 }
@@ -7491,10 +7629,10 @@ RET_LABEL6:(void)0;
 var_res = var5;
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var9 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var9 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var7 = var9;
@@ -7502,28 +7640,28 @@ RET_LABEL8:(void)0;
 }
 }
 {
-var10 = nit___nit__MClassDef___nit__model_base__MEntity__c_name(var7);
+var10 = nitc___nitc__MClassDef___nitc__model_base__MEntity__c_name(var7);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var10); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var10); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce!=NULL)) {
 var11 = varonce;
 } else {
 var12 = "___";
-var13 = standard___standard__NativeString___to_s_with_length(var12, 3l);
+var13 = core__flat___NativeString___to_s_full(var12, 3l, 3l);
 var11 = var13;
 varonce = var11;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var11); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var11); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var16 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var16 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var14 = var16;
@@ -7532,10 +7670,10 @@ RET_LABEL15:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var14) on <var14:MClassDef> */
-var19 = var14->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var14:MClassDef> */
+var19 = var14->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var14:MClassDef> */
 if (unlikely(var19 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var17 = var19;
@@ -7544,10 +7682,10 @@ RET_LABEL18:(void)0;
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var22 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var22 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var22 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var20 = var22;
@@ -7556,10 +7694,10 @@ RET_LABEL21:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var20) on <var20:MProperty> */
-var25 = var20->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var20:MProperty> */
+var25 = var20->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var20:MProperty> */
 if (unlikely(var25 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var23 = var25;
@@ -7568,10 +7706,10 @@ RET_LABEL24:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var23) on <var23:MClassDef> */
-var28 = var23->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var23:MClassDef> */
+var28 = var23->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var23:MClassDef> */
 if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var26 = var28;
@@ -7596,21 +7734,21 @@ RET_LABEL30:(void)0;
 }
 if (var29){
 {
-var34 = nit___nit__MPropDef___nit__model_base__MEntity__name(self);
+var34 = nitc___nitc__MPropDef___nitc__model_base__MEntity__name(self);
 }
 {
-var35 = standard___standard__Text___to_cmangle(var34);
+var35 = core___core__Text___to_cmangle(var34);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var35); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var35); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var38 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var38 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var38 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var36 = var38;
@@ -7619,10 +7757,10 @@ RET_LABEL37:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var36) on <var36:MClassDef> */
-var41 = var36->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var36:MClassDef> */
+var41 = var36->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var36:MClassDef> */
 if (unlikely(var41 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var39 = var41;
@@ -7631,10 +7769,10 @@ RET_LABEL40:(void)0;
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var44 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var44 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var44 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var42 = var44;
@@ -7643,10 +7781,10 @@ RET_LABEL43:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var42) on <var42:MProperty> */
-var47 = var42->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var42:MProperty> */
+var47 = var42->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var42:MProperty> */
 if (unlikely(var47 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var45 = var47;
@@ -7655,10 +7793,10 @@ RET_LABEL46:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var45) on <var45:MClassDef> */
-var50 = var45->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var45:MClassDef> */
+var50 = var45->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var45:MClassDef> */
 if (unlikely(var50 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var48 = var50;
@@ -7669,7 +7807,7 @@ RET_LABEL49:(void)0;
 { /* Inline kernel#Object#!= (var39,var48) on <var39:MModule> */
 var_other53 = var48;
 {
-var54 = ((short int(*)(val* self, val* p0))(var39->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var39, var_other53); /* == on <var39:MModule>*/
+var54 = ((short int(*)(val* self, val* p0))(var39->class->vft[COLOR_core__kernel__Object___61d_61d]))(var39, var_other53); /* == on <var39:MModule>*/
 }
 var55 = !var54;
 var51 = var55;
@@ -7680,10 +7818,10 @@ RET_LABEL52:(void)0;
 if (var51){
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var58 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var58 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var58 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var56 = var58;
@@ -7692,10 +7830,10 @@ RET_LABEL57:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var56) on <var56:MProperty> */
-var61 = var56->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var56:MProperty> */
+var61 = var56->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var56:MProperty> */
 if (unlikely(var61 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var59 = var61;
@@ -7704,10 +7842,10 @@ RET_LABEL60:(void)0;
 }
 {
 { /* Inline model#MClassDef#mmodule (var59) on <var59:MClassDef> */
-var64 = var59->attrs[COLOR_nit__model__MClassDef___mmodule].val; /* _mmodule on <var59:MClassDef> */
+var64 = var59->attrs[COLOR_nitc__model__MClassDef___mmodule].val; /* _mmodule on <var59:MClassDef> */
 if (unlikely(var64 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mmodule");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 550);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 573);
 fatal_exit(1);
 }
 var62 = var64;
@@ -7715,30 +7853,30 @@ RET_LABEL63:(void)0;
 }
 }
 {
-var65 = nit___nit__MModule___nit__model_base__MEntity__c_name(var62);
+var65 = nitc___nitc__MModule___nitc__model_base__MEntity__c_name(var62);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var65); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var65); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce66!=NULL)) {
 var67 = varonce66;
 } else {
 var68 = "__";
-var69 = standard___standard__NativeString___to_s_with_length(var68, 2l);
+var69 = core__flat___NativeString___to_s_full(var68, 2l, 2l);
 var67 = var69;
 varonce66 = var67;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var67); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var67); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 }
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var72 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var72 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var72 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var70 = var72;
@@ -7747,10 +7885,10 @@ RET_LABEL71:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var70) on <var70:MClassDef> */
-var75 = var70->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var70:MClassDef> */
+var75 = var70->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var70:MClassDef> */
 if (unlikely(var75 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var73 = var75;
@@ -7759,10 +7897,10 @@ RET_LABEL74:(void)0;
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var78 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var78 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var78 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var76 = var78;
@@ -7771,10 +7909,10 @@ RET_LABEL77:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var76) on <var76:MProperty> */
-var81 = var76->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var76:MProperty> */
+var81 = var76->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var76:MProperty> */
 if (unlikely(var81 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var79 = var81;
@@ -7783,10 +7921,10 @@ RET_LABEL80:(void)0;
 }
 {
 { /* Inline model#MClassDef#mclass (var79) on <var79:MClassDef> */
-var84 = var79->attrs[COLOR_nit__model__MClassDef___mclass].val; /* _mclass on <var79:MClassDef> */
+var84 = var79->attrs[COLOR_nitc__model__MClassDef___mclass].val; /* _mclass on <var79:MClassDef> */
 if (unlikely(var84 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclass");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 553);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 576);
 fatal_exit(1);
 }
 var82 = var84;
@@ -7797,7 +7935,7 @@ RET_LABEL83:(void)0;
 { /* Inline kernel#Object#!= (var73,var82) on <var73:MClass> */
 var_other53 = var82;
 {
-var87 = ((short int(*)(val* self, val* p0))(var73->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var73, var_other53); /* == on <var73:MClass>*/
+var87 = ((short int(*)(val* self, val* p0))(var73->class->vft[COLOR_core__kernel__Object___61d_61d]))(var73, var_other53); /* == on <var73:MClass>*/
 }
 var88 = !var87;
 var85 = var88;
@@ -7808,10 +7946,10 @@ RET_LABEL86:(void)0;
 if (var85){
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var91 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var91 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var91 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var89 = var91;
@@ -7820,10 +7958,10 @@ RET_LABEL90:(void)0;
 }
 {
 { /* Inline model#MProperty#intro_mclassdef (var89) on <var89:MProperty> */
-var94 = var89->attrs[COLOR_nit__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var89:MProperty> */
+var94 = var89->attrs[COLOR_nitc__model__MProperty___intro_mclassdef].val; /* _intro_mclassdef on <var89:MProperty> */
 if (unlikely(var94 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro_mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1946);
 fatal_exit(1);
 }
 var92 = var94;
@@ -7831,33 +7969,33 @@ RET_LABEL93:(void)0;
 }
 }
 {
-var95 = nit___nit__MClassDef___nit__model_base__MEntity__name(var92);
+var95 = nitc___nitc__MClassDef___nitc__model_base__MEntity__name(var92);
 }
 {
-var96 = standard___standard__Text___to_cmangle(var95);
+var96 = core___core__Text___to_cmangle(var95);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var96); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var96); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 if (likely(varonce97!=NULL)) {
 var98 = varonce97;
 } else {
 var99 = "__";
-var100 = standard___standard__NativeString___to_s_with_length(var99, 2l);
+var100 = core__flat___NativeString___to_s_full(var99, 2l, 2l);
 var98 = var100;
 varonce97 = var98;
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var98); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var98); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 } else {
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var103 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var103 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var103 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var101 = var103;
@@ -7866,10 +8004,10 @@ RET_LABEL102:(void)0;
 }
 {
 { /* Inline model#MProperty#name (var101) on <var101:MProperty> */
-var106 = var101->attrs[COLOR_nit__model__MProperty___name].val; /* _name on <var101:MProperty> */
+var106 = var101->attrs[COLOR_nitc__model__MProperty___name].val; /* _name on <var101:MProperty> */
 if (unlikely(var106 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1951);
 fatal_exit(1);
 }
 var104 = var106;
@@ -7877,20 +8015,20 @@ RET_LABEL105:(void)0;
 }
 }
 {
-var107 = standard___standard__Text___to_cmangle(var104);
+var107 = core___core__Text___to_cmangle(var104);
 }
 {
-standard___standard__FlatBuffer___Buffer__append(var_res, var107); /* Direct call string#FlatBuffer#append on <var_res:FlatBuffer>*/
+core___core__FlatBuffer___core__abstract_text__Buffer__append(var_res, var107); /* Direct call flat#FlatBuffer#append on <var_res:FlatBuffer>*/
 }
 }
 {
-var108 = standard___standard__FlatBuffer___Object__to_s(var_res);
+var108 = core___core__FlatBuffer___core__abstract_text__Object__to_s(var_res);
 }
 var3 = var108;
 goto RET_LABEL4;
 RET_LABEL4:(void)0;
 }
-self->attrs[COLOR_nit__model__MPropDef___c_name].val = var3; /* _c_name on <self:MPropDef> */
+self->attrs[COLOR_nitc__model__MPropDef___c_name].val = var3; /* _c_name on <self:MPropDef> */
 var2 = var3;
 }
 var = var2;
@@ -7898,17 +8036,17 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#model for (self: MPropDef): Model */
-val* nit___nit__MPropDef___nit__model_base__MEntity__model(val* self) {
+val* nitc___nitc__MPropDef___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : MClassDef */;
 val* var3 /* : MClassDef */;
 val* var4 /* : Model */;
 {
 { /* Inline model#MPropDef#mclassdef (self) on <self:MPropDef> */
-var3 = self->attrs[COLOR_nit__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
+var3 = self->attrs[COLOR_nitc__model__MPropDef___mclassdef].val; /* _mclassdef on <self:MPropDef> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mclassdef");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2209);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2227);
 fatal_exit(1);
 }
 var1 = var3;
@@ -7916,7 +8054,7 @@ RET_LABEL2:(void)0;
 }
 }
 {
-var4 = nit___nit__MClassDef___nit__model_base__MEntity__model(var1);
+var4 = nitc___nitc__MClassDef___nitc__model_base__MEntity__model(var1);
 }
 var = var4;
 goto RET_LABEL;
@@ -7924,13 +8062,13 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#to_s for (self: MPropDef): String */
-val* nit___nit__MPropDef___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MPropDef___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MPropDef___to_s].val; /* _to_s on <self:MPropDef> */
+var1 = self->attrs[COLOR_nitc__model__MPropDef___to_s].val; /* _to_s on <self:MPropDef> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _to_s");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2303);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2321);
 fatal_exit(1);
 }
 var = var1;
@@ -7938,68 +8076,92 @@ RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#to_s= for (self: MPropDef, String) */
-void nit___nit__MPropDef___to_s_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MPropDef___to_s].val = p0; /* _to_s on <self:MPropDef> */
+void nitc___nitc__MPropDef___to_s_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MPropDef___to_s].val = p0; /* _to_s on <self:MPropDef> */
 RET_LABEL:;
 }
 /* method model#MPropDef#is_intro for (self: MPropDef): Bool */
-short int nit___nit__MPropDef___is_intro(val* self) {
+short int nitc___nitc__MPropDef___is_intro(val* self) {
 short int var /* : Bool */;
-val* var1 /* : MProperty */;
-val* var3 /* : MProperty */;
-val* var4 /* : MPropDef */;
-val* var6 /* : MPropDef */;
-short int var7 /* : Bool */;
+short int var1 /* : Bool */;
+val* var2 /* : MProperty */;
+val* var4 /* : MProperty */;
+short int var5 /* : Bool */;
+short int var_ /* var : Bool */;
+val* var6 /* : MProperty */;
+val* var8 /* : MProperty */;
+val* var9 /* : MPropDef */;
+val* var11 /* : MPropDef */;
+short int var12 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var9 /* : Bool */;
-short int var11 /* : Bool */;
+short int var14 /* : Bool */;
+short int var16 /* : Bool */;
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var3 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
-if (unlikely(var3 == NULL)) {
+var4 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
-var1 = var3;
-RET_LABEL2:(void)0;
+var2 = var4;
+RET_LABEL3:(void)0;
 }
 }
+var5 = var2->attrs[COLOR_nitc__model__MProperty___intro].val != NULL; /* _intro on <var2:MProperty> */
+var_ = var5;
+if (var5){
 {
-{ /* Inline model#MProperty#intro (var1) on <var1:MProperty> */
-var6 = var1->attrs[COLOR_nit__model__MProperty___intro].val; /* _intro on <var1:MProperty> */
-if (unlikely(var6 == NULL)) {
+{ /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
+var8 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+if (unlikely(var8 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
+fatal_exit(1);
+}
+var6 = var8;
+RET_LABEL7:(void)0;
+}
+}
+{
+{ /* Inline model#MProperty#intro (var6) on <var6:MProperty> */
+var11 = var6->attrs[COLOR_nitc__model__MProperty___intro].val; /* _intro on <var6:MProperty> */
+if (unlikely(var11 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _intro");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 1968);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 1986);
 fatal_exit(1);
 }
-var4 = var6;
-RET_LABEL5:(void)0;
+var9 = var11;
+RET_LABEL10:(void)0;
 }
 }
 {
-{ /* Inline kernel#Object#== (var4,self) on <var4:MPropDef> */
+{ /* Inline kernel#Object#== (var9,self) on <var9:MPropDef> */
 var_other = self;
 {
-{ /* Inline kernel#Object#is_same_instance (var4,var_other) on <var4:MPropDef> */
-var11 = var4 == var_other;
-var9 = var11;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var9,var_other) on <var9:MPropDef> */
+var16 = var9 == var_other;
+var14 = var16;
+goto RET_LABEL15;
+RET_LABEL15:(void)0;
 }
 }
-var7 = var9;
-goto RET_LABEL8;
-RET_LABEL8:(void)0;
+var12 = var14;
+goto RET_LABEL13;
+RET_LABEL13:(void)0;
 }
 }
-var = var7;
+var1 = var12;
+} else {
+var1 = var_;
+}
+var = var1;
 goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
 /* method model#MPropDef#lookup_next_definition for (self: MPropDef, MModule, MType): MPropDef */
-val* nit___nit__MPropDef___lookup_next_definition(val* self, val* p0, val* p1) {
+val* nitc___nitc__MPropDef___lookup_next_definition(val* self, val* p0, val* p1) {
 val* var /* : MPropDef */;
 val* var_mmodule /* var mmodule: MModule */;
 val* var_mtype /* var mtype: MType */;
@@ -8009,8 +8171,8 @@ val* var3 /* : MProperty */;
 val* var5 /* : MProperty */;
 val* var6 /* : Array[MPropDef] */;
 val* var_mpropdefs /* var mpropdefs: Array[MPropDef] */;
-val* var7 /* : ArrayIterator[nullable Object] */;
-val* var_i /* var i: ArrayIterator[MPropDef] */;
+val* var7 /* : IndexedIterator[nullable Object] */;
+val* var_i /* var i: IndexedIterator[MPropDef] */;
 short int var8 /* : Bool */;
 short int var9 /* : Bool */;
 short int var_ /* var : Bool */;
@@ -8030,20 +8192,20 @@ const char* var_class_name;
 var_mmodule = p0;
 var_mtype = p1;
 {
-var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nit__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
+var1 = ((short int(*)(val* self))(var_mtype->class->vft[COLOR_nitc__model__MType__need_anchor]))(var_mtype); /* need_anchor on <var_mtype:MType>*/
 }
 var2 = !var1;
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2317);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2335);
 fatal_exit(1);
 }
 {
 { /* Inline model#MPropDef#mproperty (self) on <self:MPropDef> */
-var5 = self->attrs[COLOR_nit__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
+var5 = self->attrs[COLOR_nitc__model__MPropDef___mproperty].val; /* _mproperty on <self:MPropDef> */
 if (unlikely(var5 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mproperty");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2230);
 fatal_exit(1);
 }
 var3 = var5;
@@ -8051,27 +8213,27 @@ RET_LABEL4:(void)0;
 }
 }
 {
-var6 = nit___nit__MProperty___lookup_all_definitions(var3, var_mmodule, var_mtype);
+var6 = nitc___nitc__MProperty___lookup_all_definitions(var3, var_mmodule, var_mtype);
 }
 var_mpropdefs = var6;
 {
-var7 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_mpropdefs);
+var7 = core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(var_mpropdefs);
 }
 var_i = var7;
 for(;;) {
 {
-var9 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_i);
+var9 = ((short int(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_i); /* is_ok on <var_i:IndexedIterator[MPropDef]>*/
 }
 var_ = var9;
 if (var9){
 {
-var10 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_i);
+var10 = ((val*(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_i); /* item on <var_i:IndexedIterator[MPropDef]>*/
 }
 {
 { /* Inline kernel#Object#!= (var10,self) on <var10:nullable Object(MPropDef)> */
 var_other = self;
 {
-var13 = ((short int(*)(val* self, val* p0))(var10->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var10, var_other); /* == on <var10:nullable Object(MPropDef)>*/
+var13 = ((short int(*)(val* self, val* p0))(var10->class->vft[COLOR_core__kernel__Object___61d_61d]))(var10, var_other); /* == on <var10:nullable Object(MPropDef)>*/
 }
 var14 = !var13;
 var11 = var14;
@@ -8085,7 +8247,7 @@ var8 = var_;
 }
 if (var8){
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_i); /* Direct call array#ArrayIterator#next on <var_i:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_i); /* next on <var_i:IndexedIterator[MPropDef]>*/
 }
 } else {
 goto BREAK_label;
@@ -8093,29 +8255,29 @@ goto BREAK_label;
 }
 BREAK_label: (void)0;
 {
-var15 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_i);
+var15 = ((short int(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_i); /* is_ok on <var_i:IndexedIterator[MPropDef]>*/
 }
 if (unlikely(!var15)) {
 PRINT_ERROR("Runtime error: %s", "Assert \'has_property\' failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2322);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2340);
 fatal_exit(1);
 }
 {
-standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_i); /* Direct call array#ArrayIterator#next on <var_i:ArrayIterator[MPropDef]>*/
+((void(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__next]))(var_i); /* next on <var_i:IndexedIterator[MPropDef]>*/
 }
 {
-var16 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_i);
+var16 = ((short int(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__is_ok]))(var_i); /* is_ok on <var_i:IndexedIterator[MPropDef]>*/
 }
 if (unlikely(!var16)) {
 PRINT_ERROR("Runtime error: %s", "Assert \'has_next_property\' failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2324);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2342);
 fatal_exit(1);
 }
 {
-var17 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_i);
+var17 = ((val*(*)(val* self))((((long)var_i&3)?class_info[((long)var_i&3)]:var_i->class)->vft[COLOR_core__abstract_collection__Iterator__item]))(var_i); /* item on <var_i:IndexedIterator[MPropDef]>*/
 }
 /* <var17:nullable Object(MPropDef)> isa MPROPDEF */
-type_struct = self->type->resolution_table->types[COLOR_nit__model__MPropDef__MPROPDEF];
+type_struct = self->type->resolution_table->types[COLOR_nitc__model__MPropDef__MPROPDEF];
 cltype = type_struct->color;
 idtype = type_struct->id;
 if(cltype >= var17->type->table_size) {
@@ -8126,7 +8288,7 @@ var18 = var17->type->type_table[cltype] == idtype;
 if (unlikely(!var18)) {
 var_class_name = var17 == NULL ? "null" : var17->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "MPROPDEF", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2325);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2343);
 fatal_exit(1);
 }
 var = var17;
@@ -8135,41 +8297,41 @@ RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#msignature for (self: MMethodDef): nullable MSignature */
-val* nit___nit__MMethodDef___msignature(val* self) {
+val* nitc___nitc__MMethodDef___msignature(val* self) {
 val* var /* : nullable MSignature */;
 val* var1 /* : nullable MSignature */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___msignature].val; /* _msignature on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___msignature].val; /* _msignature on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#msignature= for (self: MMethodDef, nullable MSignature) */
-void nit___nit__MMethodDef___msignature_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MMethodDef___msignature].val = p0; /* _msignature on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___msignature_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___msignature].val = p0; /* _msignature on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MMethodDef#new_msignature for (self: MMethodDef): nullable MSignature */
-val* nit___nit__MMethodDef___new_msignature(val* self) {
+val* nitc___nitc__MMethodDef___new_msignature(val* self) {
 val* var /* : nullable MSignature */;
 val* var1 /* : nullable MSignature */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___new_msignature].val; /* _new_msignature on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___new_msignature].val; /* _new_msignature on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#new_msignature= for (self: MMethodDef, nullable MSignature) */
-void nit___nit__MMethodDef___new_msignature_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MMethodDef___new_msignature].val = p0; /* _new_msignature on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___new_msignature_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___new_msignature].val = p0; /* _new_msignature on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MMethodDef#initializers for (self: MMethodDef): Array[MProperty] */
-val* nit___nit__MMethodDef___initializers(val* self) {
+val* nitc___nitc__MMethodDef___initializers(val* self) {
 val* var /* : Array[MProperty] */;
 val* var1 /* : Array[MProperty] */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___initializers].val; /* _initializers on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___initializers].val; /* _initializers on <self:MMethodDef> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _initializers");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2345);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2363);
 fatal_exit(1);
 }
 var = var1;
@@ -8177,111 +8339,111 @@ RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#is_abstract for (self: MMethodDef): Bool */
-short int nit___nit__MMethodDef___is_abstract(val* self) {
+short int nitc___nitc__MMethodDef___is_abstract(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___is_abstract].s; /* _is_abstract on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___is_abstract].s; /* _is_abstract on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#is_abstract= for (self: MMethodDef, Bool) */
-void nit___nit__MMethodDef___is_abstract_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethodDef___is_abstract].s = p0; /* _is_abstract on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___is_abstract_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___is_abstract].s = p0; /* _is_abstract on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MMethodDef#is_intern for (self: MMethodDef): Bool */
-short int nit___nit__MMethodDef___is_intern(val* self) {
+short int nitc___nitc__MMethodDef___is_intern(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___is_intern].s; /* _is_intern on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___is_intern].s; /* _is_intern on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#is_intern= for (self: MMethodDef, Bool) */
-void nit___nit__MMethodDef___is_intern_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethodDef___is_intern].s = p0; /* _is_intern on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___is_intern_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___is_intern].s = p0; /* _is_intern on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MMethodDef#is_extern for (self: MMethodDef): Bool */
-short int nit___nit__MMethodDef___is_extern(val* self) {
+short int nitc___nitc__MMethodDef___is_extern(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___is_extern].s; /* _is_extern on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___is_extern].s; /* _is_extern on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#is_extern= for (self: MMethodDef, Bool) */
-void nit___nit__MMethodDef___is_extern_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MMethodDef___is_extern].s = p0; /* _is_extern on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___is_extern_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___is_extern].s = p0; /* _is_extern on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MMethodDef#constant_value for (self: MMethodDef): nullable Object */
-val* nit___nit__MMethodDef___constant_value(val* self) {
+val* nitc___nitc__MMethodDef___constant_value(val* self) {
 val* var /* : nullable Object */;
 val* var1 /* : nullable Object */;
-var1 = self->attrs[COLOR_nit__model__MMethodDef___constant_value].val; /* _constant_value on <self:MMethodDef> */
+var1 = self->attrs[COLOR_nitc__model__MMethodDef___constant_value].val; /* _constant_value on <self:MMethodDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MMethodDef#constant_value= for (self: MMethodDef, nullable Object) */
-void nit___nit__MMethodDef___constant_value_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MMethodDef___constant_value].val = p0; /* _constant_value on <self:MMethodDef> */
+void nitc___nitc__MMethodDef___constant_value_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MMethodDef___constant_value].val = p0; /* _constant_value on <self:MMethodDef> */
 RET_LABEL:;
 }
 /* method model#MAttributeDef#static_mtype for (self: MAttributeDef): nullable MType */
-val* nit___nit__MAttributeDef___static_mtype(val* self) {
+val* nitc___nitc__MAttributeDef___static_mtype(val* self) {
 val* var /* : nullable MType */;
 val* var1 /* : nullable MType */;
-var1 = self->attrs[COLOR_nit__model__MAttributeDef___static_mtype].val; /* _static_mtype on <self:MAttributeDef> */
+var1 = self->attrs[COLOR_nitc__model__MAttributeDef___static_mtype].val; /* _static_mtype on <self:MAttributeDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MAttributeDef#static_mtype= for (self: MAttributeDef, nullable MType) */
-void nit___nit__MAttributeDef___static_mtype_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MAttributeDef___static_mtype].val = p0; /* _static_mtype on <self:MAttributeDef> */
+void nitc___nitc__MAttributeDef___static_mtype_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MAttributeDef___static_mtype].val = p0; /* _static_mtype on <self:MAttributeDef> */
 RET_LABEL:;
 }
 /* method model#MVirtualTypeDef#bound for (self: MVirtualTypeDef): nullable MType */
-val* nit___nit__MVirtualTypeDef___bound(val* self) {
+val* nitc___nitc__MVirtualTypeDef___bound(val* self) {
 val* var /* : nullable MType */;
 val* var1 /* : nullable MType */;
-var1 = self->attrs[COLOR_nit__model__MVirtualTypeDef___bound].val; /* _bound on <self:MVirtualTypeDef> */
+var1 = self->attrs[COLOR_nitc__model__MVirtualTypeDef___bound].val; /* _bound on <self:MVirtualTypeDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MVirtualTypeDef#bound= for (self: MVirtualTypeDef, nullable MType) */
-void nit___nit__MVirtualTypeDef___bound_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MVirtualTypeDef___bound].val = p0; /* _bound on <self:MVirtualTypeDef> */
+void nitc___nitc__MVirtualTypeDef___bound_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MVirtualTypeDef___bound].val = p0; /* _bound on <self:MVirtualTypeDef> */
 RET_LABEL:;
 }
 /* method model#MVirtualTypeDef#is_fixed for (self: MVirtualTypeDef): Bool */
-short int nit___nit__MVirtualTypeDef___is_fixed(val* self) {
+short int nitc___nitc__MVirtualTypeDef___is_fixed(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MVirtualTypeDef___is_fixed].s; /* _is_fixed on <self:MVirtualTypeDef> */
+var1 = self->attrs[COLOR_nitc__model__MVirtualTypeDef___is_fixed].s; /* _is_fixed on <self:MVirtualTypeDef> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MVirtualTypeDef#is_fixed= for (self: MVirtualTypeDef, Bool) */
-void nit___nit__MVirtualTypeDef___is_fixed_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MVirtualTypeDef___is_fixed].s = p0; /* _is_fixed on <self:MVirtualTypeDef> */
+void nitc___nitc__MVirtualTypeDef___is_fixed_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MVirtualTypeDef___is_fixed].s = p0; /* _is_fixed on <self:MVirtualTypeDef> */
 RET_LABEL:;
 }
 /* method model#MClassKind#to_s for (self: MClassKind): String */
-val* nit___nit__MClassKind___standard__string__Object__to_s(val* self) {
+val* nitc___nitc__MClassKind___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
-var1 = self->attrs[COLOR_nit__model__MClassKind___to_s].val; /* _to_s on <self:MClassKind> */
+var1 = self->attrs[COLOR_nitc__model__MClassKind___to_s].val; /* _to_s on <self:MClassKind> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _to_s");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__model, 2408);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__model, 2426);
 fatal_exit(1);
 }
 var = var1;
@@ -8289,26 +8451,26 @@ RET_LABEL:;
 return var;
 }
 /* method model#MClassKind#to_s= for (self: MClassKind, String) */
-void nit___nit__MClassKind___to_s_61d(val* self, val* p0) {
-self->attrs[COLOR_nit__model__MClassKind___to_s].val = p0; /* _to_s on <self:MClassKind> */
+void nitc___nitc__MClassKind___to_s_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__model__MClassKind___to_s].val = p0; /* _to_s on <self:MClassKind> */
 RET_LABEL:;
 }
 /* method model#MClassKind#need_init for (self: MClassKind): Bool */
-short int nit___nit__MClassKind___need_init(val* self) {
+short int nitc___nitc__MClassKind___need_init(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
-var1 = self->attrs[COLOR_nit__model__MClassKind___need_init].s; /* _need_init on <self:MClassKind> */
+var1 = self->attrs[COLOR_nitc__model__MClassKind___need_init].s; /* _need_init on <self:MClassKind> */
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method model#MClassKind#need_init= for (self: MClassKind, Bool) */
-void nit___nit__MClassKind___need_init_61d(val* self, short int p0) {
-self->attrs[COLOR_nit__model__MClassKind___need_init].s = p0; /* _need_init on <self:MClassKind> */
+void nitc___nitc__MClassKind___need_init_61d(val* self, short int p0) {
+self->attrs[COLOR_nitc__model__MClassKind___need_init].s = p0; /* _need_init on <self:MClassKind> */
 RET_LABEL:;
 }
 /* method model#MClassKind#can_specialize for (self: MClassKind, MClassKind): Bool */
-short int nit___nit__MClassKind___can_specialize(val* self, val* p0) {
+short int nitc___nitc__MClassKind___can_specialize(val* self, val* p0) {
 short int var /* : Bool */;
 val* var_other /* var other: MClassKind */;
 val* var1 /* : Sys */;
@@ -8352,7 +8514,7 @@ short int var51 /* : Bool */;
 var_other = p0;
 var1 = glob_sys;
 {
-var2 = nit__model___standard__Sys___interface_kind(var1);
+var2 = nitc__model___core__Sys___interface_kind(var1);
 }
 {
 { /* Inline kernel#Object#== (var_other,var2) on <var_other:MClassKind> */
@@ -8377,7 +8539,7 @@ goto RET_LABEL;
 }
 var10 = glob_sys;
 {
-var11 = nit__model___standard__Sys___interface_kind(var10);
+var11 = nitc__model___core__Sys___interface_kind(var10);
 }
 {
 { /* Inline kernel#Object#== (self,var11) on <self:MClassKind> */
@@ -8401,7 +8563,7 @@ var9 = var_;
 } else {
 var17 = glob_sys;
 {
-var18 = nit__model___standard__Sys___enum_kind(var17);
+var18 = nitc__model___core__Sys___enum_kind(var17);
 }
 {
 { /* Inline kernel#Object#== (self,var18) on <self:MClassKind> */
@@ -8427,7 +8589,7 @@ goto RET_LABEL;
 } else {
 var24 = glob_sys;
 {
-var25 = nit__model___standard__Sys___extern_kind(var24);
+var25 = nitc__model___core__Sys___extern_kind(var24);
 }
 {
 { /* Inline kernel#Object#== (self,var25) on <self:MClassKind> */
@@ -8467,7 +8629,7 @@ goto RET_LABEL;
 } else {
 var37 = glob_sys;
 {
-var38 = nit__model___standard__Sys___enum_kind(var37);
+var38 = nitc__model___core__Sys___enum_kind(var37);
 }
 {
 { /* Inline kernel#Object#== (var_other,var38) on <var_other:MClassKind> */
@@ -8491,7 +8653,7 @@ var36 = var_44;
 } else {
 var45 = glob_sys;
 {
-var46 = nit__model___standard__Sys___extern_kind(var45);
+var46 = nitc__model___core__Sys___extern_kind(var45);
 }
 {
 { /* Inline kernel#Object#== (var_other,var46) on <var_other:MClassKind> */
@@ -8524,14 +8686,14 @@ RET_LABEL:;
 return var;
 }
 /* method model#MClassKind#init for (self: MClassKind) */
-void nit___nit__MClassKind___standard__kernel__Object__init(val* self) {
+void nitc___nitc__MClassKind___core__kernel__Object__init(val* self) {
 {
-((void(*)(val* self))(self->class->vft[COLOR_nit___nit__MClassKind___standard__kernel__Object__init]))(self); /* init on <self:MClassKind>*/
+((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MClassKind___core__kernel__Object__init]))(self); /* init on <self:MClassKind>*/
 }
 RET_LABEL:;
 }
 /* method model#Sys#abstract_kind for (self: Sys): MClassKind */
-val* nit__model___standard__Sys___abstract_kind(val* self) {
+val* nitc__model___core__Sys___abstract_kind(val* self) {
 val* var /* : MClassKind */;
 static val* varonce;
 static int varonce_guard;
@@ -8540,27 +8702,27 @@ val* var2 /* : MClassKind */;
 static val* varonce3;
 val* var4 /* : String */;
 char* var5 /* : NativeString */;
-val* var6 /* : FlatString */;
+val* var6 /* : String */;
 if (likely(varonce_guard)) {
 var1 = varonce;
 } else {
-var2 = NEW_nit__MClassKind(&type_nit__MClassKind);
+var2 = NEW_nitc__MClassKind(&type_nitc__MClassKind);
 if (likely(varonce3!=NULL)) {
 var4 = varonce3;
 } else {
 var5 = "abstract class";
-var6 = standard___standard__NativeString___to_s_with_length(var5, 14l);
+var6 = core__flat___NativeString___to_s_full(var5, 14l, 14l);
 var4 = var6;
 varonce3 = var4;
 }
 {
-((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nit__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
+((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nitc__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nit__model__MClassKind__need_init_61d]))(var2, 1); /* need_init= on <var2:MClassKind>*/
+((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nitc__model__MClassKind__need_init_61d]))(var2, 1); /* need_init= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self))(var2->class->vft[COLOR_standard__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
+((void(*)(val* self))(var2->class->vft[COLOR_core__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
 }
 var1 = var2;
 varonce = var1;
@@ -8572,7 +8734,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#Sys#concrete_kind for (self: Sys): MClassKind */
-val* nit__model___standard__Sys___concrete_kind(val* self) {
+val* nitc__model___core__Sys___concrete_kind(val* self) {
 val* var /* : MClassKind */;
 static val* varonce;
 static int varonce_guard;
@@ -8581,27 +8743,27 @@ val* var2 /* : MClassKind */;
 static val* varonce3;
 val* var4 /* : String */;
 char* var5 /* : NativeString */;
-val* var6 /* : FlatString */;
+val* var6 /* : String */;
 if (likely(varonce_guard)) {
 var1 = varonce;
 } else {
-var2 = NEW_nit__MClassKind(&type_nit__MClassKind);
+var2 = NEW_nitc__MClassKind(&type_nitc__MClassKind);
 if (likely(varonce3!=NULL)) {
 var4 = varonce3;
 } else {
 var5 = "class";
-var6 = standard___standard__NativeString___to_s_with_length(var5, 5l);
+var6 = core__flat___NativeString___to_s_full(var5, 5l, 5l);
 var4 = var6;
 varonce3 = var4;
 }
 {
-((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nit__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
+((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nitc__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nit__model__MClassKind__need_init_61d]))(var2, 1); /* need_init= on <var2:MClassKind>*/
+((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nitc__model__MClassKind__need_init_61d]))(var2, 1); /* need_init= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self))(var2->class->vft[COLOR_standard__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
+((void(*)(val* self))(var2->class->vft[COLOR_core__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
 }
 var1 = var2;
 varonce = var1;
@@ -8613,7 +8775,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#Sys#interface_kind for (self: Sys): MClassKind */
-val* nit__model___standard__Sys___interface_kind(val* self) {
+val* nitc__model___core__Sys___interface_kind(val* self) {
 val* var /* : MClassKind */;
 static val* varonce;
 static int varonce_guard;
@@ -8622,27 +8784,27 @@ val* var2 /* : MClassKind */;
 static val* varonce3;
 val* var4 /* : String */;
 char* var5 /* : NativeString */;
-val* var6 /* : FlatString */;
+val* var6 /* : String */;
 if (likely(varonce_guard)) {
 var1 = varonce;
 } else {
-var2 = NEW_nit__MClassKind(&type_nit__MClassKind);
+var2 = NEW_nitc__MClassKind(&type_nitc__MClassKind);
 if (likely(varonce3!=NULL)) {
 var4 = varonce3;
 } else {
 var5 = "interface";
-var6 = standard___standard__NativeString___to_s_with_length(var5, 9l);
+var6 = core__flat___NativeString___to_s_full(var5, 9l, 9l);
 var4 = var6;
 varonce3 = var4;
 }
 {
-((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nit__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
+((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nitc__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nit__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
+((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nitc__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self))(var2->class->vft[COLOR_standard__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
+((void(*)(val* self))(var2->class->vft[COLOR_core__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
 }
 var1 = var2;
 varonce = var1;
@@ -8654,7 +8816,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#Sys#enum_kind for (self: Sys): MClassKind */
-val* nit__model___standard__Sys___enum_kind(val* self) {
+val* nitc__model___core__Sys___enum_kind(val* self) {
 val* var /* : MClassKind */;
 static val* varonce;
 static int varonce_guard;
@@ -8663,27 +8825,27 @@ val* var2 /* : MClassKind */;
 static val* varonce3;
 val* var4 /* : String */;
 char* var5 /* : NativeString */;
-val* var6 /* : FlatString */;
+val* var6 /* : String */;
 if (likely(varonce_guard)) {
 var1 = varonce;
 } else {
-var2 = NEW_nit__MClassKind(&type_nit__MClassKind);
+var2 = NEW_nitc__MClassKind(&type_nitc__MClassKind);
 if (likely(varonce3!=NULL)) {
 var4 = varonce3;
 } else {
 var5 = "enum";
-var6 = standard___standard__NativeString___to_s_with_length(var5, 4l);
+var6 = core__flat___NativeString___to_s_full(var5, 4l, 4l);
 var4 = var6;
 varonce3 = var4;
 }
 {
-((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nit__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
+((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nitc__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nit__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
+((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nitc__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self))(var2->class->vft[COLOR_standard__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
+((void(*)(val* self))(var2->class->vft[COLOR_core__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
 }
 var1 = var2;
 varonce = var1;
@@ -8695,7 +8857,7 @@ RET_LABEL:;
 return var;
 }
 /* method model#Sys#extern_kind for (self: Sys): MClassKind */
-val* nit__model___standard__Sys___extern_kind(val* self) {
+val* nitc__model___core__Sys___extern_kind(val* self) {
 val* var /* : MClassKind */;
 static val* varonce;
 static int varonce_guard;
@@ -8704,27 +8866,27 @@ val* var2 /* : MClassKind */;
 static val* varonce3;
 val* var4 /* : String */;
 char* var5 /* : NativeString */;
-val* var6 /* : FlatString */;
+val* var6 /* : String */;
 if (likely(varonce_guard)) {
 var1 = varonce;
 } else {
-var2 = NEW_nit__MClassKind(&type_nit__MClassKind);
+var2 = NEW_nitc__MClassKind(&type_nitc__MClassKind);
 if (likely(varonce3!=NULL)) {
 var4 = varonce3;
 } else {
 var5 = "extern class";
-var6 = standard___standard__NativeString___to_s_with_length(var5, 12l);
+var6 = core__flat___NativeString___to_s_full(var5, 12l, 12l);
 var4 = var6;
 varonce3 = var4;
 }
 {
-((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nit__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
+((void(*)(val* self, val* p0))(var2->class->vft[COLOR_nitc__model__MClassKind__to_s_61d]))(var2, var4); /* to_s= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nit__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
+((void(*)(val* self, short int p0))(var2->class->vft[COLOR_nitc__model__MClassKind__need_init_61d]))(var2, 0); /* need_init= on <var2:MClassKind>*/
 }
 {
-((void(*)(val* self))(var2->class->vft[COLOR_standard__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
+((void(*)(val* self))(var2->class->vft[COLOR_core__kernel__Object__init]))(var2); /* init on <var2:MClassKind>*/
 }
 var1 = var2;
 varonce = var1;