Index: /anr/task-2.tex
===================================================================
--- /anr/task-2.tex	(revision 73)
+++ /anr/task-2.tex	(revision 74)
@@ -27,4 +27,6 @@
     \begin{livrable}
     \itemV{0}{12}{x}{\Supmc}{CSG} \setMacroInAuxFile{csgCoachArch}
+        \mustbecompleted{FIXME: LIP6 :: Pas clair pour un non expert du projet... ET remplacement de "milestone" par
+    "CSG release"} 
         The first milestone that will allow demonstrators to start working using the COACH
         hardware architecture template.
@@ -70,18 +72,14 @@
         The synthesizable VHDL description of the MWMR component corresponding to the
         SystemC module of the former delivrable (\csgAlteraSystemC);
-    \itemV{6}{12}{d}{\Subs}{UBS architecture}
-\mustbecompleted{FIXME:UBS ARGH!!!!!
-    1) Attention si vous touchez au MWMR, ils y a 3 composants MWMR.
-    2) UBS architecture est tres mal choisit, ca fait un 4ieme template
-}
-       \setMacroInAuxFile{gautMWMRoptimization}
-       Specification of an optimized MWMR component to handle data interleaving (space and time).
+    \itemV{6}{12}{d}{\Subs}{UBS communication adapter}
+       \setMacroInAuxFile{gautCOMMoptimization}
+       Specification of an optimized communication adapter (space and time) component to handle data interleaving.
        This evolution aims to solve out of order communication weakness of the classical MWMR. 
-    \itemV{12}{24}{x}{\Subs}{UBS architecture}
-       Release of the tool that generates the VHDL description of the optimized MWMR component
+    \itemV{12}{24}{x}{\Subs}{UBS communication adapter}
+       First release of the tool that generates the VHDL description of the optimized communication adapter
        and its corresponding SystemC module. 
-    \itemL{24}{30}{x}{\Subs}{UBS architecture}{0:0:0}
-       Final release of the tool that generates the VHDL description of the optimized MWMR component
-       and its corresponding SystemC module (\gautMWMRoptimization).
+    \itemL{24}{30}{x}{\Subs}{UBS communication adapter}{0:0:0}
+       Final release of the tool that generates the VHDL description of the optimized communication adapter
+       and its corresponding SystemC module (\gautCOMMoptimization).
     \end{livrable}
 \item This \ST consists of the configuration of the SocLib MUTEK and DNA operating