diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index bae1ac3e2f57021cf1024877f539d3a8fba3131d..368236c76662a27674295c53c5f3b49d33774364 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -162,9 +162,9 @@ void ClangEditorDocumentProcessor::run()
     m_builtinProcessor.run();
 }
 
-void ClangEditorDocumentProcessor::semanticRehighlight(bool force)
+void ClangEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
 {
-    m_builtinProcessor.semanticRehighlight(force);
+    m_builtinProcessor.recalculateSemanticInfoDetached(force);
 }
 
 CppTools::SemanticInfo ClangEditorDocumentProcessor::recalculateSemanticInfo()
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index e21f5f93bc94ea6c6f61f731087a638ba951214e..508c235d1fe76d371ca2611d86339ba2f0c43743 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -56,7 +56,7 @@ public:
 
     // BaseEditorDocumentProcessor interface
     void run() override;
-    void semanticRehighlight(bool force) override;
+    void recalculateSemanticInfoDetached(bool force) override;
     CppTools::SemanticInfo recalculateSemanticInfo() override;
     CppTools::BaseEditorDocumentParser *parser() override;
     CPlusPlus::Snapshot snapshot() override;
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 97bbfd5a78525eed480fc9c1b20e1145f7be532a..cf309c2969ea797a832903bc3c99fe4366cc02e0 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -182,7 +182,7 @@ void CppEditorWidget::finalizeInitialization()
     connect(document(), SIGNAL(contentsChange(int,int,int)),
             &d->m_localRenaming, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int)));
     connect(&d->m_localRenaming, &CppLocalRenaming::finished, [this] {
-        cppEditorDocument()->semanticRehighlight();
+        cppEditorDocument()->recalculateSemanticInfoDetached();
     });
     connect(&d->m_localRenaming, &CppLocalRenaming::processKeyPressNormally,
             this, &CppEditorWidget::processKeyNormally);
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index 9ee0aa52263e6c81b75b4f732079f756611e6429..dec8995138af2af18bd20fdb7b535a9f2eabc25e 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -130,11 +130,11 @@ TextEditor::CompletionAssistProvider *CppEditorDocument::completionAssistProvide
     return m_completionAssistProvider;
 }
 
-void CppEditorDocument::semanticRehighlight()
+void CppEditorDocument::recalculateSemanticInfoDetached()
 {
     CppTools::BaseEditorDocumentProcessor *p = processor();
     QTC_ASSERT(p, return);
-    p->semanticRehighlight(true);
+    p->recalculateSemanticInfoDetached(true);
 }
 
 CppTools::SemanticInfo CppEditorDocument::recalculateSemanticInfo()
diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h
index e7aef03152b7188ad319f595684a666e90bf31d7..18ba8104e520b1a45e815db96eeca99abecb4325 100644
--- a/src/plugins/cppeditor/cppeditordocument.h
+++ b/src/plugins/cppeditor/cppeditordocument.h
@@ -57,7 +57,7 @@ public:
     bool isObjCEnabled() const;
     TextEditor::CompletionAssistProvider *completionAssistProvider() const override;
 
-    void semanticRehighlight();
+    void recalculateSemanticInfoDetached();
     CppTools::SemanticInfo recalculateSemanticInfo(); // TODO: Remove me
 
     void setPreprocessorSettings(const CppTools::ProjectPart::Ptr &projectPart,
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h
index e3c8dcc6795cfe33e7cc4822e54ca576fd8cf40f..908cd9782a8f67d85779b1bf5499a7636a36d215 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -60,7 +60,7 @@ public:
 
     // Function interface to implement
     virtual void run() = 0;
-    virtual void semanticRehighlight(bool force) = 0;
+    virtual void recalculateSemanticInfoDetached(bool force) = 0;
     virtual CppTools::SemanticInfo recalculateSemanticInfo() = 0;
     virtual CPlusPlus::Snapshot snapshot() = 0;
     virtual BaseEditorDocumentParser *parser() = 0;
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index 59f0ff7c171c5004b3a7650424be0348b27fe9b7..af0efebc8f73dc78e7cf3a09efe17a5b9f2e404e 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -176,7 +176,7 @@ CPlusPlus::Snapshot BuiltinEditorDocumentProcessor::snapshot()
     return m_parser.snapshot();
 }
 
-void BuiltinEditorDocumentProcessor::semanticRehighlight(bool force)
+void BuiltinEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
 {
     const auto source = createSemanticInfoSource(force);
     m_semanticInfoUpdater.updateDetached(source);
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.h b/src/plugins/cpptools/builtineditordocumentprocessor.h
index 0b80f94c29e39223b251493ee792d0dc4e12f35b..9e18020975dcdcc40c98bd2d99d50ce4ae371c3b 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.h
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.h
@@ -51,7 +51,7 @@ public:
 
     // BaseEditorDocumentProcessor interface
     void run() override;
-    void semanticRehighlight(bool force) override;
+    void recalculateSemanticInfoDetached(bool force) override;
     CppTools::SemanticInfo recalculateSemanticInfo() override;
     BaseEditorDocumentParser *parser() override;
     CPlusPlus::Snapshot snapshot() override;