diff --git a/examples/xmlpatterns/README b/examples/xmlpatterns/README
index 5d585dc52a5c390098b7eb1ac58797eacf309b14..55b17cb1c2d19ff6fad190835a43687899c24cdf 100644
--- a/examples/xmlpatterns/README
+++ b/examples/xmlpatterns/README
@@ -1,5 +1,5 @@
 XQuery queries and XPath expressions can be used in Qt with the
-QtXmlPatterns module.
+Qt XML Patterns module.
 
 XQuery is a query language used to query XML in a concise and safe manner.
 
diff --git a/src/xmlpatterns/Mainpage.dox b/src/xmlpatterns/Mainpage.dox
index 2a56358048d9a3c9d8573d92a68b5723809e785a..b4ca79c928197a21e1052420876a234b76eea983 100644
--- a/src/xmlpatterns/Mainpage.dox
+++ b/src/xmlpatterns/Mainpage.dox
@@ -50,14 +50,14 @@
 // We mean it.
 
 /**
- * @mainpage QtXmlPatterns -- an implementation of XML technologies
+ * @mainpage Qt XML Patterns -- an implementation of XML technologies
  *
  * - @ref Patternist_info
  * - @ref Patternist_writingDoxygen
  *
  * @section Patternist_info Overview
  *
- * This is the internal developer documentation for QtXmlPatterns. Please refer
+ * This is the internal developer documentation for Qt XML Patterns. Please refer
  * to Qt Assistant for usage documentation.
  *
  * The documentation that you are reading right now, can be generated by
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index 470e18f1ead7ec0ddb3174562166befb377f8e73..c196a043b2b915d62532440da1b6c57cd9be2bf9 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 class QString;
 
 /**
- * @short The namespace for the internal API of QtXmlPatterns
+ * @short The namespace for the internal API of Qt XML Patterns
  * @internal
  */
 namespace QPatternist
diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h
index 166aaadaf0b0acdf429fd750c8d065a9b17a7d1d..6219c16ccf9de4275096de8bea8ce3aa135258c9 100644
--- a/src/xmlpatterns/utils/qpatternistlocale_p.h
+++ b/src/xmlpatterns/utils/qpatternistlocale_p.h
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
     /**
-     * @short Provides a translation context & functions for the QtXmlPatterns
+     * @short Provides a translation context & functions for the Qt XML Patterns
      * module.
      *
      * This class is not supposed to be instantiated.
diff --git a/tests/auto/xmlpatterns/XSLTTODO b/tests/auto/xmlpatterns/XSLTTODO
index 5a20441f47e47a2e394178d8b8cb9c9502e50b07..a61e343fb3606b46430a90ef855e0fcaa62028aa 100644
--- a/tests/auto/xmlpatterns/XSLTTODO
+++ b/tests/auto/xmlpatterns/XSLTTODO
@@ -578,7 +578,7 @@ John Snelson of Oracle Berkeley DB XML & XQilla writes in private mail:
 
 What is he referring to?
 
-If one spends some time on fancy diagrams, QtXmlPatterns[LINK]'s, the XQuery
+If one spends some time on fancy diagrams, Qt XML Patterns[LINK]'s, the XQuery
 engine that shipped in Qt 4.4, architecture looks like this:
 
 
@@ -590,7 +590,7 @@ and the whole approach to this is modifying the existing codebase as follows:
 
 
 
-Put differently, when QtXmlPatterns is dealing with XSL-T stylesheets, it
+Put differently, when Qt XML Patterns is dealing with XSL-T stylesheets, it
 replaces the XQuery tokenizer with a tokenizer which translates the
 stylesheet into XQuery tokens, that is consumed by the existing XQuery
 parser, extended with both grammar non-terminals and tokens to accomodate the
@@ -656,7 +656,7 @@ focus(which for doesn't, but paths do), but can do so over atomic values and
 unconditionally without sorting the result by document order(which paths
 can't/doesn't, but for do). For implementations that normalize paths into for
 loops as the formal semantics do, the approach is straight forward. In
-QtXmlPatterns' case, a synthetic token is queued which signals to create
+Qt XML Patterns' case, a synthetic token is queued which signals to create
 a "relaxed" path expression which skips halting on atomic values in its
 operands(XPTY0019) and also skips node sorting.
 
@@ -667,7 +667,7 @@ could have been used, but in anycase the IR yielded is the same, and that
 computed constructors happen to use less tokens.
 
 A particular case is xsl:namespace, an instruction which doesn't have any
-corresponding expression in XQuery. In the case of QtXmlPatterns, the code
+corresponding expression in XQuery. In the case of Qt XML Patterns, the code
 obvious already have a notion of "create this namespace on this element", and
 an AST node was trivially added for fetching the namespace components
 computationally. However, the introduction of xsl:namespace in an XQuery
@@ -702,7 +702,7 @@ but also
 because more decisions can be taken at runtime through all attribute value
 templates. xsl:sort is surely a good example of this with its AVTs for
 language, order, collation, stability and what not. XQuery's order by stands
-in strong contrast, which has these coded in the grammar. In QtXmlPatterns'
+in strong contrast, which has these coded in the grammar. In Qt XML Patterns'
 case, the AST node corresponding to order by was generalized to take things
 such as stability and order from operands. This is paid by the code paths in
 XQuery since for them are constants generated and inserted as operands even
@@ -1038,7 +1038,7 @@ Have top-level xml:space, ensure whitespace as child of xsl:stylesheet is ignore
 
     </xsl:stylesheet>
 
-Compat mode, Saxon & QtXmlPatterns fails:
+Compat mode, Saxon & Qt XML Patterns fails:
 
     <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">