Index: /soft/giet_vm/giet_xml/mapping_info.h
===================================================================
--- /soft/giet_vm/giet_xml/mapping_info.h	(revision 547)
+++ /soft/giet_vm/giet_xml/mapping_info.h	(revision 548)
@@ -65,12 +65,7 @@
     VSEG_TYPE_PTAB     = 2,  // page table 
     VSEG_TYPE_PERI     = 3,  // hardware component
-    VSEG_TYPE_MWMR     = 4,  // MWMR channel
-    VSEG_TYPE_LOCK     = 5,  // Lock
-    VSEG_TYPE_BUFFER   = 6,  // Any "no initialization" objects (stacks...)
-    VSEG_TYPE_BARRIER  = 7,  // Barrier
-    VSEG_TYPE_CONST    = 8,  // Constant
-    VSEG_TYPE_MEMSPACE = 9,  // Memspace (descriptor must be initialised)
-    VSEG_TYPE_SCHED    = 10, // Array of schedulers (one per cluster)
-    VSEG_TYPE_HEAP     = 11, // Heap   f schedulers (one per cluster)
+    VSEG_TYPE_BUFFER   = 4,  // no initialization object (stacks...)
+    VSEG_TYPE_SCHED    = 5,  // scheduler 
+    VSEG_TYPE_HEAP     = 6,  // heap 
 };
 
@@ -119,6 +114,5 @@
     IOC_SUBTYPE_BDV    = 0,
     IOC_SUBTYPE_HBA    = 1,
-    IOC_SUBTYPE_SPI    = 2,
-    IOC_SUBTYPE_NONE   = 3,
+    IOC_SUBTYPE_SDC    = 2,
 };
 
@@ -160,5 +154,5 @@
     unsigned int irqs;               // total number of irqs 
     unsigned int periphs;            // total number of peripherals 
-    char name[32];                   // mapping name
+    char name[64];                   // mapping name
 } mapping_header_t;
 
Index: /soft/giet_vm/giet_xml/xml_driver.c
===================================================================
--- /soft/giet_vm/giet_xml/xml_driver.c	(revision 547)
+++ /soft/giet_vm/giet_xml/xml_driver.c	(revision 548)
@@ -23,14 +23,9 @@
     const char * vseg_type[] = 
     { 
-        "ELF",        // binary code generated by GCC
-        "BLOB",       // binary 
-        "PTAB",       // page table 
-        "PERI",       // hardware component
-        "MWMR",       // MWMR channel
-        "LOCK",       // Spin-Lock
-        "BUFFER",     // Any "no intialiasation needed" object (stacks...)
-        "BARRIER",    // Barrier
-        "CONST",      // Constant
-        "MEMSPACE",   // Memspace
+        "ELF",        // From a .elf file
+        "BLOB",       // Raw Binary 
+        "PTAB",       // Page Table 
+        "PERI",       // Hardware Component
+        "BUFFER",     // No intialisation needed (stacks...)
         "SCHED",      // Scheduler
         "HEAP",       // Heap     
@@ -68,5 +63,5 @@
         "ISR_MMC",
         "ISR_DMA",
-        "ISR_SPI",
+        "ISR_SDC",
         "ISR_MWR",
         "ISR_HBA",
@@ -102,6 +97,5 @@
         "BDV",
         "HBA",
-        "SPI",
-        "NONE",
+        "SDC",
     };
 
Index: /soft/giet_vm/giet_xml/xml_parser.c
===================================================================
--- /soft/giet_vm/giet_xml/xml_parser.c	(revision 547)
+++ /soft/giet_vm/giet_xml/xml_parser.c	(revision 548)
@@ -878,5 +878,5 @@
         else if (strcmp(str, "ISR_MMC"    ) == 0)  irq[irq_index]->isr = ISR_MMC;
         else if (strcmp(str, "ISR_DMA"    ) == 0)  irq[irq_index]->isr = ISR_DMA;
-        else if (strcmp(str, "ISR_SPI"    ) == 0)  irq[irq_index]->isr = ISR_SPI;
+        else if (strcmp(str, "ISR_SDC"    ) == 0)  irq[irq_index]->isr = ISR_SDC;
         else if (strcmp(str, "ISR_MWR"    ) == 0)  irq[irq_index]->isr = ISR_MWR;
         else if (strcmp(str, "ISR_HBA"    ) == 0)  irq[irq_index]->isr = ISR_HBA;
@@ -1062,6 +1062,6 @@
             else if (strcmp(subtype, "HBA") == 0) 
             periph[periph_index]->subtype = IOC_SUBTYPE_HBA;
-            else if (strcmp(subtype, "SPI") == 0) 
-            periph[periph_index]->subtype = IOC_SUBTYPE_SPI;
+            else if (strcmp(subtype, "SDC") == 0) 
+            periph[periph_index]->subtype = IOC_SUBTYPE_SDC;
         }
         else