diff --git a/src/tools/clangbackend/source/clangtooltipinfocollector.cpp b/src/tools/clangbackend/source/clangtooltipinfocollector.cpp
index ba0ce0ffd18..201f6fc3401 100644
--- a/src/tools/clangbackend/source/clangtooltipinfocollector.cpp
+++ b/src/tools/clangbackend/source/clangtooltipinfocollector.cpp
@@ -44,6 +44,20 @@
 
 namespace ClangBackEnd {
 
+Utf8String qualificationPrefix(const Cursor &cursor)
+{
+    // TODO: Implement with qualificationPrefixAsVector()
+    Utf8String qualifiedName;
+
+    for (Cursor parent = cursor.semanticParent();
+         parent.isValid() && (parent.kind() == CXCursor_Namespace);
+         parent = parent.semanticParent()) {
+        qualifiedName = parent.spelling() + Utf8StringLiteral("::") + qualifiedName;
+    }
+
+    return qualifiedName;
+}
+
 namespace {
 
 Utf8StringVector qualificationPrefixAsVector(const Cursor &cursor)
@@ -59,20 +73,6 @@ Utf8StringVector qualificationPrefixAsVector(const Cursor &cursor)
     return result;
 }
 
-Utf8String qualificationPrefix(const Cursor &cursor)
-{
-    // TODO: Implement with qualificationPrefixAsVector()
-    Utf8String qualifiedName;
-
-    for (Cursor parent = cursor.semanticParent();
-         parent.isValid() && (parent.kind() == CXCursor_Namespace);
-         parent = parent.semanticParent()) {
-        qualifiedName = parent.spelling() + Utf8StringLiteral("::") + qualifiedName;
-    }
-
-    return qualifiedName;
-}
-
 Utf8String displayName(const Cursor &cursor)
 {
     if (cursor.kind() == CXCursor_ClassTemplate) {
diff --git a/src/tools/clangbackend/source/clangtooltipinfocollector.h b/src/tools/clangbackend/source/clangtooltipinfocollector.h
index 8009aa8bf4a..ae1609c2765 100644
--- a/src/tools/clangbackend/source/clangtooltipinfocollector.h
+++ b/src/tools/clangbackend/source/clangtooltipinfocollector.h
@@ -33,6 +33,7 @@
 
 namespace ClangBackEnd {
 
+class Cursor;
 class UnsavedFiles;
 
 ToolTipInfo collectToolTipInfo(UnsavedFiles &unsavedFiles,
@@ -42,4 +43,6 @@ ToolTipInfo collectToolTipInfo(UnsavedFiles &unsavedFiles,
                                uint line,
                                uint column);
 
+Utf8String qualificationPrefix(const Cursor &cursor);
+
 } // namespace ClangBackEnd
diff --git a/src/tools/clangbackend/source/fulltokeninfo.cpp b/src/tools/clangbackend/source/fulltokeninfo.cpp
index 283798d0be4..e850e0495ca 100644
--- a/src/tools/clangbackend/source/fulltokeninfo.cpp
+++ b/src/tools/clangbackend/source/fulltokeninfo.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "clangstring.h"
+#include "clangtooltipinfocollector.h"
 #include "cursor.h"
 #include "fulltokeninfo.h"
 #include "sourcerange.h"
@@ -46,29 +47,27 @@ FullTokenInfo::operator TokenInfoContainer() const
     return TokenInfoContainer(line(), column(), length(), m_types, m_extraInfo);
 }
 
-static Utf8String fullyQualifiedType(const Cursor &cursor)
-{
-    Utf8String typeSpelling = cursor.type().canonical().utf8Spelling();
-    if (typeSpelling.isEmpty()) {
-        // Only if it's the namespaces level.
-        typeSpelling = cursor.unifiedSymbolResolution();
-        typeSpelling.replace(Utf8StringLiteral("c:@N@"), Utf8StringLiteral(""));
-        typeSpelling.replace(Utf8StringLiteral("@N@"), Utf8StringLiteral("::"));
-        typeSpelling.replace(Utf8StringLiteral("c:@aN"), Utf8StringLiteral("(anonymous)"));
+static Utf8String fullyQualifiedType(const Cursor &cursor) {
+    Utf8String prefix;
+    if (cursor.kind() == CXCursor_ClassTemplate || cursor.kind() == CXCursor_Namespace) {
+        if (cursor.unifiedSymbolResolution() == "c:@aN")
+            return Utf8String::fromUtf8("(anonymous)");
+        return qualificationPrefix(cursor) + cursor.displayName();
     }
-    return typeSpelling;
+    return cursor.type().canonical().spelling();
 }
 
 void FullTokenInfo::updateTypeSpelling(const Cursor &cursor, bool functionLike)
 {
-    m_extraInfo.typeSpelling = fullyQualifiedType(cursor);
     m_extraInfo.semanticParentTypeSpelling = fullyQualifiedType(cursor.semanticParent());
-    if (!functionLike)
+    if (!functionLike) {
+        m_extraInfo.typeSpelling = fullyQualifiedType(cursor);
         return;
-    Type type = cursor.type().canonical();
+    }
+
     m_extraInfo.token = cursor.displayName();
     // On the client side full type is typeSpelling + token.
-    m_extraInfo.typeSpelling = type.resultType().utf8Spelling();
+    m_extraInfo.typeSpelling = cursor.type().resultType().utf8Spelling();
 }
 
 static Utf8String propertyParentSpelling(CXTranslationUnit cxTranslationUnit,