diff --git a/Packets/ListParser.dox b/Packets/ListParser.dox
index d42310cf0f6e3f5711876067aa48544ee38661ee..d2786b945dd3e8270639636e88afc51c73a61b69 100644
--- a/Packets/ListParser.dox
+++ b/Packets/ListParser.dox
@@ -36,8 +36,8 @@ namespace senf {
 
             // mandatory typedefs in the parser and container policy
             typedef ElementParser element_type;
-            typedef Parse_List< ExampleListPolicy > parser_type;
-            typedef Parse_List_Container< ExampleListPolicy > container_type;
+            typedef ListParser< ExampleListPolicy > parser_type;
+            typedef ListParser_Container< ExampleListPolicy > container_type;
 
             // mandatory constant in parser and container policy
             static const size_type init_bytes = 0;
@@ -85,10 +85,10 @@ namespace senf {
         typedef unspecified parser_type; ///< List parser type
                                         /**< parser_type is the list parser used to parse a list of
                                              this type,
-                                             e.g. <tt>senf::Parse_List<ExampleListPolicy></tt>. */
+                                             e.g. <tt>senf::ListParser<ExampleListPolicy></tt>. */
         typedef unspecified container_type; ///< Type of container wrapper
                                         /**< This is the container wrapper of the list, e.g.
-                                             <tt>Parse_List_Container<ExampleListPolicy></tt>. The
+                                             <tt>ListParser_Container<ExampleListPolicy></tt>. The
                                              container may however use a \e different policy, as
                                              long as that policy is constructible from the parser
                                              policy. */
diff --git a/Packets/ListParser.hh b/Packets/ListParser.hh
index 004e77f021962974e9becb09c0b7d057e71a253d..817ba4827777607bfbf4a9431edb6b0feebf9e80 100644
--- a/Packets/ListParser.hh
+++ b/Packets/ListParser.hh
@@ -229,7 +229,7 @@ namespace senf {
         // The size field should be declared private or read-only (size is accessible via the list)
         SENF_PARSER_PRIVATE_FIELD ( list_size_, senf::UInt16Parser );
         // Define the list
-        SENF_PARSER_VECTOR ( list, list_size_, EltParser );
+        SENF_PARSER_LIST ( list, list_size_, EltParser );
         \endcode
         
         Here \c EltParser can be an arbitrary parser and need not have a fixed size.
@@ -267,7 +267,7 @@ namespace senf {
 
         The tags are applied to the \a size parameter:
         \code
-        SENF_PARSER_LIST ( vec, transform(MyTransform, list_size_), EltParser );
+        SENF_PARSER_LIST ( list, transform(MyTransform, list_size_), EltParser );
         \endcode
 
         \warning There are some caveats when working with \c bytes() type lists: