diff --git a/docs/5.0/components/query-parsers.md b/docs/5.0/components/parsers.md
similarity index 95%
rename from docs/5.0/components/query-parsers.md
rename to docs/5.0/components/parsers.md
index ed0c583c..adff7883 100644
--- a/docs/5.0/components/query-parsers.md
+++ b/docs/5.0/components/parsers.md
@@ -3,10 +3,15 @@ layout: default
 title: The Query component
 ---
 
-Query Parsers
+Parsers
 =======
 
-The library provides two classes `QueryParser` and `QueryBuilder` to ease query string creation and conversion.
+The library provides the following classes to ease components parsing:
+
+- `QueryParser` to parse and deserialize a query string.
+- `QueryBuilder` to build a query string from a collection of key/value pairs.
+
+<p class="message-notice">The parsers and their functions alias are defined in the <code>League\Uri</code> namespace.</p>
 
 ~~~php
 <?php
diff --git a/docs/5.0/components/query.md b/docs/5.0/components/query.md
index 12df10be..6c955cf2 100644
--- a/docs/5.0/components/query.md
+++ b/docs/5.0/components/query.md
@@ -46,7 +46,7 @@ Since version <code>1.5.0</code>:<br>
 <code>Query::parse</code> is deprecated and replaced by <code>QueryParser::parse</code><br>
 <code>Query::extract</code> is deprecated and replaced by <code>QueryParser::extract</code><br>
 <code>Query::build</code> is deprecated and replaced by <code>QueryBuilder::build</code><br>
-Please refers to the <a href="/5.0/components/query-parsers">Query Parsers</a> documentation page for more informations.
+Please refers to the <a href="/5.0/components/parsers">Query Parsers</a> documentation page for more informations.
 </p>
 
 
diff --git a/docs/5.0/functions.md b/docs/5.0/functions.md
index c4a1ab43..ae47e4fd 100644
--- a/docs/5.0/functions.md
+++ b/docs/5.0/functions.md
@@ -94,10 +94,10 @@ Because these functions require different URI packages. Some of them may be miss
 ### URI components
 
 <ul class="item-list">
-	<li><a href="/5.0/components/query-parsers/#queryparserparse">parse_query</a></li>
-	<li><a href="/5.0/components/query-parsers/#queryparserextract">extract_query</a></li>
-	<li><a href="/5.0/components/query-parsers/#querybuilderbuild">build_query</a></li>
-	<li><a href="/5.0/components/query-parsers/#queryparserconvert">pairs_to_params</a></li>
+	<li><a href="/5.0/components/parsers/#queryparserparse">parse_query</a></li>
+	<li><a href="/5.0/components/parsers/#queryparserextract">extract_query</a></li>
+	<li><a href="/5.0/components/parsers/#querybuilderbuild">build_query</a></li>
+	<li><a href="/5.0/components/parsers/#queryparserconvert">pairs_to_params</a></li>
 	<li><a href="/5.0/parser/parser/#scheme-validation">is_scheme</a></li>
 	<li><a href="/5.0/parser/parser/#host-validation">is_host</a></li>
 	<li><a href="/5.0/parser/parser/#port-validation">is_port</a></li>
diff --git a/docs/_data/menu.yml b/docs/_data/menu.yml
index ee846a7a..a06e03ac 100644
--- a/docs/_data/menu.yml
+++ b/docs/_data/menu.yml
@@ -31,6 +31,7 @@ version:
         Uri components:
             Overview: '/5.0/components/'
             Installation: '/5.0/components/installation/'
+            Parsers: '/5.0/components/parsers/'
             API: '/5.0/components/api/'
             Scheme: '/5.0/components/scheme/'
             UserInfo: '/5.0/components/userinfo/'