diff --git a/src/lib/escape/Escape.h b/src/lib/escape/Escape.h
index c362566d16..c8f6267ec3 100644
--- a/src/lib/escape/Escape.h
+++ b/src/lib/escape/Escape.h
@@ -20,8 +20,6 @@
 
 /**
  * @page escape_main Escape
- * @image html  e_big.png
- * @author Youness Alaoui
  * @date 2011
  *
  * @section intro_sec Introduction
diff --git a/src/lib/escape/escape_libgen.h b/src/lib/escape/escape_libgen.h
index 0c23a76821..4b636740f7 100644
--- a/src/lib/escape/escape_libgen.h
+++ b/src/lib/escape/escape_libgen.h
@@ -5,6 +5,7 @@
  * @file escape_libgen.h
  * @brief The file that provides functions ported from Unix in libgen.h.
  * @defgroup Escape_Libgen_Group Libgen.h functions.
+ * @ingroup Escape
  *
  * This header provides functions ported from Unix in libgen.h.
  *
diff --git a/src/lib/escape/escape_unistd.h b/src/lib/escape/escape_unistd.h
index 0e96d3f3cb..1ed1b5abce 100644
--- a/src/lib/escape/escape_unistd.h
+++ b/src/lib/escape/escape_unistd.h
@@ -5,6 +5,7 @@
  * @file escape_unistd.h
  * @brief The file that provides functions ported from Unix in unistd.h.
  * @defgroup Escape_Unistd_Group Unistd.h functions
+ * @ingroup Escape
  *
  * This header provides functions ported from Unix in unistd.h.
  *
diff --git a/src/lib/escape/sys/mman.h b/src/lib/escape/sys/mman.h
index 98ef7fa5fc..b243c15362 100644
--- a/src/lib/escape/sys/mman.h
+++ b/src/lib/escape/sys/mman.h
@@ -61,7 +61,8 @@ extern "C" {
 /**
  * @file mman.h
  * @brief The file that provides the memory map functions
- * @defgroup Mman Functions that manage memory mappping.
+ * @defgroup Escape_Mman Functions that manage memory mappping.
+ * @ingroup Escape
  *
  * This header provides the meomry map functions mmap and munmap.
  *
@@ -101,7 +102,7 @@ extern "C" {
  *
  * Conformity: None.
  *
- * @ingroup Mman
+ * @ingroup Escape_Mman
  */
 EAPI void *mmap(void *addr,
                 size_t len,
@@ -125,7 +126,7 @@ EAPI void *mmap(void *addr,
  *
  * Conformity: None.
  *
- * @ingroup Mman
+ * @ingroup Escape_Mman
  */
 EAPI int
 munmap(void *addr,
@@ -164,7 +165,7 @@ munmap(void *addr,
 
  * Conformity: None.
  *
- * @ingroup Mman
+ * @ingroup Escape_Mman
  */
 EAPI int
 madvise(void *addr,