diff --git a/src/libecmaobjects/ecma-alloc.c b/src/libecmaobjects/ecma-alloc.c
index 92b17d8ca..9457c2993 100644
--- a/src/libecmaobjects/ecma-alloc.c
+++ b/src/libecmaobjects/ecma-alloc.c
@@ -31,7 +31,7 @@ JERRY_STATIC_ASSERT (sizeof (ecma_collection_chunk_t) == sizeof (uint64_t));
 JERRY_STATIC_ASSERT (sizeof (ecma_string_t) == sizeof (uint64_t));
 JERRY_STATIC_ASSERT (sizeof (ecma_completion_value_t) == sizeof (uint32_t));
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaalloc Routines for allocation/freeing memory for ECMA data types
diff --git a/src/libecmaobjects/ecma-alloc.h b/src/libecmaobjects/ecma-alloc.h
index 220843f82..d6ce1f7e7 100644
--- a/src/libecmaobjects/ecma-alloc.h
+++ b/src/libecmaobjects/ecma-alloc.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaalloc Routines for allocation/freeing memory for ECMA data types
diff --git a/src/libecmaobjects/ecma-gc.c b/src/libecmaobjects/ecma-gc.c
index 9367352d5..ead47b3d3 100644
--- a/src/libecmaobjects/ecma-gc.c
+++ b/src/libecmaobjects/ecma-gc.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmagc Garbage collector
diff --git a/src/libecmaobjects/ecma-gc.h b/src/libecmaobjects/ecma-gc.h
index 8775551d6..2aca13352 100644
--- a/src/libecmaobjects/ecma-gc.h
+++ b/src/libecmaobjects/ecma-gc.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmagc Garbage collector
diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h
index cd0414e24..d777ea63d 100644
--- a/src/libecmaobjects/ecma-globals.h
+++ b/src/libecmaobjects/ecma-globals.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmatypes ECMA types
diff --git a/src/libecmaobjects/ecma-helpers-conversion.c b/src/libecmaobjects/ecma-helpers-conversion.c
index ebad562f1..4e08f57d6 100644
--- a/src/libecmaobjects/ecma-helpers-conversion.c
+++ b/src/libecmaobjects/ecma-helpers-conversion.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers-number.c b/src/libecmaobjects/ecma-helpers-number.c
index 0fe9f2855..dee2a88dd 100644
--- a/src/libecmaobjects/ecma-helpers-number.c
+++ b/src/libecmaobjects/ecma-helpers-number.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers-string.c b/src/libecmaobjects/ecma-helpers-string.c
index 80a0f05e9..9eacf2de4 100644
--- a/src/libecmaobjects/ecma-helpers-string.c
+++ b/src/libecmaobjects/ecma-helpers-string.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers-value.c b/src/libecmaobjects/ecma-helpers-value.c
index 3dec65ace..1a2905e9d 100644
--- a/src/libecmaobjects/ecma-helpers-value.c
+++ b/src/libecmaobjects/ecma-helpers-value.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers-values-collection.c b/src/libecmaobjects/ecma-helpers-values-collection.c
index 2c006b314..064446f2d 100644
--- a/src/libecmaobjects/ecma-helpers-values-collection.c
+++ b/src/libecmaobjects/ecma-helpers-values-collection.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers.c b/src/libecmaobjects/ecma-helpers.c
index 6b5e769d1..bbbd1f2a6 100644
--- a/src/libecmaobjects/ecma-helpers.c
+++ b/src/libecmaobjects/ecma-helpers.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-helpers.h b/src/libecmaobjects/ecma-helpers.h
index f188f2bd8..7f5f6191e 100644
--- a/src/libecmaobjects/ecma-helpers.h
+++ b/src/libecmaobjects/ecma-helpers.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmahelpers Helpers for operations with ECMA data types
diff --git a/src/libecmaobjects/ecma-reference.h b/src/libecmaobjects/ecma-reference.h
index 28efde2dd..9c7f9f3df 100644
--- a/src/libecmaobjects/ecma-reference.h
+++ b/src/libecmaobjects/ecma-reference.h
@@ -16,7 +16,7 @@
 #ifndef ECMA_REFERENCE_H
 #define ECMA_REFERENCE_H
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-array-object.c b/src/libecmaoperations/ecma-array-object.c
index e9595b789..648232435 100644
--- a/src/libecmaoperations/ecma-array-object.c
+++ b/src/libecmaoperations/ecma-array-object.c
@@ -23,7 +23,7 @@
 #include "ecma-objects.h"
 #include "ecma-objects-general.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaarrayobject ECMA Array object related routines
diff --git a/src/libecmaoperations/ecma-array-object.h b/src/libecmaoperations/ecma-array-object.h
index 2a5d3c6e4..5b81c5bff 100644
--- a/src/libecmaoperations/ecma-array-object.h
+++ b/src/libecmaoperations/ecma-array-object.h
@@ -18,7 +18,7 @@
 
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaarrayobject ECMA Array object related routines
diff --git a/src/libecmaoperations/ecma-comparison.c b/src/libecmaoperations/ecma-comparison.c
index 88e47b9a6..748b5afb6 100644
--- a/src/libecmaoperations/ecma-comparison.c
+++ b/src/libecmaoperations/ecma-comparison.c
@@ -19,7 +19,7 @@
 #include "ecma-try-catch-macro.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmacomparison ECMA comparison
diff --git a/src/libecmaoperations/ecma-comparison.h b/src/libecmaoperations/ecma-comparison.h
index 79969c062..daffc5603 100644
--- a/src/libecmaoperations/ecma-comparison.h
+++ b/src/libecmaoperations/ecma-comparison.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmacomparison ECMA comparison
diff --git a/src/libecmaoperations/ecma-conversion.c b/src/libecmaoperations/ecma-conversion.c
index 165887ff6..550b9f648 100644
--- a/src/libecmaoperations/ecma-conversion.c
+++ b/src/libecmaoperations/ecma-conversion.c
@@ -24,7 +24,7 @@
 #include "ecma-try-catch-macro.h"
 #include "jerry-libc.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaconversion ECMA conversion routines
diff --git a/src/libecmaoperations/ecma-conversion.h b/src/libecmaoperations/ecma-conversion.h
index 14fe28efc..74c2e3779 100644
--- a/src/libecmaoperations/ecma-conversion.h
+++ b/src/libecmaoperations/ecma-conversion.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaconversion ECMA conversion
diff --git a/src/libecmaoperations/ecma-exceptions.c b/src/libecmaoperations/ecma-exceptions.c
index 7ca4802c3..d1bfb1ee0 100644
--- a/src/libecmaoperations/ecma-exceptions.c
+++ b/src/libecmaoperations/ecma-exceptions.c
@@ -18,7 +18,7 @@
 #include "ecma-helpers.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-exceptions.h b/src/libecmaoperations/ecma-exceptions.h
index fc4f52df9..ad234b4b5 100644
--- a/src/libecmaoperations/ecma-exceptions.h
+++ b/src/libecmaoperations/ecma-exceptions.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-function-object.c b/src/libecmaoperations/ecma-function-object.c
index cfd7a47d9..e22570014 100644
--- a/src/libecmaoperations/ecma-function-object.c
+++ b/src/libecmaoperations/ecma-function-object.c
@@ -26,7 +26,7 @@
 #include "ecma-try-catch-macro.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmafunctionobject ECMA Function object related routines
diff --git a/src/libecmaoperations/ecma-function-object.h b/src/libecmaoperations/ecma-function-object.h
index c5bdc1d11..b82769b33 100644
--- a/src/libecmaoperations/ecma-function-object.h
+++ b/src/libecmaoperations/ecma-function-object.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "interpreter.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmafunctionobject ECMA Function object related routines
diff --git a/src/libecmaoperations/ecma-get-put-value.c b/src/libecmaoperations/ecma-get-put-value.c
index c443a3a31..05b1a260a 100644
--- a/src/libecmaoperations/ecma-get-put-value.c
+++ b/src/libecmaoperations/ecma-get-put-value.c
@@ -28,7 +28,7 @@
 #include "ecma-operations.h"
 #include "ecma-try-catch-macro.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaoperations ECMA-defined operations
diff --git a/src/libecmaoperations/ecma-global-object.c b/src/libecmaoperations/ecma-global-object.c
index 1d8917448..193491b7f 100644
--- a/src/libecmaoperations/ecma-global-object.c
+++ b/src/libecmaoperations/ecma-global-object.c
@@ -20,7 +20,7 @@
 #include "ecma-helpers.h"
 #include "ecma-magic-strings.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaglobalobject ECMA Global object related routines
diff --git a/src/libecmaoperations/ecma-global-object.h b/src/libecmaoperations/ecma-global-object.h
index c662fbcac..0f87b8102 100644
--- a/src/libecmaoperations/ecma-global-object.h
+++ b/src/libecmaoperations/ecma-global-object.h
@@ -18,7 +18,7 @@
 
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaglobalobject ECMA Global object related routines
diff --git a/src/libecmaoperations/ecma-lex-env.c b/src/libecmaoperations/ecma-lex-env.c
index 3c78f459a..e51815ced 100644
--- a/src/libecmaoperations/ecma-lex-env.c
+++ b/src/libecmaoperations/ecma-lex-env.c
@@ -22,7 +22,7 @@
 #include "ecma-objects.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-lex-env.h b/src/libecmaoperations/ecma-lex-env.h
index 65c252ac4..735e463b9 100644
--- a/src/libecmaoperations/ecma-lex-env.h
+++ b/src/libecmaoperations/ecma-lex-env.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-magic-strings.c b/src/libecmaoperations/ecma-magic-strings.c
index dda6ccde7..e55d2b582 100644
--- a/src/libecmaoperations/ecma-magic-strings.c
+++ b/src/libecmaoperations/ecma-magic-strings.c
@@ -17,7 +17,7 @@
 #include "ecma-helpers.h"
 #include "ecma-magic-strings.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmamagicstrings Collection of magic string constants used in ECMA
diff --git a/src/libecmaoperations/ecma-magic-strings.h b/src/libecmaoperations/ecma-magic-strings.h
index 22d18f04a..4c6491291 100644
--- a/src/libecmaoperations/ecma-magic-strings.h
+++ b/src/libecmaoperations/ecma-magic-strings.h
@@ -18,7 +18,7 @@
 
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmamagicstrings Collection of magic string constants used in ECMA
diff --git a/src/libecmaoperations/ecma-number-arithmetic.c b/src/libecmaoperations/ecma-number-arithmetic.c
index 0f9f5b8c1..f2983b5bf 100644
--- a/src/libecmaoperations/ecma-number-arithmetic.c
+++ b/src/libecmaoperations/ecma-number-arithmetic.c
@@ -16,7 +16,7 @@
 #include "ecma-globals.h"
 #include "ecma-number-arithmetic.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-number-arithmetic.h b/src/libecmaoperations/ecma-number-arithmetic.h
index 408f405cc..76ee6ac8f 100644
--- a/src/libecmaoperations/ecma-number-arithmetic.h
+++ b/src/libecmaoperations/ecma-number-arithmetic.h
@@ -18,7 +18,7 @@
 
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-objects-arguments.c b/src/libecmaoperations/ecma-objects-arguments.c
index 9478b47a6..4b2b66258 100644
--- a/src/libecmaoperations/ecma-objects-arguments.c
+++ b/src/libecmaoperations/ecma-objects-arguments.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmafunctionobject ECMA Function object related routines
diff --git a/src/libecmaoperations/ecma-objects-general.c b/src/libecmaoperations/ecma-objects-general.c
index 5cc601937..9e7e3ca97 100644
--- a/src/libecmaoperations/ecma-objects-general.c
+++ b/src/libecmaoperations/ecma-objects-general.c
@@ -22,7 +22,7 @@
 #include "ecma-objects-general.h"
 #include "ecma-try-catch-macro.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmageneralobjectsinternalops General ECMA objects' operations
diff --git a/src/libecmaoperations/ecma-objects-general.h b/src/libecmaoperations/ecma-objects-general.h
index 582a3dd73..dc4e0245a 100644
--- a/src/libecmaoperations/ecma-objects-general.h
+++ b/src/libecmaoperations/ecma-objects-general.h
@@ -19,7 +19,7 @@
 #include "ecma-conversion.h"
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaobjectsinternalops ECMA objects' operations
diff --git a/src/libecmaoperations/ecma-objects.c b/src/libecmaoperations/ecma-objects.c
index f551e01de..229174021 100644
--- a/src/libecmaoperations/ecma-objects.c
+++ b/src/libecmaoperations/ecma-objects.c
@@ -19,7 +19,7 @@
 #include "ecma-objects-general.h"
 #include "ecma-objects.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaobjectsinternalops ECMA objects' operations
diff --git a/src/libecmaoperations/ecma-objects.h b/src/libecmaoperations/ecma-objects.h
index 9016738c2..214713ce0 100644
--- a/src/libecmaoperations/ecma-objects.h
+++ b/src/libecmaoperations/ecma-objects.h
@@ -19,7 +19,7 @@
 #include "ecma-conversion.h"
 #include "ecma-globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaobjectsinternalops ECMA objects' operations
diff --git a/src/libecmaoperations/ecma-operations.h b/src/libecmaoperations/ecma-operations.h
index 7bafc7fd8..504fdff54 100644
--- a/src/libecmaoperations/ecma-operations.h
+++ b/src/libecmaoperations/ecma-operations.h
@@ -20,7 +20,7 @@
 #include "ecma-lex-env.h"
 #include "ecma-reference.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  *
  * \addtogroup ecmaoperations ECMA-defined operations
diff --git a/src/libecmaoperations/ecma-reference.c b/src/libecmaoperations/ecma-reference.c
index 2030524bb..5a28af5c3 100644
--- a/src/libecmaoperations/ecma-reference.c
+++ b/src/libecmaoperations/ecma-reference.c
@@ -20,7 +20,7 @@
 #include "ecma-reference.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */
 
diff --git a/src/libecmaoperations/ecma-reference.h b/src/libecmaoperations/ecma-reference.h
index a9fff9da0..3fe2cea76 100644
--- a/src/libecmaoperations/ecma-reference.h
+++ b/src/libecmaoperations/ecma-reference.h
@@ -19,7 +19,7 @@
 #include "ecma-globals.h"
 #include "globals.h"
 
-/** \addtogroup ecma ---TODO---
+/** \addtogroup ecma ECMA
  * @{
  */