diff --git a/SoftwareGuide/Art/ImageIOCollaborationDiagram.fig b/SoftwareGuide/Art/ImageIOCollaborationDiagram.fig
index 5ab2aeef922da00a6fa55d6dfa630586f5dc3d04..3003e5f8799c69c6e0b2d3cd508fd36af80a275a 100644
--- a/SoftwareGuide/Art/ImageIOCollaborationDiagram.fig
+++ b/SoftwareGuide/Art/ImageIOCollaborationDiagram.fig
@@ -72,17 +72,17 @@ Single
 	 6150 3225 6150 2700
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 	 9000 3675 9000 3225
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-	 6150 4275 6150 3225
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 	 8175 4275 8175 3225
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
 	 6450 3675 8025 3675 8025 4050 6450 4050 6450 3675
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
+	 6225 4275 6225 3225
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
-	 5550 4275 7050 4275 7050 4650 5550 4650 5550 4275
+	 5550 4275 6900 4275 6900 4650 5550 4650 5550 4275
 4 0 0 50 0 0 12 0.0000 4 135 90 1350 2700 1\001
 4 0 0 50 0 0 12 0.0000 4 135 90 4425 1650 1\001
 4 0 0 50 0 0 12 0.0000 4 135 90 7725 1650 1\001
 4 0 0 50 0 0 12 0.0000 4 135 90 10875 2700 1\001
 4 1 0 50 0 12 12 0.0000 4 165 1155 7237 3900 GDALImageIO\001
-4 1 0 50 0 12 12 0.0000 4 165 1050 6300 4500 CAIImageIO\001
+4 1 0 50 0 12 12 0.0000 4 165 1260 6225 4500 ONERAImageIO\001
diff --git a/SoftwareGuide/Art/ImageIOFactoriesClassDiagram.fig b/SoftwareGuide/Art/ImageIOFactoriesClassDiagram.fig
index cacfeac99bbd6630aeed90dec89b7e3cbbf6064e..ca5ff62ac55feefc0b4f6a01bd0a950834365dab 100644
--- a/SoftwareGuide/Art/ImageIOFactoriesClassDiagram.fig
+++ b/SoftwareGuide/Art/ImageIOFactoriesClassDiagram.fig
@@ -91,14 +91,14 @@ Single
 	 4125 3225 4125 2700
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
 	 750 4275 3150 4275 3150 4650 750 4650 750 4275
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 8025 3675 10350 3675 10350 4050 8025 4050 8025 3675
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 	 3300 4875 3300 3225
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
 	 1050 4875 3450 4875 3450 5250 1050 5250 1050 4875
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
-	 8025 3675 10350 3675 10350 4050 8025 4050 8025 3675
 4 1 0 50 -1 5 18 0.0000 0 120 165 8100 2175 *\001
 4 1 0 50 -1 5 18 0.0000 0 180 165 6975 2175 1\001
 4 1 0 50 0 12 12 0.0000 4 165 1890 1987 4500 GDALImageIOFactory\001
-4 1 0 50 0 12 12 0.0000 4 165 1785 2250 5100 CAIImageIOFactory\001
 4 1 0 50 0 12 12 0.0000 4 135 1995 9225 3900 other ITK Factories\001
+4 1 0 50 0 12 12 0.0000 4 165 1995 2250 5100 ONERAImageIOFactory\001
diff --git a/SoftwareGuide/Latex/ReadWrite.tex b/SoftwareGuide/Latex/ReadWrite.tex
index d17f6d8d198a09b022aa59ea7d2872e4c9227b25..783d0811c68b27abc85889549c43f721f122f897 100644
--- a/SoftwareGuide/Latex/ReadWrite.tex
+++ b/SoftwareGuide/Latex/ReadWrite.tex
@@ -96,23 +96,18 @@ create the specific ImageIO instance that will be returned to the
 ImageFileReader and used to perform the read operations.
 
 With respect to the ITK formats, OTB adds most of the remote sensing
-image formats. In order to do so, two IO libraries are encapsulated by
-their respective IO factories. These libraries are:
-\begin{itemize}
-  \item The Geospatial Data Abstraction Library, GDAL
-      \url{http://www.gdal.org/}, is a translator library for raster
+image formats. In order to do so, the Geospatial Data Abstraction Library, GDAL
+      \url{http://www.gdal.org/}, is encapsultated in a ImageIO
+      factory. GDAL is a translator library for raster
       geospatial data formats that is released under an X/MIT style
       Open Source license. As a library, it presents a single abstract
       data model to the calling application for all supported formats,
       which include CEOS, GeoTIFF, ENVI, and much more. See
       \url{http://www.remotesensing.org/gdal/formats_list.html} for
       the full format list.
-    \item CNES's Couche Acc\`es Image, CAI, which supports SPOT image
-    formats and several CNES's inhouse image formats.
-\end{itemize}
 
-Since GDAL and CAI are themselves multi-format libraries, these IO
-factories are able to choose the appropriate ressource for reading and
+      Since GDAL is itself a multi-format library, the GDAL IO
+factory is able to choose the appropriate ressource for reading and
 writing images. 
 
 In most cases the mechanism is transparent to the user who only interacts