c_src: updates c_src for extern classes to be special of Pointer

[nit.git] / c_src / standard___collection___array._sep.c

diff --git a/c_src/array._sep.c b/c_src/standard___collection___array._sep.c
similarity index 58%
rename from c_src/array._sep.c
rename to c_src/standard___collection___array._sep.c
index e593de6..391ec15 100644 (file)
--- a/c_src/array._sep.c
+++ b/c_src/standard___collection___array._sep.c
@@ -1,53 +1,53 @@
-/* This C file is generated by NIT to compile module array. */
-#include "array._sep.h"
-val_t array___AbstractArrayRead___length(val_t p0){
+/* This C file is generated by NIT to compile module standard___collection___array. */
+#include "standard___collection___array._sep.h"
+val_t standard___collection___array___AbstractArrayRead___length(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 23;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___length;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___length;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___AbstractArrayRead___is_empty(val_t p0){
+val_t standard___collection___array___AbstractArrayRead___is_empty(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 26;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___is_empty;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___is_empty;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:26 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 26);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 26);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   REGB1 = TAG_Int(0);
   REGB2 = TAG_Bool(IS_EQUAL_OO(REGB0,REGB1));
   if (UNTAG_Bool(REGB2)) {
   } else {
-    /* ./../lib/standard//kernel.nit:207 */
+    /* ./../lib/standard//kernel.nit:210 */
     REGB1 = TAG_Bool((REGB0)==(REGB1));
     /* ./../lib/standard//collection//array.nit:26 */
     REGB2 = REGB1;
@@ -57,7 +57,7 @@ val_t array___AbstractArrayRead___is_empty(val_t p0){
   stack_frame_head = fra.me.prev;
   return REGB2;
 }
-val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___has(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -65,9 +65,9 @@ val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 28;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___has;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___has;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -78,20 +78,20 @@ val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
   /* ./../lib/standard//collection//array.nit:30 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:32 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:32 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:33 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
       REGB2 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -100,7 +100,7 @@ val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB2 = REGB3;
         }
       }
@@ -110,7 +110,7 @@ val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
       }
       /* ./../lib/standard//collection//array.nit:34 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:34 */
       REGB0 = REGB3;
@@ -128,7 +128,7 @@ val_t array___AbstractArrayRead___has(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB2;
 }
-val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___has_only(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -136,9 +136,9 @@ val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 39;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___has_only;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___has_only;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -149,20 +149,20 @@ val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
   /* ./../lib/standard//collection//array.nit:41 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:43 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:43 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:44 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
       REGB2 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -171,7 +171,7 @@ val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB2 = REGB3;
         }
       }
@@ -182,7 +182,7 @@ val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
       }
       /* ./../lib/standard//collection//array.nit:45 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:45 */
       REGB0 = REGB3;
@@ -200,15 +200,15 @@ val_t array___AbstractArrayRead___has_only(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB2;
 }
-val_t array___AbstractArrayRead___has_key(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___has_key(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 50;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___has_key;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___has_key;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
@@ -216,18 +216,18 @@ val_t array___AbstractArrayRead___has_key(val_t p0, val_t p1){
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:50 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:50 */
   if (UNTAG_Bool(REGB1)) {
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
   } else {
     /* ./../lib/standard//collection//array.nit:50 */
@@ -239,7 +239,7 @@ val_t array___AbstractArrayRead___has_key(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___AbstractArrayRead___count(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___count(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -248,9 +248,9 @@ val_t array___AbstractArrayRead___count(val_t p0, val_t p1){
   val_t REGB4;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 52;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___count;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___count;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -263,20 +263,20 @@ val_t array___AbstractArrayRead___count(val_t p0, val_t p1){
   /* ./../lib/standard//collection//array.nit:55 */
   REGB1 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:57 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB3 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:57 */
     if (UNTAG_Bool(REGB3)) {
       /* ./../lib/standard//collection//array.nit:58 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB1);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB1);
       REGB3 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB3)) {
       } else {
@@ -285,20 +285,20 @@ val_t array___AbstractArrayRead___count(val_t p0, val_t p1){
           REGB4 = TAG_Bool(false);
           REGB3 = REGB4;
         } else {
-          REGB4 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB4 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB3 = REGB4;
         }
       }
       if (UNTAG_Bool(REGB3)) {
         REGB3 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:215 */
+        /* ./../lib/standard//kernel.nit:218 */
         REGB3 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB3));
         /* ./../lib/standard//collection//array.nit:58 */
         REGB0 = REGB3;
       }
       /* ./../lib/standard//collection//array.nit:59 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:59 */
       REGB1 = REGB3;
@@ -314,14 +314,14 @@ val_t array___AbstractArrayRead___count(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___AbstractArrayRead___index_of(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___index_of(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 64;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___index_of;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___index_of;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -330,21 +330,21 @@ val_t array___AbstractArrayRead___index_of(val_t p0, val_t p1){
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:64 */
   REGB0 = TAG_Int(0);
-  REGB0 = CALL_array___AbstractArrayRead___index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB0);
+  REGB0 = CALL_standard___collection___array___AbstractArrayRead___index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB0);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___AbstractArrayRead___last_index_of(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead___last_index_of(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 66;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___last_index_of;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___last_index_of;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -352,24 +352,24 @@ val_t array___AbstractArrayRead___last_index_of(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:66 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:66 */
-  REGB1 = CALL_array___AbstractArrayRead___last_index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB1);
+  REGB1 = CALL_standard___collection___array___AbstractArrayRead___last_index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB1);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
+val_t standard___collection___array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -377,9 +377,9 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 68;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___index_of_from;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___index_of_from;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -389,20 +389,20 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
   fra.me.REG[1] = p1;
   REGB0 = p2;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:72 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:72 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:73 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
       REGB2 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -411,7 +411,7 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB2 = REGB3;
         }
       }
@@ -422,7 +422,7 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
       }
       /* ./../lib/standard//collection//array.nit:76 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:76 */
       REGB0 = REGB3;
@@ -434,7 +434,7 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
   label2: while(0);
   /* ./../lib/standard//collection//array.nit:78 */
   REGB0 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:216 */
+  /* ./../lib/standard//kernel.nit:219 */
   REGB0 = TAG_Int(-UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:78 */
   REGB2 = REGB0;
@@ -443,16 +443,16 @@ val_t array___AbstractArrayRead___index_of_from(val_t p0, val_t p1, val_t p2){
   stack_frame_head = fra.me.prev;
   return REGB2;
 }
-val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p2){
+val_t standard___collection___array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 81;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___last_index_of_from;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___last_index_of_from;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -464,12 +464,12 @@ val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p
   /* ./../lib/standard//collection//array.nit:84 */
   while(1) {
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:84 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:85 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
       REGB1 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB1)) {
       } else {
@@ -478,7 +478,7 @@ val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p
           REGB2 = TAG_Bool(false);
           REGB1 = REGB2;
         } else {
-          REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB1 = REGB2;
         }
       }
@@ -489,7 +489,7 @@ val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p
       } else {
         /* ./../lib/standard//collection//array.nit:88 */
         REGB2 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:217 */
+        /* ./../lib/standard//kernel.nit:220 */
         REGB2 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB2));
         /* ./../lib/standard//collection//array.nit:88 */
         REGB0 = REGB2;
@@ -502,7 +502,7 @@ val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p
   label2: while(0);
   /* ./../lib/standard//collection//array.nit:91 */
   REGB0 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:216 */
+  /* ./../lib/standard//kernel.nit:219 */
   REGB0 = TAG_Int(-UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:91 */
   REGB1 = REGB0;
@@ -511,15 +511,15 @@ val_t array___AbstractArrayRead___last_index_of_from(val_t p0, val_t p1, val_t p
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___AbstractArrayRead___reversed(val_t p0){
+val_t standard___collection___array___AbstractArrayRead___reversed(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 94;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___reversed;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___reversed;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -527,30 +527,30 @@ val_t array___AbstractArrayRead___reversed(val_t p0){
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:96 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 96);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 96);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:97 */
-  fra.me.REG[1] = NEW_Array_array___Array___with_capacity(REGB0);
+  fra.me.REG[1] = NEW_Array_standard___collection___array___Array___with_capacity(REGB0);
   /* ./../lib/standard//collection//array.nit:98 */
   while(1) {
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:214 */
+    /* ./../lib/standard//kernel.nit:217 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:98 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:99 */
       REGB1 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
       /* ./../lib/standard//collection//array.nit:99 */
       REGB0 = REGB1;
       /* ./../lib/standard//collection//array.nit:100 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
-      CALL_abstract_collection___SimpleCollection___add(fra.me.REG[1])(fra.me.REG[1], fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[1])(fra.me.REG[1], fra.me.REG[2]);
     } else {
       /* ./../lib/standard//collection//array.nit:98 */
       goto label1;
@@ -563,7 +563,7 @@ val_t array___AbstractArrayRead___reversed(val_t p0){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-void array___AbstractArrayRead___copy_to(val_t p0, val_t p1, val_t p2, val_t p3, val_t p4){
+void standard___collection___array___AbstractArrayRead___copy_to(val_t p0, val_t p1, val_t p2, val_t p3, val_t p4){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -572,9 +572,9 @@ void array___AbstractArrayRead___copy_to(val_t p0, val_t p1, val_t p2, val_t p3,
   val_t REGB4;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 105;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___copy_to;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___copy_to;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -588,22 +588,22 @@ void array___AbstractArrayRead___copy_to(val_t p0, val_t p1, val_t p2, val_t p3,
   /* ./../lib/standard//collection//array.nit:109 */
   while(1) {
     REGB3 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:214 */
+    /* ./../lib/standard//kernel.nit:217 */
     REGB3 = TAG_Bool(UNTAG_Int(REGB1)>UNTAG_Int(REGB3));
     /* ./../lib/standard//collection//array.nit:109 */
     if (UNTAG_Bool(REGB3)) {
       /* ./../lib/standard//collection//array.nit:110 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB3 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:110 */
       REGB1 = REGB3;
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB2)+UNTAG_Int(REGB1));
       REGB4 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
       /* ./../lib/standard//collection//array.nit:111 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB4);
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB3, fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB4);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB3, fra.me.REG[2]);
     } else {
       /* ./../lib/standard//collection//array.nit:109 */
       goto label1;
@@ -613,7 +613,7 @@ void array___AbstractArrayRead___copy_to(val_t p0, val_t p1, val_t p2, val_t p3,
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArrayRead___output(val_t p0){
+void standard___collection___array___AbstractArrayRead___output(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -621,9 +621,9 @@ void array___AbstractArrayRead___output(val_t p0){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 115;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___output;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___output;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -632,20 +632,20 @@ void array___AbstractArrayRead___output(val_t p0){
   /* ./../lib/standard//collection//array.nit:117 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:119 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:119 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:120 */
-      fra.me.REG[1] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      fra.me.REG[1] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
       /* ./../lib/standard//collection//array.nit:121 */
       REGB2 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
@@ -655,7 +655,7 @@ void array___AbstractArrayRead___output(val_t p0){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[1])(fra.me.REG[1], NIT_NULL);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[1])(fra.me.REG[1], NIT_NULL);
           REGB2 = REGB3;
         }
       }
@@ -663,13 +663,13 @@ void array___AbstractArrayRead___output(val_t p0){
       if (UNTAG_Bool(REGB2)) {
         REGB2 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
         if (UNTAG_Bool(REGB2)) {
-          nit_abort("Reciever is null", NULL, LOCATE_array, 121);
+          nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 121);
         }
-        CALL_kernel___Object___output(fra.me.REG[1])(fra.me.REG[1]);
+        CALL_standard___kernel___Object___output(fra.me.REG[1])(fra.me.REG[1]);
       }
       /* ./../lib/standard//collection//array.nit:122 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:122 */
       REGB0 = REGB2;
@@ -682,25 +682,25 @@ void array___AbstractArrayRead___output(val_t p0){
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___AbstractArrayRead___iterator(val_t p0){
+val_t standard___collection___array___AbstractArrayRead___iterator(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 126;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___iterator;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___iterator;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:126 */
-  fra.me.REG[0] = NEW_ArrayIterator_array___ArrayIterator___init(fra.me.REG[0]);
+  fra.me.REG[0] = NEW_ArrayIterator_standard___collection___array___ArrayIterator___init(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
+val_t standard___collection___array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -709,9 +709,9 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
   val_t REGB4;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 128;
-  fra.me.meth = LOCATE_array___AbstractArrayRead_____eqeq;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead_____eqeq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -721,7 +721,7 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:131 */
-  REGB0 = TAG_Bool((fra.me.REG[1]!=NIT_NULL) && VAL_ISA(fra.me.REG[1], COLOR_AbstractArray, ID_AbstractArray)) /*cast AbstractArray[E]*/;
+  REGB0 = TAG_Bool((fra.me.REG[1]!=NIT_NULL) && VAL_ISA(fra.me.REG[1], COLOR_standard___collection___array___AbstractArray, ID_standard___collection___array___AbstractArray)) /*cast AbstractArray[E]*/;
   REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
   if (UNTAG_Bool(REGB0)) {
     REGB0 = TAG_Bool(true);
@@ -734,29 +734,29 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
     goto label1;
   }
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:133 */
   REGB2 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
-    nit_abort("Reciever is null", NULL, LOCATE_array, 133);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 133);
   }
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[1]);
+  REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:133 */
   REGB3 = TAG_Bool(IS_EQUAL_OO(REGB2,REGB1));
   if (UNTAG_Bool(REGB3)) {
   } else {
-    /* ./../lib/standard//kernel.nit:207 */
+    /* ./../lib/standard//kernel.nit:210 */
     REGB2 = TAG_Bool((REGB2)==(REGB1));
     /* ./../lib/standard//collection//array.nit:133 */
     REGB3 = REGB2;
@@ -771,17 +771,17 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
   REGB3 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:135 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB3)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:135 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:136 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB3);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB3);
       REGB2 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 136);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 136);
       }
-      fra.me.REG[3] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[1])(fra.me.REG[1], REGB3);
+      fra.me.REG[3] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[1])(fra.me.REG[1], REGB3);
       REGB2 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[3]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -790,7 +790,7 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
           REGB4 = TAG_Bool(false);
           REGB2 = REGB4;
         } else {
-          REGB4 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[3]);
+          REGB4 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[3]);
           REGB2 = REGB4;
         }
       }
@@ -802,7 +802,7 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
       }
       /* ./../lib/standard//collection//array.nit:137 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB3)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:137 */
       REGB3 = REGB2;
@@ -820,42 +820,42 @@ val_t array___AbstractArrayRead_____eqeq(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void array___AbstractArrayRead___init(val_t p0, int* init_table){
-  int itpos0 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_AbstractArrayRead].i;
+void standard___collection___array___AbstractArrayRead___init(val_t p0, int* init_table){
+  int itpos0 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___AbstractArrayRead].i;
   struct {struct stack_frame_t me;} fra;
   val_t tmp;
   if (init_table[itpos0]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 0;
-  fra.me.meth = LOCATE_array___AbstractArrayRead___init;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArrayRead___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 0;
   stack_frame_head = fra.me.prev;
   init_table[itpos0] = 1;
   return;
 }
-void array___AbstractArray___enlarge(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___enlarge(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 147;
-  fra.me.meth = LOCATE_array___AbstractArray___enlarge;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___enlarge;
   fra.me.has_broke = 0;
   fra.me.REG_size = 0;
   /* ./../lib/standard//collection//array.nit:147 */
-  nit_abort("Deferred method called", NULL, LOCATE_array, 147);
+  nit_abort("Deferred method called", NULL, LOCATE_standard___collection___array, 147);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___push(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___push(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 149;
-  fra.me.meth = LOCATE_array___AbstractArray___push;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___push;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -863,56 +863,56 @@ void array___AbstractArray___push(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:149 */
-  CALL_abstract_collection___SimpleCollection___add(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___AbstractArray___pop(val_t p0){
+val_t standard___collection___array___AbstractArray___pop(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 151;
-  fra.me.meth = LOCATE_array___AbstractArray___pop;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___pop;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:153 */
-  REGB0 = CALL_abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
   REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert %s  failed", "'not_empty'", LOCATE_array, 153);
+    nit_abort("Assert %s  failed", "'not_empty'", LOCATE_standard___collection___array, 153);
   }
   /* ./../lib/standard//collection//array.nit:154 */
-  fra.me.REG[1] = CALL_abstract_collection___SequenceRead___last(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[1] = CALL_standard___collection___abstract_collection___SequenceRead___last(fra.me.REG[0])(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:155 */
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:155 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB1;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB1;
   /* ./../lib/standard//collection//array.nit:156 */
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-val_t array___AbstractArray___shift(val_t p0){
+val_t standard___collection___array___AbstractArray___shift(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 159;
-  fra.me.meth = LOCATE_array___AbstractArray___shift;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___shift;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -920,39 +920,39 @@ val_t array___AbstractArray___shift(val_t p0){
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:161 */
-  REGB0 = CALL_abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
   REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert %s  failed", "'not_empty'", LOCATE_array, 161);
+    nit_abort("Assert %s  failed", "'not_empty'", LOCATE_standard___collection___array, 161);
   }
   /* ./../lib/standard//collection//array.nit:162 */
-  fra.me.REG[1] = CALL_abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[1] = CALL_standard___collection___abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:163 */
   REGB0 = TAG_Int(1);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:165 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:165 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:166 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB2 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:166 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[2]);
       /* ./../lib/standard//collection//array.nit:167 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:167 */
       REGB0 = REGB2;
@@ -964,25 +964,25 @@ val_t array___AbstractArray___shift(val_t p0){
   label1: while(0);
   /* ./../lib/standard//collection//array.nit:169 */
   REGB0 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB0 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:169 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:170 */
   goto label2;
   label2: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-void array___AbstractArray___unshift(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___unshift(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 173;
-  fra.me.meth = LOCATE_array___AbstractArray___unshift;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___unshift;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -991,33 +991,33 @@ void array___AbstractArray___unshift(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:175 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:176 */
   while(1) {
     REGB0 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:214 */
+    /* ./../lib/standard//kernel.nit:217 */
     REGB0 = TAG_Bool(UNTAG_Int(REGB1)>UNTAG_Int(REGB0));
     /* ./../lib/standard//collection//array.nit:176 */
     if (UNTAG_Bool(REGB0)) {
       /* ./../lib/standard//collection//array.nit:177 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB0 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB0));
       /* ./../lib/standard//collection//array.nit:177 */
-      fra.me.REG[2] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB1);
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB1);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
       /* ./../lib/standard//collection//array.nit:178 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB0 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB0));
       /* ./../lib/standard//collection//array.nit:178 */
       REGB1 = REGB0;
@@ -1029,20 +1029,20 @@ void array___AbstractArray___unshift(val_t p0, val_t p1){
   label1: while(0);
   /* ./../lib/standard//collection//array.nit:180 */
   REGB1 = TAG_Int(0);
-  CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB1, fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB1, fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___insert(val_t p0, val_t p1, val_t p2){
+void standard___collection___array___AbstractArray___insert(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 183;
-  fra.me.meth = LOCATE_array___AbstractArray___insert;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___insert;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1051,46 +1051,46 @@ void array___AbstractArray___insert(val_t p0, val_t p1, val_t p2){
   fra.me.REG[1] = p1;
   REGB0 = p2;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:185 */
   REGB2 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ./../lib/standard//kernel.nit:218 */
   REGB2 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB2));
   /* ./../lib/standard//collection//array.nit:185 */
-  CALL_array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB2);
+  CALL_standard___collection___array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB2);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:217 */
+  REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:220 */
   REGB2 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:186 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ./../lib/standard//kernel.nit:218 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:186 */
-  CALL_array___AbstractArrayRead___copy_to(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB2, fra.me.REG[0], REGB1);
+  CALL_standard___collection___array___AbstractArrayRead___copy_to(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB2, fra.me.REG[0], REGB1);
   /* ./../lib/standard//collection//array.nit:187 */
-  CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___add(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___add(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 190;
-  fra.me.meth = LOCATE_array___AbstractArray___add;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___add;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1098,43 +1098,43 @@ void array___AbstractArray___add(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:190 */
-  CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___clear(val_t p0){
+void standard___collection___array___AbstractArray___clear(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 192;
-  fra.me.meth = LOCATE_array___AbstractArray___clear;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___clear;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:192 */
   REGB0 = TAG_Int(0);
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___remove(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___remove(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 194;
-  fra.me.meth = LOCATE_array___AbstractArray___remove;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___remove;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1142,20 +1142,20 @@ void array___AbstractArray___remove(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:194 */
-  REGB0 = CALL_abstract_collection___SequenceRead___index_of(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  CALL_abstract_collection___Map___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
+  REGB0 = CALL_standard___collection___abstract_collection___SequenceRead___index_of(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___Map___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___remove_all(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___remove_all(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 196;
-  fra.me.meth = LOCATE_array___AbstractArray___remove_all;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___remove_all;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1163,18 +1163,18 @@ void array___AbstractArray___remove_all(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:198 */
-  REGB0 = CALL_abstract_collection___SequenceRead___index_of(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___abstract_collection___SequenceRead___index_of(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:199 */
   while(1) {
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:199 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:200 */
-      CALL_abstract_collection___Map___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
+      CALL_standard___collection___abstract_collection___Map___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
       /* ./../lib/standard//collection//array.nit:201 */
-      REGB1 = CALL_array___AbstractArrayRead___index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB0);
+      REGB1 = CALL_standard___collection___array___AbstractArrayRead___index_of_from(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], REGB0);
       REGB0 = REGB1;
     } else {
       /* ./../lib/standard//collection//array.nit:199 */
@@ -1185,7 +1185,7 @@ void array___AbstractArray___remove_all(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___AbstractArray___remove_at(val_t p0, val_t p1){
+void standard___collection___array___AbstractArray___remove_at(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1193,9 +1193,9 @@ void array___AbstractArray___remove_at(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 205;
-  fra.me.meth = LOCATE_array___AbstractArray___remove_at;
+  fra.me.meth = LOCATE_standard___collection___array___AbstractArray___remove_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1203,19 +1203,19 @@ void array___AbstractArray___remove_at(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:208 */
   REGB2 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB2));
   /* ./../lib/standard//collection//array.nit:208 */
   if (UNTAG_Bool(REGB2)) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
   } else {
     /* ./../lib/standard//collection//array.nit:208 */
@@ -1225,24 +1225,24 @@ void array___AbstractArray___remove_at(val_t p0, val_t p1){
   if (UNTAG_Bool(REGB2)) {
     /* ./../lib/standard//collection//array.nit:209 */
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:210 */
     while(1) {
-      /* ./../lib/standard//kernel.nit:212 */
+      /* ./../lib/standard//kernel.nit:215 */
       REGB0 = TAG_Bool(UNTAG_Int(REGB2)<UNTAG_Int(REGB1));
       /* ./../lib/standard//collection//array.nit:210 */
       if (UNTAG_Bool(REGB0)) {
         /* ./../lib/standard//collection//array.nit:211 */
         REGB0 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:217 */
+        /* ./../lib/standard//kernel.nit:220 */
         REGB0 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB0));
         /* ./../lib/standard//collection//array.nit:211 */
-        fra.me.REG[1] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB2);
-        CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
+        fra.me.REG[1] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[0])(fra.me.REG[0], REGB2);
+        CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
         /* ./../lib/standard//collection//array.nit:212 */
         REGB0 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:215 */
+        /* ./../lib/standard//kernel.nit:218 */
         REGB0 = TAG_Int(UNTAG_Int(REGB2)+UNTAG_Int(REGB0));
         /* ./../lib/standard//collection//array.nit:212 */
         REGB2 = REGB0;
@@ -1254,24 +1254,24 @@ void array___AbstractArray___remove_at(val_t p0, val_t p1){
     label1: while(0);
     /* ./../lib/standard//collection//array.nit:214 */
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:217 */
+    /* ./../lib/standard//kernel.nit:220 */
     REGB2 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:214 */
-    ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB2;
+    ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB2;
   }
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___Array___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_t clos_fun0){
+void standard___collection___array___Array___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_t clos_fun0){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   fun_t CREG[1];
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 231;
-  fra.me.meth = LOCATE_array___Array___iterate;
+  fra.me.meth = LOCATE_standard___collection___array___Array___iterate;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -1284,31 +1284,31 @@ void array___Array___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_
   /* ./../lib/standard//collection//array.nit:234 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:235 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 235);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 235);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:236 */
-  fra.me.REG[1] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[1] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:237 */
   while(1) {
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:237 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:238 */
       REGB1 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 238);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 238);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB0)];
@@ -1319,7 +1319,7 @@ void array___Array___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_
       }
       /* ./../lib/standard//collection//array.nit:239 */
       REGB1 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
       /* ./../lib/standard//collection//array.nit:239 */
       REGB0 = REGB1;
@@ -1333,16 +1333,16 @@ void array___Array___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___Array_____bra(val_t p0, val_t p1){
+val_t standard___collection___array___Array_____bra(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 243;
-  fra.me.meth = LOCATE_array___Array_____bra;
+  fra.me.meth = LOCATE_standard___collection___array___Array_____bra;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
@@ -1350,17 +1350,17 @@ val_t array___Array_____bra(val_t p0, val_t p1){
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:245 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:245 */
   if (UNTAG_Bool(REGB1)) {
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
   } else {
     /* ./../lib/standard//collection//array.nit:245 */
@@ -1369,13 +1369,13 @@ val_t array___Array_____bra(val_t p0, val_t p1){
   }
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+    nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
   }
   /* ./../lib/standard//collection//array.nit:246 */
-  fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
   }
   /* ./../lib/standard//collection//array.nit:654 */
   fra.me.REG[0] = ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)];
@@ -1385,16 +1385,16 @@ val_t array___Array_____bra(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___Array_____braeq(val_t p0, val_t p1, val_t p2){
+void standard___collection___array___Array_____braeq(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 249;
-  fra.me.meth = LOCATE_array___Array_____braeq;
+  fra.me.meth = LOCATE_standard___collection___array___Array_____braeq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1404,20 +1404,20 @@ void array___Array_____braeq(val_t p0, val_t p1, val_t p2){
   fra.me.REG[1] = p2;
   /* ./../lib/standard//collection//array.nit:251 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:251 */
   if (UNTAG_Bool(REGB1)) {
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 251);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 251);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB2 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB2));
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB2));
   } else {
     /* ./../lib/standard//collection//array.nit:251 */
@@ -1426,64 +1426,64 @@ void array___Array_____braeq(val_t p0, val_t p1, val_t p2){
   }
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Assert %s  failed", "'index'", LOCATE_array, 251);
+    nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 251);
   }
   /* ./../lib/standard//collection//array.nit:252 */
-  REGB2 = TAG_Bool(ATTR_array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_array, 252);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___array, 252);
   }
-  REGB2 = ATTR_array___Array____capacity(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:211 */
+  REGB2 = ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:214 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB2)<=UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:252 */
   if (UNTAG_Bool(REGB2)) {
     /* ./../lib/standard//collection//array.nit:253 */
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:253 */
-    CALL_array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB2);
+    CALL_standard___collection___array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB2);
   }
   /* ./../lib/standard//collection//array.nit:255 */
-  REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 255);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 255);
   }
-  REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:211 */
+  REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:214 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB2)<=UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:255 */
   if (UNTAG_Bool(REGB2)) {
     /* ./../lib/standard//collection//array.nit:256 */
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:256 */
-    ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB2;
+    ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB2;
   }
   /* ./../lib/standard//collection//array.nit:258 */
-  fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   REGB2 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
-    nit_abort("Reciever is null", NULL, LOCATE_array, 258);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 258);
   }
   /* ./../lib/standard//collection//array.nit:655 */
   ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)]=fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___Array___add(val_t p0, val_t p1){
+void standard___collection___array___Array___add(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 261;
-  fra.me.meth = LOCATE_array___Array___add;
+  fra.me.meth = LOCATE_standard___collection___array___Array___add;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1491,48 +1491,48 @@ void array___Array___add(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:263 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 263);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 263);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:264 */
-  REGB1 = TAG_Bool(ATTR_array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_array, 264);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___array, 264);
   }
-  REGB1 = ATTR_array___Array____capacity(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:211 */
+  REGB1 = ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:214 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB1)<=UNTAG_Int(REGB0));
   /* ./../lib/standard//collection//array.nit:264 */
   if (UNTAG_Bool(REGB1)) {
     /* ./../lib/standard//collection//array.nit:265 */
     REGB1 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:265 */
-    CALL_array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB1);
+    CALL_standard___collection___array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB1);
   }
   /* ./../lib/standard//collection//array.nit:267 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ./../lib/standard//kernel.nit:218 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:267 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB1;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB1;
   /* ./../lib/standard//collection//array.nit:268 */
-  fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_array, 268);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 268);
   }
   /* ./../lib/standard//collection//array.nit:655 */
   ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)]=fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___Array___enlarge(val_t p0, val_t p1){
+void standard___collection___array___Array___enlarge(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1540,9 +1540,9 @@ void array___Array___enlarge(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 271;
-  fra.me.meth = LOCATE_array___Array___enlarge;
+  fra.me.meth = LOCATE_standard___collection___array___Array___enlarge;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -1551,13 +1551,13 @@ void array___Array___enlarge(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:273 */
-  REGB1 = TAG_Bool(ATTR_array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_array, 273);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___array, 273);
   }
-  REGB1 = ATTR_array___Array____capacity(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:211 */
+  REGB1 = ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:214 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB0)<=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:274 */
   if (UNTAG_Bool(REGB2)) {
@@ -1565,16 +1565,16 @@ void array___Array___enlarge(val_t p0, val_t p1){
   }
   /* ./../lib/standard//collection//array.nit:275 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:211 */
+    /* ./../lib/standard//kernel.nit:214 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB1)<=UNTAG_Int(REGB0));
     /* ./../lib/standard//collection//array.nit:275 */
     if (UNTAG_Bool(REGB2)) {
       REGB2 = TAG_Int(2);
-      /* ./../lib/standard//kernel.nit:218 */
+      /* ./../lib/standard//kernel.nit:221 */
       REGB2 = TAG_Int(UNTAG_Int(REGB1)*UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:275 */
       REGB3 = TAG_Int(2);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB3 = TAG_Int(UNTAG_Int(REGB2)+UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:275 */
       REGB1 = REGB3;
@@ -1586,73 +1586,73 @@ void array___Array___enlarge(val_t p0, val_t p1){
   /* ./../lib/standard//collection//array.nit:648 */
   fra.me.REG[1] = NEW_NativeArray(UNTAG_Int(REGB1), sizeof(val_t));
   /* ./../lib/standard//collection//array.nit:277 */
-  REGB0 = TAG_Bool(ATTR_array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___Array____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_array, 277);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___array, 277);
   }
-  REGB0 = ATTR_array___Array____capacity(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]);
   REGB3 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:214 */
+  /* ./../lib/standard//kernel.nit:217 */
   REGB3 = TAG_Bool(UNTAG_Int(REGB0)>UNTAG_Int(REGB3));
   /* ./../lib/standard//collection//array.nit:277 */
   if (UNTAG_Bool(REGB3)) {
-    fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[0]);
-    REGB3 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
+    REGB3 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB3)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 277);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 277);
     }
-    REGB3 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+    REGB3 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
     REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 277);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 277);
     }
     /* ./../lib/standard//collection//array.nit:656 */
     (void)memcpy(((Nit_NativeArray )fra.me.REG[1])->val, ((Nit_NativeArray)fra.me.REG[2])->val, UNTAG_Int(REGB3)*sizeof(val_t));
   }
   /* ./../lib/standard//collection//array.nit:278 */
-  ATTR_array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
+  ATTR_standard___collection___array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
   /* ./../lib/standard//collection//array.nit:279 */
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB1;
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___Array___init(val_t p0, int* init_table){
-  int itpos1 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_Array].i;
+void standard___collection___array___Array___init(val_t p0, int* init_table){
+  int itpos1 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___Array].i;
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   if (init_table[itpos1]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 282;
-  fra.me.meth = LOCATE_array___Array___init;
+  fra.me.meth = LOCATE_standard___collection___array___Array___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:285 */
   REGB0 = TAG_Int(0);
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:286 */
   REGB0 = TAG_Int(0);
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   init_table[itpos1] = 1;
   return;
 }
-void array___Array___with_items(val_t p0, val_t p1, int* init_table){
-  int itpos2 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_Array].i;
+void standard___collection___array___Array___with_items(val_t p0, val_t p1, int* init_table){
+  int itpos2 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___Array].i;
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t tmp;
   if (init_table[itpos2]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 289;
-  fra.me.meth = LOCATE_array___Array___with_items;
+  fra.me.meth = LOCATE_standard___collection___array___Array___with_items;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -1661,46 +1661,46 @@ void array___Array___with_items(val_t p0, val_t p1, int* init_table){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:289 */
-  REGB0 = TAG_Bool((fra.me.REG[1]!=NIT_NULL) && VAL_ISA(fra.me.REG[1], COLOR_Array, ID_Array)) /*cast Array[E]*/;
+  REGB0 = TAG_Bool((fra.me.REG[1]!=NIT_NULL) && VAL_ISA(fra.me.REG[1], COLOR_standard___collection___array___Array, ID_standard___collection___array___Array)) /*cast Array[E]*/;
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Cast failed", NULL, LOCATE_array, 289);
+    nit_abort("Cast failed", NULL, LOCATE_standard___collection___array, 289);
   }
   /* ./../lib/standard//collection//array.nit:292 */
-  fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[1]);
-  ATTR_array___Array____items(fra.me.REG[0]) = fra.me.REG[2];
+  fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[1]);
+  ATTR_standard___collection___array___Array____items(fra.me.REG[0]) = fra.me.REG[2];
   /* ./../lib/standard//collection//array.nit:293 */
-  REGB0 = TAG_Bool(ATTR_array___Array____capacity(fra.me.REG[1])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___Array____capacity(fra.me.REG[1])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_array, 293);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___array, 293);
   }
-  REGB0 = ATTR_array___Array____capacity(fra.me.REG[1]);
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB0;
+  REGB0 = ATTR_standard___collection___array___Array____capacity(fra.me.REG[1]);
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[1]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:294 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   init_table[itpos2] = 1;
   return;
 }
-void array___Array___with_capacity(val_t p0, val_t p1, int* init_table){
-  int itpos3 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_Array].i;
+void standard___collection___array___Array___with_capacity(val_t p0, val_t p1, int* init_table){
+  int itpos3 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___Array].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   if (init_table[itpos3]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 297;
-  fra.me.meth = LOCATE_array___Array___with_capacity;
+  fra.me.meth = LOCATE_standard___collection___array___Array___with_capacity;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1709,28 +1709,28 @@ void array___Array___with_capacity(val_t p0, val_t p1, int* init_table){
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:300 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:300 */
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert %s  failed", "'positive'", LOCATE_array, 300);
+    nit_abort("Assert %s  failed", "'positive'", LOCATE_standard___collection___array, 300);
   }
   /* ./../lib/standard//collection//array.nit:648 */
   fra.me.REG[1] = NEW_NativeArray(UNTAG_Int(REGB0), sizeof(val_t));
   /* ./../lib/standard//collection//array.nit:301 */
-  ATTR_array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
+  ATTR_standard___collection___array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
   /* ./../lib/standard//collection//array.nit:302 */
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:303 */
   REGB0 = TAG_Int(0);
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   init_table[itpos3] = 1;
   return;
 }
-void array___Array___filled_with(val_t p0, val_t p1, val_t p2, int* init_table){
-  int itpos4 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_Array].i;
+void standard___collection___array___Array___filled_with(val_t p0, val_t p1, val_t p2, int* init_table){
+  int itpos4 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___Array].i;
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1738,9 +1738,9 @@ void array___Array___filled_with(val_t p0, val_t p1, val_t p2, int* init_table){
   val_t tmp;
   if (init_table[itpos4]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 306;
-  fra.me.meth = LOCATE_array___Array___filled_with;
+  fra.me.meth = LOCATE_standard___collection___array___Array___filled_with;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -1751,34 +1751,34 @@ void array___Array___filled_with(val_t p0, val_t p1, val_t p2, int* init_table){
   REGB0 = p2;
   /* ./../lib/standard//collection//array.nit:309 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:309 */
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert %s  failed", "'positive'", LOCATE_array, 309);
+    nit_abort("Assert %s  failed", "'positive'", LOCATE_standard___collection___array, 309);
   }
   /* ./../lib/standard//collection//array.nit:648 */
   fra.me.REG[2] = NEW_NativeArray(UNTAG_Int(REGB0), sizeof(val_t));
   /* ./../lib/standard//collection//array.nit:310 */
-  ATTR_array___Array____items(fra.me.REG[0]) = fra.me.REG[2];
+  ATTR_standard___collection___array___Array____items(fra.me.REG[0]) = fra.me.REG[2];
   /* ./../lib/standard//collection//array.nit:311 */
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:312 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:313 */
   REGB1 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:314 */
   while(1) {
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB0));
     /* ./../lib/standard//collection//array.nit:314 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:315 */
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB1, fra.me.REG[1]);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB1, fra.me.REG[1]);
       /* ./../lib/standard//collection//array.nit:316 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:316 */
       REGB1 = REGB2;
@@ -1792,17 +1792,17 @@ void array___Array___filled_with(val_t p0, val_t p1, val_t p2, int* init_table){
   init_table[itpos4] = 1;
   return;
 }
-void array___Array___with_native(val_t p0, val_t p1, val_t p2, int* init_table){
-  int itpos5 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_Array].i;
+void standard___collection___array___Array___with_native(val_t p0, val_t p1, val_t p2, int* init_table){
+  int itpos5 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___Array].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   if (init_table[itpos5]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 320;
-  fra.me.meth = LOCATE_array___Array___with_native;
+  fra.me.meth = LOCATE_standard___collection___array___Array___with_native;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -1812,48 +1812,48 @@ void array___Array___with_native(val_t p0, val_t p1, val_t p2, int* init_table){
   REGB0 = p2;
   /* ./../lib/standard//collection//array.nit:323 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:323 */
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert %s  failed", "'positive'", LOCATE_array, 323);
+    nit_abort("Assert %s  failed", "'positive'", LOCATE_standard___collection___array, 323);
   }
   /* ./../lib/standard//collection//array.nit:324 */
-  ATTR_array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
+  ATTR_standard___collection___array___Array____items(fra.me.REG[0]) = fra.me.REG[1];
   /* ./../lib/standard//collection//array.nit:325 */
-  ATTR_array___Array____capacity(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___Array____capacity(fra.me.REG[0]) = REGB0;
   /* ./../lib/standard//collection//array.nit:326 */
-  ATTR_array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   init_table[itpos5] = 1;
   return;
 }
-val_t array___Array___intern_items(val_t p0){
+val_t standard___collection___array___Array___intern_items(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 332;
-  fra.me.meth = LOCATE_array___Array___intern_items;
+  fra.me.meth = LOCATE_standard___collection___array___Array___intern_items;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:334 */
-  fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Cast failed", NULL, LOCATE_array, 334);
+    nit_abort("Cast failed", NULL, LOCATE_standard___collection___array, 334);
   }
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t clos_fun0){
+void standard___collection___array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t clos_fun0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1861,9 +1861,9 @@ void array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t c
   fun_t CREG[1];
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 339;
-  fra.me.meth = LOCATE_array___Array___sort;
+  fra.me.meth = LOCATE_standard___collection___array___Array___sort;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
@@ -1874,17 +1874,17 @@ void array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t c
   /* ./../lib/standard//collection//array.nit:343 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:343 */
   REGB2 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB2 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB2));
-  CALL_array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB2, (&(fra.me)), ((fun_t)OC_array___Array___sort_1));
+  CALL_standard___collection___array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB2, (&(fra.me)), ((fun_t)OC_standard___collection___array___Array___sort_1));
   switch ((&(fra.me))->has_broke) {
     case 0: break;
     case 1: (&(fra.me))->has_broke = 0; goto label3;
@@ -1893,15 +1893,15 @@ void array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t c
   stack_frame_head = fra.me.prev;
   return;
 }
-  val_t OC_array___Array___sort_1(struct stack_frame_t *closctx, val_t p0, val_t p1){
+  val_t OC_standard___collection___array___Array___sort_1(struct stack_frame_t *closctx, val_t p0, val_t p1){
     struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
     val_t REGB0;
     val_t tmp;
     /* ./../lib/standard//collection//array.nit:343 */
     fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-    fra.me.file = LOCATE_array;
+    fra.me.file = LOCATE_standard___collection___array;
     fra.me.line = 343;
-    fra.me.meth = LOCATE_array___Array___sort;
+    fra.me.meth = LOCATE_standard___collection___array___Array___sort;
     fra.me.has_broke = 0;
     fra.me.REG_size = 2;
     fra.me.REG[0] = NIT_NULL;
@@ -1918,7 +1918,7 @@ void array___Array___sort(val_t p0, struct stack_frame_t *closctx_param, fun_t c
     stack_frame_head = fra.me.prev;
     return REGB0;
   }
-void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t *closctx_param, fun_t clos_fun0){
+void standard___collection___array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t *closctx_param, fun_t clos_fun0){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1930,9 +1930,9 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
   fun_t CREG[1];
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 346;
-  fra.me.meth = LOCATE_array___Array___sub_sort;
+  fra.me.meth = LOCATE_standard___collection___array___Array___sub_sort;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -1945,7 +1945,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
   REGB0 = p1;
   REGB1 = p2;
   CREG[0] = clos_fun0;
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:350 */
   if (UNTAG_Bool(REGB2)) {
@@ -1954,9 +1954,9 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
   } else {
     /* ./../lib/standard//collection//array.nit:352 */
     REGB2 = TAG_Int(7);
-    /* ./../lib/standard//kernel.nit:215 */
+    /* ./../lib/standard//kernel.nit:218 */
     REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
-    /* ./../lib/standard//kernel.nit:212 */
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB2)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:352 */
     if (UNTAG_Bool(REGB2)) {
@@ -1965,17 +1965,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       REGB2 = REGB0;
       /* ./../lib/standard//collection//array.nit:245 */
       REGB3 = TAG_Int(0);
-      /* ./../lib/standard//kernel.nit:213 */
+      /* ./../lib/standard//kernel.nit:216 */
       REGB3 = TAG_Bool(UNTAG_Int(REGB2)>=UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:245 */
       if (UNTAG_Bool(REGB3)) {
-        REGB3 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
+        REGB3 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
         if (UNTAG_Bool(REGB3)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+          nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
         }
-        REGB3 = ATTR_array___AbstractArrayRead____length(fra.me.REG[1]);
-        /* ./../lib/standard//kernel.nit:212 */
+        REGB3 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1]);
+        /* ./../lib/standard//kernel.nit:215 */
         REGB3 = TAG_Bool(UNTAG_Int(REGB2)<UNTAG_Int(REGB3));
       } else {
         /* ./../lib/standard//collection//array.nit:245 */
@@ -1984,13 +1984,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       }
       if (UNTAG_Bool(REGB3)) {
       } else {
-        nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+        nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
       }
       /* ./../lib/standard//collection//array.nit:246 */
-      fra.me.REG[1] = ATTR_array___Array____items(fra.me.REG[1]);
+      fra.me.REG[1] = ATTR_standard___collection___array___Array____items(fra.me.REG[1]);
       REGB3 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
       if (UNTAG_Bool(REGB3)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[1] = ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB2)];
@@ -2003,13 +2003,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       REGB3 = REGB1;
       /* ./../lib/standard//collection//array.nit:356 */
       while(1) {
-        /* ./../lib/standard//kernel.nit:214 */
+        /* ./../lib/standard//kernel.nit:217 */
         REGB4 = TAG_Bool(UNTAG_Int(REGB3)>UNTAG_Int(REGB2));
         /* ./../lib/standard//collection//array.nit:356 */
         if (UNTAG_Bool(REGB4)) {
           /* ./../lib/standard//collection//array.nit:357 */
           while(1) {
-            /* ./../lib/standard//kernel.nit:211 */
+            /* ./../lib/standard//kernel.nit:214 */
             REGB4 = TAG_Bool(UNTAG_Int(REGB2)<=UNTAG_Int(REGB1));
             /* ./../lib/standard//collection//array.nit:357 */
             if (UNTAG_Bool(REGB4)) {
@@ -2018,17 +2018,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               REGB4 = REGB2;
               /* ./../lib/standard//collection//array.nit:245 */
               REGB5 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:213 */
+              /* ./../lib/standard//kernel.nit:216 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)>=UNTAG_Int(REGB5));
               /* ./../lib/standard//collection//array.nit:245 */
               if (UNTAG_Bool(REGB5)) {
-               REGB5 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+               REGB5 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
                if (UNTAG_Bool(REGB5)) {
                } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
                }
-               REGB5 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-               /* ./../lib/standard//kernel.nit:212 */
+               REGB5 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+               /* ./../lib/standard//kernel.nit:215 */
                REGB5 = TAG_Bool(UNTAG_Int(REGB4)<UNTAG_Int(REGB5));
               } else {
                /* ./../lib/standard//collection//array.nit:245 */
@@ -2037,13 +2037,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               }
               if (UNTAG_Bool(REGB5)) {
               } else {
-               nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+               nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
               }
               /* ./../lib/standard//collection//array.nit:246 */
-              fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+              fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
               REGB5 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
               if (UNTAG_Bool(REGB5)) {
-               nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+               nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
               }
               /* ./../lib/standard//collection//array.nit:654 */
               fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB4)];
@@ -2056,7 +2056,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
                goto label1;
               }
               REGB5 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:211 */
+              /* ./../lib/standard//kernel.nit:214 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)<=UNTAG_Int(REGB5));
             } else {
               /* ./../lib/standard//collection//array.nit:357 */
@@ -2065,7 +2065,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
             if (UNTAG_Bool(REGB5)) {
               REGB5 = TAG_Int(1);
-              /* ./../lib/standard//kernel.nit:215 */
+              /* ./../lib/standard//kernel.nit:218 */
               REGB5 = TAG_Int(UNTAG_Int(REGB2)+UNTAG_Int(REGB5));
               /* ./../lib/standard//collection//array.nit:357 */
               REGB2 = REGB5;
@@ -2076,7 +2076,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
           label4: while(0);
           /* ./../lib/standard//collection//array.nit:358 */
           while(1) {
-            /* ./../lib/standard//kernel.nit:214 */
+            /* ./../lib/standard//kernel.nit:217 */
             REGB5 = TAG_Bool(UNTAG_Int(REGB3)>UNTAG_Int(REGB2));
             /* ./../lib/standard//collection//array.nit:358 */
             if (UNTAG_Bool(REGB5)) {
@@ -2085,17 +2085,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               REGB5 = REGB3;
               /* ./../lib/standard//collection//array.nit:245 */
               REGB4 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:213 */
+              /* ./../lib/standard//kernel.nit:216 */
               REGB4 = TAG_Bool(UNTAG_Int(REGB5)>=UNTAG_Int(REGB4));
               /* ./../lib/standard//collection//array.nit:245 */
               if (UNTAG_Bool(REGB4)) {
-               REGB4 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+               REGB4 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
                if (UNTAG_Bool(REGB4)) {
                } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
                }
-               REGB4 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-               /* ./../lib/standard//kernel.nit:212 */
+               REGB4 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+               /* ./../lib/standard//kernel.nit:215 */
                REGB4 = TAG_Bool(UNTAG_Int(REGB5)<UNTAG_Int(REGB4));
               } else {
                /* ./../lib/standard//collection//array.nit:245 */
@@ -2104,13 +2104,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               }
               if (UNTAG_Bool(REGB4)) {
               } else {
-               nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+               nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
               }
               /* ./../lib/standard//collection//array.nit:246 */
-              fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+              fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
               REGB4 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
               if (UNTAG_Bool(REGB4)) {
-               nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+               nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
               }
               /* ./../lib/standard//collection//array.nit:654 */
               fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB5)];
@@ -2123,7 +2123,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
                goto label1;
               }
               REGB4 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:213 */
+              /* ./../lib/standard//kernel.nit:216 */
               REGB4 = TAG_Bool(UNTAG_Int(REGB5)>=UNTAG_Int(REGB4));
             } else {
               /* ./../lib/standard//collection//array.nit:358 */
@@ -2132,7 +2132,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
             if (UNTAG_Bool(REGB4)) {
               REGB4 = TAG_Int(1);
-              /* ./../lib/standard//kernel.nit:217 */
+              /* ./../lib/standard//kernel.nit:220 */
               REGB4 = TAG_Int(UNTAG_Int(REGB3)-UNTAG_Int(REGB4));
               /* ./../lib/standard//collection//array.nit:358 */
               REGB3 = REGB4;
@@ -2141,7 +2141,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
           }
           label6: while(0);
-          /* ./../lib/standard//kernel.nit:214 */
+          /* ./../lib/standard//kernel.nit:217 */
           REGB4 = TAG_Bool(UNTAG_Int(REGB3)>UNTAG_Int(REGB2));
           /* ./../lib/standard//collection//array.nit:359 */
           if (UNTAG_Bool(REGB4)) {
@@ -2150,17 +2150,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             REGB4 = REGB2;
             /* ./../lib/standard//collection//array.nit:245 */
             REGB5 = TAG_Int(0);
-            /* ./../lib/standard//kernel.nit:213 */
+            /* ./../lib/standard//kernel.nit:216 */
             REGB5 = TAG_Bool(UNTAG_Int(REGB4)>=UNTAG_Int(REGB5));
             /* ./../lib/standard//collection//array.nit:245 */
             if (UNTAG_Bool(REGB5)) {
-              REGB5 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+              REGB5 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
               if (UNTAG_Bool(REGB5)) {
               } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
               }
-              REGB5 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-              /* ./../lib/standard//kernel.nit:212 */
+              REGB5 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+              /* ./../lib/standard//kernel.nit:215 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)<UNTAG_Int(REGB5));
             } else {
               /* ./../lib/standard//collection//array.nit:245 */
@@ -2169,13 +2169,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
             if (UNTAG_Bool(REGB5)) {
             } else {
-              nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+              nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
             }
             /* ./../lib/standard//collection//array.nit:246 */
-            fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+            fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
             REGB5 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
             if (UNTAG_Bool(REGB5)) {
-              nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+              nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
             }
             /* ./../lib/standard//collection//array.nit:654 */
             fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB4)];
@@ -2187,17 +2187,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             REGB4 = REGB3;
             /* ./../lib/standard//collection//array.nit:245 */
             REGB5 = TAG_Int(0);
-            /* ./../lib/standard//kernel.nit:213 */
+            /* ./../lib/standard//kernel.nit:216 */
             REGB5 = TAG_Bool(UNTAG_Int(REGB4)>=UNTAG_Int(REGB5));
             /* ./../lib/standard//collection//array.nit:245 */
             if (UNTAG_Bool(REGB5)) {
-              REGB5 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[3])!=NIT_NULL);
+              REGB5 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[3])!=NIT_NULL);
               if (UNTAG_Bool(REGB5)) {
               } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
               }
-              REGB5 = ATTR_array___AbstractArrayRead____length(fra.me.REG[3]);
-              /* ./../lib/standard//kernel.nit:212 */
+              REGB5 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[3]);
+              /* ./../lib/standard//kernel.nit:215 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)<UNTAG_Int(REGB5));
             } else {
               /* ./../lib/standard//collection//array.nit:245 */
@@ -2206,13 +2206,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
             if (UNTAG_Bool(REGB5)) {
             } else {
-              nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+              nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
             }
             /* ./../lib/standard//collection//array.nit:246 */
-            fra.me.REG[3] = ATTR_array___Array____items(fra.me.REG[3]);
+            fra.me.REG[3] = ATTR_standard___collection___array___Array____items(fra.me.REG[3]);
             REGB5 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
             if (UNTAG_Bool(REGB5)) {
-              nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+              nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
             }
             /* ./../lib/standard//collection//array.nit:654 */
             fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[3])->val[UNTAG_Int(REGB4)];
@@ -2220,9 +2220,9 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             goto label8;
             label8: while(0);
             /* ./../lib/standard//collection//array.nit:361 */
-            CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[3]);
+            CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[3]);
             /* ./../lib/standard//collection//array.nit:362 */
-            CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB3, fra.me.REG[2]);
+            CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB3, fra.me.REG[2]);
           }
         } else {
           /* ./../lib/standard//collection//array.nit:356 */
@@ -2232,23 +2232,23 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       label9: while(0);
       /* ./../lib/standard//collection//array.nit:365 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB3 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:243 */
       fra.me.REG[2] = fra.me.REG[0];
       /* ./../lib/standard//collection//array.nit:245 */
       REGB4 = TAG_Int(0);
-      /* ./../lib/standard//kernel.nit:213 */
+      /* ./../lib/standard//kernel.nit:216 */
       REGB4 = TAG_Bool(UNTAG_Int(REGB3)>=UNTAG_Int(REGB4));
       /* ./../lib/standard//collection//array.nit:245 */
       if (UNTAG_Bool(REGB4)) {
-        REGB4 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+        REGB4 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
         if (UNTAG_Bool(REGB4)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+          nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
         }
-        REGB4 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-        /* ./../lib/standard//kernel.nit:212 */
+        REGB4 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+        /* ./../lib/standard//kernel.nit:215 */
         REGB4 = TAG_Bool(UNTAG_Int(REGB3)<UNTAG_Int(REGB4));
       } else {
         /* ./../lib/standard//collection//array.nit:245 */
@@ -2257,13 +2257,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       }
       if (UNTAG_Bool(REGB4)) {
       } else {
-        nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+        nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
       }
       /* ./../lib/standard//collection//array.nit:246 */
-      fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+      fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
       REGB4 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB4)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB3)];
@@ -2271,23 +2271,23 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
       goto label10;
       label10: while(0);
       /* ./../lib/standard//collection//array.nit:365 */
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
       /* ./../lib/standard//collection//array.nit:366 */
       REGB3 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB3 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:366 */
-      CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB3, fra.me.REG[1]);
+      CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB3, fra.me.REG[1]);
       /* ./../lib/standard//collection//array.nit:367 */
       REGB3 = TAG_Int(2);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB3 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB3));
-      CALL_array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB3, (&(fra.me)), ((fun_t)OC_array___Array___sub_sort_11));
+      CALL_standard___collection___array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB0, REGB3, (&(fra.me)), ((fun_t)OC_standard___collection___array___Array___sub_sort_11));
       switch ((&(fra.me))->has_broke) {
         case 0: break;
         case 1: (&(fra.me))->has_broke = 0; goto label1;
       }
-      CALL_array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB2, REGB1, (&(fra.me)), ((fun_t)OC_array___Array___sub_sort_13));
+      CALL_standard___collection___array___Array___sub_sort(fra.me.REG[0])(fra.me.REG[0], REGB2, REGB1, (&(fra.me)), ((fun_t)OC_standard___collection___array___Array___sub_sort_13));
       switch ((&(fra.me))->has_broke) {
         case 0: break;
         case 1: (&(fra.me))->has_broke = 0; goto label1;
@@ -2295,7 +2295,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
     } else {
       /* ./../lib/standard//collection//array.nit:371 */
       while(1) {
-        /* ./../lib/standard//kernel.nit:212 */
+        /* ./../lib/standard//kernel.nit:215 */
         REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
         /* ./../lib/standard//collection//array.nit:371 */
         if (UNTAG_Bool(REGB2)) {
@@ -2306,17 +2306,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
           REGB3 = REGB0;
           /* ./../lib/standard//collection//array.nit:245 */
           REGB4 = TAG_Int(0);
-          /* ./../lib/standard//kernel.nit:213 */
+          /* ./../lib/standard//kernel.nit:216 */
           REGB4 = TAG_Bool(UNTAG_Int(REGB3)>=UNTAG_Int(REGB4));
           /* ./../lib/standard//collection//array.nit:245 */
           if (UNTAG_Bool(REGB4)) {
-            REGB4 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
+            REGB4 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
             if (UNTAG_Bool(REGB4)) {
             } else {
-              nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+              nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
             }
-            REGB4 = ATTR_array___AbstractArrayRead____length(fra.me.REG[1]);
-            /* ./../lib/standard//kernel.nit:212 */
+            REGB4 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1]);
+            /* ./../lib/standard//kernel.nit:215 */
             REGB4 = TAG_Bool(UNTAG_Int(REGB3)<UNTAG_Int(REGB4));
           } else {
             /* ./../lib/standard//collection//array.nit:245 */
@@ -2325,13 +2325,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
           }
           if (UNTAG_Bool(REGB4)) {
           } else {
-            nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+            nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
           }
           /* ./../lib/standard//collection//array.nit:246 */
-          fra.me.REG[1] = ATTR_array___Array____items(fra.me.REG[1]);
+          fra.me.REG[1] = ATTR_standard___collection___array___Array____items(fra.me.REG[1]);
           REGB4 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
           if (UNTAG_Bool(REGB4)) {
-            nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+            nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
           }
           /* ./../lib/standard//collection//array.nit:654 */
           fra.me.REG[1] = ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB3)];
@@ -2342,7 +2342,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
           REGB3 = REGB0;
           /* ./../lib/standard//collection//array.nit:375 */
           while(1) {
-            /* ./../lib/standard//kernel.nit:211 */
+            /* ./../lib/standard//kernel.nit:214 */
             REGB4 = TAG_Bool(UNTAG_Int(REGB3)<=UNTAG_Int(REGB1));
             /* ./../lib/standard//collection//array.nit:375 */
             if (UNTAG_Bool(REGB4)) {
@@ -2351,17 +2351,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               REGB4 = REGB3;
               /* ./../lib/standard//collection//array.nit:245 */
               REGB5 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:213 */
+              /* ./../lib/standard//kernel.nit:216 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)>=UNTAG_Int(REGB5));
               /* ./../lib/standard//collection//array.nit:245 */
               if (UNTAG_Bool(REGB5)) {
-               REGB5 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+               REGB5 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
                if (UNTAG_Bool(REGB5)) {
                } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
                }
-               REGB5 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-               /* ./../lib/standard//kernel.nit:212 */
+               REGB5 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+               /* ./../lib/standard//kernel.nit:215 */
                REGB5 = TAG_Bool(UNTAG_Int(REGB4)<UNTAG_Int(REGB5));
               } else {
                /* ./../lib/standard//collection//array.nit:245 */
@@ -2370,13 +2370,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               }
               if (UNTAG_Bool(REGB5)) {
               } else {
-               nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+               nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
               }
               /* ./../lib/standard//collection//array.nit:246 */
-              fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+              fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
               REGB5 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
               if (UNTAG_Bool(REGB5)) {
-               nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+               nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
               }
               /* ./../lib/standard//collection//array.nit:654 */
               fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB4)];
@@ -2389,7 +2389,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
                goto label1;
               }
               REGB5 = TAG_Int(0);
-              /* ./../lib/standard//kernel.nit:214 */
+              /* ./../lib/standard//kernel.nit:217 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB4)>UNTAG_Int(REGB5));
               /* ./../lib/standard//collection//array.nit:376 */
               if (UNTAG_Bool(REGB5)) {
@@ -2400,17 +2400,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
                REGB5 = REGB3;
                /* ./../lib/standard//collection//array.nit:245 */
                REGB4 = TAG_Int(0);
-               /* ./../lib/standard//kernel.nit:213 */
+               /* ./../lib/standard//kernel.nit:216 */
                REGB4 = TAG_Bool(UNTAG_Int(REGB5)>=UNTAG_Int(REGB4));
                /* ./../lib/standard//collection//array.nit:245 */
                if (UNTAG_Bool(REGB4)) {
-               REGB4 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+               REGB4 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
                if (UNTAG_Bool(REGB4)) {
                } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
                }
-               REGB4 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-               /* ./../lib/standard//kernel.nit:212 */
+               REGB4 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+               /* ./../lib/standard//kernel.nit:215 */
                REGB4 = TAG_Bool(UNTAG_Int(REGB5)<UNTAG_Int(REGB4));
                } else {
                /* ./../lib/standard//collection//array.nit:245 */
@@ -2419,13 +2419,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
                }
                if (UNTAG_Bool(REGB4)) {
                } else {
-               nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+               nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
                }
                /* ./../lib/standard//collection//array.nit:246 */
-               fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+               fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
                REGB4 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
                if (UNTAG_Bool(REGB4)) {
-               nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+               nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
                }
                /* ./../lib/standard//collection//array.nit:654 */
                fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB5)];
@@ -2437,7 +2437,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
               }
               /* ./../lib/standard//collection//array.nit:380 */
               REGB5 = TAG_Int(1);
-              /* ./../lib/standard//kernel.nit:215 */
+              /* ./../lib/standard//kernel.nit:218 */
               REGB5 = TAG_Int(UNTAG_Int(REGB3)+UNTAG_Int(REGB5));
               /* ./../lib/standard//collection//array.nit:380 */
               REGB3 = REGB5;
@@ -2451,7 +2451,7 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
           REGB3 = TAG_Bool(IS_EQUAL_OO(REGB2,REGB0));
           if (UNTAG_Bool(REGB3)) {
           } else {
-            /* ./../lib/standard//kernel.nit:207 */
+            /* ./../lib/standard//kernel.nit:210 */
             REGB5 = TAG_Bool((REGB2)==(REGB0));
             /* ./../lib/standard//collection//array.nit:382 */
             REGB3 = REGB5;
@@ -2463,17 +2463,17 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             REGB3 = REGB0;
             /* ./../lib/standard//collection//array.nit:245 */
             REGB5 = TAG_Int(0);
-            /* ./../lib/standard//kernel.nit:213 */
+            /* ./../lib/standard//kernel.nit:216 */
             REGB5 = TAG_Bool(UNTAG_Int(REGB3)>=UNTAG_Int(REGB5));
             /* ./../lib/standard//collection//array.nit:245 */
             if (UNTAG_Bool(REGB5)) {
-              REGB5 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+              REGB5 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
               if (UNTAG_Bool(REGB5)) {
               } else {
-               nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+               nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
               }
-              REGB5 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-              /* ./../lib/standard//kernel.nit:212 */
+              REGB5 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+              /* ./../lib/standard//kernel.nit:215 */
               REGB5 = TAG_Bool(UNTAG_Int(REGB3)<UNTAG_Int(REGB5));
             } else {
               /* ./../lib/standard//collection//array.nit:245 */
@@ -2482,13 +2482,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             }
             if (UNTAG_Bool(REGB5)) {
             } else {
-              nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+              nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
             }
             /* ./../lib/standard//collection//array.nit:246 */
-            fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+            fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
             REGB5 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
             if (UNTAG_Bool(REGB5)) {
-              nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+              nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
             }
             /* ./../lib/standard//collection//array.nit:654 */
             fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB3)];
@@ -2496,13 +2496,13 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
             goto label19;
             label19: while(0);
             /* ./../lib/standard//collection//array.nit:383 */
-            CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[2]);
+            CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB2, fra.me.REG[2]);
             /* ./../lib/standard//collection//array.nit:384 */
-            CALL_abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
+            CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
           }
           /* ./../lib/standard//collection//array.nit:386 */
           REGB2 = TAG_Int(1);
-          /* ./../lib/standard//kernel.nit:215 */
+          /* ./../lib/standard//kernel.nit:218 */
           REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
           /* ./../lib/standard//collection//array.nit:386 */
           REGB0 = REGB2;
@@ -2518,15 +2518,15 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
   stack_frame_head = fra.me.prev;
   return;
 }
-      val_t OC_array___Array___sub_sort_11(struct stack_frame_t *closctx, val_t p0, val_t p1){
+      val_t OC_standard___collection___array___Array___sub_sort_11(struct stack_frame_t *closctx, val_t p0, val_t p1){
         struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
         val_t REGB0;
         val_t tmp;
         /* ./../lib/standard//collection//array.nit:367 */
         fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-        fra.me.file = LOCATE_array;
+        fra.me.file = LOCATE_standard___collection___array;
         fra.me.line = 367;
-        fra.me.meth = LOCATE_array___Array___sub_sort;
+        fra.me.meth = LOCATE_standard___collection___array___Array___sub_sort;
         fra.me.has_broke = 0;
         fra.me.REG_size = 2;
         fra.me.REG[0] = NIT_NULL;
@@ -2543,15 +2543,15 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
         stack_frame_head = fra.me.prev;
         return REGB0;
       }
-      val_t OC_array___Array___sub_sort_13(struct stack_frame_t *closctx, val_t p0, val_t p1){
+      val_t OC_standard___collection___array___Array___sub_sort_13(struct stack_frame_t *closctx, val_t p0, val_t p1){
         struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
         val_t REGB0;
         val_t tmp;
         /* ./../lib/standard//collection//array.nit:368 */
         fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-        fra.me.file = LOCATE_array;
+        fra.me.file = LOCATE_standard___collection___array;
         fra.me.line = 368;
-        fra.me.meth = LOCATE_array___Array___sub_sort;
+        fra.me.meth = LOCATE_standard___collection___array___Array___sub_sort;
         fra.me.has_broke = 0;
         fra.me.REG_size = 2;
         fra.me.REG[0] = NIT_NULL;
@@ -2568,72 +2568,72 @@ void array___Array___sub_sort(val_t p0, val_t p1, val_t p2, struct stack_frame_t
         stack_frame_head = fra.me.prev;
         return REGB0;
       }
-val_t array___ArrayIterator___item(val_t p0){
+val_t standard___collection___array___ArrayIterator___item(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 395;
-  fra.me.meth = LOCATE_array___ArrayIterator___item;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayIterator___item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:395 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayIterator____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayIterator____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 395);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 395);
   }
-  fra.me.REG[1] = ATTR_array___ArrayIterator____array(fra.me.REG[0]);
-  REGB0 = TAG_Bool(ATTR_array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
+  fra.me.REG[1] = ATTR_standard___collection___array___ArrayIterator____array(fra.me.REG[0]);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_index", LOCATE_array, 395);
+    nit_abort("Uninitialized attribute %s", "_index", LOCATE_standard___collection___array, 395);
   }
-  REGB0 = ATTR_array___ArrayIterator____index(fra.me.REG[0]);
-  fra.me.REG[1] = CALL_abstract_collection___MapRead_____bra(fra.me.REG[1])(fra.me.REG[1], REGB0);
+  REGB0 = ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]);
+  fra.me.REG[1] = CALL_standard___collection___abstract_collection___MapRead_____bra(fra.me.REG[1])(fra.me.REG[1], REGB0);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-val_t array___ArrayIterator___is_ok(val_t p0){
+val_t standard___collection___array___ArrayIterator___is_ok(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 399;
-  fra.me.meth = LOCATE_array___ArrayIterator___is_ok;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayIterator___is_ok;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:399 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_index", LOCATE_array, 399);
+    nit_abort("Uninitialized attribute %s", "_index", LOCATE_standard___collection___array, 399);
   }
-  REGB0 = ATTR_array___ArrayIterator____index(fra.me.REG[0]);
-  REGB1 = TAG_Bool(ATTR_array___ArrayIterator____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayIterator____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 399);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 399);
   }
-  fra.me.REG[0] = ATTR_array___ArrayIterator____array(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayIterator____array(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:212 */
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+  /* ./../lib/standard//kernel.nit:215 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:399 */
   goto label1;
@@ -2641,39 +2641,39 @@ val_t array___ArrayIterator___is_ok(val_t p0){
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-void array___ArrayIterator___next(val_t p0){
+void standard___collection___array___ArrayIterator___next(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 401;
-  fra.me.meth = LOCATE_array___ArrayIterator___next;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayIterator___next;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:401 */
-  REGB0 = ATTR_array___ArrayIterator____index(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]);
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ./../lib/standard//kernel.nit:218 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:401 */
-  ATTR_array___ArrayIterator____index(fra.me.REG[0]) = REGB1;
+  ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]) = REGB1;
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArrayIterator___init(val_t p0, val_t p1, int* init_table){
-  int itpos6 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_ArrayIterator].i;
+void standard___collection___array___ArrayIterator___init(val_t p0, val_t p1, int* init_table){
+  int itpos6 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___ArrayIterator].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   if (init_table[itpos6]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 403;
-  fra.me.meth = LOCATE_array___ArrayIterator___init;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayIterator___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -2681,44 +2681,44 @@ void array___ArrayIterator___init(val_t p0, val_t p1, int* init_table){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:405 */
-  ATTR_array___ArrayIterator____array(fra.me.REG[0]) = fra.me.REG[1];
+  ATTR_standard___collection___array___ArrayIterator____array(fra.me.REG[0]) = fra.me.REG[1];
   /* ./../lib/standard//collection//array.nit:406 */
   REGB0 = TAG_Int(0);
-  ATTR_array___ArrayIterator____index(fra.me.REG[0]) = REGB0;
+  ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]) = REGB0;
   stack_frame_head = fra.me.prev;
   init_table[itpos6] = 1;
   return;
 }
-val_t array___ArrayIterator___index(val_t p0){
+val_t standard___collection___array___ArrayIterator___index(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 409;
-  fra.me.meth = LOCATE_array___ArrayIterator___index;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayIterator___index;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:409 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_index", LOCATE_array, 409);
+    nit_abort("Uninitialized attribute %s", "_index", LOCATE_standard___collection___array, 409);
   }
-  REGB0 = ATTR_array___ArrayIterator____index(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___ArrayIterator____index(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___ArraySet___has(val_t p0, val_t p1){
+val_t standard___collection___array___ArraySet___has(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 421;
-  fra.me.meth = LOCATE_array___ArraySet___has;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___has;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -2726,26 +2726,26 @@ val_t array___ArraySet___has(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:421 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 421);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 421);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___Collection___has(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___has(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void array___ArraySet___add(val_t p0, val_t p1){
+void standard___collection___array___ArraySet___add(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 423;
-  fra.me.meth = LOCATE_array___ArraySet___add;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___add;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -2754,142 +2754,142 @@ void array___ArraySet___add(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:423 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 423);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 423);
   }
-  fra.me.REG[2] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___Collection___has(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___has(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
   REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
   if (UNTAG_Bool(REGB0)) {
-    REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+    REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 423);
+      nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 423);
     }
-    fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-    CALL_abstract_collection___SimpleCollection___add(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+    fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+    CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   }
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArraySet___is_empty(val_t p0){
+val_t standard___collection___array___ArraySet___is_empty(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 425;
-  fra.me.meth = LOCATE_array___ArraySet___is_empty;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___is_empty;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:425 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 425);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 425);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___ArraySet___length(val_t p0){
+val_t standard___collection___array___ArraySet___length(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 427;
-  fra.me.meth = LOCATE_array___ArraySet___length;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___length;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:427 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 427);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 427);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:427 */
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___ArraySet___first(val_t p0){
+val_t standard___collection___array___ArraySet___first(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 429;
-  fra.me.meth = LOCATE_array___ArraySet___first;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___first;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:431 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 431);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 431);
   }
-  fra.me.REG[1] = ATTR_array___ArraySet____array(fra.me.REG[0]);
+  fra.me.REG[1] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[1]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:431 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:214 */
+  /* ./../lib/standard//kernel.nit:217 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:431 */
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_array, 431);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___array, 431);
   }
   /* ./../lib/standard//collection//array.nit:432 */
-  REGB1 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 432);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 432);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___ArraySet___remove(val_t p0, val_t p1){
+void standard___collection___array___ArraySet___remove(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 435;
-  fra.me.meth = LOCATE_array___ArraySet___remove;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___remove;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -2898,31 +2898,31 @@ void array___ArraySet___remove(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:437 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 437);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 437);
   }
-  fra.me.REG[2] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___SequenceRead___index_of(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___SequenceRead___index_of(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:438 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:438 */
   if (UNTAG_Bool(REGB1)) {
-    CALL_array___ArraySet___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
+    CALL_standard___collection___array___ArraySet___remove_at(fra.me.REG[0])(fra.me.REG[0], REGB0);
   }
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArraySet___remove_all(val_t p0, val_t p1){
+void standard___collection___array___ArraySet___remove_all(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 441;
-  fra.me.meth = LOCATE_array___ArraySet___remove_all;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___remove_all;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -2930,93 +2930,93 @@ void array___ArraySet___remove_all(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:441 */
-  CALL_abstract_collection___RemovableCollection___remove(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  CALL_standard___collection___abstract_collection___RemovableCollection___remove(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArraySet___clear(val_t p0){
+void standard___collection___array___ArraySet___clear(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 443;
-  fra.me.meth = LOCATE_array___ArraySet___clear;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___clear;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:443 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 443);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 443);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  CALL_abstract_collection___RemovableCollection___clear(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___RemovableCollection___clear(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArraySet___iterator(val_t p0){
+val_t standard___collection___array___ArraySet___iterator(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 445;
-  fra.me.meth = LOCATE_array___ArraySet___iterator;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___iterator;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:445 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 445);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 445);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
-  fra.me.REG[0] = NEW_ArraySetIterator_array___ArraySetIterator___init(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = NEW_ArraySetIterator_standard___collection___array___ArraySetIterator___init(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___ArraySet___enlarge(val_t p0, val_t p1){
+void standard___collection___array___ArraySet___enlarge(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 447;
-  fra.me.meth = LOCATE_array___ArraySet___enlarge;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___enlarge;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:448 */
-  REGB1 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 448);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 448);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  CALL_array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB0);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  CALL_standard___collection___array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB0);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArraySet___remove_at(val_t p0, val_t p1){
+void standard___collection___array___ArraySet___remove_at(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 450;
-  fra.me.meth = LOCATE_array___ArraySet___remove_at;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___remove_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -3025,62 +3025,62 @@ void array___ArraySet___remove_at(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:452 */
-  REGB1 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 452);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 452);
   }
-  fra.me.REG[1] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  REGB1 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  fra.me.REG[1] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 452);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 452);
   }
-  fra.me.REG[2] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  fra.me.REG[2] = CALL_abstract_collection___SequenceRead___last(fra.me.REG[2])(fra.me.REG[2]);
-  CALL_abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB0, fra.me.REG[2]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  fra.me.REG[2] = CALL_standard___collection___abstract_collection___SequenceRead___last(fra.me.REG[2])(fra.me.REG[2]);
+  CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB0, fra.me.REG[2]);
   /* ./../lib/standard//collection//array.nit:453 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_array", LOCATE_array, 453);
+    nit_abort("Uninitialized attribute %s", "_array", LOCATE_standard___collection___array, 453);
   }
-  fra.me.REG[0] = ATTR_array___ArraySet____array(fra.me.REG[0]);
-  CALL_abstract_collection___Sequence___pop(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___Sequence___pop(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArraySet___init(val_t p0, int* init_table){
-  int itpos7 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_ArraySet].i;
+void standard___collection___array___ArraySet___init(val_t p0, int* init_table){
+  int itpos7 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___ArraySet].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   if (init_table[itpos7]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 456;
-  fra.me.meth = LOCATE_array___ArraySet___init;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:457 */
-  fra.me.REG[1] = NEW_Array_array___Array___init();
-  ATTR_array___ArraySet____array(fra.me.REG[0]) = fra.me.REG[1];
+  fra.me.REG[1] = NEW_Array_standard___collection___array___Array___init();
+  ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   init_table[itpos7] = 1;
   return;
 }
-void array___ArraySet___with_capacity(val_t p0, val_t p1, int* init_table){
-  int itpos8 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_ArraySet].i;
+void standard___collection___array___ArraySet___with_capacity(val_t p0, val_t p1, int* init_table){
+  int itpos8 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___ArraySet].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   if (init_table[itpos8]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 459;
-  fra.me.meth = LOCATE_array___ArraySet___with_capacity;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySet___with_capacity;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -3088,94 +3088,94 @@ void array___ArraySet___with_capacity(val_t p0, val_t p1, int* init_table){
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:460 */
-  fra.me.REG[1] = NEW_Array_array___Array___with_capacity(REGB0);
-  ATTR_array___ArraySet____array(fra.me.REG[0]) = fra.me.REG[1];
+  fra.me.REG[1] = NEW_Array_standard___collection___array___Array___with_capacity(REGB0);
+  ATTR_standard___collection___array___ArraySet____array(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   init_table[itpos8] = 1;
   return;
 }
-val_t array___ArraySetIterator___is_ok(val_t p0){
+val_t standard___collection___array___ArraySetIterator___is_ok(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 467;
-  fra.me.meth = LOCATE_array___ArraySetIterator___is_ok;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySetIterator___is_ok;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:467 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_array, 467);
+    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_standard___collection___array, 467);
   }
-  fra.me.REG[0] = ATTR_array___ArraySetIterator____iter(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void array___ArraySetIterator___next(val_t p0){
+void standard___collection___array___ArraySetIterator___next(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 469;
-  fra.me.meth = LOCATE_array___ArraySetIterator___next;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySetIterator___next;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:469 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_array, 469);
+    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_standard___collection___array, 469);
   }
-  fra.me.REG[0] = ATTR_array___ArraySetIterator____iter(fra.me.REG[0]);
-  CALL_abstract_collection___Iterator___next(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___Iterator___next(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArraySetIterator___item(val_t p0){
+val_t standard___collection___array___ArraySetIterator___item(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 471;
-  fra.me.meth = LOCATE_array___ArraySetIterator___item;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySetIterator___item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:471 */
-  REGB0 = TAG_Bool(ATTR_array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_array, 471);
+    nit_abort("Uninitialized attribute %s", "_iter", LOCATE_standard___collection___array, 471);
   }
-  fra.me.REG[0] = ATTR_array___ArraySetIterator____iter(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_abstract_collection___Iterator___item(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Iterator___item(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___ArraySetIterator___init(val_t p0, val_t p1, int* init_table){
-  int itpos9 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_ArraySetIterator].i;
+void standard___collection___array___ArraySetIterator___init(val_t p0, val_t p1, int* init_table){
+  int itpos9 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___ArraySetIterator].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   if (init_table[itpos9]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 473;
-  fra.me.meth = LOCATE_array___ArraySetIterator___init;
+  fra.me.meth = LOCATE_standard___collection___array___ArraySetIterator___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -3183,21 +3183,21 @@ void array___ArraySetIterator___init(val_t p0, val_t p1, int* init_table){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:473 */
-  ATTR_array___ArraySetIterator____iter(fra.me.REG[0]) = fra.me.REG[1];
+  ATTR_standard___collection___array___ArraySetIterator____iter(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   init_table[itpos9] = 1;
   return;
 }
-val_t array___ArrayMap_____bra(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap_____bra(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 483;
-  fra.me.meth = LOCATE_array___ArrayMap_____bra;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap_____bra;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -3205,33 +3205,33 @@ val_t array___ArrayMap_____bra(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:486 */
-  REGB0 = CALL_array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:487 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:487 */
   if (UNTAG_Bool(REGB1)) {
     /* ./../lib/standard//collection//array.nit:488 */
-    REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 488);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 488);
     }
-    fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
     /* ./../lib/standard//collection//array.nit:245 */
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:245 */
     if (UNTAG_Bool(REGB1)) {
-      REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+      REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+        nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
       }
-      REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-      /* ./../lib/standard//kernel.nit:212 */
+      REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+      /* ./../lib/standard//kernel.nit:215 */
       REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     } else {
       /* ./../lib/standard//collection//array.nit:245 */
@@ -3240,13 +3240,13 @@ val_t array___ArrayMap_____bra(val_t p0, val_t p1){
     }
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+      nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
     }
     /* ./../lib/standard//collection//array.nit:246 */
-    fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+    fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
     REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
     }
     /* ./../lib/standard//collection//array.nit:654 */
     fra.me.REG[0] = ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)];
@@ -3256,28 +3256,28 @@ val_t array___ArrayMap_____bra(val_t p0, val_t p1){
     /* ./../lib/standard//collection//array.nit:488 */
     REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 488);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 488);
     }
-    fra.me.REG[0] = CALL_abstract_collection___Couple___second(fra.me.REG[0])(fra.me.REG[0]);
+    fra.me.REG[0] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[0])(fra.me.REG[0]);
     goto label2;
   } else {
     /* ./../lib/standard//collection//array.nit:490 */
-    nit_abort("Aborted", NULL, LOCATE_array, 490);
+    nit_abort("Aborted", NULL, LOCATE_standard___collection___array, 490);
   }
   label2: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___ArrayMap_____braeq(val_t p0, val_t p1, val_t p2){
+void standard___collection___array___ArrayMap_____braeq(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 494;
-  fra.me.meth = LOCATE_array___ArrayMap_____braeq;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap_____braeq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -3288,33 +3288,33 @@ void array___ArrayMap_____braeq(val_t p0, val_t p1, val_t p2){
   fra.me.REG[1] = p1;
   fra.me.REG[2] = p2;
   /* ./../lib/standard//collection//array.nit:497 */
-  REGB0 = CALL_array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:498 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:498 */
   if (UNTAG_Bool(REGB1)) {
     /* ./../lib/standard//collection//array.nit:499 */
-    REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 499);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 499);
     }
-    fra.me.REG[3] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[3] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
     /* ./../lib/standard//collection//array.nit:245 */
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:245 */
     if (UNTAG_Bool(REGB1)) {
-      REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[3])!=NIT_NULL);
+      REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[3])!=NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+        nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
       }
-      REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[3]);
-      /* ./../lib/standard//kernel.nit:212 */
+      REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[3]);
+      /* ./../lib/standard//kernel.nit:215 */
       REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     } else {
       /* ./../lib/standard//collection//array.nit:245 */
@@ -3323,13 +3323,13 @@ void array___ArrayMap_____braeq(val_t p0, val_t p1, val_t p2){
     }
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+      nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
     }
     /* ./../lib/standard//collection//array.nit:246 */
-    fra.me.REG[3] = ATTR_array___Array____items(fra.me.REG[3]);
+    fra.me.REG[3] = ATTR_standard___collection___array___Array____items(fra.me.REG[3]);
     REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
     }
     /* ./../lib/standard//collection//array.nit:654 */
     fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[3])->val[UNTAG_Int(REGB0)];
@@ -3339,32 +3339,32 @@ void array___ArrayMap_____braeq(val_t p0, val_t p1, val_t p2){
     /* ./../lib/standard//collection//array.nit:499 */
     REGB0 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 499);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 499);
     }
-    CALL_abstract_collection___Couple___second__eq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[2]);
+    CALL_standard___collection___abstract_collection___Couple___second__eq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[2]);
   } else {
     /* ./../lib/standard//collection//array.nit:501 */
-    REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 501);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 501);
     }
-    fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-    fra.me.REG[2] = NEW_Couple_abstract_collection___Couple___init(fra.me.REG[1], fra.me.REG[2]);
-    CALL_abstract_collection___Sequence___push(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[2]);
+    fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[2] = NEW_Couple_standard___collection___abstract_collection___Couple___init(fra.me.REG[1], fra.me.REG[2]);
+    CALL_standard___collection___abstract_collection___Sequence___push(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[2]);
   }
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArrayMap___has_key(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___has_key(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 505;
-  fra.me.meth = LOCATE_array___ArrayMap___has_key;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___has_key;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -3372,9 +3372,9 @@ val_t array___ArrayMap___has_key(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:506 */
-  REGB0 = CALL_array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:506 */
   goto label1;
@@ -3382,16 +3382,16 @@ val_t array___ArrayMap___has_key(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___ArrayMap___has(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___has(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 508;
-  fra.me.meth = LOCATE_array___ArrayMap___has;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___has;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -3401,45 +3401,45 @@ val_t array___ArrayMap___has(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:511 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 511);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 511);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:234 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:235 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 235);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 235);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:236 */
-  fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:237 */
   while(1) {
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:237 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:238 */
       REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 238);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 238);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB0)];
       /* ./../lib/standard//collection//array.nit:511 */
-      fra.me.REG[3] = CALL_abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
+      fra.me.REG[3] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
       REGB1 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[3],fra.me.REG[1]));
       if (UNTAG_Bool(REGB1)) {
       } else {
@@ -3448,7 +3448,7 @@ val_t array___ArrayMap___has(val_t p0, val_t p1){
           REGB2 = TAG_Bool(false);
           REGB1 = REGB2;
         } else {
-          REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
+          REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
           REGB1 = REGB2;
         }
       }
@@ -3458,7 +3458,7 @@ val_t array___ArrayMap___has(val_t p0, val_t p1){
       }
       /* ./../lib/standard//collection//array.nit:239 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:239 */
       REGB0 = REGB2;
@@ -3476,16 +3476,16 @@ val_t array___ArrayMap___has(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___ArrayMap___has_only(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___has_only(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 515;
-  fra.me.meth = LOCATE_array___ArrayMap___has_only;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___has_only;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -3495,45 +3495,45 @@ val_t array___ArrayMap___has_only(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:518 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 518);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 518);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:234 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:235 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 235);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 235);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:236 */
-  fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:237 */
   while(1) {
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:237 */
     if (UNTAG_Bool(REGB1)) {
       /* ./../lib/standard//collection//array.nit:238 */
       REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 238);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 238);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB0)];
       /* ./../lib/standard//collection//array.nit:518 */
-      fra.me.REG[3] = CALL_abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
+      fra.me.REG[3] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
       REGB1 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[3],fra.me.REG[1]));
       if (UNTAG_Bool(REGB1)) {
       } else {
@@ -3542,7 +3542,7 @@ val_t array___ArrayMap___has_only(val_t p0, val_t p1){
           REGB2 = TAG_Bool(false);
           REGB1 = REGB2;
         } else {
-          REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
+          REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
           REGB1 = REGB2;
         }
       }
@@ -3553,7 +3553,7 @@ val_t array___ArrayMap___has_only(val_t p0, val_t p1){
       }
       /* ./../lib/standard//collection//array.nit:239 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:239 */
       REGB0 = REGB2;
@@ -3571,69 +3571,69 @@ val_t array___ArrayMap___has_only(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB1;
 }
-val_t array___ArrayMap___length(val_t p0){
+val_t standard___collection___array___ArrayMap___length(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 522;
-  fra.me.meth = LOCATE_array___ArrayMap___length;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___length;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:523 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 523);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 523);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:523 */
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___ArrayMap___first(val_t p0){
+val_t standard___collection___array___ArrayMap___first(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 525;
-  fra.me.meth = LOCATE_array___ArrayMap___first;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___first;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:525 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 525);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 525);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Collection___first(fra.me.REG[0])(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_array, 525);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 525);
   }
-  fra.me.REG[0] = CALL_abstract_collection___Couple___second(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-val_t array___ArrayMap___count(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___count(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -3641,9 +3641,9 @@ val_t array___ArrayMap___count(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 527;
-  fra.me.meth = LOCATE_array___ArrayMap___count;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___count;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
   fra.me.REG[0] = NIT_NULL;
@@ -3655,45 +3655,45 @@ val_t array___ArrayMap___count(val_t p0, val_t p1){
   /* ./../lib/standard//collection//array.nit:530 */
   REGB0 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:531 */
-  REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 531);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 531);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:234 */
   REGB1 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:235 */
-  REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+  REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 235);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 235);
   }
-  REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
+  REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:236 */
-  fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:237 */
   while(1) {
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+    REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB2)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:237 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:238 */
       REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 238);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 238);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB1)];
       /* ./../lib/standard//collection//array.nit:531 */
-      fra.me.REG[3] = CALL_abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
+      fra.me.REG[3] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[3])(fra.me.REG[3]);
       REGB2 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[3],fra.me.REG[1]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -3702,20 +3702,20 @@ val_t array___ArrayMap___count(val_t p0, val_t p1){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
           REGB2 = REGB3;
         }
       }
       if (UNTAG_Bool(REGB2)) {
         REGB2 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:215 */
+        /* ./../lib/standard//kernel.nit:218 */
         REGB2 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB2));
         /* ./../lib/standard//collection//array.nit:531 */
         REGB0 = REGB2;
       }
       /* ./../lib/standard//collection//array.nit:239 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:239 */
       REGB1 = REGB2;
@@ -3731,58 +3731,58 @@ val_t array___ArrayMap___count(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t array___ArrayMap___iterator(val_t p0){
+val_t standard___collection___array___ArrayMap___iterator(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 535;
-  fra.me.meth = LOCATE_array___ArrayMap___iterator;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___iterator;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:535 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 535);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 535);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
-  fra.me.REG[0] = NEW_CoupleMapIterator_abstract_collection___CoupleMapIterator___init(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = NEW_CoupleMapIterator_standard___collection___abstract_collection___CoupleMapIterator___init(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-val_t array___ArrayMap___is_empty(val_t p0){
+val_t standard___collection___array___ArrayMap___is_empty(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 537;
-  fra.me.meth = LOCATE_array___ArrayMap___is_empty;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___is_empty;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:537 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 537);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 537);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  REGB0 = CALL_abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void array___ArrayMap___remove(val_t p0, val_t p1){
+void standard___collection___array___ArrayMap___remove(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -3790,9 +3790,9 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 539;
-  fra.me.meth = LOCATE_array___ArrayMap___remove;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___remove;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -3801,52 +3801,52 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:541 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 541);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 541);
   }
-  fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
   /* ./../lib/standard//collection//array.nit:541 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:542 */
   while(1) {
     REGB0 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB0 = TAG_Bool(UNTAG_Int(REGB1)>=UNTAG_Int(REGB0));
     /* ./../lib/standard//collection//array.nit:542 */
     if (UNTAG_Bool(REGB0)) {
       /* ./../lib/standard//collection//array.nit:543 */
-      REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+      REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 543);
+        nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 543);
       }
-      fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+      fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
       /* ./../lib/standard//collection//array.nit:243 */
       REGB0 = REGB1;
       /* ./../lib/standard//collection//array.nit:245 */
       REGB2 = TAG_Int(0);
-      /* ./../lib/standard//kernel.nit:213 */
+      /* ./../lib/standard//kernel.nit:216 */
       REGB2 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:245 */
       if (UNTAG_Bool(REGB2)) {
-        REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+        REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
         if (UNTAG_Bool(REGB2)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+          nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
         }
-        REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-        /* ./../lib/standard//kernel.nit:212 */
+        REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+        /* ./../lib/standard//kernel.nit:215 */
         REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB2));
       } else {
         /* ./../lib/standard//collection//array.nit:245 */
@@ -3855,13 +3855,13 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
       }
       if (UNTAG_Bool(REGB2)) {
       } else {
-        nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+        nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
       }
       /* ./../lib/standard//collection//array.nit:246 */
-      fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+      fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
       REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB0)];
@@ -3871,9 +3871,9 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
       /* ./../lib/standard//collection//array.nit:543 */
       REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 543);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 543);
       }
-      fra.me.REG[2] = CALL_abstract_collection___Couple___second(fra.me.REG[2])(fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[2])(fra.me.REG[2]);
       REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
       } else {
@@ -3882,19 +3882,19 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
           REGB2 = TAG_Bool(false);
           REGB0 = REGB2;
         } else {
-          REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB0 = REGB2;
         }
       }
       if (UNTAG_Bool(REGB0)) {
         /* ./../lib/standard//collection//array.nit:544 */
-        CALL_array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB1);
+        CALL_standard___collection___array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB1);
         /* ./../lib/standard//collection//array.nit:545 */
         goto label2;
       }
       /* ./../lib/standard//collection//array.nit:547 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB0 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB0));
       /* ./../lib/standard//collection//array.nit:547 */
       REGB1 = REGB0;
@@ -3908,7 +3908,7 @@ void array___ArrayMap___remove(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArrayMap___remove_all(val_t p0, val_t p1){
+void standard___collection___array___ArrayMap___remove_all(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -3916,9 +3916,9 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
   val_t REGB3;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 551;
-  fra.me.meth = LOCATE_array___ArrayMap___remove_all;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___remove_all;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -3927,52 +3927,52 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:553 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 553);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 553);
   }
-  fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB0 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB0 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
+  REGB0 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
   /* ./../lib/standard//collection//array.nit:553 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ./../lib/standard//kernel.nit:220 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:554 */
   while(1) {
     REGB0 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB0 = TAG_Bool(UNTAG_Int(REGB1)>=UNTAG_Int(REGB0));
     /* ./../lib/standard//collection//array.nit:554 */
     if (UNTAG_Bool(REGB0)) {
       /* ./../lib/standard//collection//array.nit:555 */
-      REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+      REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 555);
+        nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 555);
       }
-      fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+      fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
       /* ./../lib/standard//collection//array.nit:243 */
       REGB0 = REGB1;
       /* ./../lib/standard//collection//array.nit:245 */
       REGB2 = TAG_Int(0);
-      /* ./../lib/standard//kernel.nit:213 */
+      /* ./../lib/standard//kernel.nit:216 */
       REGB2 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:245 */
       if (UNTAG_Bool(REGB2)) {
-        REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+        REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
         if (UNTAG_Bool(REGB2)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+          nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
         }
-        REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-        /* ./../lib/standard//kernel.nit:212 */
+        REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+        /* ./../lib/standard//kernel.nit:215 */
         REGB2 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB2));
       } else {
         /* ./../lib/standard//collection//array.nit:245 */
@@ -3981,13 +3981,13 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
       }
       if (UNTAG_Bool(REGB2)) {
       } else {
-        nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+        nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
       }
       /* ./../lib/standard//collection//array.nit:246 */
-      fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+      fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
       REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB0)];
@@ -3997,9 +3997,9 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
       /* ./../lib/standard//collection//array.nit:555 */
       REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 555);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 555);
       }
-      fra.me.REG[2] = CALL_abstract_collection___Couple___second(fra.me.REG[2])(fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___Couple___second(fra.me.REG[2])(fra.me.REG[2]);
       REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
       } else {
@@ -4008,17 +4008,17 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
           REGB2 = TAG_Bool(false);
           REGB0 = REGB2;
         } else {
-          REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB0 = REGB2;
         }
       }
       if (UNTAG_Bool(REGB0)) {
         /* ./../lib/standard//collection//array.nit:556 */
-        CALL_array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB1);
+        CALL_standard___collection___array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB1);
       }
       /* ./../lib/standard//collection//array.nit:558 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:217 */
+      /* ./../lib/standard//kernel.nit:220 */
       REGB0 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB0));
       /* ./../lib/standard//collection//array.nit:558 */
       REGB1 = REGB0;
@@ -4031,15 +4031,15 @@ void array___ArrayMap___remove_all(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArrayMap___remove_at(val_t p0, val_t p1){
+void standard___collection___array___ArrayMap___remove_at(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 562;
-  fra.me.meth = LOCATE_array___ArrayMap___remove_at;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___remove_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -4047,76 +4047,76 @@ void array___ArrayMap___remove_at(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:564 */
-  REGB0 = CALL_array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:565 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:565 */
   if (UNTAG_Bool(REGB1)) {
-    CALL_array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB0);
+    CALL_standard___collection___array___ArrayMap___remove_at_index(fra.me.REG[0])(fra.me.REG[0], REGB0);
   }
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArrayMap___clear(val_t p0){
+void standard___collection___array___ArrayMap___clear(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 568;
-  fra.me.meth = LOCATE_array___ArrayMap___clear;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___clear;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:568 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 568);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 568);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  CALL_abstract_collection___RemovableCollection___clear(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___RemovableCollection___clear(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___ArrayMap___enlarge(val_t p0, val_t p1){
+void standard___collection___array___ArrayMap___enlarge(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 570;
-  fra.me.meth = LOCATE_array___ArrayMap___enlarge;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___enlarge;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:571 */
-  REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 571);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 571);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  CALL_array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB0);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  CALL_standard___collection___array___AbstractArray___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB0);
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArrayMap___couple_at(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___couple_at(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 573;
-  fra.me.meth = LOCATE_array___ArrayMap___couple_at;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___couple_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -4124,33 +4124,33 @@ val_t array___ArrayMap___couple_at(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:575 */
-  REGB0 = CALL_array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = CALL_standard___collection___array___ArrayMap___index(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   /* ./../lib/standard//collection//array.nit:576 */
   REGB1 = TAG_Int(0);
-  /* ./../lib/standard//kernel.nit:213 */
+  /* ./../lib/standard//kernel.nit:216 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:576 */
   if (UNTAG_Bool(REGB1)) {
     /* ./../lib/standard//collection//array.nit:577 */
-    REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 577);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 577);
     }
-    fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
     /* ./../lib/standard//collection//array.nit:245 */
     REGB1 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
     /* ./../lib/standard//collection//array.nit:245 */
     if (UNTAG_Bool(REGB1)) {
-      REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
+      REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+        nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
       }
-      REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[0]);
-      /* ./../lib/standard//kernel.nit:212 */
+      REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[0]);
+      /* ./../lib/standard//kernel.nit:215 */
       REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
     } else {
       /* ./../lib/standard//collection//array.nit:245 */
@@ -4159,13 +4159,13 @@ val_t array___ArrayMap___couple_at(val_t p0, val_t p1){
     }
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+      nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
     }
     /* ./../lib/standard//collection//array.nit:246 */
-    fra.me.REG[0] = ATTR_array___Array____items(fra.me.REG[0]);
+    fra.me.REG[0] = ATTR_standard___collection___array___Array____items(fra.me.REG[0]);
     REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
     }
     /* ./../lib/standard//collection//array.nit:654 */
     fra.me.REG[0] = ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)];
@@ -4183,15 +4183,15 @@ val_t array___ArrayMap___couple_at(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___ArrayMap___remove_at_index(val_t p0, val_t p1){
+void standard___collection___array___ArrayMap___remove_at_index(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 586;
-  fra.me.meth = LOCATE_array___ArrayMap___remove_at_index;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___remove_at_index;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -4200,32 +4200,32 @@ void array___ArrayMap___remove_at_index(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   REGB0 = p1;
   /* ./../lib/standard//collection//array.nit:589 */
-  REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 589);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 589);
   }
-  fra.me.REG[1] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  fra.me.REG[1] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 589);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 589);
   }
-  fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  fra.me.REG[2] = CALL_abstract_collection___SequenceRead___last(fra.me.REG[2])(fra.me.REG[2]);
-  CALL_abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB0, fra.me.REG[2]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[2] = CALL_standard___collection___abstract_collection___SequenceRead___last(fra.me.REG[2])(fra.me.REG[2]);
+  CALL_standard___collection___abstract_collection___Map_____braeq(fra.me.REG[1])(fra.me.REG[1], REGB0, fra.me.REG[2]);
   /* ./../lib/standard//collection//array.nit:590 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 590);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 590);
   }
-  fra.me.REG[0] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
-  CALL_abstract_collection___Sequence___pop(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___Sequence___pop(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t array___ArrayMap___index(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayMap___index(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -4234,9 +4234,9 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
   val_t REGB4;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 596;
-  fra.me.meth = LOCATE_array___ArrayMap___index;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___index;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -4245,51 +4245,51 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   /* ./../lib/standard//collection//array.nit:600 */
-  REGB0 = TAG_Bool(ATTR_array___ArrayMap____last_index(fra.me.REG[0])!=NIT_NULL);
+  REGB0 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____last_index(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_last_index", LOCATE_array, 600);
+    nit_abort("Uninitialized attribute %s", "_last_index", LOCATE_standard___collection___array, 600);
   }
-  REGB0 = ATTR_array___ArrayMap____last_index(fra.me.REG[0]);
+  REGB0 = ATTR_standard___collection___array___ArrayMap____last_index(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:601 */
-  REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 601);
+    nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 601);
   }
-  fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+  fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
   /* ./../lib/standard//collection//array.nit:23 */
-  REGB1 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+  REGB1 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
   }
-  REGB1 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-  /* ./../lib/standard//kernel.nit:212 */
+  REGB1 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+  /* ./../lib/standard//kernel.nit:215 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:601 */
   if (UNTAG_Bool(REGB1)) {
-    REGB1 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB1 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 601);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 601);
     }
-    fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
     /* ./../lib/standard//collection//array.nit:243 */
     REGB1 = REGB0;
     /* ./../lib/standard//collection//array.nit:245 */
     REGB2 = TAG_Int(0);
-    /* ./../lib/standard//kernel.nit:213 */
+    /* ./../lib/standard//kernel.nit:216 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB1)>=UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:245 */
     if (UNTAG_Bool(REGB2)) {
-      REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+      REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+        nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
       }
-      REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-      /* ./../lib/standard//kernel.nit:212 */
+      REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+      /* ./../lib/standard//kernel.nit:215 */
       REGB2 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB2));
     } else {
       /* ./../lib/standard//collection//array.nit:245 */
@@ -4298,13 +4298,13 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
     }
     if (UNTAG_Bool(REGB2)) {
     } else {
-      nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+      nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
     }
     /* ./../lib/standard//collection//array.nit:246 */
-    fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+    fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
     REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB2)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
     }
     /* ./../lib/standard//collection//array.nit:654 */
     fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB1)];
@@ -4314,9 +4314,9 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
     /* ./../lib/standard//collection//array.nit:601 */
     REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
-      nit_abort("Reciever is null", NULL, LOCATE_array, 601);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 601);
     }
-    fra.me.REG[2] = CALL_abstract_collection___Couple___first(fra.me.REG[2])(fra.me.REG[2]);
+    fra.me.REG[2] = CALL_standard___collection___abstract_collection___Couple___first(fra.me.REG[2])(fra.me.REG[2]);
     REGB1 = TAG_Bool(IS_EQUAL_ON(fra.me.REG[1],fra.me.REG[2]));
     if (UNTAG_Bool(REGB1)) {
     } else {
@@ -4325,7 +4325,7 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
         REGB2 = TAG_Bool(false);
         REGB1 = REGB2;
       } else {
-        REGB2 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+        REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
         REGB1 = REGB2;
       }
     }
@@ -4340,45 +4340,45 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
   REGB1 = TAG_Int(0);
   /* ./../lib/standard//collection//array.nit:604 */
   while(1) {
-    REGB2 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+    REGB2 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB2)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 604);
+      nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 604);
     }
-    fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+    fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
     /* ./../lib/standard//collection//array.nit:23 */
-    REGB2 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+    REGB2 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
     if (UNTAG_Bool(REGB2)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 23);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 23);
     }
-    REGB2 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-    /* ./../lib/standard//kernel.nit:212 */
+    REGB2 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+    /* ./../lib/standard//kernel.nit:215 */
     REGB2 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB2));
     /* ./../lib/standard//collection//array.nit:604 */
     if (UNTAG_Bool(REGB2)) {
       /* ./../lib/standard//collection//array.nit:605 */
-      REGB2 = TAG_Bool(ATTR_array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
+      REGB2 = TAG_Bool(ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_items", LOCATE_array, 605);
+        nit_abort("Uninitialized attribute %s", "_items", LOCATE_standard___collection___array, 605);
       }
-      fra.me.REG[2] = ATTR_array___ArrayMap____items(fra.me.REG[0]);
+      fra.me.REG[2] = ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]);
       /* ./../lib/standard//collection//array.nit:243 */
       REGB2 = REGB1;
       /* ./../lib/standard//collection//array.nit:245 */
       REGB3 = TAG_Int(0);
-      /* ./../lib/standard//kernel.nit:213 */
+      /* ./../lib/standard//kernel.nit:216 */
       REGB3 = TAG_Bool(UNTAG_Int(REGB2)>=UNTAG_Int(REGB3));
       /* ./../lib/standard//collection//array.nit:245 */
       if (UNTAG_Bool(REGB3)) {
-        REGB3 = TAG_Bool(ATTR_array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
+        REGB3 = TAG_Bool(ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2])!=NIT_NULL);
         if (UNTAG_Bool(REGB3)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_length", LOCATE_array, 245);
+          nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___array, 245);
         }
-        REGB3 = ATTR_array___AbstractArrayRead____length(fra.me.REG[2]);
-        /* ./../lib/standard//kernel.nit:212 */
+        REGB3 = ATTR_standard___collection___array___AbstractArrayRead____length(fra.me.REG[2]);
+        /* ./../lib/standard//kernel.nit:215 */
         REGB3 = TAG_Bool(UNTAG_Int(REGB2)<UNTAG_Int(REGB3));
       } else {
         /* ./../lib/standard//collection//array.nit:245 */
@@ -4387,13 +4387,13 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
       }
       if (UNTAG_Bool(REGB3)) {
       } else {
-        nit_abort("Assert %s  failed", "'index'", LOCATE_array, 245);
+        nit_abort("Assert %s  failed", "'index'", LOCATE_standard___collection___array, 245);
       }
       /* ./../lib/standard//collection//array.nit:246 */
-      fra.me.REG[2] = ATTR_array___Array____items(fra.me.REG[2]);
+      fra.me.REG[2] = ATTR_standard___collection___array___Array____items(fra.me.REG[2]);
       REGB3 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB3)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 246);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 246);
       }
       /* ./../lib/standard//collection//array.nit:654 */
       fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB2)];
@@ -4403,9 +4403,9 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
       /* ./../lib/standard//collection//array.nit:605 */
       REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
       if (UNTAG_Bool(REGB2)) {
-        nit_abort("Reciever is null", NULL, LOCATE_array, 605);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___array, 605);
       }
-      fra.me.REG[2] = CALL_abstract_collection___Couple___first(fra.me.REG[2])(fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___Couple___first(fra.me.REG[2])(fra.me.REG[2]);
       REGB2 = TAG_Bool(IS_EQUAL_ON(fra.me.REG[1],fra.me.REG[2]));
       if (UNTAG_Bool(REGB2)) {
       } else {
@@ -4414,20 +4414,20 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
           REGB3 = TAG_Bool(false);
           REGB2 = REGB3;
         } else {
-          REGB3 = CALL_kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
+          REGB3 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], fra.me.REG[1]);
           REGB2 = REGB3;
         }
       }
       if (UNTAG_Bool(REGB2)) {
         /* ./../lib/standard//collection//array.nit:606 */
-        ATTR_array___ArrayMap____last_index(fra.me.REG[0]) = REGB1;
+        ATTR_standard___collection___array___ArrayMap____last_index(fra.me.REG[0]) = REGB1;
         /* ./../lib/standard//collection//array.nit:607 */
         REGB0 = REGB1;
         goto label2;
       }
       /* ./../lib/standard//collection//array.nit:609 */
       REGB2 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:215 */
+      /* ./../lib/standard//kernel.nit:218 */
       REGB2 = TAG_Int(UNTAG_Int(REGB1)+UNTAG_Int(REGB2));
       /* ./../lib/standard//collection//array.nit:609 */
       REGB1 = REGB2;
@@ -4439,7 +4439,7 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
   label4: while(0);
   /* ./../lib/standard//collection//array.nit:611 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:216 */
+  /* ./../lib/standard//kernel.nit:219 */
   REGB1 = TAG_Int(-UNTAG_Int(REGB1));
   /* ./../lib/standard//collection//array.nit:611 */
   REGB0 = REGB1;
@@ -4448,35 +4448,35 @@ val_t array___ArrayMap___index(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void array___ArrayMap___init(val_t p0, int* init_table){
-  int itpos10 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_ArrayMap].i;
+void standard___collection___array___ArrayMap___init(val_t p0, int* init_table){
+  int itpos10 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___array___ArrayMap].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   if (init_table[itpos10]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 614;
-  fra.me.meth = LOCATE_array___ArrayMap___init;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayMap___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:617 */
-  fra.me.REG[1] = NEW_Array_array___Array___init();
-  ATTR_array___ArrayMap____items(fra.me.REG[0]) = fra.me.REG[1];
+  fra.me.REG[1] = NEW_Array_standard___collection___array___Array___init();
+  ATTR_standard___collection___array___ArrayMap____items(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   init_table[itpos10] = 1;
   return;
 }
-val_t array___Iterator___to_a(val_t p0){
+val_t standard___collection___array___Iterator___to_a(val_t p0){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 624;
-  fra.me.meth = LOCATE_array___Iterator___to_a;
+  fra.me.meth = LOCATE_standard___collection___array___Iterator___to_a;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
   fra.me.REG[0] = NIT_NULL;
@@ -4484,16 +4484,16 @@ val_t array___Iterator___to_a(val_t p0){
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:627 */
-  fra.me.REG[1] = NEW_Array_array___Array___init();
+  fra.me.REG[1] = NEW_Array_standard___collection___array___Array___init();
   /* ./../lib/standard//collection//array.nit:628 */
   while(1) {
-    REGB0 = CALL_abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
+    REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
     if (UNTAG_Bool(REGB0)) {
       /* ./../lib/standard//collection//array.nit:629 */
-      fra.me.REG[2] = CALL_abstract_collection___Iterator___item(fra.me.REG[0])(fra.me.REG[0]);
-      CALL_abstract_collection___SimpleCollection___add(fra.me.REG[1])(fra.me.REG[1], fra.me.REG[2]);
+      fra.me.REG[2] = CALL_standard___collection___abstract_collection___Iterator___item(fra.me.REG[0])(fra.me.REG[0]);
+      CALL_standard___collection___abstract_collection___SimpleCollection___add(fra.me.REG[1])(fra.me.REG[1], fra.me.REG[2]);
       /* ./../lib/standard//collection//array.nit:630 */
-      CALL_abstract_collection___Iterator___next(fra.me.REG[0])(fra.me.REG[0]);
+      CALL_standard___collection___abstract_collection___Iterator___next(fra.me.REG[0])(fra.me.REG[0]);
     } else {
       /* ./../lib/standard//collection//array.nit:628 */
       goto label1;
@@ -4506,33 +4506,33 @@ val_t array___Iterator___to_a(val_t p0){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-val_t array___Collection___to_a(val_t p0){
+val_t standard___collection___array___Collection___to_a(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 637;
-  fra.me.meth = LOCATE_array___Collection___to_a;
+  fra.me.meth = LOCATE_standard___collection___array___Collection___to_a;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
   /* ./../lib/standard//collection//array.nit:640 */
-  fra.me.REG[0] = CALL_abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
-  fra.me.REG[0] = CALL_array___Iterator___to_a(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___Collection___iterator(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___array___Iterator___to_a(fra.me.REG[0])(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-val_t array___ArrayCapable___calloc_array(val_t p0, val_t p1){
+val_t standard___collection___array___ArrayCapable___calloc_array(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 648;
-  fra.me.meth = LOCATE_array___ArrayCapable___calloc_array;
+  fra.me.meth = LOCATE_standard___collection___array___ArrayCapable___calloc_array;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
@@ -4543,14 +4543,14 @@ val_t array___ArrayCapable___calloc_array(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-val_t array___NativeArray_____bra(val_t p0, val_t p1){
+val_t standard___collection___array___NativeArray_____bra(val_t p0, val_t p1){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 654;
-  fra.me.meth = LOCATE_array___NativeArray_____bra;
+  fra.me.meth = LOCATE_standard___collection___array___NativeArray_____bra;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
   fra.me.REG[0] = NIT_NULL;
@@ -4561,14 +4561,14 @@ val_t array___NativeArray_____bra(val_t p0, val_t p1){
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
 }
-void array___NativeArray_____braeq(val_t p0, val_t p1, val_t p2){
+void standard___collection___array___NativeArray_____braeq(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 655;
-  fra.me.meth = LOCATE_array___NativeArray_____braeq;
+  fra.me.meth = LOCATE_standard___collection___array___NativeArray_____braeq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;
@@ -4581,14 +4581,14 @@ void array___NativeArray_____braeq(val_t p0, val_t p1, val_t p2){
   stack_frame_head = fra.me.prev;
   return;
 }
-void array___NativeArray___copy_to(val_t p0, val_t p1, val_t p2){
+void standard___collection___array___NativeArray___copy_to(val_t p0, val_t p1, val_t p2){
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_array;
+  fra.me.file = LOCATE_standard___collection___array;
   fra.me.line = 656;
-  fra.me.meth = LOCATE_array___NativeArray___copy_to;
+  fra.me.meth = LOCATE_standard___collection___array___NativeArray___copy_to;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
   fra.me.REG[0] = NIT_NULL;