Clang: Clean up some IPC names

This is long overdue since some names were simply wrong and/or
misleading. Also, some of the old names were long enough to almost get
crazy.

The renaming starts from ClangCodeModelServerInterface and
ClangCodeModelClientInterface and affects usages and related functions.

For the ClangCodeModelServerInterface, categorize the messages in
 - messages that require a response (request*)
 - notification messages (the remaining ones)

Change-Id: I5342ed8e0d87404ee72f3c3766fd8ef7505defb1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

48 files changed, 362 insertions, 342 deletions

diff --git a/src/libs/clangsupport/cmbalivemessage.cpp b/src/libs/clangsupport/alivemessage.cpp
index 72a4d37bea6..99392fc0fde 100644
--- a/src/libs/clangsupport/cmbalivemessage.cpp
+++ b/src/libs/clangsupport/alivemessage.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "cmbalivemessage.h"
+#include "alivemessage.h"
 
 #include <QDebug>
 
@@ -34,4 +34,4 @@ QDebug operator<<(QDebug debug, const AliveMessage &/*message*/)
     return debug.nospace() << "AliveMessage()";
 }
 
-}
+} // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbalivemessage.h b/src/libs/clangsupport/alivemessage.h
index 3e8f5c70f45..3e8f5c70f45 100644
--- a/src/libs/clangsupport/cmbalivemessage.h
+++ b/src/libs/clangsupport/alivemessage.h
diff --git a/src/libs/clangsupport/documentannotationschangedmessage.cpp b/src/libs/clangsupport/annotationsmessage.cpp
index 90344e24435..65349f6801e 100644
--- a/src/libs/clangsupport/documentannotationschangedmessage.cpp
+++ b/src/libs/clangsupport/annotationsmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "documentannotationschangedmessage.h"
+#include "annotationsmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message)
+QDebug operator<<(QDebug debug, const AnnotationsMessage &message)
 {
-    debug.nospace() << "DocumentAnnotationsChangedMessage("
+    debug.nospace() << "AnnotationsMessage("
                     << message.fileContainer
                     << ", " << message.diagnostics.size()
                     << ", " << !message.firstHeaderErrorDiagnostic.text.isEmpty()
diff --git a/src/libs/clangsupport/documentannotationschangedmessage.h b/src/libs/clangsupport/annotationsmessage.h
index b5006cb2267..c3a19a82b4f 100644
--- a/src/libs/clangsupport/documentannotationschangedmessage.h
+++ b/src/libs/clangsupport/annotationsmessage.h
@@ -35,32 +35,32 @@
 
 namespace ClangBackEnd {
 
-class CLANGSUPPORT_EXPORT DocumentAnnotationsChangedMessage
+class CLANGSUPPORT_EXPORT AnnotationsMessage
 {
 public:
-    DocumentAnnotationsChangedMessage() = default;
+    AnnotationsMessage() = default;
     // For pure token infos update
-    DocumentAnnotationsChangedMessage(const FileContainer &fileContainer,
+    AnnotationsMessage(const FileContainer &fileContainer,
                                       const QVector<TokenInfoContainer> &tokenInfos)
         : fileContainer(fileContainer),
           tokenInfos(tokenInfos),
           onlyTokenInfos(true)
     {
     }
-    DocumentAnnotationsChangedMessage(const FileContainer &fileContainer,
-                                      const QVector<DiagnosticContainer> &diagnostics,
-                                      const DiagnosticContainer &firstHeaderErrorDiagnostic,
-                                      const QVector<TokenInfoContainer> &tokenInfos,
-                                      const QVector<SourceRangeContainer> &skippedPreprocessorRanges)
-        : fileContainer(fileContainer),
-          tokenInfos(tokenInfos),
-          diagnostics(diagnostics),
-          firstHeaderErrorDiagnostic(firstHeaderErrorDiagnostic),
-          skippedPreprocessorRanges(skippedPreprocessorRanges)
+    AnnotationsMessage(const FileContainer &fileContainer,
+                       const QVector<DiagnosticContainer> &diagnostics,
+                       const DiagnosticContainer &firstHeaderErrorDiagnostic,
+                       const QVector<TokenInfoContainer> &tokenInfos,
+                       const QVector<SourceRangeContainer> &skippedPreprocessorRanges)
+        : fileContainer(fileContainer)
+        , tokenInfos(tokenInfos)
+        , diagnostics(diagnostics)
+        , firstHeaderErrorDiagnostic(firstHeaderErrorDiagnostic)
+        , skippedPreprocessorRanges(skippedPreprocessorRanges)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const DocumentAnnotationsChangedMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const AnnotationsMessage &message)
     {
         out << message.onlyTokenInfos;
         out << message.fileContainer;
@@ -74,7 +74,7 @@ public:
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, DocumentAnnotationsChangedMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, AnnotationsMessage &message)
     {
         in >> message.onlyTokenInfos;
         in >> message.fileContainer;
@@ -88,8 +88,7 @@ public:
         return in;
     }
 
-    friend bool operator==(const DocumentAnnotationsChangedMessage &first,
-                    const DocumentAnnotationsChangedMessage &second)
+    friend bool operator==(const AnnotationsMessage &first, const AnnotationsMessage &second)
     {
         return first.fileContainer == second.fileContainer
             && first.diagnostics == second.diagnostics
@@ -107,7 +106,7 @@ public:
     bool onlyTokenInfos = false;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const AnnotationsMessage &message);
 
-DECLARE_MESSAGE(DocumentAnnotationsChangedMessage)
+DECLARE_MESSAGE(AnnotationsMessage)
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/clangcodemodelclientinterface.cpp b/src/libs/clangsupport/clangcodemodelclientinterface.cpp
index 492ea7896fe..5093308fa20 100644
--- a/src/libs/clangsupport/clangcodemodelclientinterface.cpp
+++ b/src/libs/clangsupport/clangcodemodelclientinterface.cpp
@@ -41,11 +41,11 @@ void ClangCodeModelClientInterface::dispatch(const MessageEnvelop &messageEnvelo
         case MessageType::EchoMessage:
             echo(messageEnvelop.message<EchoMessage>());
             break;
-        case MessageType::CodeCompletedMessage:
-            codeCompleted(messageEnvelop.message<CodeCompletedMessage>());
+        case MessageType::CompletionsMessage:
+            completions(messageEnvelop.message<CompletionsMessage>());
             break;
-        case MessageType::DocumentAnnotationsChangedMessage:
-            documentAnnotationsChanged(messageEnvelop.message<DocumentAnnotationsChangedMessage>());
+        case MessageType::AnnotationsMessage:
+            annotations(messageEnvelop.message<AnnotationsMessage>());
             break;
         case MessageType::ReferencesMessage:
             references(messageEnvelop.message<ReferencesMessage>());
diff --git a/src/libs/clangsupport/clangcodemodelclientinterface.h b/src/libs/clangsupport/clangcodemodelclientinterface.h
index 915bc8bf1fe..04b68ce0f50 100644
--- a/src/libs/clangsupport/clangcodemodelclientinterface.h
+++ b/src/libs/clangsupport/clangcodemodelclientinterface.h
@@ -31,25 +31,25 @@ namespace ClangBackEnd {
 
 class ClangCodeModelServerInterface;
 
-class CodeCompletedMessage;
-class CompleteCodeMessage;
-class DocumentAnnotationsChangedMessage;
+class AnnotationsMessage;
+class CompletionsMessage;
+class DocumentVisibilityChangedMessage;
+class DocumentsChangedMessage;
+class DocumentsClosedMessage;
+class DocumentsOpenedMessage;
 class EchoMessage;
-class ReferencesMessage;
 class FollowSymbolMessage;
-class RegisterProjectPartsForEditorMessage;
-class RegisterTranslationUnitForEditorMessage;
-class RegisterUnsavedFilesForEditorMessage;
-class RequestDocumentAnnotationsMessage;
-class RequestReferencesMessage;
+class ProjectPartsRemovedMessage;
+class ProjectPartsUpdatedMessage;
+class ReferencesMessage;
+class RequestAnnotationsMessage;
+class RequestCompletionsMessage;
 class RequestFollowSymbolMessage;
+class RequestReferencesMessage;
 class RequestToolTipMessage;
 class ToolTipMessage;
-class UnregisterProjectPartsForEditorMessage;
-class UnregisterTranslationUnitsForEditorMessage;
-class UnregisterUnsavedFilesForEditorMessage;
-class UpdateTranslationUnitsForEditorMessage;
-class UpdateVisibleTranslationUnitsMessage;
+class UnsavedFilesRemovedMessage;
+class UnsavedFilesUpdatedMessage;
 
 class CLANGSUPPORT_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
 {
@@ -58,8 +58,8 @@ public:
 
     virtual void alive() = 0;
     virtual void echo(const EchoMessage &message) = 0;
-    virtual void codeCompleted(const CodeCompletedMessage &message) = 0;
-    virtual void documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message) = 0;
+    virtual void completions(const CompletionsMessage &message) = 0;
+    virtual void annotations(const AnnotationsMessage &message) = 0;
     virtual void references(const ReferencesMessage &message) = 0;
     virtual void followSymbol(const FollowSymbolMessage &message) = 0;
     virtual void tooltip(const ToolTipMessage &message) = 0;
diff --git a/src/libs/clangsupport/clangcodemodelclientmessages.h b/src/libs/clangsupport/clangcodemodelclientmessages.h
index 2903cda2079..e73f4b99af1 100644
--- a/src/libs/clangsupport/clangcodemodelclientmessages.h
+++ b/src/libs/clangsupport/clangcodemodelclientmessages.h
@@ -25,10 +25,10 @@
 
 #pragma once
 
-#include "cmbalivemessage.h"
-#include "cmbcodecompletedmessage.h"
-#include "cmbechomessage.h"
-#include "documentannotationschangedmessage.h"
+#include "alivemessage.h"
+#include "completionsmessage.h"
+#include "echomessage.h"
+#include "annotationsmessage.h"
 #include "referencesmessage.h"
 #include "followsymbolmessage.h"
 #include "tooltipmessage.h"
diff --git a/src/libs/clangsupport/clangcodemodelclientproxy.cpp b/src/libs/clangsupport/clangcodemodelclientproxy.cpp
index fc75a226ed5..538677e6c1c 100644
--- a/src/libs/clangsupport/clangcodemodelclientproxy.cpp
+++ b/src/libs/clangsupport/clangcodemodelclientproxy.cpp
@@ -75,12 +75,12 @@ void ClangCodeModelClientProxy::echo(const EchoMessage &message)
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelClientProxy::codeCompleted(const CodeCompletedMessage &message)
+void ClangCodeModelClientProxy::completions(const CompletionsMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelClientProxy::documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message)
+void ClangCodeModelClientProxy::annotations(const AnnotationsMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
diff --git a/src/libs/clangsupport/clangcodemodelclientproxy.h b/src/libs/clangsupport/clangcodemodelclientproxy.h
index 58b87a05d8b..480cbe646e1 100644
--- a/src/libs/clangsupport/clangcodemodelclientproxy.h
+++ b/src/libs/clangsupport/clangcodemodelclientproxy.h
@@ -53,8 +53,8 @@ public:
 
     void alive() override;
     void echo(const EchoMessage &message) override;
-    void codeCompleted(const CodeCompletedMessage &message) override;
-    void documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message) override;
+    void completions(const CompletionsMessage &message) override;
+    void annotations(const AnnotationsMessage &message) override;
     void references(const ReferencesMessage &message) override;
     void followSymbol(const FollowSymbolMessage &message) override;
     void tooltip(const ToolTipMessage &message) override;
diff --git a/src/libs/clangsupport/clangcodemodelserverinterface.cpp b/src/libs/clangsupport/clangcodemodelserverinterface.cpp
index d50e97367d5..364cec41325 100644
--- a/src/libs/clangsupport/clangcodemodelserverinterface.cpp
+++ b/src/libs/clangsupport/clangcodemodelserverinterface.cpp
@@ -38,32 +38,35 @@ void ClangCodeModelServerInterface::dispatch(const MessageEnvelop &messageEnvelo
         case MessageType::EndMessage:
             end();
             break;
-        case MessageType::RegisterTranslationUnitForEditorMessage:
-            registerTranslationUnitsForEditor(messageEnvelop.message<RegisterTranslationUnitForEditorMessage>());
+        case MessageType::DocumentsOpenedMessage:
+            documentsOpened(messageEnvelop.message<DocumentsOpenedMessage>());
             break;
-        case MessageType::UpdateTranslationUnitsForEditorMessage:
-            updateTranslationUnitsForEditor(messageEnvelop.message<UpdateTranslationUnitsForEditorMessage>());
+        case MessageType::DocumentsChangedMessage:
+            documentsChanged(messageEnvelop.message<DocumentsChangedMessage>());
             break;
-        case MessageType::UnregisterTranslationUnitsForEditorMessage:
-            unregisterTranslationUnitsForEditor(messageEnvelop.message<UnregisterTranslationUnitsForEditorMessage>());
+        case MessageType::DocumentsClosedMessage:
+            documentsClosed(messageEnvelop.message<DocumentsClosedMessage>());
             break;
-        case MessageType::RegisterProjectPartsForEditorMessage:
-            registerProjectPartsForEditor(messageEnvelop.message<RegisterProjectPartsForEditorMessage>());
+        case MessageType::DocumentVisibilityChangedMessage:
+            documentVisibilityChanged(messageEnvelop.message<DocumentVisibilityChangedMessage>());
             break;
-        case MessageType::UnregisterProjectPartsForEditorMessage:
-            unregisterProjectPartsForEditor(messageEnvelop.message<UnregisterProjectPartsForEditorMessage>());
+        case MessageType::ProjectPartsUpdatedMessage:
+            projectPartsUpdated(messageEnvelop.message<ProjectPartsUpdatedMessage>());
             break;
-        case MessageType::RegisterUnsavedFilesForEditorMessage:
-            registerUnsavedFilesForEditor(messageEnvelop.message<RegisterUnsavedFilesForEditorMessage>());
+        case MessageType::ProjectPartsRemovedMessage:
+            projectPartsRemoved(messageEnvelop.message<ProjectPartsRemovedMessage>());
             break;
-        case MessageType::UnregisterUnsavedFilesForEditorMessage:
-            unregisterUnsavedFilesForEditor(messageEnvelop.message<UnregisterUnsavedFilesForEditorMessage>());
+        case MessageType::UnsavedFilesUpdatedMessage:
+            unsavedFilesUpdated(messageEnvelop.message<UnsavedFilesUpdatedMessage>());
             break;
-        case MessageType::CompleteCodeMessage:
-            completeCode(messageEnvelop.message<CompleteCodeMessage>());
+        case MessageType::UnsavedFilesRemovedMessage:
+            unsavedFilesRemoved(messageEnvelop.message<UnsavedFilesRemovedMessage>());
             break;
-        case MessageType::RequestDocumentAnnotationsMessage:
-            requestDocumentAnnotations(messageEnvelop.message<RequestDocumentAnnotationsMessage>());
+        case MessageType::RequestCompletionsMessage:
+            requestCompletions(messageEnvelop.message<RequestCompletionsMessage>());
+            break;
+        case MessageType::RequestAnnotationsMessage:
+            requestAnnotations(messageEnvelop.message<RequestAnnotationsMessage>());
             break;
         case MessageType::RequestReferencesMessage:
             requestReferences(messageEnvelop.message<RequestReferencesMessage>());
@@ -74,9 +77,6 @@ void ClangCodeModelServerInterface::dispatch(const MessageEnvelop &messageEnvelo
         case MessageType::RequestToolTipMessage:
             requestToolTip(messageEnvelop.message<RequestToolTipMessage>());
             break;
-        case MessageType::UpdateVisibleTranslationUnitsMessage:
-            updateVisibleTranslationUnits(messageEnvelop.message<UpdateVisibleTranslationUnitsMessage>());
-            break;
         default:
             qWarning() << "Unknown ClangCodeModelServerMessage";
     }
diff --git a/src/libs/clangsupport/clangcodemodelserverinterface.h b/src/libs/clangsupport/clangcodemodelserverinterface.h
index ffbeffaeb38..6cac4aea5fb 100644
--- a/src/libs/clangsupport/clangcodemodelserverinterface.h
+++ b/src/libs/clangsupport/clangcodemodelserverinterface.h
@@ -41,19 +41,23 @@ public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;
 
     virtual void end() = 0;
-    virtual void registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) = 0;
-    virtual void updateTranslationUnitsForEditor(const UpdateTranslationUnitsForEditorMessage &message) = 0;
-    virtual void unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) = 0;
-    virtual void registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) = 0;
-    virtual void unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) = 0;
-    virtual void registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message) = 0;
-    virtual void unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message) = 0;
-    virtual void completeCode(const CompleteCodeMessage &message) = 0;
-    virtual void requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) = 0;
+
+    virtual void documentsOpened(const DocumentsOpenedMessage &message) = 0;
+    virtual void documentsChanged(const DocumentsChangedMessage &message) = 0;
+    virtual void documentsClosed(const DocumentsClosedMessage &message) = 0;
+    virtual void documentVisibilityChanged(const DocumentVisibilityChangedMessage &message) = 0;
+
+    virtual void projectPartsUpdated(const ProjectPartsUpdatedMessage &message) = 0;
+    virtual void projectPartsRemoved(const ProjectPartsRemovedMessage &message) = 0;
+
+    virtual void unsavedFilesUpdated(const UnsavedFilesUpdatedMessage &message) = 0;
+    virtual void unsavedFilesRemoved(const UnsavedFilesRemovedMessage &message) = 0;
+
+    virtual void requestCompletions(const RequestCompletionsMessage &message) = 0;
+    virtual void requestAnnotations(const RequestAnnotationsMessage &message) = 0;
     virtual void requestReferences(const RequestReferencesMessage &message) = 0;
     virtual void requestFollowSymbol(const RequestFollowSymbolMessage &message) = 0;
     virtual void requestToolTip(const RequestToolTipMessage &message) = 0;
-    virtual void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) = 0;
 };
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/clangcodemodelservermessages.h b/src/libs/clangsupport/clangcodemodelservermessages.h
index 0e577b08ddd..ab3b5c4b4f4 100644
--- a/src/libs/clangsupport/clangcodemodelservermessages.h
+++ b/src/libs/clangsupport/clangcodemodelservermessages.h
@@ -25,18 +25,22 @@
 
 #pragma once
 
-#include "cmbechomessage.h"
-#include "cmbcompletecodemessage.h"
-#include "cmbendmessage.h"
-#include "cmbregisterprojectsforeditormessage.h"
-#include "cmbregistertranslationunitsforeditormessage.h"
-#include "cmbunregisterprojectsforeditormessage.h"
-#include "cmbunregistertranslationunitsforeditormessage.h"
-#include "registerunsavedfilesforeditormessage.h"
-#include "requestdocumentannotations.h"
-#include "requestreferencesmessage.h"
+#include "echomessage.h"
+#include "endmessage.h"
+
+#include "documentsopenedmessage.h"
+#include "documentsclosedmessage.h"
+#include "documentschangedmessage.h"
+#include "documentvisibilitychangedmessage.h"
+
+#include "projectpartsupdatedmessage.h"
+#include "projectpartsremovedmessage.h"
+
+#include "unsavedfilesupdatedmessage.h"
+#include "unsavedfilesremovedmessage.h"
+
+#include "requestannotationsmessage.h"
+#include "requestcompletionsmessage.h"
 #include "requestfollowsymbolmessage.h"
+#include "requestreferencesmessage.h"
 #include "requesttooltipmessage.h"
-#include "unregisterunsavedfilesforeditormessage.h"
-#include "updatetranslationunitsforeditormessage.h"
-#include "updatevisibletranslationunitsmessage.h"
diff --git a/src/libs/clangsupport/clangcodemodelserverproxy.cpp b/src/libs/clangsupport/clangcodemodelserverproxy.cpp
index 23a80284802..b5d309d346c 100644
--- a/src/libs/clangsupport/clangcodemodelserverproxy.cpp
+++ b/src/libs/clangsupport/clangcodemodelserverproxy.cpp
@@ -31,7 +31,8 @@
 
 namespace ClangBackEnd {
 
-ClangCodeModelServerProxy::ClangCodeModelServerProxy(ClangCodeModelClientInterface *client, QIODevice *ioDevice)
+ClangCodeModelServerProxy::ClangCodeModelServerProxy(ClangCodeModelClientInterface *client,
+                                                     QIODevice *ioDevice)
     : BaseServerProxy(client, ioDevice)
 {
 }
@@ -41,47 +42,47 @@ void ClangCodeModelServerProxy::end()
     m_writeMessageBlock.write(EndMessage());
 }
 
-void ClangCodeModelServerProxy::registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message)
+void ClangCodeModelServerProxy::documentsOpened(const DocumentsOpenedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &message)
+void ClangCodeModelServerProxy::documentsChanged(const DocumentsChangedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message)
+void ClangCodeModelServerProxy::documentsClosed(const DocumentsClosedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message)
+void ClangCodeModelServerProxy::projectPartsUpdated(const ProjectPartsUpdatedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message)
+void ClangCodeModelServerProxy::projectPartsRemoved(const ProjectPartsRemovedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangBackEnd::ClangCodeModelServerProxy::registerUnsavedFilesForEditor(const ClangBackEnd::RegisterUnsavedFilesForEditorMessage &message)
+void ClangCodeModelServerProxy::unsavedFilesUpdated(const UnsavedFilesUpdatedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangBackEnd::ClangCodeModelServerProxy::unregisterUnsavedFilesForEditor(const ClangBackEnd::UnregisterUnsavedFilesForEditorMessage &message)
+void ClangCodeModelServerProxy::unsavedFilesRemoved(const UnsavedFilesRemovedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::completeCode(const CompleteCodeMessage &message)
+void ClangCodeModelServerProxy::requestCompletions(const RequestCompletionsMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message)
+void ClangCodeModelServerProxy::requestAnnotations(const RequestAnnotationsMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
@@ -101,7 +102,8 @@ void ClangCodeModelServerProxy::requestToolTip(const RequestToolTipMessage &mess
     m_writeMessageBlock.write(message);
 }
 
-void ClangCodeModelServerProxy::updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message)
+void ClangCodeModelServerProxy::documentVisibilityChanged(
+    const DocumentVisibilityChangedMessage &message)
 {
     m_writeMessageBlock.write(message);
 }
diff --git a/src/libs/clangsupport/clangcodemodelserverproxy.h b/src/libs/clangsupport/clangcodemodelserverproxy.h
index 62ea90eebe2..fe574fccd75 100644
--- a/src/libs/clangsupport/clangcodemodelserverproxy.h
+++ b/src/libs/clangsupport/clangcodemodelserverproxy.h
@@ -49,19 +49,23 @@ public:
     ClangCodeModelServerProxy(ClangCodeModelClientInterface *client, QIODevice *ioDevice);
 
     void end() override;
-    void registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) override;
-    void updateTranslationUnitsForEditor(const UpdateTranslationUnitsForEditorMessage &message) override;
-    void unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) override;
-    void registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) override;
-    void unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) override;
-    void registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message) override;
-    void unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message) override;
-    void completeCode(const CompleteCodeMessage &message) override;
-    void requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) override;
+
+    void documentsOpened(const DocumentsOpenedMessage &message) override;
+    void documentsChanged(const DocumentsChangedMessage &message) override;
+    void documentsClosed(const DocumentsClosedMessage &message) override;
+    void documentVisibilityChanged(const DocumentVisibilityChangedMessage &message) override;
+
+    void projectPartsUpdated(const ProjectPartsUpdatedMessage &message) override;
+    void projectPartsRemoved(const ProjectPartsRemovedMessage &message) override;
+
+    void unsavedFilesUpdated(const UnsavedFilesUpdatedMessage &message) override;
+    void unsavedFilesRemoved(const UnsavedFilesRemovedMessage &message) override;
+
+    void requestCompletions(const RequestCompletionsMessage &message) override;
+    void requestAnnotations(const RequestAnnotationsMessage &message) override;
     void requestReferences(const RequestReferencesMessage &message) override;
     void requestFollowSymbol(const RequestFollowSymbolMessage &message) override;
     void requestToolTip(const RequestToolTipMessage &message) override;
-    void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) override;
 };
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/clangrefactoringclientmessages.h b/src/libs/clangsupport/clangrefactoringclientmessages.h
index 7b90453540a..18c070695a9 100644
--- a/src/libs/clangsupport/clangrefactoringclientmessages.h
+++ b/src/libs/clangsupport/clangrefactoringclientmessages.h
@@ -28,4 +28,4 @@
 #include "sourcelocationsforrenamingmessage.h"
 #include "sourcerangesanddiagnosticsforquerymessage.h"
 #include "sourcerangesforquerymessage.h"
-#include "cmbalivemessage.h"
+#include "alivemessage.h"
diff --git a/src/libs/clangsupport/clangrefactoringservermessages.h b/src/libs/clangsupport/clangrefactoringservermessages.h
index 1f7866444b1..cdcc309c2d8 100644
--- a/src/libs/clangsupport/clangrefactoringservermessages.h
+++ b/src/libs/clangsupport/clangrefactoringservermessages.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "cancelmessage.h"
-#include "cmbendmessage.h"
+#include "endmessage.h"
 #include "requestsourcelocationforrenamingmessage.h"
 #include "requestsourcerangesanddiagnosticsforquerymessage.h"
 #include "requestsourcerangesforquerymessage.h"
diff --git a/src/libs/clangsupport/clangsupport-lib.pri b/src/libs/clangsupport/clangsupport-lib.pri
index 501e9fbfb94..857bc39ddd0 100644
--- a/src/libs/clangsupport/clangsupport-lib.pri
+++ b/src/libs/clangsupport/clangsupport-lib.pri
@@ -16,21 +16,21 @@ SOURCES += \
     $$PWD/clangcodemodelconnectionclient.cpp \
     $$PWD/clangcodemodelserverinterface.cpp \
     $$PWD/clangcodemodelserverproxy.cpp \
-    $$PWD/cmbalivemessage.cpp \
-    $$PWD/cmbcodecompletedmessage.cpp \
-    $$PWD/cmbcompletecodemessage.cpp \
-    $$PWD/cmbechomessage.cpp \
-    $$PWD/cmbendmessage.cpp \
-    $$PWD/cmbregisterprojectsforeditormessage.cpp \
-    $$PWD/cmbregistertranslationunitsforeditormessage.cpp \
-    $$PWD/cmbunregisterprojectsforeditormessage.cpp \
-    $$PWD/cmbunregistertranslationunitsforeditormessage.cpp \
+    $$PWD/alivemessage.cpp \
+    $$PWD/completionsmessage.cpp \
+    $$PWD/requestcompletionsmessage.cpp \
+    $$PWD/echomessage.cpp \
+    $$PWD/endmessage.cpp \
+    $$PWD/projectpartsupdatedmessage.cpp \
+    $$PWD/documentsopenedmessage.cpp \
+    $$PWD/projectpartsremovedmessage.cpp \
+    $$PWD/documentsclosedmessage.cpp \
     $$PWD/codecompletionchunk.cpp \
     $$PWD/codecompletion.cpp \
     $$PWD/connectionclient.cpp \
     $$PWD/connectionserver.cpp \
     $$PWD/diagnosticcontainer.cpp \
-    $$PWD/documentannotationschangedmessage.cpp \
+    $$PWD/annotationsmessage.cpp \
     $$PWD/dynamicastmatcherdiagnosticcontainer.cpp \
     $$PWD/dynamicastmatcherdiagnosticcontextcontainer.cpp \
     $$PWD/dynamicastmatcherdiagnosticmessagecontainer.cpp \
@@ -55,9 +55,9 @@ SOURCES += \
     $$PWD/refactoringserverinterface.cpp \
     $$PWD/refactoringserverproxy.cpp \
     $$PWD/referencesmessage.cpp \
-    $$PWD/registerunsavedfilesforeditormessage.cpp \
+    $$PWD/unsavedfilesupdatedmessage.cpp \
     $$PWD/removeprojectpartsmessage.cpp \
-    $$PWD/requestdocumentannotations.cpp \
+    $$PWD/requestannotationsmessage.cpp \
     $$PWD/requestfollowsymbolmessage.cpp \
     $$PWD/requestreferencesmessage.cpp \
     $$PWD/requestsourcelocationforrenamingmessage.cpp \
@@ -80,10 +80,10 @@ SOURCES += \
     $$PWD/tokeninfocontainer.cpp \
     $$PWD/tooltipmessage.cpp \
     $$PWD/tooltipinfo.cpp \
-    $$PWD/unregisterunsavedfilesforeditormessage.cpp \
+    $$PWD/unsavedfilesremovedmessage.cpp \
     $$PWD/updateprojectpartsmessage.cpp \
-    $$PWD/updatetranslationunitsforeditormessage.cpp \
-    $$PWD/updatevisibletranslationunitsmessage.cpp \
+    $$PWD/documentschangedmessage.cpp \
+    $$PWD/documentvisibilitychangedmessage.cpp \
     $$PWD/writemessageblock.cpp \
     $$PWD/filepathcaching.cpp \
     $$PWD/filepathid.cpp \
@@ -106,21 +106,21 @@ HEADERS += \
     $$PWD/clangrefactoringclientmessages.h \
     $$PWD/clangrefactoringmessages.h \
     $$PWD/clangrefactoringservermessages.h \
-    $$PWD/cmbalivemessage.h \
-    $$PWD/cmbcodecompletedmessage.h \
-    $$PWD/cmbcompletecodemessage.h \
-    $$PWD/cmbechomessage.h \
-    $$PWD/cmbendmessage.h \
-    $$PWD/cmbregisterprojectsforeditormessage.h \
-    $$PWD/cmbregistertranslationunitsforeditormessage.h \
-    $$PWD/cmbunregisterprojectsforeditormessage.h \
-    $$PWD/cmbunregistertranslationunitsforeditormessage.h \
+    $$PWD/alivemessage.h \
+    $$PWD/completionsmessage.h \
+    $$PWD/requestcompletionsmessage.h \
+    $$PWD/echomessage.h \
+    $$PWD/endmessage.h \
+    $$PWD/projectpartsupdatedmessage.h \
+    $$PWD/documentsopenedmessage.h \
+    $$PWD/projectpartsremovedmessage.h \
+    $$PWD/documentsclosedmessage.h \
     $$PWD/codecompletionchunk.h \
     $$PWD/codecompletion.h \
     $$PWD/connectionclient.h \
     $$PWD/connectionserver.h \
     $$PWD/diagnosticcontainer.h \
-    $$PWD/documentannotationschangedmessage.h \
+    $$PWD/annotationsmessage.h \
     $$PWD/dynamicastmatcherdiagnosticcontainer.h \
     $$PWD/dynamicastmatcherdiagnosticcontextcontainer.h \
     $$PWD/dynamicastmatcherdiagnosticmessagecontainer.h \
@@ -149,9 +149,9 @@ HEADERS += \
     $$PWD/refactoringserverinterface.h \
     $$PWD/refactoringserverproxy.h \
     $$PWD/referencesmessage.h \
-    $$PWD/registerunsavedfilesforeditormessage.h \
+    $$PWD/unsavedfilesupdatedmessage.h \
     $$PWD/removeprojectpartsmessage.h \
-    $$PWD/requestdocumentannotations.h \
+    $$PWD/requestannotationsmessage.h \
     $$PWD/requestfollowsymbolmessage.h \
     $$PWD/requestreferencesmessage.h \
     $$PWD/requestsourcelocationforrenamingmessage.h \
@@ -177,10 +177,10 @@ HEADERS += \
     $$PWD/tokeninfocontainer.h \
     $$PWD/tooltipmessage.h \
     $$PWD/tooltipinfo.h \
-    $$PWD/unregisterunsavedfilesforeditormessage.h \
+    $$PWD/unsavedfilesremovedmessage.h \
     $$PWD/updateprojectpartsmessage.h \
-    $$PWD/updatetranslationunitsforeditormessage.h \
-    $$PWD/updatevisibletranslationunitsmessage.h \
+    $$PWD/documentschangedmessage.h \
+    $$PWD/documentvisibilitychangedmessage.h \
     $$PWD/writemessageblock.h \
     $$PWD/ipcclientprovider.h \
     $$PWD/requestsourcerangesforquerymessage.h \
diff --git a/src/libs/clangsupport/clangsupport_global.h b/src/libs/clangsupport/clangsupport_global.h
index 8c5b5f57b80..def7cea41c0 100644
--- a/src/libs/clangsupport/clangsupport_global.h
+++ b/src/libs/clangsupport/clangsupport_global.h
@@ -138,18 +138,19 @@ enum class MessageType : quint8 {
     EchoMessage,
     EndMessage,
 
-    RegisterTranslationUnitForEditorMessage,
-    UpdateTranslationUnitsForEditorMessage,
-    UnregisterTranslationUnitsForEditorMessage,
+    DocumentsOpenedMessage,
+    DocumentsChangedMessage,
+    DocumentsClosedMessage,
+    DocumentVisibilityChangedMessage,
 
-    RegisterUnsavedFilesForEditorMessage,
-    UnregisterUnsavedFilesForEditorMessage,
+    UnsavedFilesUpdatedMessage,
+    UnsavedFilesRemovedMessage,
 
-    RegisterProjectPartsForEditorMessage,
-    UnregisterProjectPartsForEditorMessage,
+    ProjectPartsUpdatedMessage,
+    ProjectPartsRemovedMessage,
 
-    RequestDocumentAnnotationsMessage,
-    DocumentAnnotationsChangedMessage,
+    RequestAnnotationsMessage,
+    AnnotationsMessage,
 
     RequestReferencesMessage,
     ReferencesMessage,
@@ -160,10 +161,8 @@ enum class MessageType : quint8 {
     RequestToolTipMessage,
     ToolTipMessage,
 
-    UpdateVisibleTranslationUnitsMessage,
-
-    CompleteCodeMessage,
-    CodeCompletedMessage,
+    RequestCompletionsMessage,
+    CompletionsMessage,
 
     SourceLocationsForRenamingMessage,
     RequestSourceLocationsForRenamingMessage,
diff --git a/src/libs/clangsupport/cmbcodecompletedmessage.cpp b/src/libs/clangsupport/completionsmessage.cpp
index ca10cf15f1a..b6324f6a647 100644
--- a/src/libs/clangsupport/cmbcodecompletedmessage.cpp
+++ b/src/libs/clangsupport/completionsmessage.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "cmbcodecompletedmessage.h"
+#include "completionsmessage.h"
 
 #include <QDebug>
 
@@ -40,9 +40,9 @@ static const char *completionCorrectionToText(CompletionCorrection correction)
 }
 #undef RETURN_TEXT_FOR_CASE
 
-QDebug operator<<(QDebug debug, const CodeCompletedMessage &message)
+QDebug operator<<(QDebug debug, const CompletionsMessage &message)
 {
-    debug.nospace() << "CodeCompletedMessage(";
+    debug.nospace() << "CompletionsMessage(";
 
     debug.nospace() << message.codeCompletions << ", "
                     << completionCorrectionToText(message.neededCorrection) << ", "
diff --git a/src/libs/clangsupport/cmbcodecompletedmessage.h b/src/libs/clangsupport/completionsmessage.h
index e3b74e9d798..b77710a93b0 100644
--- a/src/libs/clangsupport/cmbcodecompletedmessage.h
+++ b/src/libs/clangsupport/completionsmessage.h
@@ -33,20 +33,20 @@
 
 namespace ClangBackEnd {
 
-class CodeCompletedMessage
+class CompletionsMessage
 {
 public:
-    CodeCompletedMessage() = default;
-    CodeCompletedMessage(const CodeCompletions &codeCompletions,
-                         CompletionCorrection neededCorrection,
-                         quint64 ticketNumber)
-        : codeCompletions(codeCompletions),
-          ticketNumber(ticketNumber),
-          neededCorrection(neededCorrection)
+    CompletionsMessage() = default;
+    CompletionsMessage(const CodeCompletions &codeCompletions,
+                       CompletionCorrection neededCorrection,
+                       quint64 ticketNumber)
+        : codeCompletions(codeCompletions)
+        , ticketNumber(ticketNumber)
+        , neededCorrection(neededCorrection)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const CodeCompletedMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const CompletionsMessage &message)
     {
         out << message.codeCompletions;
         out << static_cast<quint32>(message.neededCorrection);
@@ -55,7 +55,7 @@ public:
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, CodeCompletedMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, CompletionsMessage &message)
     {
         quint32 neededCorrection;
 
@@ -68,7 +68,7 @@ public:
         return in;
     }
 
-    friend bool operator==(const CodeCompletedMessage &first, const CodeCompletedMessage &second)
+    friend bool operator==(const CompletionsMessage &first, const CompletionsMessage &second)
     {
         return first.ticketNumber == second.ticketNumber
             && first.neededCorrection == second.neededCorrection
@@ -81,7 +81,7 @@ public:
     CompletionCorrection neededCorrection = CompletionCorrection::NoCorrection;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CompletionsMessage &message);
 
-DECLARE_MESSAGE(CodeCompletedMessage)
+DECLARE_MESSAGE(CompletionsMessage)
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/documentschangedmessage.cpp
index 1daa1812864..41512d8081a 100644
--- a/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp
+++ b/src/libs/clangsupport/documentschangedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "registerunsavedfilesforeditormessage.h"
+#include "documentschangedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message)
+QDebug operator<<(QDebug debug, const DocumentsChangedMessage &message)
 {
-    debug.nospace() << "RegisterUnsavedFilesForEditorMessage(";
+    debug.nospace() << "DocumentsChangedMessage(";
 
     for (const FileContainer &fileContainer : message.fileContainers)
         debug.nospace() << fileContainer<< ", ";
diff --git a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h b/src/libs/clangsupport/documentschangedmessage.h
index b3a5e8ee08d..3d3f6138e8c 100644
--- a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/documentschangedmessage.h
@@ -31,30 +31,31 @@
 
 namespace ClangBackEnd {
 
-class RegisterUnsavedFilesForEditorMessage
+class DocumentsChangedMessage
 {
 public:
-    RegisterUnsavedFilesForEditorMessage() = default;
-    RegisterUnsavedFilesForEditorMessage(const QVector<FileContainer> &fileContainers)
+    DocumentsChangedMessage() = default;
+    DocumentsChangedMessage(const QVector<FileContainer> &fileContainers)
         : fileContainers(fileContainers)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const RegisterUnsavedFilesForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const DocumentsChangedMessage &message)
     {
         out << message.fileContainers;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, RegisterUnsavedFilesForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, DocumentsChangedMessage &message)
     {
         in >> message.fileContainers;
 
         return in;
     }
 
-    friend bool operator==(const RegisterUnsavedFilesForEditorMessage &first, const RegisterUnsavedFilesForEditorMessage &second)
+    friend bool operator==(const DocumentsChangedMessage &first,
+                           const DocumentsChangedMessage &second)
     {
         return first.fileContainers == second.fileContainers;
     }
@@ -63,7 +64,7 @@ public:
     QVector<FileContainer> fileContainers;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentsChangedMessage &message);
 
-DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage);
+DECLARE_MESSAGE(DocumentsChangedMessage)
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/documentsclosedmessage.cpp
index 42b6fa35244..7c23586b836 100644
--- a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/documentsclosedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "cmbunregistertranslationunitsforeditormessage.h"
+#include "documentsclosedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message)
+QDebug operator<<(QDebug debug, const DocumentsClosedMessage &message)
 {
-    debug.nospace() << "UnregisterTranslationUnitsForEditorMessage(";
+    debug.nospace() << "DocumentsClosedMessage(";
 
     for (const FileContainer &fileContainer : message.fileContainers)
         debug.nospace() << fileContainer << ", ";
diff --git a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h b/src/libs/clangsupport/documentsclosedmessage.h
index 72ce67622f9..458a78fa8c9 100644
--- a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/documentsclosedmessage.h
@@ -25,36 +25,38 @@
 
 #pragma once
 
+#include "clangsupport_global.h"
+
 #include "filecontainer.h"
 
 #include <QVector>
 
 namespace ClangBackEnd {
 
-class UpdateTranslationUnitsForEditorMessage
+class DocumentsClosedMessage
 {
 public:
-    UpdateTranslationUnitsForEditorMessage() = default;
-    UpdateTranslationUnitsForEditorMessage(const QVector<FileContainer> &fileContainers)
+    DocumentsClosedMessage() = default;
+    DocumentsClosedMessage(const QVector<FileContainer> &fileContainers)
         : fileContainers(fileContainers)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const UpdateTranslationUnitsForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const DocumentsClosedMessage &message)
     {
         out << message.fileContainers;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, UpdateTranslationUnitsForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, DocumentsClosedMessage &message)
     {
         in >> message.fileContainers;
 
         return in;
     }
 
-    friend bool operator==(const UpdateTranslationUnitsForEditorMessage &first, const UpdateTranslationUnitsForEditorMessage &second)
+    friend bool operator==(const DocumentsClosedMessage &first, const DocumentsClosedMessage &second)
     {
         return first.fileContainers == second.fileContainers;
     }
@@ -63,7 +65,7 @@ public:
     QVector<FileContainer> fileContainers;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentsClosedMessage &message);
 
-DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage)
+DECLARE_MESSAGE(DocumentsClosedMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/documentsopenedmessage.cpp
index e0fa5d43d74..647899b3fe1 100644
--- a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/documentsopenedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "cmbregistertranslationunitsforeditormessage.h"
+#include "documentsopenedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message)
+QDebug operator<<(QDebug debug, const DocumentsOpenedMessage &message)
 {
-    debug.nospace() << "RegisterTranslationUnitForEditorMessage(";
+    debug.nospace() << "DocumentsOpenedMessage(";
 
     for (const FileContainer &fileContainer : message.fileContainers)
         debug.nospace() << fileContainer<< ", ";
diff --git a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/documentsopenedmessage.h
index 6ec1ebcd9fd..d56596ef7b8 100644
--- a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/documentsopenedmessage.h
@@ -32,20 +32,20 @@
 
 namespace ClangBackEnd {
 
-class RegisterTranslationUnitForEditorMessage
+class DocumentsOpenedMessage
 {
 public:
-    RegisterTranslationUnitForEditorMessage() = default;
-    RegisterTranslationUnitForEditorMessage(const QVector<FileContainer> &fileContainers,
-                                            const Utf8String &currentEditorFilePath,
-                                            const Utf8StringVector &visibleEditorFilePaths)
-        : fileContainers(fileContainers),
-          currentEditorFilePath(currentEditorFilePath),
-          visibleEditorFilePaths(visibleEditorFilePaths)
+    DocumentsOpenedMessage() = default;
+    DocumentsOpenedMessage(const QVector<FileContainer> &fileContainers,
+                           const Utf8String &currentEditorFilePath,
+                           const Utf8StringVector &visibleEditorFilePaths)
+        : fileContainers(fileContainers)
+        , currentEditorFilePath(currentEditorFilePath)
+        , visibleEditorFilePaths(visibleEditorFilePaths)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const DocumentsOpenedMessage &message)
     {
         out << message.fileContainers;
         out << message.currentEditorFilePath;
@@ -53,7 +53,7 @@ public:
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, DocumentsOpenedMessage &message)
     {
         in >> message.fileContainers;
         in >> message.currentEditorFilePath;
@@ -62,7 +62,7 @@ public:
         return in;
     }
 
-    friend bool operator==(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second)
+    friend bool operator==(const DocumentsOpenedMessage &first, const DocumentsOpenedMessage &second)
     {
         return first.fileContainers == second.fileContainers
             && first.currentEditorFilePath == second.currentEditorFilePath
@@ -75,7 +75,7 @@ public:
     Utf8StringVector visibleEditorFilePaths;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentsOpenedMessage &message);
 
-DECLARE_MESSAGE(RegisterTranslationUnitForEditorMessage);
+DECLARE_MESSAGE(DocumentsOpenedMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp b/src/libs/clangsupport/documentvisibilitychangedmessage.cpp
index e0826a756be..f82efe65818 100644
--- a/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp
+++ b/src/libs/clangsupport/documentvisibilitychangedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "updatevisibletranslationunitsmessage.h"
+#include "documentvisibilitychangedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message)
+QDebug operator<<(QDebug debug, const DocumentVisibilityChangedMessage &message)
 {
-    debug.nospace() << "UpdateVisibleTranslationUnitsMessage(";
+    debug.nospace() << "DocumentVisibilityChangedMessage(";
 
     debug.nospace() << message.currentEditorFilePath << ", ";
 
diff --git a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h b/src/libs/clangsupport/documentvisibilitychangedmessage.h
index e51706276d2..cb8b0f2679e 100644
--- a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
+++ b/src/libs/clangsupport/documentvisibilitychangedmessage.h
@@ -33,18 +33,18 @@
 
 namespace ClangBackEnd {
 
-class UpdateVisibleTranslationUnitsMessage
+class DocumentVisibilityChangedMessage
 {
 public:
-    UpdateVisibleTranslationUnitsMessage() = default;
-    UpdateVisibleTranslationUnitsMessage(const Utf8String &currentEditorFilePath,
-                                         const Utf8StringVector &visibleEditorFilePaths)
-        : currentEditorFilePath(currentEditorFilePath),
-          visibleEditorFilePaths(visibleEditorFilePaths)
+    DocumentVisibilityChangedMessage() = default;
+    DocumentVisibilityChangedMessage(const Utf8String &currentEditorFilePath,
+                                     const Utf8StringVector &visibleEditorFilePaths)
+        : currentEditorFilePath(currentEditorFilePath)
+        , visibleEditorFilePaths(visibleEditorFilePaths)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const UpdateVisibleTranslationUnitsMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const DocumentVisibilityChangedMessage &message)
     {
         out << message.currentEditorFilePath;
         out << message.visibleEditorFilePaths;
@@ -52,7 +52,7 @@ public:
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, UpdateVisibleTranslationUnitsMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, DocumentVisibilityChangedMessage &message)
     {
         in >> message.currentEditorFilePath;
         in >> message.visibleEditorFilePaths;
@@ -60,7 +60,8 @@ public:
         return in;
     }
 
-    friend bool operator==(const UpdateVisibleTranslationUnitsMessage &first, const UpdateVisibleTranslationUnitsMessage &second)
+    friend bool operator==(const DocumentVisibilityChangedMessage &first,
+                           const DocumentVisibilityChangedMessage &second)
     {
         return first.currentEditorFilePath == second.currentEditorFilePath
             && first.visibleEditorFilePaths == second.visibleEditorFilePaths;
@@ -71,7 +72,7 @@ public:
     Utf8StringVector visibleEditorFilePaths;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentVisibilityChangedMessage &message);
 
-DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage)
+DECLARE_MESSAGE(DocumentVisibilityChangedMessage)
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbechomessage.cpp b/src/libs/clangsupport/echomessage.cpp
index 4d221737ea8..a8842b537b5 100644
--- a/src/libs/clangsupport/cmbechomessage.cpp
+++ b/src/libs/clangsupport/echomessage.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "cmbechomessage.h"
+#include "echomessage.h"
 
 #include <QDebug>
 
diff --git a/src/libs/clangsupport/cmbechomessage.h b/src/libs/clangsupport/echomessage.h
index 0b2bf22641c..0b2bf22641c 100644
--- a/src/libs/clangsupport/cmbechomessage.h
+++ b/src/libs/clangsupport/echomessage.h
diff --git a/src/libs/clangsupport/cmbendmessage.cpp b/src/libs/clangsupport/endmessage.cpp
index 7dbc49e41ed..23132d456a4 100644
--- a/src/libs/clangsupport/cmbendmessage.cpp
+++ b/src/libs/clangsupport/endmessage.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "cmbendmessage.h"
+#include "endmessage.h"
 
 #include <QDebug>
 
@@ -34,4 +34,4 @@ QDebug operator<<(QDebug debug, const EndMessage &/*message*/)
     return debug.nospace() << "EndMessage()";
 }
 
-}
+} // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbendmessage.h b/src/libs/clangsupport/endmessage.h
index 8ecb2646b82..8ecb2646b82 100644
--- a/src/libs/clangsupport/cmbendmessage.h
+++ b/src/libs/clangsupport/endmessage.h
diff --git a/src/libs/clangsupport/messageenvelop.cpp b/src/libs/clangsupport/messageenvelop.cpp
index 134616a5b93..b4da3d87587 100644
--- a/src/libs/clangsupport/messageenvelop.cpp
+++ b/src/libs/clangsupport/messageenvelop.cpp
@@ -38,32 +38,35 @@ QDebug operator<<(QDebug debug, const MessageEnvelop &messageEnvelop)
         case MessageType::EndMessage:
             qDebug() << "EndMessage()";
             break;
-        case MessageType::RegisterTranslationUnitForEditorMessage:
-            qDebug() << messageEnvelop.message<RegisterTranslationUnitForEditorMessage>();
+        case MessageType::DocumentsOpenedMessage:
+            qDebug() << messageEnvelop.message<DocumentsOpenedMessage>();
             break;
-        case MessageType::UpdateTranslationUnitsForEditorMessage:
-            qDebug() << messageEnvelop.message<UpdateTranslationUnitsForEditorMessage>();
+        case MessageType::DocumentsChangedMessage:
+            qDebug() << messageEnvelop.message<DocumentsChangedMessage>();
             break;
-        case MessageType::UnregisterTranslationUnitsForEditorMessage:
-            qDebug() << messageEnvelop.message<UnregisterTranslationUnitsForEditorMessage>();
+        case MessageType::DocumentsClosedMessage:
+            qDebug() << messageEnvelop.message<DocumentsClosedMessage>();
             break;
-        case MessageType::RegisterProjectPartsForEditorMessage:
-            qDebug() << messageEnvelop.message<RegisterProjectPartsForEditorMessage>();
+        case MessageType::DocumentVisibilityChangedMessage:
+            qDebug() << messageEnvelop.message<DocumentVisibilityChangedMessage>();
             break;
-        case MessageType::UnregisterProjectPartsForEditorMessage:
-            qDebug() << messageEnvelop.message<UnregisterProjectPartsForEditorMessage>();
+        case MessageType::ProjectPartsUpdatedMessage:
+            qDebug() << messageEnvelop.message<ProjectPartsUpdatedMessage>();
             break;
-        case MessageType::RegisterUnsavedFilesForEditorMessage:
-            qDebug() << messageEnvelop.message<RegisterUnsavedFilesForEditorMessage>();
+        case MessageType::ProjectPartsRemovedMessage:
+            qDebug() << messageEnvelop.message<ProjectPartsRemovedMessage>();
             break;
-        case MessageType::UnregisterUnsavedFilesForEditorMessage:
-            qDebug() << messageEnvelop.message<UnregisterUnsavedFilesForEditorMessage>();
+        case MessageType::UnsavedFilesUpdatedMessage:
+            qDebug() << messageEnvelop.message<UnsavedFilesUpdatedMessage>();
             break;
-        case MessageType::CompleteCodeMessage:
-            qDebug() << messageEnvelop.message<CompleteCodeMessage>();
+        case MessageType::UnsavedFilesRemovedMessage:
+            qDebug() << messageEnvelop.message<UnsavedFilesRemovedMessage>();
             break;
-        case MessageType::RequestDocumentAnnotationsMessage:
-            qDebug() << messageEnvelop.message<RequestDocumentAnnotationsMessage>();
+        case MessageType::RequestCompletionsMessage:
+            qDebug() << messageEnvelop.message<RequestCompletionsMessage>();
+            break;
+        case MessageType::RequestAnnotationsMessage:
+            qDebug() << messageEnvelop.message<RequestAnnotationsMessage>();
             break;
         case MessageType::RequestReferencesMessage:
             qDebug() << messageEnvelop.message<RequestReferencesMessage>();
@@ -71,17 +74,14 @@ QDebug operator<<(QDebug debug, const MessageEnvelop &messageEnvelop)
         case MessageType::RequestToolTipMessage:
             qDebug() << messageEnvelop.message<RequestToolTipMessage>();
             break;
-        case MessageType::UpdateVisibleTranslationUnitsMessage:
-            qDebug() << messageEnvelop.message<UpdateVisibleTranslationUnitsMessage>();
-            break;
         case MessageType::AliveMessage:
             qDebug() << "AliveMessage()";
             break;
         case MessageType::EchoMessage:
             qDebug() << messageEnvelop.message<EchoMessage>();
             break;
-        case MessageType::CodeCompletedMessage:
-            qDebug() << messageEnvelop.message<CodeCompletedMessage>();
+        case MessageType::CompletionsMessage:
+            qDebug() << messageEnvelop.message<CompletionsMessage>();
             break;
         case MessageType::ReferencesMessage:
             qDebug() << messageEnvelop.message<ReferencesMessage>();
@@ -89,8 +89,8 @@ QDebug operator<<(QDebug debug, const MessageEnvelop &messageEnvelop)
         case MessageType::ToolTipMessage:
             qDebug() << messageEnvelop.message<ToolTipMessage>();
             break;
-        case MessageType::DocumentAnnotationsChangedMessage:
-            qDebug() << messageEnvelop.message<DocumentAnnotationsChangedMessage>();
+        case MessageType::AnnotationsMessage:
+            qDebug() << messageEnvelop.message<AnnotationsMessage>();
             break;
         default:
             qWarning() << "Unknown Message";
diff --git a/src/libs/clangsupport/pchmanagerclientproxy.cpp b/src/libs/clangsupport/pchmanagerclientproxy.cpp
index ad583113bba..6a216ef6361 100644
--- a/src/libs/clangsupport/pchmanagerclientproxy.cpp
+++ b/src/libs/clangsupport/pchmanagerclientproxy.cpp
@@ -25,7 +25,7 @@
 
 #include "pchmanagerclientproxy.h"
 
-#include "cmbalivemessage.h"
+#include "alivemessage.h"
 #include "messageenvelop.h"
 #include "pchmanagerserverinterface.h"
 #include "precompiledheadersupdatedmessage.h"
diff --git a/src/libs/clangsupport/pchmanagerserverproxy.cpp b/src/libs/clangsupport/pchmanagerserverproxy.cpp
index 079c8890d94..fbf4866542a 100644
--- a/src/libs/clangsupport/pchmanagerserverproxy.cpp
+++ b/src/libs/clangsupport/pchmanagerserverproxy.cpp
@@ -25,7 +25,7 @@
 
 #include "pchmanagerserverproxy.h"
 
-#include "cmbendmessage.h"
+#include "endmessage.h"
 #include "messageenvelop.h"
 #include "pchmanagerclientinterface.h"
 #include "removeprojectpartsmessage.h"
diff --git a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/projectpartsremovedmessage.cpp
index 8d109051d6e..8c727fbc4bd 100644
--- a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp
+++ b/src/libs/clangsupport/projectpartsremovedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "cmbunregisterprojectsforeditormessage.h"
+#include "projectpartsremovedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message)
+QDebug operator<<(QDebug debug, const ProjectPartsRemovedMessage &message)
 {
-    debug.nospace() << "UnregisterProjectPartsForEditorMessage(";
+    debug.nospace() << "ProjectPartsRemovedMessage(";
 
     for (const Utf8String &fileNames_ : message.projectPartIds)
         debug.nospace() << fileNames_ << ", ";
diff --git a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h b/src/libs/clangsupport/projectpartsremovedmessage.h
index eaace726b84..754298aa0d8 100644
--- a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/projectpartsremovedmessage.h
@@ -33,30 +33,31 @@
 
 namespace ClangBackEnd {
 
-class CLANGSUPPORT_EXPORT UnregisterProjectPartsForEditorMessage
+class CLANGSUPPORT_EXPORT ProjectPartsRemovedMessage
 {
 public:
-    UnregisterProjectPartsForEditorMessage() = default;
-    UnregisterProjectPartsForEditorMessage(const Utf8StringVector &projectPartIds)
+    ProjectPartsRemovedMessage() = default;
+    ProjectPartsRemovedMessage(const Utf8StringVector &projectPartIds)
         : projectPartIds(projectPartIds)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const ProjectPartsRemovedMessage &message)
     {
         out << message.projectPartIds;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, ProjectPartsRemovedMessage &message)
     {
         in >> message.projectPartIds;
 
         return in;
     }
 
-    friend bool operator==(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second)
+    friend bool operator==(const ProjectPartsRemovedMessage &first,
+                           const ProjectPartsRemovedMessage &second)
     {
         return first.projectPartIds == second.projectPartIds;
     }
@@ -65,7 +66,7 @@ public:
     Utf8StringVector projectPartIds;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ProjectPartsRemovedMessage &message);
 
-DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage);
+DECLARE_MESSAGE(ProjectPartsRemovedMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/projectpartsupdatedmessage.cpp
index 8a57c6e8d7b..7550ea81546 100644
--- a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp
+++ b/src/libs/clangsupport/projectpartsupdatedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "cmbregisterprojectsforeditormessage.h"
+#include "projectpartsupdatedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message)
+QDebug operator<<(QDebug debug, const ProjectPartsUpdatedMessage &message)
 {
-    debug.nospace() << "RegisterProjectPartsForEditorMessage(";
+    debug.nospace() << "ProjectPartsUpdatedMessage(";
 
     for (const ProjectPartContainer &projectContainer : message.projectContainers)
         debug.nospace() << projectContainer<< ", ";
diff --git a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h b/src/libs/clangsupport/projectpartsupdatedmessage.h
index fe22127c446..07981a6eb62 100644
--- a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/projectpartsupdatedmessage.h
@@ -32,30 +32,31 @@
 
 namespace ClangBackEnd {
 
-class RegisterProjectPartsForEditorMessage
+class ProjectPartsUpdatedMessage
 {
 public:
-    RegisterProjectPartsForEditorMessage() = default;
-    RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers)
+    ProjectPartsUpdatedMessage() = default;
+    ProjectPartsUpdatedMessage(const QVector<ProjectPartContainer> &projectContainers)
         : projectContainers(projectContainers)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const ProjectPartsUpdatedMessage &message)
     {
         out << message.projectContainers;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, ProjectPartsUpdatedMessage &message)
     {
         in >> message.projectContainers;
 
         return in;
     }
 
-    friend bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second)
+    friend bool operator==(const ProjectPartsUpdatedMessage &first,
+                           const ProjectPartsUpdatedMessage &second)
     {
         return first.projectContainers == second.projectContainers;
     }
@@ -64,7 +65,7 @@ public:
     QVector<ProjectPartContainer> projectContainers;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ProjectPartsUpdatedMessage &message);
 
-DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage);
+DECLARE_MESSAGE(ProjectPartsUpdatedMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/refactoringclientproxy.cpp b/src/libs/clangsupport/refactoringclientproxy.cpp
index 576489aa250..28195122bcb 100644
--- a/src/libs/clangsupport/refactoringclientproxy.cpp
+++ b/src/libs/clangsupport/refactoringclientproxy.cpp
@@ -25,7 +25,7 @@
 
 #include "refactoringclientproxy.h"
 
-#include "cmbalivemessage.h"
+#include "alivemessage.h"
 #include "messageenvelop.h"
 #include "refactoringserverinterface.h"
 #include "clangrefactoringclientmessages.h"
diff --git a/src/libs/clangsupport/requestdocumentannotations.cpp b/src/libs/clangsupport/requestannotationsmessage.cpp
index 83265a8fcc0..45392f92677 100644
--- a/src/libs/clangsupport/requestdocumentannotations.cpp
+++ b/src/libs/clangsupport/requestannotationsmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "requestdocumentannotations.h"
+#include "requestannotationsmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message)
+QDebug operator<<(QDebug debug, const RequestAnnotationsMessage &message)
 {
-    debug.nospace() << "RequestDocumentAnnotationsMessage("
+    debug.nospace() << "RequestAnnotationsMessage("
                     << message.fileContainer
                     << ")";
 
diff --git a/src/libs/clangsupport/requestdocumentannotations.h b/src/libs/clangsupport/requestannotationsmessage.h
index 395f66ae4af..24be10d1245 100644
--- a/src/libs/clangsupport/requestdocumentannotations.h
+++ b/src/libs/clangsupport/requestannotationsmessage.h
@@ -29,30 +29,31 @@
 
 namespace ClangBackEnd {
 
-class RequestDocumentAnnotationsMessage
+class RequestAnnotationsMessage
 {
 public:
-    RequestDocumentAnnotationsMessage() = default;
-    RequestDocumentAnnotationsMessage(const FileContainer &fileContainer)
+    RequestAnnotationsMessage() = default;
+    RequestAnnotationsMessage(const FileContainer &fileContainer)
         : fileContainer(fileContainer)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const RequestDocumentAnnotationsMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const RequestAnnotationsMessage &message)
     {
         out << message.fileContainer;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, RequestDocumentAnnotationsMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, RequestAnnotationsMessage &message)
     {
         in >> message.fileContainer;
 
         return in;
     }
 
-    friend bool operator==(const RequestDocumentAnnotationsMessage &first, const RequestDocumentAnnotationsMessage &second)
+    friend bool operator==(const RequestAnnotationsMessage &first,
+                           const RequestAnnotationsMessage &second)
     {
         return first.fileContainer == second.fileContainer;
     }
@@ -61,7 +62,7 @@ public:
     FileContainer fileContainer;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestAnnotationsMessage &message);
 
-DECLARE_MESSAGE(RequestDocumentAnnotationsMessage);
+DECLARE_MESSAGE(RequestAnnotationsMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbcompletecodemessage.cpp b/src/libs/clangsupport/requestcompletionsmessage.cpp
index a99c6d64bdf..bb2fdcb9825 100644
--- a/src/libs/clangsupport/cmbcompletecodemessage.cpp
+++ b/src/libs/clangsupport/requestcompletionsmessage.cpp
@@ -23,17 +23,17 @@
 **
 ****************************************************************************/
 
-#include "cmbcompletecodemessage.h"
+#include "requestcompletionsmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-quint64 CompleteCodeMessage::ticketCounter = 0;
+quint64 RequestCompletionsMessage::ticketCounter = 0;
 
-QDebug operator<<(QDebug debug, const CompleteCodeMessage &message)
+QDebug operator<<(QDebug debug, const RequestCompletionsMessage &message)
 {
-    debug.nospace() << "CompleteCodeMessage(";
+    debug.nospace() << "RequestCompletionsMessage(";
 
     debug.nospace() << message.filePath << ", ";
     debug.nospace() << message.line << ", ";
diff --git a/src/libs/clangsupport/cmbcompletecodemessage.h b/src/libs/clangsupport/requestcompletionsmessage.h
index d32287fa934..ff87d920a81 100644
--- a/src/libs/clangsupport/cmbcompletecodemessage.h
+++ b/src/libs/clangsupport/requestcompletionsmessage.h
@@ -33,27 +33,27 @@
 
 namespace ClangBackEnd {
 
-class CompleteCodeMessage
+class RequestCompletionsMessage
 {
 public:
-    CompleteCodeMessage() = default;
-    CompleteCodeMessage(const Utf8String &filePath,
-                        quint32 line,
-                        quint32 column,
-                        const Utf8String &projectPartId,
-                        qint32 funcNameStartLine = -1,
-                        qint32 funcNameStartColumn = -1)
-        : filePath(filePath),
-          projectPartId(projectPartId),
-          ticketNumber(++ticketCounter),
-          line(line),
-          column(column),
-          funcNameStartLine(funcNameStartLine),
-          funcNameStartColumn(funcNameStartColumn)
+    RequestCompletionsMessage() = default;
+    RequestCompletionsMessage(const Utf8String &filePath,
+                              quint32 line,
+                              quint32 column,
+                              const Utf8String &projectPartId,
+                              qint32 funcNameStartLine = -1,
+                              qint32 funcNameStartColumn = -1)
+        : filePath(filePath)
+        , projectPartId(projectPartId)
+        , ticketNumber(++ticketCounter)
+        , line(line)
+        , column(column)
+        , funcNameStartLine(funcNameStartLine)
+        , funcNameStartColumn(funcNameStartColumn)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const CompleteCodeMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const RequestCompletionsMessage &message)
     {
         out << message.filePath;
         out << message.projectPartId;
@@ -66,7 +66,7 @@ public:
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, CompleteCodeMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, RequestCompletionsMessage &message)
     {
         in >> message.filePath;
         in >> message.projectPartId;
@@ -79,7 +79,8 @@ public:
         return in;
     }
 
-    friend bool operator==(const CompleteCodeMessage &first, const CompleteCodeMessage &second)
+    friend bool operator==(const RequestCompletionsMessage &first,
+                           const RequestCompletionsMessage &second)
     {
         return first.ticketNumber == second.ticketNumber
                 && first.filePath == second.filePath
@@ -101,7 +102,7 @@ public:
     qint32 funcNameStartColumn = -1;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestCompletionsMessage &message);
 
-DECLARE_MESSAGE(CompleteCodeMessage);
+DECLARE_MESSAGE(RequestCompletionsMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp b/src/libs/clangsupport/unsavedfilesremovedmessage.cpp
index 9c05cb43e7e..8da5ca1c1b9 100644
--- a/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/unsavedfilesremovedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "updatetranslationunitsforeditormessage.h"
+#include "unsavedfilesremovedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message)
+QDebug operator<<(QDebug debug, const UnsavedFilesRemovedMessage &message)
 {
-    debug.nospace() << "UpdateTranslationUnitsForEditorMessage(";
+    debug.nospace() << "UnsavedFilesRemovedMessage(";
 
     for (const FileContainer &fileContainer : message.fileContainers)
         debug.nospace() << fileContainer<< ", ";
diff --git a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h b/src/libs/clangsupport/unsavedfilesremovedmessage.h
index 92b6c13bf10..58714b407f2 100644
--- a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/unsavedfilesremovedmessage.h
@@ -31,30 +31,31 @@
 
 namespace ClangBackEnd {
 
-class UnregisterUnsavedFilesForEditorMessage
+class UnsavedFilesRemovedMessage
 {
 public:
-    UnregisterUnsavedFilesForEditorMessage() = default;
-    UnregisterUnsavedFilesForEditorMessage(const QVector<FileContainer> &fileContainers)
+    UnsavedFilesRemovedMessage() = default;
+    UnsavedFilesRemovedMessage(const QVector<FileContainer> &fileContainers)
         : fileContainers(fileContainers)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const UnregisterUnsavedFilesForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const UnsavedFilesRemovedMessage &message)
     {
         out << message.fileContainers;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, UnregisterUnsavedFilesForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, UnsavedFilesRemovedMessage &message)
     {
         in >> message.fileContainers;
 
         return in;
     }
 
-    friend bool operator==(const UnregisterUnsavedFilesForEditorMessage &first, const UnregisterUnsavedFilesForEditorMessage &second)
+    friend bool operator==(const UnsavedFilesRemovedMessage &first,
+                           const UnsavedFilesRemovedMessage &second)
     {
         return first.fileContainers == second.fileContainers;
     }
@@ -63,7 +64,7 @@ public:
     QVector<FileContainer> fileContainers;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnsavedFilesRemovedMessage &message);
 
-DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage)
+DECLARE_MESSAGE(UnsavedFilesRemovedMessage)
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/unsavedfilesupdatedmessage.cpp
index cb1d3ed3b97..80000a65664 100644
--- a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp
+++ b/src/libs/clangsupport/unsavedfilesupdatedmessage.cpp
@@ -23,15 +23,15 @@
 **
 ****************************************************************************/
 
-#include "unregisterunsavedfilesforeditormessage.h"
+#include "unsavedfilesupdatedmessage.h"
 
 #include <QDebug>
 
 namespace ClangBackEnd {
 
-QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message)
+QDebug operator<<(QDebug debug, const UnsavedFilesUpdatedMessage &message)
 {
-    debug.nospace() << "UnregisterUnsavedFilesForEditorMessage(";
+    debug.nospace() << "UnsavedFilesUpdatedMessage(";
 
     for (const FileContainer &fileContainer : message.fileContainers)
         debug.nospace() << fileContainer<< ", ";
diff --git a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/unsavedfilesupdatedmessage.h
index bdf91dac4e6..5d796f7ae00 100644
--- a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/unsavedfilesupdatedmessage.h
@@ -25,38 +25,37 @@
 
 #pragma once
 
-#include "clangsupport_global.h"
-
 #include "filecontainer.h"
 
 #include <QVector>
 
 namespace ClangBackEnd {
 
-class UnregisterTranslationUnitsForEditorMessage
+class UnsavedFilesUpdatedMessage
 {
 public:
-    UnregisterTranslationUnitsForEditorMessage() = default;
-    UnregisterTranslationUnitsForEditorMessage(const QVector<FileContainer> &fileContainers)
+    UnsavedFilesUpdatedMessage() = default;
+    UnsavedFilesUpdatedMessage(const QVector<FileContainer> &fileContainers)
         : fileContainers(fileContainers)
     {
     }
 
-    friend QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForEditorMessage &message)
+    friend QDataStream &operator<<(QDataStream &out, const UnsavedFilesUpdatedMessage &message)
     {
         out << message.fileContainers;
 
         return out;
     }
 
-    friend QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForEditorMessage &message)
+    friend QDataStream &operator>>(QDataStream &in, UnsavedFilesUpdatedMessage &message)
     {
         in >> message.fileContainers;
 
         return in;
     }
 
-    friend bool operator==(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second)
+    friend bool operator==(const UnsavedFilesUpdatedMessage &first,
+                           const UnsavedFilesUpdatedMessage &second)
     {
         return first.fileContainers == second.fileContainers;
     }
@@ -65,7 +64,7 @@ public:
     QVector<FileContainer> fileContainers;
 };
 
-CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnsavedFilesUpdatedMessage &message);
 
-DECLARE_MESSAGE(UnregisterTranslationUnitsForEditorMessage);
+DECLARE_MESSAGE(UnsavedFilesUpdatedMessage);
 } // namespace ClangBackEnd