diff --git a/.cirrus.default.yml b/.cirrus.default.yml
index 56e1d9c7d..ebffc5f40 100644
--- a/.cirrus.default.yml
+++ b/.cirrus.default.yml
@@ -203,7 +203,7 @@ qa_connectedModeSonarQube_task:
         SQ_VERSION: 'LATEST_RELEASE'
         QA_CATEGORY: 'LATEST_RELEASE'
     - env:
-        SQ_VERSION: 'DEV'
+        SQ_VERSION: '10.8.0.99052'
         QA_CATEGORY: 'DEV'
   <<: *SETUP_MAVEN_CACHE_QA
   <<: *SETUP_ORCHESTRATOR_CACHE
diff --git a/its/org.sonarlint.eclipse.its.connected.sc/src/org/sonarlint/eclipse/its/connected/sc/SonarCloudConnectedModeTest.java b/its/org.sonarlint.eclipse.its.connected.sc/src/org/sonarlint/eclipse/its/connected/sc/SonarCloudConnectedModeTest.java
index bbf5424da..81ad91501 100644
--- a/its/org.sonarlint.eclipse.its.connected.sc/src/org/sonarlint/eclipse/its/connected/sc/SonarCloudConnectedModeTest.java
+++ b/its/org.sonarlint.eclipse.its.connected.sc/src/org/sonarlint/eclipse/its/connected/sc/SonarCloudConnectedModeTest.java
@@ -191,7 +191,7 @@ public void fixSuggestion_with_ConnectionSetup_noProject() throws InterruptedExc
     new WaitUntil(new ConfirmConnectionCreationDialogOpened(true));
     new ConfirmConnectionCreationDialog(true).trust();
 
-    shellByName("SonarLint - No mathing open project found")
+    shellByName("SonarQube Cloud - No matching open project found")
       .ifPresent(shell -> {
         new DefaultLink(shell, "Open Troubleshooting documentation").click();
       });
diff --git a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/AbstractSonarQubeConnectedModeTest.java b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/AbstractSonarQubeConnectedModeTest.java
index 861d657f3..d6f9d4685 100644
--- a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/AbstractSonarQubeConnectedModeTest.java
+++ b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/AbstractSonarQubeConnectedModeTest.java
@@ -150,7 +150,7 @@ protected static void createConnectionAndBindProject(OrchestratorRule orchestrat
     wizard.next();
 
     // as login can take time, wait for the next page to appear
-    new WaitUntil(new WidgetIsFound(Label.class, new WithTextMatcher("SonarQube Connection Identifier")));
+    new WaitUntil(new WidgetIsFound(Label.class, new WithTextMatcher("SonarQube Server Connection Identifier")));
     var connectionNamePage = new ServerConnectionWizard.ConnectionNamePage(wizard);
 
     connectionNamePage.setConnectionName("test");
@@ -196,7 +196,7 @@ protected static void createConnectionAndBindProject(OrchestratorRule orchestrat
   }
 
   protected static void bindProjectFromContextMenu(Project project, String projectKey) {
-    new ContextMenu(project.getTreeItem()).getItem("SonarLint", "Bind to SonarQube or SonarCloud...").select();
+    new ContextMenu(project.getTreeItem()).getItem("SonarQube", "Bind to SonarQube (Server, Cloud)...").select();
 
     var projectBindingWizard = new ProjectBindingWizard();
     projectBindingWizard.next();
diff --git a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/OpenInIdeTest.java b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/OpenInIdeTest.java
index 20d44bc87..42af3a56a 100644
--- a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/OpenInIdeTest.java
+++ b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/OpenInIdeTest.java
@@ -177,7 +177,7 @@ public void test_open_in_ide_assist_manual_binding() throws IOException, Interru
     } catch (Exception err) {
       // ================================================================================================================
       // INFO: Because of SLE-797 we currently have to bind it manually and trigger it again
-      var popUp = new DefaultShell("SonarLint - No mathing open project found");
+      var popUp = new DefaultShell("SonarQube Server - No matching open project found");
       new DefaultLink(popUp, "Open Troubleshooting documentation").click();
       bindProjectFromContextMenu(rootProject, MAVEN_TAINT_PROJECT_KEY);
       triggerOpenInIDE(orchestrator.getServer().getUrl(), branch.getName(), s101.getKey());
@@ -221,7 +221,7 @@ public void test_open_in_ide_assist_automated_binding_empty_workspace() throws I
     new ConfirmConnectionCreationDialog(false).trust();
 
     // 4) await pop-up saying that automatic binding is not possible
-    var popUp = new DefaultShell("SonarLint - No mathing open project found");
+    var popUp = new DefaultShell("SonarQube Server - No matching open project found");
     new DefaultLink(popUp, "Open Troubleshooting documentation").click();
 
     // 5) Check that token still exists
@@ -287,7 +287,7 @@ public void test_open_in_ide_assist_automated_binding() throws IOException, Inte
     } catch (Exception err) {
       // ================================================================================================================
       // INFO: Because of SLE-797 we currently have to bind it manually and trigger it again
-      var popUp = new DefaultShell("SonarLint - No mathing open project found");
+      var popUp = new DefaultShell("SonarQube Server - No matching open project found");
       new DefaultLink(popUp, "Open Troubleshooting documentation").click();
       bindProjectFromContextMenu(rootProject, MAVEN_TAINT_PROJECT_KEY);
       triggerOpenInIDE(orchestrator.getServer().getUrl(), branch.getName(), s101.getKey());
@@ -309,7 +309,7 @@ public void test_open_in_ide_assist_automated_binding() throws IOException, Inte
 
   private void closeTaintPopupIfAny() {
     try {
-      new DefaultShell("SonarLint - Taint vulnerability found").close();
+      new DefaultShell("SonarQube - Taint vulnerability found").close();
     } catch (CoreLayerException notFound) {
 
     }
@@ -326,7 +326,7 @@ public void test_open_in_ide_when_project_already_bound() throws IOException, In
     var rootProject = importExistingProjectIntoWorkspace("java/maven-taint", MAVEN_TAINT_PROJECT_KEY);
     createConnectionAndBindProject(orchestrator, MAVEN_TAINT_PROJECT_KEY);
     try {
-      new DefaultShell("SonarLint Binding Suggestion").close();
+      new DefaultShell("SonarQube - Binding Suggestion").close();
     } catch (Exception ignored) {
     }
 
diff --git a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/SonarQubeConnectedModeTest.java b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/SonarQubeConnectedModeTest.java
index b5381f4fa..1ae6065b4 100644
--- a/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/SonarQubeConnectedModeTest.java
+++ b/its/org.sonarlint.eclipse.its.connected.sq/src/org/sonarlint/eclipse/its/connected/sq/SonarQubeConnectedModeTest.java
@@ -42,7 +42,6 @@
 import org.eclipse.reddeer.swt.impl.link.DefaultLink;
 import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
 import org.eclipse.reddeer.swt.impl.menu.ContextMenuItem;
-import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
 import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.eclipse.reddeer.workbench.impl.editor.DefaultEditor;
 import org.eclipse.reddeer.workbench.impl.editor.Marker;
@@ -172,7 +171,7 @@ public void configureServerFromNewWizard() {
     wizard.next();
 
     // as login can take time, wait for the next page to appear
-    new WaitUntil(new WidgetIsFound(Label.class, new WithTextMatcher("SonarQube Connection Identifier")));
+    new WaitUntil(new WidgetIsFound(Label.class, new WithTextMatcher("SonarQube Server Connection Identifier")));
     var connectionNamePage = new ServerConnectionWizard.ConnectionNamePage(wizard);
 
     assertThat(connectionNamePage.getConnectionName()).isEqualTo("127.0.0.1");
@@ -241,7 +240,7 @@ public void shouldFindSecretsInConnectedMode() {
     createConnectionAndBindProject(orchestrator, SECRET_JAVA_PROJECT_NAME);
 
     // Remove binding suggestion notification
-    new DefaultLink(shellByName("SonarLint Binding Suggestion").get(), "Don't ask again").click();
+    new DefaultLink(shellByName("SonarQube - Binding Suggestion").get(), "Don't ask again").click();
 
     waitForAnalysisReady(SECRET_JAVA_PROJECT_NAME);
 
@@ -249,7 +248,7 @@ public void shouldFindSecretsInConnectedMode() {
     waitForMarkers(new DefaultEditor(),
       tuple("Make sure this AWS Secret Access Key gets revoked, changed, and removed from the code.", 4));
 
-    shellByName("SonarLint - Secret(s) detected").ifPresent(shell -> {
+    shellByName("SonarQube - Secret(s) detected").ifPresent(shell -> {
       assertThat(getNotificationText(shell)).contains(SECRET_JAVA_PROJECT_NAME);
       new DefaultLink(shell, "Dismiss").click();
     });
@@ -267,13 +266,13 @@ public void shareConnectedModeConfiguration() {
     createConnectionAndBindProject(orchestrator, JAVA_SIMPLE_PROJECT_KEY);
 
     // Remove binding suggestion notification
-    shellByName("SonarLint Binding Suggestion")
+    shellByName("SonarQube - Binding Suggestion")
       .ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
 
     waitForAnalysisReady(JAVA_SIMPLE_PROJECT_KEY);
 
     // Share Connected Mode configuration
-    new ContextMenu(project.getTreeItem()).getItem("SonarLint", "Share Binding...").select();
+    new ContextMenu(project.getTreeItem()).getItem("SonarQube", "Share Binding...").select();
     new WaitUntil(new ShareConnectedModeConfigurationDialogOpened());
 
     var dialog = new ShareConnectedModeConfigurationDialog();
@@ -293,7 +292,7 @@ public void shouldAutomaticallyUpdateRuleSetWhenChangedOnServer() throws Excepti
     createConnectionAndBindProject(orchestrator, JAVA_SIMPLE_PROJECT_KEY);
 
     // Remove binding suggestion notification
-    shellByName("SonarLint Binding Suggestion")
+    shellByName("SonarQube - Binding Suggestion")
       .ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
 
     waitForAnalysisReady(JAVA_SIMPLE_PROJECT_KEY);
@@ -352,7 +351,7 @@ public void check_grouping() {
     createConnectionAndBindProject(orchestrator, JAVA_SIMPLE_PROJECT_KEY);
 
     // Remove binding suggestion notification
-    new DefaultLink(shellByName("SonarLint Binding Suggestion").get(), "Don't ask again").click();
+    new DefaultLink(shellByName("SonarQube - Binding Suggestion").get(), "Don't ask again").click();
 
     waitForAnalysisReady(JAVA_SIMPLE_PROJECT_KEY);
 
@@ -428,7 +427,7 @@ public void test_MarkIssueAs_Dialog() {
       INSUFFICIENT_PERMISSION_USER);
 
     // 7) Remove binding suggestion notification
-    new DefaultLink(shellByName("SonarLint Binding Suggestion").get(), "Don't ask again").click();
+    new DefaultLink(shellByName("SonarQube - Binding Suggestion").get(), "Don't ask again").click();
 
     waitForAnalysisReady(MAVEN2_PROJECT_KEY);
 
@@ -471,7 +470,7 @@ public void test_MarkIssueAs_Dialog() {
     doAndWaitForSonarLintAnalysisJob(dialog::ok);
 
     // 12) Remove marked as resolved notification
-    new DefaultLink(shellByName("SonarLint - Issue marked as resolved").get(), "Dismiss").click();
+    new DefaultLink(shellByName("SonarQube - Issue marked as resolved").get(), "Dismiss").click();
 
     // 13) Assert marker is gone
     await().until(() -> onTheFlyView.getIssues(ISSUE_MATCHER), List<SonarLintIssueMarker>::isEmpty);
@@ -516,14 +515,14 @@ public void test_new_code_period_preference() {
     // 3) bind to project on SonarQube / check issues and taint vulnerabilities exist
     createConnectionAndBindProject(orchestrator, MAVEN_TAINT_PROJECT_KEY, Server.ADMIN_LOGIN, Server.ADMIN_PASSWORD);
 
-    new DefaultLink(shellByName("SonarLint Binding Suggestion").get(), "Don't ask again").click();
+    new DefaultLink(shellByName("SonarLint - Binding Suggestion").get(), "Don't ask again").click();
 
     waitForAnalysisReady(MAVEN_TAINT_PROJECT_KEY);
 
     await().untilAsserted(() -> assertThat(onTheFlyView.getItems()).hasSize(2));
     await().untilAsserted(() -> assertThat(taintVulnerabilitiesView.getItems()).hasSize(1));
 
-    new DefaultLink(shellByName("SonarLint - Taint vulnerability found").get(), "Show in view").click();
+    new DefaultLink(shellByName("SonarQube - Taint vulnerability found").get(), "Show in view").click();
 
     // 4) unbind project / set new code period to "previous version" / run second analysis with a new version
     var bindingsView = new BindingsView();
@@ -584,7 +583,7 @@ public void test_Java_Python_DBD() {
 
     // 3) bind to project on SonarQube / check issues exist now
     createConnectionAndBindProject(orchestrator, DBD_PROJECT_KEY, Server.ADMIN_LOGIN, Server.ADMIN_PASSWORD);
-    shellByName("SonarLint Binding Suggestion").ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
+    shellByName("SonarQube - Binding Suggestion").ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
 
     openFileAndWaitForAnalysisCompletion(rootProject.getResource("dbd.py"));
     waitForSonarLintMarkers(onTheFlyView,
@@ -618,16 +617,16 @@ public void test_custom_secrets() {
 
     // 3) bind to project on SonarQube / check issues exist now
     createConnectionAndBindProject(orchestrator, CUSTOM_SECRETS_PROJECT_KEY, Server.ADMIN_LOGIN, Server.ADMIN_PASSWORD);
-    shellByName("SonarLint Binding Suggestion").ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
-
-    shellByName("SonarLint - Secret(s) detected").ifPresent(shell -> {
-      assertThat(getNotificationText(shell)).contains(CUSTOM_SECRETS_PROJECT_KEY);
-      new DefaultLink(shell, "Dismiss").click();
-    });
+    shellByName("SonarQube - Binding Suggestion").ifPresent(shell -> new DefaultLink(shell, "Don't ask again").click());
 
     openFileAndWaitForAnalysisCompletion(rootProject.getResource("Heresy.txt"));
     waitForMarkers(new DefaultEditor(),
       tuple("User-specified secrets should not be disclosed.", 1));
+
+    shellByName("SonarQube - Secret(s) detected").ifPresent(shell -> {
+      assertThat(getNotificationText(shell)).contains(CUSTOM_SECRETS_PROJECT_KEY);
+      shell.close();
+    });
   }
 
   private static QualityProfile getQualityProfile(String projectKey, String qualityProfileName) {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/AbstractSonarLintTest.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/AbstractSonarLintTest.java
index 8bd39479d..ece1bc785 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/AbstractSonarLintTest.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/AbstractSonarLintTest.java
@@ -131,7 +131,7 @@ public static final void cleanupAfterClass() {
     if ("oldest".equals(System.getProperty("target.platform"))) {
       Optional<DefaultShell> dialog;
       do {
-        dialog = shellByName("SonarLint - New Eclipse user survey");
+        dialog = shellByName("SonarQube for Eclipse - New user survey");
         dialog.ifPresent(DefaultShell::close);
       } while (dialog.isPresent());
     }
@@ -146,6 +146,8 @@ public final void cleanup() {
     // this prevents trying to clear the console in the middle of a job
     waitSonarLintAnalysisJobs();
 
+    shellByName("SonarQube for Eclipse - Release Notes").ifPresent(DefaultShell::close);
+
     var consoleView = new SonarLintConsole();
     System.out.println(consoleView.getConsoleView().getConsoleText());
     consoleView.clear();
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ConfirmConnectionCreationDialog.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ConfirmConnectionCreationDialog.java
index 3273c8179..697a808bd 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ConfirmConnectionCreationDialog.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ConfirmConnectionCreationDialog.java
@@ -26,8 +26,8 @@ public class ConfirmConnectionCreationDialog extends DefaultShell {
 
   public ConfirmConnectionCreationDialog(Boolean isSonarCloud) {
     super(isSonarCloud
-      ? "Do you trust this SonarCloud organization?"
-      : "Do you trust this SonarQube server?");
+      ? "Do you trust this SonarQube Cloud organization?"
+      : "Do you trust this SonarQube Server instance?");
     this.isSonarCloud = isSonarCloud;
   }
 
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/EnhancedWithConnectedModeInformationDialog.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/EnhancedWithConnectedModeInformationDialog.java
index 7a5665ea1..a4900214d 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/EnhancedWithConnectedModeInformationDialog.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/EnhancedWithConnectedModeInformationDialog.java
@@ -34,7 +34,7 @@ public void learnMore() {
   }
 
   public void trySonarCloudForFree() {
-    new CustomButton(this, "Try SonarCloud for free").click();
+    new CustomButton(this, "Try SonarQube Cloud for free").click();
   }
 
   public void dontAskAgain() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionAvailableDialog.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionAvailableDialog.java
index 4dd31b361..a809c9cb8 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionAvailableDialog.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionAvailableDialog.java
@@ -26,7 +26,7 @@
 
 public class FixSuggestionAvailableDialog extends DefaultShell {
   public FixSuggestionAvailableDialog(Integer index, Integer all) {
-    super(String.format("SonarLint Fix Suggestion (%d/%d)", index + 1, all));
+    super(String.format("SonarQube Fix Suggestion (%d/%d)", index + 1, all));
   }
 
   public void applyTheChange() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionUnavailableDialog.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionUnavailableDialog.java
index 76ad9de80..789ff5988 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionUnavailableDialog.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/FixSuggestionUnavailableDialog.java
@@ -26,7 +26,7 @@
 
 public class FixSuggestionUnavailableDialog extends DefaultShell {
   public FixSuggestionUnavailableDialog(Integer index, Integer all) {
-    super(String.format("SonarLint Fix Suggestion (%d/%d)", index + 1, all));
+    super(String.format("SonarQube Fix Suggestion (%d/%d)", index + 1, all));
   }
 
   public void proceed() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ProjectSelectionDialog.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ProjectSelectionDialog.java
index b147f23ab..d5809827a 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ProjectSelectionDialog.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/ProjectSelectionDialog.java
@@ -26,7 +26,7 @@
 
 public class ProjectSelectionDialog extends DefaultShell {
   public ProjectSelectionDialog() {
-    super("SonarLint - Project Selection");
+    super("SonarQube for Eclipse - Project Selection");
   }
 
   public void filterProjectName(String projectName) {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/TrustButton.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/TrustButton.java
index 37c6788be..5786419f7 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/TrustButton.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/dialogs/TrustButton.java
@@ -32,8 +32,8 @@ public TrustButton(ReferencedComposite referencedComposite, int index, boolean i
     super(referencedComposite,
       index,
       isSonarCloud
-        ? "Connect to SonarCloud"
-        : "Connect to this SonarQube server",
+        ? "Connect to SonarQube Cloud"
+        : "Connect to this SonarQube Server instance",
       SWT.PUSH);
   }
 }
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/FileExclusionsPreferences.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/FileExclusionsPreferences.java
index 9a67ead62..0d9c9d95a 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/FileExclusionsPreferences.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/FileExclusionsPreferences.java
@@ -34,7 +34,7 @@ public class FileExclusionsPreferences extends PropertyPage {
   private static final String VALUE_COL = "Value";
 
   public FileExclusionsPreferences(ReferencedComposite referencedComposite) {
-    super(referencedComposite, new String[] {"SonarLint", "File Exclusions"});
+    super(referencedComposite, new String[] {"SonarQube", "File Exclusions"});
   }
 
   public void add(String exclusion) {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/ReleaseNotesPreferences.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/ReleaseNotesPreferences.java
index b53a62568..45ad368d0 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/ReleaseNotesPreferences.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/ReleaseNotesPreferences.java
@@ -30,7 +30,7 @@
 
 public class ReleaseNotesPreferences extends PropertyPage {
   public ReleaseNotesPreferences(WorkbenchPreferenceDialog preferenceDialog) {
-    super(preferenceDialog, "SonarLint", "Release Notes");
+    super(preferenceDialog, "SonarQube", "Release Notes");
   }
 
   public void cancel() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/RuleConfigurationPreferences.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/RuleConfigurationPreferences.java
index e4690a24a..66733c1ba 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/RuleConfigurationPreferences.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/RuleConfigurationPreferences.java
@@ -34,7 +34,7 @@
 public class RuleConfigurationPreferences extends PropertyPage {
 
   public RuleConfigurationPreferences(WorkbenchPreferenceDialog preferenceDialog) {
-    super(preferenceDialog, "SonarLint", "Rules Configuration");
+    super(preferenceDialog, "SonarQube", "Rules Configuration");
   }
 
   public void add(String exclusion) {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintPreferences.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintPreferences.java
index 1d7b10231..877419d65 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintPreferences.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintPreferences.java
@@ -28,7 +28,7 @@
 import org.eclipse.reddeer.swt.impl.text.DefaultText;
 
 public class SonarLintPreferences extends PropertyPage {
-  public static final String NAME = "SonarLint";
+  public static final String NAME = "SonarQube";
 
   public SonarLintPreferences(ReferencedComposite referencedComposite) {
     super(referencedComposite, NAME);
@@ -39,15 +39,15 @@ public void setTestFileRegularExpressions(String regex) {
   }
 
   public void setMarkersSeverity(MarkerSeverity severity) {
-    new DefaultCombo(this, new WithLabelMatcher("SonarLint markers severity:")).setSelection(severity.getTextInCombo());
+    new DefaultCombo(this, new WithLabelMatcher("SonarQube markers severity:")).setSelection(severity.getTextInCombo());
   }
 
   public void setShowAllMarkers(boolean showAllMarkers) {
-    new CheckBox(this, new WithTextMatcher("Show SonarLint markers for resolved issues as well")).toggle(showAllMarkers);
+    new CheckBox(this, new WithTextMatcher("Show SonarQube markers for resolved issues as well")).toggle(showAllMarkers);
   }
 
   public void setFocusOnNewCode(boolean focusOnNewCode) {
-    new CheckBox(this, new WithTextMatcher("Show SonarLint markers only for new code")).toggle(focusOnNewCode);
+    new CheckBox(this, new WithTextMatcher("Show SonarQube markers only for new code")).toggle(focusOnNewCode);
   }
 
   public enum MarkerSeverity {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintProperties.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintProperties.java
index 008f9ccda..2554525c3 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintProperties.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/preferences/SonarLintProperties.java
@@ -29,7 +29,7 @@
 
 public class SonarLintProperties extends PropertyPage {
 
-  public static final String NAME = "SonarLint";
+  public static final String NAME = "SonarQube";
 
   public SonarLintProperties(ReferencedComposite referencedComposite) {
     super(referencedComposite, NAME);
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/BindingsView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/BindingsView.java
index a078db90e..18a45ac3c 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/BindingsView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/BindingsView.java
@@ -35,14 +35,14 @@
 public class BindingsView extends WorkbenchView {
 
   public BindingsView() {
-    super("SonarLint Bindings");
+    super("SonarQube Bindings");
   }
 
   public boolean isBindingEmpty() {
     activate();
     try {
       new DefaultLink(cTabItem, new WithTextMatcher(
-        "<a>Connect to SonarQube/SonarCloud...</a>"));
+        "<a>Connect to SonarQube (Server, Cloud)...</a>"));
       return true;
     } catch (CoreLayerException e) {
       return false;
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/IssueLocationsView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/IssueLocationsView.java
index 508b77e0e..73f7c4648 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/IssueLocationsView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/IssueLocationsView.java
@@ -26,7 +26,7 @@
 public class IssueLocationsView extends WorkbenchView {
 
   public IssueLocationsView() {
-    super("SonarLint Issue Locations");
+    super("SonarQube Issue Locations");
   }
 
   public Tree getTree() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/OnTheFlyView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/OnTheFlyView.java
index 122017421..9bcfa90b8 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/OnTheFlyView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/OnTheFlyView.java
@@ -41,7 +41,7 @@
 public class OnTheFlyView extends AbstractMarkersSupportView {
 
   public OnTheFlyView() {
-    super("SonarLint On-The-Fly");
+    super("SonarQube On-The-Fly");
   }
 
   public List<TreeItem> getItems() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/ReportView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/ReportView.java
index 88770c446..02676e18d 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/ReportView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/ReportView.java
@@ -32,7 +32,7 @@
 public class ReportView extends AbstractMarkersSupportView {
 
   public ReportView() {
-    super("SonarLint Report");
+    super("SonarQube Report");
   }
 
   public List<TreeItem> getItems() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/RuleDescriptionView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/RuleDescriptionView.java
index 2f1d8bda9..c5b2f14cd 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/RuleDescriptionView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/RuleDescriptionView.java
@@ -33,7 +33,7 @@
 
 public class RuleDescriptionView extends WorkbenchView {
   public RuleDescriptionView() {
-    super("SonarLint Rule Description");
+    super("SonarQube Rule Description");
   }
 
   public Label getRuleName() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintConsole.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintConsole.java
index 03cea1595..d9858f8b9 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintConsole.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintConsole.java
@@ -34,7 +34,7 @@ public class SonarLintConsole {
   public SonarLintConsole() {
     consoleView = new ConsoleView();
     // Console name starts with a sequence number that we can't forsee
-    openConsole(StringEndsWith.endsWith("SonarLint Console"));
+    openConsole(StringEndsWith.endsWith("SonarQube Console"));
   }
 
   public ConsoleView getConsoleView() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintTaintVulnerabilitiesView.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintTaintVulnerabilitiesView.java
index 9f3ba3fd7..d3f79dc7c 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintTaintVulnerabilitiesView.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/views/SonarLintTaintVulnerabilitiesView.java
@@ -31,7 +31,7 @@
 
 public class SonarLintTaintVulnerabilitiesView extends AbstractMarkersSupportView {
   public SonarLintTaintVulnerabilitiesView() {
-    super("SonarLint Taint Vulnerabilities");
+    super("SonarQube Taint Vulnerabilities");
   }
 
   public List<TreeItem> getItems() {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ProjectBindingWizard.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ProjectBindingWizard.java
index 7fe37d2d2..ebd3c6116 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ProjectBindingWizard.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ProjectBindingWizard.java
@@ -30,7 +30,7 @@
 
 public class ProjectBindingWizard extends WizardDialog {
   public ProjectBindingWizard() {
-    super(new DefaultShell("Bind to a SonarQube or SonarCloud project"));
+    super(new DefaultShell("Bind to a SonarQube (Server, Cloud) project"));
   }
 
   public static class BoundProjectsPage extends WizardPage {
diff --git a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ServerConnectionWizard.java b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ServerConnectionWizard.java
index 3668d7f53..cf49a0f7c 100644
--- a/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ServerConnectionWizard.java
+++ b/its/org.sonarlint.eclipse.its.shared/src/org/sonarlint/eclipse/its/shared/reddeer/wizards/ServerConnectionWizard.java
@@ -34,7 +34,7 @@
 
 public class ServerConnectionWizard extends NewMenuWizard {
   public ServerConnectionWizard() {
-    super("Connect to SonarQube or SonarCloud", "SonarLint", "New SonarQube/SonarCloud Connection");
+    super("Connect to SonarQube (Server, Cloud)", "SonarQube", "New SonarQube (Server, Cloud) Connection");
   }
 
   public static class ServerTypePage extends WizardPage {
diff --git a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/FileExclusionsTest.java b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/FileExclusionsTest.java
index eba6a9b5e..b6393d12b 100644
--- a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/FileExclusionsTest.java
+++ b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/FileExclusionsTest.java
@@ -57,15 +57,15 @@ public void should_exclude_file() throws Exception {
 
     // Exclude file
     helloFile.select();
-    new ContextMenu(helloFile.getTreeItem()).getItem("SonarLint", "Exclude").select();
+    new ContextMenu(helloFile.getTreeItem()).getItem("SonarQube", "Exclude").select();
 
     // ensure issues markers are cleared even before the next analysis
-    new WaitUntil(new OnTheFlyViewIsEmpty(issuesView), TimePeriod.DEFAULT);
+    new WaitUntil(new OnTheFlyViewIsEmpty(issuesView), TimePeriod.getCustom(30));
     waitForNoSonarLintMarkers(issuesView);
 
     helloFile.select();
-    assertThat(new ContextMenuItem("SonarLint", "Exclude").isEnabled()).isFalse();
-    assertThat(new ContextMenuItem("SonarLint", "Analyze").isEnabled()).isFalse();
+    assertThat(new ContextMenuItem("SonarQube", "Exclude").isEnabled()).isFalse();
+    assertThat(new ContextMenuItem("SonarQube", "Analyze").isEnabled()).isFalse();
 
     // reopen the file to ensure issue doesn't come back
     openFileAndWaitForAnalysisCompletion(helloFile);
@@ -81,7 +81,7 @@ public void should_exclude_file() throws Exception {
     // Clear the preference when running tests locally in developper env
     ConfigurationScope.INSTANCE.getNode(UI_PLUGIN_ID).remove(PREF_SKIP_CONFIRM_ANALYZE_MULTIPLE_FILES);
     rootProject.select();
-    new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select();
+    new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select();
 
     doAndWaitForSonarLintAnalysisJob(() -> new OkButton(shellByName("Confirmation").get()).click());
     waitForNoSonarLintMarkers(issuesView);
diff --git a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/SecretsTest.java b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/SecretsTest.java
index cd796676b..531418aee 100644
--- a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/SecretsTest.java
+++ b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/SecretsTest.java
@@ -45,7 +45,7 @@ public void shouldFindSecretsInTextFiles() {
     waitForMarkers(new DefaultEditor(),
       tuple("Make sure this AWS Secret Access Key gets revoked, changed, and removed from the code.", 3));
 
-    shellByName("SonarLint - Secret(s) detected").ifPresent(shell -> {
+    shellByName("SonarQube - Secret(s) detected").ifPresent(shell -> {
       assertThat(getNotificationText(shell)).contains(SECRET_IN_TEXT_FILE);
       new DefaultLink(shell, "Dismiss").click();
     });
@@ -60,7 +60,7 @@ public void shouldFindSecretsInSourceFiles() {
     waitForMarkers(new DefaultEditor(),
       tuple("Make sure this AWS Secret Access Key gets revoked, changed, and removed from the code.", 4));
 
-    shellByName("SonarLint - Secret(s) detected").ifPresent(shell -> {
+    shellByName("SonarQube - Secret(s) detected").ifPresent(shell -> {
       assertThat(getNotificationText(shell)).contains(SECRET_JAVA);
       new DefaultLink(shell, "Dismiss").click();
     });
diff --git a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneAnalysisTest.java b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneAnalysisTest.java
index 33144f7c2..6cec863a9 100644
--- a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneAnalysisTest.java
+++ b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneAnalysisTest.java
@@ -183,32 +183,32 @@ public void analyzeProjectWithMissingLanguageAnalyzers() {
     var abapFile = rootProject.getResource("Test.abap");
     openFileAndWaitForAnalysisCompletion(abapFile);
 
-    var notAnalyzedOpt = shellByName("SonarLint - Language could not be analyzed");
+    var notAnalyzedOpt = shellByName("SonarQube for Eclipse - Language could not be analyzed");
     notAnalyzedOpt.ifPresent(shell -> new DefaultLink(shell, "Learn more").click());
-    notAnalyzedOpt.ifPresent(shell -> new DefaultLink(shell, "Try SonarCloud for free").click());
+    notAnalyzedOpt.ifPresent(shell -> new DefaultLink(shell, "Try SonarQube Cloud for free").click());
     notAnalyzedOpt.ifPresent(DefaultShell::close);
 
-    new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select();
+    new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select();
     new WaitUntil(new EnhancedWithConnectedModeInformationDialogOpened(dialogTitle));
     var dialog = new EnhancedWithConnectedModeInformationDialog(dialogTitle);
     doAndWaitForSonarLintAnalysisJob(dialog::learnMore);
 
     // THe project contains multiple languages, therefore the shell name slightly differs
-    notAnalyzedOpt = shellByName("SonarLint - Languages could not be analyzed");
+    notAnalyzedOpt = shellByName("SonarQube for Eclipse - Languages could not be analyzed");
     notAnalyzedOpt.ifPresent(shell -> new DefaultLink(shell, "Don't show again").click());
 
-    new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select();
+    new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select();
     new WaitUntil(new EnhancedWithConnectedModeInformationDialogOpened(dialogTitle));
     var dialog2 = new EnhancedWithConnectedModeInformationDialog(dialogTitle);
     doAndWaitForSonarLintAnalysisJob(dialog2::trySonarCloudForFree);
 
-    new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select();
+    new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select();
     new WaitUntil(new EnhancedWithConnectedModeInformationDialogOpened(dialogTitle));
     var dialog3 = new EnhancedWithConnectedModeInformationDialog(dialogTitle);
     doAndWaitForSonarLintAnalysisJob(dialog3::dontAskAgain);
 
     doAndWaitForSonarLintAnalysisJob(
-      () -> new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select());
+      () -> new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select());
   }
 
   @Test
@@ -268,7 +268,7 @@ public void shouldAnalyseJava() {
     var reportView = new ReportView();
 
     // Trigger manual analysis of a single file (should only add markers to the report view)
-    doAndWaitForSonarLintAnalysisJob(() -> new ContextMenu(helloJavaFile.getTreeItem()).getItem("SonarLint", "Analyze").select());
+    doAndWaitForSonarLintAnalysisJob(() -> new ContextMenu(helloJavaFile.getTreeItem()).getItem("SonarQube", "Analyze").select());
     waitForNoMarkers(textEditor);
 
     // TODO: Implement for ReportView
@@ -283,7 +283,7 @@ public void shouldAnalyseJava() {
 
     // Trigger manual analysis of all files
     rootProject.select();
-    new ContextMenu(rootProject.getTreeItem()).getItem("SonarLint", "Analyze").select();
+    new ContextMenu(rootProject.getTreeItem()).getItem("SonarQube", "Analyze").select();
     new WaitUntil(new ConfirmManualAnalysisDialogOpened());
     doAndWaitForSonarLintAnalysisJob(() -> new ConfirmManualAnalysisDialog().ok());
     waitForNoMarkers(textEditor);
diff --git a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneSharedConnectedModeTest.java b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneSharedConnectedModeTest.java
index 4b8dd2db4..354fbe318 100644
--- a/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneSharedConnectedModeTest.java
+++ b/its/org.sonarlint.eclipse.its.standalone/src/org/sonarlint/eclipse/its/standalone/StandaloneSharedConnectedModeTest.java
@@ -43,9 +43,9 @@ public class StandaloneSharedConnectedModeTest extends AbstractSonarLintTest {
   private static final String GRADLE_SUB_PROJECT = "gradle-sub-project";
   private static final String GRADLE_MAVEN_MIXED_PROJECT = "MixedProjectMavenSide";
 
-  private static final String SHELL_NAME_SONARQUBE = "SonarLint Connection Suggestion to SonarQube";
-  private static final String SHELL_NAME_SONARCLOUD = "SonarLint Connection Suggestion to SonarCloud";
-  private static final String SHELL_NAME_MULTIPLE = "SonarLint Multiple Connection Suggestions found";
+  private static final String SHELL_NAME_SONARQUBE = "Connection Suggestion to SonarQube Server";
+  private static final String SHELL_NAME_SONARCLOUD = "Connection Suggestion to SonarQube Cloud";
+  private static final String SHELL_NAME_MULTIPLE = "SonarQube - Multiple Connection Suggestions found";
 
   // When one test fails it shouldn't let following tests fail due to the pop-ups staying.
   @After
@@ -61,17 +61,31 @@ public void single_project_Gradle() {
 
     importExistingGradleProjectIntoWorkspace("java/gradle-project", GRADLE_PROJECT);
 
-    var shellOpt = shellByName("SonarLint Connection Suggestion to SonarQube");
+    var shellOpt = shellByName(SHELL_NAME_SONARQUBE);
     try {
       assertThat(shellOpt).isNotEmpty();
+      var shell = shellOpt.get();
 
-      assertThat(getNotificationText(shellOpt.get()))
-        .contains(LOCAL_SONARQUBE)
-        .contains(GRADLE_GROUP + ":" + GRADLE_PROJECT)
-        .contains("local project '" + GRADLE_PROJECT);
+      assertThat(getNotificationText(shell))
+        .contains(LOCAL_SONARQUBE);
+
+      // Sadly the Gradle integration is very slow and error-prone here. Not every time it sees the projects being
+      // connected and therefore loads them sometimes correctly as one project, sometimes as two projects with a job
+      // joining them together afterwards. The second case is too slow for the SonarLint backend and therefore flaky on
+      // the CI (but can be witnessed locally as well sometimes), that's why we catch it here just in case: The
+      // SonarLint integration is working correctly as expected in both situations, the Gradle integration just isn't.
+      assertThat(getNotificationText(shell)).satisfiesAnyOf(
+        list -> assertThat(list).contains("local project '" + GRADLE_ROOT_PROJECT),
+        list -> assertThat(list).contains("local project '" + GRADLE_SUB_PROJECT),
+        list -> assertThat(list).contains("local project '" + GRADLE_PROJECT));
     } finally {
-      shellOpt.ifPresent(DefaultShell::close);
+      shellOpt.ifPresent(shell -> {
+        if (!shell.getControl().isDisposed()) {
+          shell.close();
+        }
+      });
     }
+    shellByName(SHELL_NAME_SONARQUBE).ifPresent(DefaultShell::close);
   }
 
   @Test
@@ -80,7 +94,7 @@ public void multi_project_Gradle() {
 
     importExistingGradleProjectIntoWorkspace("java/gradle-root-project", GRADLE_ROOT_PROJECT);
 
-    var firstShell = shellByName("SonarLint Connection Suggestion to SonarQube");
+    var firstShell = shellByName(SHELL_NAME_SONARQUBE);
     try {
       assertThat(firstShell).isNotEmpty();
       assertThat(getNotificationText(firstShell.get()))
@@ -98,9 +112,13 @@ public void multi_project_Gradle() {
           list -> assertThat(list).contains("local project '" + GRADLE_SUB_PROJECT));
       }
     } finally {
-      firstShell.ifPresent(DefaultShell::close);
-      shellByName("SonarLint Connection Suggestion to SonarQube").ifPresent(DefaultShell::close);
+      firstShell.ifPresent(shell -> {
+        if (!shell.getControl().isDisposed()) {
+          shell.close();
+        }
+      });
     }
+    shellByName(SHELL_NAME_SONARQUBE).ifPresent(DefaultShell::close);
   }
 
   // Mixed Gradle/Maven project containing two different shared Connected Mode configurations
@@ -110,7 +128,7 @@ public void mixed_Gradle_Maven_project() {
 
     importExistingProjectIntoWorkspace("java/gradle-maven-mixed", GRADLE_MAVEN_MIXED_PROJECT);
 
-    var shellOpt = shellByName("SonarLint Multiple Connection Suggestions found");
+    var shellOpt = shellByName(SHELL_NAME_MULTIPLE);
     try {
       assertThat(shellOpt).isNotEmpty();
 
@@ -134,5 +152,6 @@ public void mixed_Gradle_Maven_project() {
         }
       });
     }
+    shellByName(SHELL_NAME_MULTIPLE).ifPresent(DefaultShell::close);
   }
 }
diff --git a/org.sonarlint.eclipse.core.tests/src/test/java/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotificationsTest.java b/org.sonarlint.eclipse.core.tests/src/test/java/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotificationsTest.java
index 08bb81722..862cd96cf 100644
--- a/org.sonarlint.eclipse.core.tests/src/test/java/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotificationsTest.java
+++ b/org.sonarlint.eclipse.core.tests/src/test/java/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotificationsTest.java
@@ -59,8 +59,8 @@ public void notifyIfSkippedLanguage_JRE() {
       .isEqualTo(
         List.of(new Notification(
           "Analyzer Requirement",
-          "SonarLint failed to analyze Java code",
-          "SonarLint requires Java runtime version 11 or later to analyze Java code. Current version is 1.8.\n" +
+          "SonarQube for Eclipse failed to analyze Java code",
+          "SonarQube for Eclipse requires Java runtime version 11 or later to analyze Java code. Current version is 1.8.\n" +
             "See <a href=\"https://wiki.eclipse.org/Eclipse.ini#Specifying_the_JVM\">the Eclipse Wiki</a> to configure your IDE to run with a more recent JRE.")));
   }
 
@@ -70,9 +70,9 @@ public void notifyIfSkippedLanguage_Node() {
     assertThat(notifications).usingRecursiveComparison().isEqualTo(
       List.of(new Notification(
         "Analyzer Requirement",
-        "SonarLint failed to analyze JavaScript code",
-        "SonarLint requires Node.js runtime version 8.0 or later to analyze JavaScript code. Current version is 7.2.\n" +
-          "Please configure the Node.js path in the <a href=\"#edit-settings\">SonarLint settings</a>.")));
+        "SonarQube for Eclipse failed to analyze JavaScript code",
+        "SonarQube for Eclipse requires Node.js runtime version 8.0 or later to analyze JavaScript code. Current version is 7.2.\n" +
+          "Please configure the Node.js path in the <a href=\"#edit-settings\">SonarQube settings</a>.")));
   }
 
 }
diff --git a/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/SonarLintNotifications.java b/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/SonarLintNotifications.java
index 411e9ce5a..25983dad3 100644
--- a/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/SonarLintNotifications.java
+++ b/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/SonarLintNotifications.java
@@ -56,11 +56,11 @@ public void showNotificationIfFirstSecretDetected(ISonarLintProject project) {
     if (SonarLintGlobalConfiguration.secretsNeverDetected()) {
       SonarLintNotifications.get().showNotification(new SonarLintNotifications.Notification(
         "Secret(s) detected",
-        "SonarLint detected secrets in the open files of the project '" + project.getName() + "'.",
-        "SonarLint detected secrets in one of the open files of the project '" + project.getName() + "'. " +
+        "SonarQube detected secrets in the open files of the project '" + project.getName() + "'.",
+        "SonarQube detected secrets in one of the open files of the project '" + project.getName() + "'. " +
           "We strongly advise you to review those secrets " +
           "and ensure they are not committed into repositories. " +
-          "Please refer to the SonarLint On-The-Fly view for more information."));
+          "Please refer to the SonarQube On-The-Fly view for more information."));
       SonarLintGlobalConfiguration.setSecretsWereDetected();
     }
   }
diff --git a/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotifications.java b/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotifications.java
index 3ac98f768..dfd60a448 100644
--- a/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotifications.java
+++ b/org.sonarlint.eclipse.core/src/org/sonarlint/eclipse/core/internal/engine/AnalysisRequirementNotifications.java
@@ -42,21 +42,21 @@ public static void resetCachedMessages() {
   public static void notifyOnceForSkippedPlugins(org.sonarsource.sonarlint.core.rpc.protocol.common.Language analyzedSkippedLanguage, SkipReason skipReason, String minVersion,
     @Nullable String currentVersion) {
     var languageWithLabel = Language.valueOf(analyzedSkippedLanguage.name());
-    final var shortMsg = "SonarLint failed to analyze " + languageWithLabel.getLabel() + " code";
+    final var shortMsg = "SonarQube for Eclipse failed to analyze " + languageWithLabel.getLabel() + " code";
     if (skipReason == SkipReason.UNSATISFIED_JRE) {
       var content = String.format(
-        "SonarLint requires Java runtime version %s or later to analyze %s code. "
+        "SonarQube for Eclipse requires Java runtime version %s or later to analyze %s code. "
           + "Current version is %s.\n"
           + "See <a href=\"https://wiki.eclipse.org/Eclipse.ini#Specifying_the_JVM\">the Eclipse Wiki</a> to configure your IDE to run with a more recent JRE.",
         minVersion, languageWithLabel.getLabel(), currentVersion);
       createNotificationOnce(shortMsg, content);
     } else if (skipReason == SkipReason.UNSATISFIED_NODE_JS) {
       var content = new StringBuilder(
-        String.format("SonarLint requires Node.js runtime version %s or later to analyze %s code.", minVersion, languageWithLabel.getLabel()));
+        String.format("SonarQube for Eclipse requires Node.js runtime version %s or later to analyze %s code.", minVersion, languageWithLabel.getLabel()));
       if (currentVersion != null) {
         content.append(String.format(" Current version is %s.", currentVersion));
       }
-      content.append("\nPlease configure the Node.js path in the <a href=\"#edit-settings\">SonarLint settings</a>.");
+      content.append("\nPlease configure the Node.js path in the <a href=\"#edit-settings\">SonarQube settings</a>.");
       createNotificationOnce(shortMsg, content.toString());
     }
   }
diff --git a/org.sonarlint.eclipse.ui/OSGI-INF/l10n/bundle.properties b/org.sonarlint.eclipse.ui/OSGI-INF/l10n/bundle.properties
index 7f49381e5..bbf4426e4 100644
--- a/org.sonarlint.eclipse.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.sonarlint.eclipse.ui/OSGI-INF/l10n/bundle.properties
@@ -6,23 +6,23 @@ sonarlint.decorator.name=SonarLint Bound Project Indicator
 sonarlint.decorator.description=Adds an icon decoration to \
   projects bound with a SonarQube/SonarCloud server.
 
-sonar.preference.page.name = SonarLint
+sonar.preference.page.name = SonarQube
 sonar.preference.extraProps.page.name = Analyzer Properties
-sonar.category.view.name = SonarLint
-sonar.category.wizard.name = SonarLint
-sonar.properties.page.name = SonarLint
-sonar.menu.label = SonarLint
+sonar.category.view.name = SonarQube
+sonar.category.wizard.name = SonarQube
+sonar.properties.page.name = SonarQube
+sonar.menu.label = SonarQube
 sonar.marker.name = SonarLint issue
 sonar.marker.specification.label = SonarLint issue
 sonar.consolefactory.label = SonarLint Console
 sonar.actionset.label = SonarLint
 
-sonar.issues.view.name= SonarLint On-The-Fly
+sonar.issues.view.name= SonarQube On-The-Fly
 sonar.issues.view.rulenamefield= Rule name
 sonar.issues.view.rulekeyfield= Rule key
 sonar.issues.view.rulepriorityfield=Rule severity
 sonar.issues.view.serverissuekeyfield= Server issue key
 
-sonar.changesetissues.view.name= SonarLint Report
+sonar.changesetissues.view.name= SonarQube Report
 
-consoleFactory.label = SonarLint Console
+consoleFactory.label = SonarQube Console
diff --git a/org.sonarlint.eclipse.ui/build.properties b/org.sonarlint.eclipse.ui/build.properties
index 0ab94b19a..47e2c99a6 100644
--- a/org.sonarlint.eclipse.ui/build.properties
+++ b/org.sonarlint.eclipse.ui/build.properties
@@ -13,21 +13,3 @@ bin.includes = plugin.xml,\
 jars.compile.order = .
 output.. = target/classes/
 source.. = src/
-bin.excludes = icons/full/eview16/rule.xcf,\
-               icons/full/eview16/rule@2x.xcf,\
-               icons/full/marker_resolution16/showrule.xcf,\
-               icons/full/marker_resolution16/showrule@2x.xcf,\
-               icons/full/annotation16/README,\
-               icons/full/annotation16/hotspot.xcf,\
-               icons/full/annotation16/hotspot@2x.xcf,\
-               icons/full/eview16/hotspots.xcf,\
-               icons/full/eview16/hotspots@2x.xcf,\
-               icons/priority/high.xcf,\
-               icons/priority/low.xcf,\
-               icons/priority/medium.xcf,\
-               icons/full/eview16/vulnerabilities.xcf,\
-               icons/full/eview16/vulnerabilities@2x.xcf,\
-               icons/full/annotation16/vulnerability.xcf,\
-               icons/full/annotation16/vulnerability@2x.xcf,\
-               icons/full/marker_resolution16/quickfix_change.xcf,\
-               icons/full/marker_resolution16/quickfix_change@2x.xcf
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/README b/org.sonarlint.eclipse.ui/icons/full/annotation16/README
deleted file mode 100644
index d32b634c8..000000000
--- a/org.sonarlint.eclipse.ui/icons/full/annotation16/README
+++ /dev/null
@@ -1 +0,0 @@
-Annotation icons should have a margin or they will be truncated in the vertical ruler. 
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot.xcf b/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot.xcf
deleted file mode 100644
index ec6c3390b..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot@2x.xcf
deleted file mode 100644
index 4e4d2e3e7..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/hotspot@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/issue.png b/org.sonarlint.eclipse.ui/icons/full/annotation16/issue.png
index b77e2cd5c..6b8f4a9d8 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/issue.png and b/org.sonarlint.eclipse.ui/icons/full/annotation16/issue.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/issue@2x.png b/org.sonarlint.eclipse.ui/icons/full/annotation16/issue@2x.png
index 8a376ab6c..a05a45078 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/issue@2x.png and b/org.sonarlint.eclipse.ui/icons/full/annotation16/issue@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability.xcf b/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability.xcf
deleted file mode 100644
index f53280c62..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability@2x.xcf
deleted file mode 100644
index 5bac0dcf5..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/annotation16/vulnerability@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/bindings.png b/org.sonarlint.eclipse.ui/icons/full/eview16/bindings.png
index 7f4637c28..9b4e21a6b 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/bindings.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/bindings.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/bindings@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/bindings@2x.png
index dbe3794d8..284956cef 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/bindings@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/bindings@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.png b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.png
index 453d8d95d..9741ed5a1 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.xcf
deleted file mode 100644
index 6f7fdf594..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.png
index e38011647..e4f41ab82 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.xcf
deleted file mode 100644
index 8d006ab17..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/hotspots@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/locations.png b/org.sonarlint.eclipse.ui/icons/full/eview16/locations.png
index 27b7548c2..d437cb4d6 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/locations.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/locations.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/locations@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/locations@2x.png
index bdc7c43b5..0a1ae8566 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/locations@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/locations@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly.png b/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly.png
index db41354fa..6b8f4a9d8 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly@2x.png
index 4965bc41b..a05a45078 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/onthefly@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/report.png b/org.sonarlint.eclipse.ui/icons/full/eview16/report.png
index 0f10a6879..e4c5be252 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/report.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/report.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/report@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/report@2x.png
index e6432fd05..0520d414c 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/report@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/report@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/rule.png b/org.sonarlint.eclipse.ui/icons/full/eview16/rule.png
index 02a66def7..9ac38e318 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/rule.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/rule.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/rule.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/rule.xcf
deleted file mode 100644
index 52d6a8249..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/rule.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.png
index 2af61cf31..63e914bfe 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.xcf
deleted file mode 100644
index defbd03b0..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/rule@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.png b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.png
index a99007e25..239f16bc6 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.xcf
deleted file mode 100644
index cebd8b1d7..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.png b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.png
index b0286a45c..d96526b56 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.png and b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.xcf
deleted file mode 100644
index 38c6b5316..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/eview16/vulnerabilities@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule.png
index d98472ecc..273de2613 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule.png and b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule@2x.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule@2x.png
index e085e9b3d..3660808a8 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule@2x.png and b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/disablerule@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.png
index db7b1c580..e9f22f048 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.png and b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.xcf b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.xcf
deleted file mode 100644
index 462c2d62b..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.png
index f3f4a9353..0a543c4db 100644
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.png and b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.xcf
deleted file mode 100644
index efda84aa6..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/quickfix_change@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations.png
deleted file mode 100644
index 6dbd12cbf..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations.png and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations@2x.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations@2x.png
deleted file mode 100644
index d694bd788..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showlocations@2x.png and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.png
deleted file mode 100644
index 3c4252219..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.png and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.xcf b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.xcf
deleted file mode 100644
index 9681fa0bd..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.png b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.png
deleted file mode 100644
index 6523d2447..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.png and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.xcf b/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.xcf
deleted file mode 100644
index 5666af142..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/full/marker_resolution16/showrule@2x.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarcloud-resolved-16px.png b/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarcloud-resolved-16px.png
index edec1ef52..6dcf1f855 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarcloud-resolved-16px.png and b/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarcloud-resolved-16px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarqube-resolved-16px.png b/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarqube-resolved-16px.png
index 92dddc71b..fbbd6fbac 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarqube-resolved-16px.png and b/org.sonarlint.eclipse.ui/icons/logo/resolved/sonarqube-resolved-16px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-16px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-16px.png
index 65ed089ce..f650e6c1e 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-16px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-16px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-black-256px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-black-256px.png
index 16f93555a..6e87011cf 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-black-256px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarcloud-black-256px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-16px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-16px.png
index db41354fa..6b8f4a9d8 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-16px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-16px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-32px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-32px.png
index 4965bc41b..a05a45078 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-32px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-32px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-64px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-64px.png
index 4d1e4d9b2..dcef1a79e 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-64px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-64px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-black-256x68.png b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-black-256x68.png
index bdcca9b52..24fde8304 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarlint-black-256x68.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarlint-black-256x68.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarqube-16px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarqube-16px.png
index da8464643..a8178ef42 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarqube-16px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarqube-16px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/logo/sonarqube-black-256px.png b/org.sonarlint.eclipse.ui/icons/logo/sonarqube-black-256px.png
index d3e2f384b..68186ce3a 100644
Binary files a/org.sonarlint.eclipse.ui/icons/logo/sonarqube-black-256px.png and b/org.sonarlint.eclipse.ui/icons/logo/sonarqube-black-256px.png differ
diff --git a/org.sonarlint.eclipse.ui/icons/priority/high.xcf b/org.sonarlint.eclipse.ui/icons/priority/high.xcf
deleted file mode 100644
index e10ec8af6..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/priority/high.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/priority/low.xcf b/org.sonarlint.eclipse.ui/icons/priority/low.xcf
deleted file mode 100644
index 88f9ca57a..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/priority/low.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/priority/medium.xcf b/org.sonarlint.eclipse.ui/icons/priority/medium.xcf
deleted file mode 100644
index 091e58e09..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/priority/medium.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/severity/blocker.xcf b/org.sonarlint.eclipse.ui/icons/severity/blocker.xcf
deleted file mode 100644
index 047c5ed50..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/severity/blocker.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/severity/critical.xcf b/org.sonarlint.eclipse.ui/icons/severity/critical.xcf
deleted file mode 100644
index 74a443a0f..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/severity/critical.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/severity/info.xcf b/org.sonarlint.eclipse.ui/icons/severity/info.xcf
deleted file mode 100644
index 60cc964cc..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/severity/info.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/severity/major.xcf b/org.sonarlint.eclipse.ui/icons/severity/major.xcf
deleted file mode 100644
index d8d4dd8c0..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/severity/major.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/severity/minor.xcf b/org.sonarlint.eclipse.ui/icons/severity/minor.xcf
deleted file mode 100644
index cc2fd58ce..000000000
Binary files a/org.sonarlint.eclipse.ui/icons/severity/minor.xcf and /dev/null differ
diff --git a/org.sonarlint.eclipse.ui/icons/svg/sonarlint.svg b/org.sonarlint.eclipse.ui/icons/svg/sonarlint.svg
index 19645f041..58b69095a 100644
--- a/org.sonarlint.eclipse.ui/icons/svg/sonarlint.svg
+++ b/org.sonarlint.eclipse.ui/icons/svg/sonarlint.svg
@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="391" height="390.6"><g transform="translate(-60.2 -60.1)"><defs><path id="a" d="M0 0h512v512H0z"/></defs><clipPath id="b"><use xlink:href="#a" width="100%" height="100%" overflow="visible"/></clipPath><path d="M255.7 450.7c-107.8 0-195.5-87.6-195.5-195.3 0-107.7 87.7-195.3 195.5-195.3s195.5 87.6 195.5 195.3c0 107.7-87.7 195.3-195.5 195.3m0-355.2c-88.2 0-160 71.7-160 159.8 0 88.1 71.8 159.8 160 159.8s160-71.7 160-159.8c0-88.1-71.8-159.8-160-159.8" clip-path="url(#b)" fill="#cb2029"/></g><path d="M332.4 184.8c-5.1-10.2-11.5-23-24.1-23-12.5 0-18.9 12.7-24.1 23-4.8 9.5-7.5 14.5-13.5 14.5s-8.7-5-13.5-14.5c-5.1-10.2-11.5-23-24.1-23-12.6 0-18.9 12.7-24.1 23-4.8 9.5-7.5 14.5-13.5 14.5s-8.7-5-13.5-14.5c-5.1-10.2-11.5-23-24.1-23-12.6 0-18.9 12.7-24.1 23-4.8 9.5-7.5 14.5-13.5 14.5s-8.7-5-13.5-14.5c-5.1-10.2-11.5-23-24.1-23-12.5 0-18.9 12.1-24 22.3 0 0-3.9 8.7-5.6 12.8-1.7 4.1-8.3 19.7-2.3 27.2 3.4 4.2 8.3-1.8 11.1-6.2 2.1-3.4 7.1-13.2 7.1-13.2 5.1-9.1 7.8-14 13.7-14 6 0 8.7 5 13.5 14.5 5.1 10.2 11.5 23 24.1 23 12.5 0 18.9-12.7 24.1-23 4.8-9.5 7.5-14.5 13.5-14.5s8.7 5 13.5 14.5c5.1 10.2 11.5 23 24.1 23 12.5 0 18.9-12.7 24.1-23 4.8-9.5 7.5-14.5 13.5-14.5s8.7 5 13.5 14.5c5.1 10.2 11.5 23 24.1 23 12.6 0 18.9-12.7 24.1-23 4.8-9.5 7.5-14.5 13.5-14.5s8.7 5 13.5 14.5c0 0 2.2 4.3 5.4 9.9 1.4 2.3 6.6 11.1 11.2 10.8 4.1-.3 5.6-13.3 1-24.7-3.1-7.6-7-16.4-7-16.4z" fill="#cb2029"/></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path d="M14.85,8.78c0,.36-.41.57-.7.36-.32-.24-.52-.62-.68-.92-.22-.42-.38-.67-.58-.67s-.35.25-.58.67c-.26.49-.62,1.16-1.38,1.16s-1.12-.67-1.38-1.16c-.22-.42-.37-.67-.58-.67s-.35.25-.57.67c-.26.49-.62,1.16-1.38,1.16s-1.12-.67-1.38-1.16c-.22-.42-.37-.67-.57-.67s-.35.25-.57.67c-.26.49-.62,1.16-1.38,1.16s-1.12-.67-1.38-1.16c-.16-.29-.28-.51-.4-.61-.1-.08-.17-.19-.17-.32v-.07c0-.36.41-.57.7-.36.32.24.52.62.68.92.22.42.37.67.57.67s.35-.25.57-.67c.26-.49.62-1.16,1.38-1.16s1.12.67,1.38,1.16c.22.42.37.67.58.67s.35-.25.57-.67c.26-.49.62-1.16,1.38-1.16s1.12.67,1.38,1.16c.22.42.37.67.58.67s.35-.25.58-.67c.26-.49.62-1.16,1.38-1.16s1.12.67,1.38,1.16c.16.29.28.51.41.61.1.08.17.19.17.32v.07Z" fill="#336ccb"/>
+  <path d="M8.12,15.06c-1.65,0-3.22-.57-4.49-1.61-.2-.17-.22-.48-.04-.67h0c.17-.18.44-.19.62-.04,1.14.95,2.57,1.44,4.07,1.4,1.5-.04,2.9-.61,3.99-1.61.18-.16.45-.16.62,0h0c.19.18.19.49,0,.67-1.25,1.16-2.87,1.81-4.59,1.86-.06,0-.13,0-.19,0Z" fill="#336ccb"/>
+  <path d="M3.35,3.47h0c-.19-.18-.19-.49,0-.67,1.29-1.19,2.93-1.81,4.59-1.85s3.32.49,4.68,1.61c.2.17.22.48.04.67h0c-.17.17-.44.19-.62.04-1.17-.96-2.6-1.43-4.03-1.4s-2.89.57-4.03,1.61c-.18.16-.45.16-.62,0Z" fill="#336ccb"/>
+</svg>
\ No newline at end of file
diff --git a/org.sonarlint.eclipse.ui/intro/RELEASE_NOTES.html b/org.sonarlint.eclipse.ui/intro/RELEASE_NOTES.html
index b048d840e..0766b4933 100644
--- a/org.sonarlint.eclipse.ui/intro/RELEASE_NOTES.html
+++ b/org.sonarlint.eclipse.ui/intro/RELEASE_NOTES.html
@@ -58,6 +58,6 @@ <h2>10.8</h2>
 <div>
 	<h2>Older releases</h2>
 	<p>
-		See the <a href="https://github.com/SonarSource/sonarlint-eclipse/releases">GitHub Release page</a> of SonarLint for Eclipse.
+		See the <a href="https://github.com/SonarSource/sonarlint-eclipse/releases">GitHub Release page</a> of SonarQube for Eclipse.
 	</p>
 </div>
diff --git a/org.sonarlint.eclipse.ui/intro/overviewExtensionContent.xml b/org.sonarlint.eclipse.ui/intro/overviewExtensionContent.xml
index 7ef442064..79319593b 100644
--- a/org.sonarlint.eclipse.ui/intro/overviewExtensionContent.xml
+++ b/org.sonarlint.eclipse.ui/intro/overviewExtensionContent.xml
@@ -8,17 +8,17 @@
     <group labl="SonarLint" style-id="content=group" id="content-group">
       <!-- -->
       <link style-id="content-link"
-            label="SonarLint Release Notes"
+            label="SonarQube for Eclipse Release Notes"
             url="http://org.eclipse.ui.intro/runAction?pluginId=org.sonarlint.eclipse.ui&amp;class=org.sonarlint.eclipse.ui.internal.intro.ShowReleaseNotesAction"
             id="overviewReleaseNotes">
-        <text>Show SonarLint for Eclipse Release Notes</text>
+        <text>Show SonarQube for Eclipse Release Notes</text>
       </link>
       
       <link style-id="content-link"
             label="Sonar Community Forum"
             url="http://org.eclipse.ui.intro/openBrowser?url=https://community.sonarsource.com"
             id="sonarCommunity">
-        <text>Join the Sonar Community Forum, read news, announcements and help us improve SonarLint</text>
+        <text>Join the Sonar Community Forum, read news, announcements and help us improve SonarQube</text>
       </link>
     </group>
   </extensionContent>
diff --git a/org.sonarlint.eclipse.ui/intro/tutorialsExtensionContent.xml b/org.sonarlint.eclipse.ui/intro/tutorialsExtensionContent.xml
index 5ed079512..6a4bbc2fd 100644
--- a/org.sonarlint.eclipse.ui/intro/tutorialsExtensionContent.xml
+++ b/org.sonarlint.eclipse.ui/intro/tutorialsExtensionContent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <introContent>
   <extensionContent id="org.sonarlint.eclipse.ui"
-                    name="SonarLint Tutorials"
+                    name="SonarQube for Eclipse Tutorials"
                     style="../css/welcome_view.css"
                     alt-style="../css/welcome_view.properties"
                     path="tutorials/@">
@@ -11,7 +11,7 @@
             label="Investigating issues"
             url="http://org.eclipse.ui.intro/openBrowser?url=https://docs.sonarsource.com/sonarlint/eclipse/using-sonarlint/investigating-issues/"
             id="investigatingIssues">
-        <text>Learn how to investigate issues found by SonarLint</text>
+        <text>Learn how to investigate issues found by SonarQube for Eclipse</text>
       </link>
       
       <!-- 2) Learn about Connected Mode, setting it up -->
@@ -27,7 +27,7 @@
             label="Troubleshooting"
             url="http://org.eclipse.ui.intro/openBrowser?url=https://docs.sonarsource.com/sonarlint/eclipse/troubleshooting/"
             id="troubleshooting">
-        <text>Learn how to troubleshoot issues related to SonarLint</text>
+        <text>Learn how to troubleshoot issues related to SonarQube for Eclipse</text>
       </link>
     </group>
   </extensionContent>
diff --git a/org.sonarlint.eclipse.ui/intro/whatsNewExtensionContent.xml b/org.sonarlint.eclipse.ui/intro/whatsNewExtensionContent.xml
index 14b64df65..6c47519a7 100644
--- a/org.sonarlint.eclipse.ui/intro/whatsNewExtensionContent.xml
+++ b/org.sonarlint.eclipse.ui/intro/whatsNewExtensionContent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <introContent>
   <extensionContent id="org.sonarlint.eclipse.ui"
-                    name="SonarLint Release Notes"
+                    name="SonarQube for Eclipse Release Notes"
                     style="../css/welcome_view.css"
                     alt-style="../css/welcome_view.properties"
                     path="whatsnew/@">
@@ -10,7 +10,7 @@
             label="SonarLint Release Notes"
             url="http://org.eclipse.ui.intro/runAction?pluginId=org.sonarlint.eclipse.ui&amp;class=org.sonarlint.eclipse.ui.internal.intro.ShowReleaseNotesAction"
             id="releaseNotes">
-        <text>Show SonarLint for Eclipse Release Notes</text>
+        <text>Show SonarQube for Eclipse Release Notes</text>
       </link>
     </group>
   </extensionContent>
diff --git a/org.sonarlint.eclipse.ui/plugin.xml b/org.sonarlint.eclipse.ui/plugin.xml
index 8c8b2fd5d..d5c6647c9 100644
--- a/org.sonarlint.eclipse.ui/plugin.xml
+++ b/org.sonarlint.eclipse.ui/plugin.xml
@@ -81,11 +81,11 @@
 	
 	  <wizard
 	      id="org.sonarlint.eclipse.ui.new.server"
-	      name="New SonarQube/SonarCloud Connection"
+	      name="New SonarQube (Server, Cloud) Connection"
 	      class="org.sonarlint.eclipse.ui.internal.binding.wizard.connection.ServerConnectionWizard"
 	      category="org.sonarlint.eclipse"
 	      icon="icons/full/eview16/bindings.png">
-	    <description>Configure a connection with a SonarQube or SonarCloud server</description>
+	    <description>Configure a connection with SonarQube (Server, Cloud)</description>
 	  </wizard>
 	</extension>
 	
@@ -153,7 +153,7 @@
           class="org.sonarlint.eclipse.ui.internal.views.RuleDescriptionWebView"
           icon="icons/full/eview16/rule.png"
           id="org.sonarlint.eclipse.ui.views.RuleDescriptionWebView"
-          name="SonarLint Rule Description">
+          name="SonarQube Rule Description">
     </view>
     <view
 	        allowMultiple="false"
@@ -161,7 +161,7 @@
           class="org.sonarlint.eclipse.ui.internal.views.locations.IssueLocationsView"
           icon="icons/full/eview16/locations.png"
           id="org.sonarlint.eclipse.ui.views.IssueLocationsView"
-          name="SonarLint Issue Locations">
+          name="SonarQube Issue Locations">
     </view>
     <view
 	        allowMultiple="false"
@@ -169,7 +169,7 @@
 	        class="org.sonarlint.eclipse.ui.internal.binding.BindingsView"
 	        icon="icons/full/eview16/bindings.png"
 	        id="org.sonarlint.eclipse.ui.ServersView"
-	        name="SonarLint Bindings">
+	        name="SonarQube Bindings">
 	  </view>
     <view
 	        allowMultiple="false"
@@ -177,7 +177,7 @@
 	        class="org.sonarlint.eclipse.ui.internal.hotspots.HotspotsView"
 	        icon="icons/full/eview16/hotspots.png"
 	        id="org.sonarlint.eclipse.ui.views.HotspotsView"
-	        name="SonarLint Security Hotspots">
+	        name="SonarQube Security Hotspots">
 	  </view>
     <view
         allowMultiple="false"
@@ -185,15 +185,15 @@
         class="org.sonarlint.eclipse.ui.internal.views.issues.TaintVulnerabilitiesView"
         icon="icons/full/eview16/vulnerabilities.png"
         id="org.sonarlint.eclipse.ui.views.issues.TaintVulnerabilitiesView"
-        name="SonarLint Taint Vulnerabilities">
+        name="SonarQube Taint Vulnerabilities">
     </view>
   </extension>
   
   <extension point="org.eclipse.ui.contexts">
 	  <context
 	    id="org.eclipse.ui.sonarlintServerViewScope"
-	    name="In SonarLint Servers View"
-	    description="In SonarLint Servers View"
+	    name="In SonarQube Bindings View"
+	    description="In SonarQube Bindings View"
 	    parentId="org.eclipse.ui.contexts.window">
 	  </context>
 	</extension>
@@ -866,7 +866,7 @@
             locationURI="popup:org.sonarlint.eclipse.ui.views.issues.IssuesView">
            <command
                  commandId="org.sonarlint.eclipse.ui.internal.command.ShowRuleDescriptionCommand"
-                 icon="icons/full/marker_resolution16/showrule.png"
+                 icon="icons/full/eview16/rule.png"
                  style="push"
                  mnemonic="R">
                  <visibleWhen
@@ -975,7 +975,7 @@
             locationURI="popup:org.sonarlint.eclipse.ui.views.issues.ChangeSetIssuesView">
            <command
                  commandId="org.sonarlint.eclipse.ui.internal.command.ShowRuleDescriptionCommand"
-                 icon="icons/full/marker_resolution16/showrule.png"
+                 icon="icons/full/eview16/rule.png"
                  style="push"
                  mnemonic="R">
                  <visibleWhen
@@ -1163,7 +1163,7 @@
             locationURI="popup:org.sonarlint.eclipse.ui.views.issues.TaintVulnerabilitiesView">
            <command
                  commandId="org.sonarlint.eclipse.ui.internal.command.ShowRuleDescriptionCommand"
-                 icon="icons/full/marker_resolution16/showrule.png"
+                 icon="icons/full/eview16/rule.png"
                  style="push"
                  mnemonic="R">
                  <visibleWhen
@@ -1237,19 +1237,19 @@
           categoryId="org.sonarlint.eclipse.ui.command.category">
     </command>
     <command
-          description="Bind to a project analyzed on SonarQube or SonarCloud"
+          description="Bind to a project analyzed on SonarQube (Server, Cloud)"
           id="org.sonarlint.eclipse.ui.internal.command.BindProjectsCommand"
-          name="Bind to SonarQube or SonarCloud..."
+          name="Bind to SonarQube (Server, Cloud)..."
           categoryId="org.sonarlint.eclipse.ui.command.category">
     </command>
     <command
-          description="Share the binding information to SonarQube or SonarCloud"
+          description="Share the binding information to SonarQube (Server, Cloud)"
           id="org.sonarlint.eclipse.ui.internal.command.ShareBindingCommand"
           name="Share Binding..."
           categoryId="org.sonarlint.eclipse.ui.command.category">
     </command>
     <command
-          description="Bind to a project analyzed on SonarQube or SonarCloud"
+          description="Bind to a project analyzed on SonarQube (Server, Cloud)"
           id="org.sonarlint.eclipse.ui.internal.command.ChangeProjectsBindingCommand"
           name="Change Binding..."
           categoryId="org.sonarlint.eclipse.ui.command.category">
diff --git a/org.sonarlint.eclipse.ui/sonarlint32.png b/org.sonarlint.eclipse.ui/sonarlint32.png
index 4965bc41b..a05a45078 100644
Binary files a/org.sonarlint.eclipse.ui/sonarlint32.png and b/org.sonarlint.eclipse.ui/sonarlint32.png differ
diff --git a/org.sonarlint.eclipse.ui/sonarlint32@2x.png b/org.sonarlint.eclipse.ui/sonarlint32@2x.png
index 4d1e4d9b2..dcef1a79e 100644
Binary files a/org.sonarlint.eclipse.ui/sonarlint32@2x.png and b/org.sonarlint.eclipse.ui/sonarlint32@2x.png differ
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/Messages.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/Messages.java
index 5e2376fff..89785ea04 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/Messages.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/Messages.java
@@ -36,8 +36,6 @@ public final class Messages extends NLS {
   public static String SonarPreferencePage_title;
   public static String SonarPreferencePage_description;
   public static String SonarPreferencePage_label_marker_severity;
-  public static String SonarPreferencePage_label_issue_filter;
-  public static String SonarPreferencePage_label_issue_period;
   public static String SonarPreferencePage_label_extra_args;
   public static String SonarPreferencePage_label_test_file_glob_patterns;
   public static String SonarProjectPropertyBlock_label_override_workspace_settings;
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintImages.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintImages.java
index f7daedac1..175a03050 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintImages.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/SonarLintImages.java
@@ -66,8 +66,8 @@ public final class SonarLintImages {
   public static final Image ISSUE_ANNOTATION = createImage("full/annotation16/issue.png"); //$NON-NLS-1$
   public static final Image HOTSPOT_ANNOTATION = createImage("full/annotation16/hotspot.png"); //$NON-NLS-1$
   public static final Image VULNERABILITY_ANNOTATION = createImage("full/annotation16/vulnerability.png"); //$NON-NLS-1$
-  public static final Image RESOLUTION_SHOW_RULE = createImage("full/marker_resolution16/showrule.png"); //$NON-NLS-1$
-  public static final Image RESOLUTION_SHOW_LOCATIONS = createImage("full/marker_resolution16/showlocations.png"); //$NON-NLS-1$
+  public static final Image RESOLUTION_SHOW_RULE = createImage("full/eview16/rule.png"); //$NON-NLS-1$
+  public static final Image RESOLUTION_SHOW_LOCATIONS = createImage("full/eview16/locations.png"); //$NON-NLS-1$
   public static final Image RESOLUTION_DISABLE_RULE = createImage("full/marker_resolution16/disablerule.png"); //$NON-NLS-1$
   public static final Image RESOLUTION_QUICKFIX_CHANGE = createImage("full/marker_resolution16/quickfix_change.png"); //$NON-NLS-1$
   public static final Image BALLOON_IMG = createImage("logo/sonarlint-16px.png"); //$NON-NLS-1$
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/ProjectToBindSelectionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/ProjectToBindSelectionDialog.java
index 979c55d33..9c266eb3b 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/ProjectToBindSelectionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/ProjectToBindSelectionDialog.java
@@ -39,7 +39,7 @@ public class ProjectToBindSelectionDialog extends ElementListSelectionDialog {
   private ProjectToBindSelectionDialog(Shell parent, String message, List<ISonarLintProject> projects) {
     super(parent, new SonarLintProjectLabelProvider());
     setElements(projects.toArray());
-    setTitle("SonarLint - Project Selection");
+    setTitle("SonarQube for Eclipse - Project Selection");
     setMessage(message);
     setHelpAvailable(false);
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/AssistSuggestConnectionJob.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/AssistSuggestConnectionJob.java
index 147c14b05..759e643db 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/AssistSuggestConnectionJob.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/AssistSuggestConnectionJob.java
@@ -55,7 +55,7 @@ public class AssistSuggestConnectionJob extends AbstractAssistCreatingConnection
 
   public AssistSuggestConnectionJob(Either<String, String> serverUrlOrOrganization,
     Map<String, List<ProjectSuggestionDto>> projectMapping) {
-    super("Connected Mode suggestion for " + (serverUrlOrOrganization.isLeft() ? "SonarQube" : "SonarCloud"),
+    super("Connected Mode suggestion for SonarQube " + (serverUrlOrOrganization.isLeft() ? "Server" : "Cloud"),
       serverUrlOrOrganization, false, true);
     this.projectMapping = projectMapping;
   }
@@ -117,9 +117,9 @@ private void tryProjectbinding() {
     } catch (ExecutionException | InterruptedException err) {
       var message = "";
       if (serverUrlOrOrganization.isLeft()) {
-        message += "SonarQube '" + serverUrlOrOrganization.getLeft() + "'";
+        message += "SonarQube Server '" + serverUrlOrOrganization.getLeft() + "'";
       } else {
-        message += "SonarCloud organization '" + serverUrlOrOrganization.getRight() + "'";
+        message += "SonarQube Cloud organization '" + serverUrlOrOrganization.getRight() + "'";
       }
 
       SonarLintLogger.get().error(message + " cannot be loaded", err);
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarCloudConnectionCreationDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarCloudConnectionCreationDialog.java
index 4d7e817d6..21f63bfb8 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarCloudConnectionCreationDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarCloudConnectionCreationDialog.java
@@ -24,9 +24,10 @@
 public class ConfirmSonarCloudConnectionCreationDialog extends AbstractConfirmConnectionCreationDialog {
   public ConfirmSonarCloudConnectionCreationDialog(Shell parentShell, String organization, boolean automaticSetUp) {
     super(parentShell,
-      "Do you trust this SonarCloud organization?",
-      "SonarCloud is attempting to set up a connection for the organization '" + organization + "' with SonarLint.",
-      "Connect to SonarCloud",
+      "Do you trust this SonarQube Cloud organization?",
+      "SonarQube Cloud is attempting to set up a connection for the organization '" + organization
+        + "'.",
+      "Connect to SonarQube Cloud",
       automaticSetUp);
   }
 }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarQubeConnectionCreationDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarQubeConnectionCreationDialog.java
index 273c54893..5b6cc0665 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarQubeConnectionCreationDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/assist/ConfirmSonarQubeConnectionCreationDialog.java
@@ -24,10 +24,10 @@
 public class ConfirmSonarQubeConnectionCreationDialog extends AbstractConfirmConnectionCreationDialog {
   public ConfirmSonarQubeConnectionCreationDialog(Shell parentShell, String serverUrl, boolean automaticSetUp) {
     super(parentShell,
-      "Do you trust this SonarQube server?",
-      "The server at '" + serverUrl + "' is attempting to set up a connection with SonarLint. Letting SonarLint "
-        + "connect to an untrusted server is potentially dangerous.",
-      "Connect to this SonarQube server",
+      "Do you trust this SonarQube Server instance?",
+      "The server at '" + serverUrl + "' is attempting to set up a connection. Letting SonarQube for Eclipse connect "
+        + "to an untrusted server is potentially dangerous.",
+      "Connect to this SonarQube Server instance",
       automaticSetUp);
   }
 }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionIdWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionIdWizardPage.java
index b0757c0a8..b790e6b3f 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionIdWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionIdWizardPage.java
@@ -69,7 +69,8 @@ protected void doCreateControl(Composite container) {
   public void setVisible(boolean visible) {
     super.setVisible(visible);
     if (visible) {
-      setTitle(model.getConnectionType() == ConnectionType.SONARCLOUD ? "SonarCloud Connection Identifier" : "SonarQube Connection Identifier");
+      setTitle((model.getConnectionType() == ConnectionType.SONARCLOUD ? "SonarQube Cloud" : "SonarQube Server")
+        + " Connection Identifier");
       connectionIdTextBinding.validateTargetToModel();
     }
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionTypeWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionTypeWizardPage.java
index cc17bbcb5..bc0502ced 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionTypeWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ConnectionTypeWizardPage.java
@@ -77,12 +77,12 @@ public void createControl(Composite parent) {
     sonarQubeLabel.setLayoutData(gd);
 
     var sonarCloudFreeLabel = new Link(radioButtonGroupContainer, SWT.WRAP);
-    sonarCloudFreeLabel.setText("<a>SonarCloud</a> is entirely free for open source projects");
+    sonarCloudFreeLabel.setText("<a>SonarQube Cloud</a> is entirely free for open source projects");
     sonarCloudFreeLabel.setLayoutData(gd);
     sonarCloudFreeLabel.addListener(SWT.Selection, e -> BrowserUtils.openExternalBrowserWithTelemetry(LinkTelemetry.SONARCLOUD_PRODUCT_PAGE, e.display));
 
     var sonarQubeFreeLabel = new Link(radioButtonGroupContainer, SWT.WRAP);
-    sonarQubeFreeLabel.setText("SonarQube offers a free <a>Community Edition</a>");
+    sonarQubeFreeLabel.setText("SonarQube Server offers a free <a>Community Build</a>");
     sonarQubeFreeLabel.setLayoutData(gd);
     sonarQubeFreeLabel.addListener(SWT.Selection, e -> BrowserUtils.openExternalBrowserWithTelemetry(LinkTelemetry.SONARQUBE_EDITIONS_DOWNLOADS, e.display));
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/EditNotificationsWizard.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/EditNotificationsWizard.java
index 91eb3c849..45a43a0f1 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/EditNotificationsWizard.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/EditNotificationsWizard.java
@@ -48,7 +48,8 @@ private EditNotificationsWizard(String title, ServerConnectionModel model, Conne
   }
 
   private EditNotificationsWizard(ConnectionFacade connection) {
-    this(connection.isSonarCloud() ? "Edit SonarCloud notifications" : "Edit SonarQube notifications", new ServerConnectionModel(connection), connection);
+    this(connection.isSonarCloud() ? "Edit SonarQube Cloud notifications" : "Edit SonarQube Server notifications",
+      new ServerConnectionModel(connection), connection);
   }
 
   public static WizardDialog createDialog(Shell parent, ConnectionFacade connection) {
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/NotificationsWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/NotificationsWizardPage.java
index f74c8c0c3..0f2302e28 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/NotificationsWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/NotificationsWizardPage.java
@@ -94,14 +94,15 @@ public void widgetSelected(SelectionEvent e) {
   public void setVisible(boolean visible) {
     if (visible) {
       final var isSc = model.getConnectionType() == ConnectionType.SONARCLOUD;
-      final var sqOrSc = isSc ? "SonarCloud" : "SonarQube";
-      notificationsEnabledCheckbox.setText("Receive notifications from " + sqOrSc);
+      final var sqOrSc = isSc ? "Cloud" : "Server";
+      notificationsEnabledCheckbox.setText("Receive notifications from SonarQube" + sqOrSc);
       final var docUrl = isSc ? "https://docs.sonarcloud.io/advanced-setup/sonarlint-smart-notifications/"
         : "https://docs.sonarqube.org/latest/user-guide/sonarlint-connected-mode/#smart-notifications";
-      notificationsLink.setText("You will receive <a href=\"" + docUrl + "\">notifications</a> from " + sqOrSc + " in situations like:");
+      notificationsLink.setText("You will receive <a href=\"" + docUrl + "\">notifications</a> from SonarQube "
+        + sqOrSc + " in situations like:");
       notificationsDetails.setText(
         "  - the Quality Gate status of a bound project changes\n" +
-          "  - the latest analysis of a bound project on " + sqOrSc + " raises new issues assigned to you");
+          "  - the latest analysis of a bound project on SonarQube " + sqOrSc + " raises new issues assigned to you");
       container.requestLayout();
     }
     super.setVisible(visible);
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/OrganizationWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/OrganizationWizardPage.java
index c33988c2c..415b15d15 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/OrganizationWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/OrganizationWizardPage.java
@@ -40,7 +40,7 @@ public class OrganizationWizardPage extends AbstractServerConnectionWizardPage {
   private Binding orgaTextBinding;
 
   public OrganizationWizardPage(ServerConnectionModel model) {
-    super("organization_page", "SonarCloud Organization", model, 2);
+    super("organization_page", "SonarQube Cloud Organization", model, 2);
     setDescription("Start typing to search among organizations you are member of, or enter any organization key");
   }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java
index 4ca3ac146..fd57b7429 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/ServerConnectionWizard.java
@@ -79,11 +79,12 @@ public ServerConnectionWizard() {
   }
 
   public ServerConnectionWizard(ServerConnectionModel model) {
-    this("Connect to SonarQube or SonarCloud", model, null);
+    this("Connect to SonarQube (Server, Cloud)", model, null);
   }
 
   private ServerConnectionWizard(ConnectionFacade sonarServer) {
-    this(sonarServer.isSonarCloud() ? "Edit SonarCloud connection" : "Edit SonarQube connection", new ServerConnectionModel(sonarServer), sonarServer);
+    this(sonarServer.isSonarCloud() ? "Edit SonarQube Cloud connection" : "Edit SonarQube Server connection",
+      new ServerConnectionModel(sonarServer), sonarServer);
   }
 
   public static WizardDialog createDialog(Shell parent) {
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/SuggestConnectionWizard.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/SuggestConnectionWizard.java
index a4d1bb656..7d242bc3e 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/SuggestConnectionWizard.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/SuggestConnectionWizard.java
@@ -27,7 +27,7 @@
 /** Wizard that is containing only the token page for Connected Mode suggestions */
 public class SuggestConnectionWizard extends AbstractConnectionWizard {
   public SuggestConnectionWizard(ServerConnectionModel model) {
-    super("Connected Mode suggestion for SonarQube or SonarCloud", model);
+    super("Connected Mode suggestion for SonarQube (Server, Cloud)", model);
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/TokenWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/TokenWizardPage.java
index 111638154..0b93e2082 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/TokenWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/TokenWizardPage.java
@@ -65,10 +65,10 @@ protected void doCreateControl(Composite container) {
 
       var organization = model.getOrganization();
       if (organization == null) {
-        connectionLabel.setText("The token is used for setting up the connection to the SonarQube server URL '"
+        connectionLabel.setText("The token is used for setting up the connection to the SonarQube Server URL '"
           + model.getServerUrl() + "'.");
       } else {
-        connectionLabel.setText("The token is used for setting up the connection with SonarCloud to the organization '"
+        connectionLabel.setText("The token is used for setting up the connection to the SonarQube Cloud organization '"
           + organization + "'.");
       }
 
@@ -168,7 +168,9 @@ public HelpGenerateUserTokenResponse getResponse() {
   public void setVisible(boolean visible) {
     super.setVisible(visible);
     if (visible) {
-      setTitle(model.getConnectionType() == ConnectionType.SONARCLOUD ? "SonarCloud User Authentication Token" : "SonarQube User Authentication Token");
+      setTitle(model.getConnectionType() == ConnectionType.SONARCLOUD
+        ? "SonarQube Cloud User Authentication Token"
+        : "SonarQube Server User Authentication Token");
       tokenTextBinding.validateTargetToModel();
     }
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/UsernamePasswordWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/UsernamePasswordWizardPage.java
index 154b1577e..4bcd2f800 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/UsernamePasswordWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/connection/UsernamePasswordWizardPage.java
@@ -39,7 +39,7 @@
 /**
  *  @deprecated SonarCloud only offers authentication via token, SonarQube should follow soon
  */
-@Deprecated(since="9.1", forRemoval=true)
+@Deprecated(since = "9.1", forRemoval = true)
 public class UsernamePasswordWizardPage extends AbstractServerConnectionWizardPage {
   public static final String DEPRECATION_MESSAGE = "Authentication via username and password is deprecated and will "
     + "be removed in the future. Please use a token instead.";
@@ -52,7 +52,7 @@ public class UsernamePasswordWizardPage extends AbstractServerConnectionWizardPa
   private Binding passwordTextBinding;
 
   public UsernamePasswordWizardPage(ServerConnectionModel model) {
-    super("server_credentials_page", "SonarQube User Credentials", model, 2);
+    super("server_credentials_page", "SonarQube Server User Credentials", model, 2);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ConnectionSelectionWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ConnectionSelectionWizardPage.java
index 3d27dc133..a8e3e8c84 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ConnectionSelectionWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ConnectionSelectionWizardPage.java
@@ -47,7 +47,7 @@ public class ConnectionSelectionWizardPage extends AbstractProjectBindingWizardP
   private Binding connectionBinding;
 
   public ConnectionSelectionWizardPage(ProjectBindingModel model) {
-    super("connection_select_page", "Choose the SonarQube or SonarCloud server connection", model, 2);
+    super("connection_select_page", "Choose the SonarQube (Server, Cloud) connection", model, 2);
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java
index 70747b588..4d5026e8e 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectBindingWizard.java
@@ -73,7 +73,7 @@ private ProjectBindingWizard(String title, ProjectBindingModel model) {
   }
 
   private ProjectBindingWizard(Collection<ISonarLintProject> selectedProjects, @Nullable ConnectionFacade selectedConnection) {
-    this("Bind to a SonarQube or SonarCloud project", new ProjectBindingModel());
+    this("Bind to a SonarQube (Server, Cloud) project", new ProjectBindingModel());
     this.model.setProjects(selectedProjects.stream()
       .sorted(comparing(ISonarLintProject::getName))
       .collect(toCollection(ArrayList::new)));
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectsSelectionWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectsSelectionWizardPage.java
index 94aa24144..33efac6ee 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectsSelectionWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/ProjectsSelectionWizardPage.java
@@ -66,8 +66,9 @@ protected void doCreateControl(Composite container) {
     gd.widthHint = 500;
 
     var bindingLabel = new Label(bindingContainer, SWT.WRAP);
-    bindingLabel.setText("Complete your Connected Mode setup by binding your local project to your SonarQube or SonarCloud project "
-      + "to benefit from the same rules and settings that are used to inspect the project on the server.");
+    bindingLabel.setText("Complete your Connected Mode setup by binding your local project to your SonarQube (Server, "
+      + "Cloud) project to benefit from the same rules and settings that are used to inspect the project on the "
+      + "server.");
     bindingLabel.setLayoutData(gd);
 
     var tableContainer = new Composite(bindingContainer, SWT.NONE);
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/SonarProjectSelectionWizardPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/SonarProjectSelectionWizardPage.java
index caa93285f..ac0ceceb9 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/SonarProjectSelectionWizardPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/binding/wizard/project/SonarProjectSelectionWizardPage.java
@@ -41,7 +41,7 @@ public class SonarProjectSelectionWizardPage extends AbstractProjectBindingWizar
   private Binding projectTextBinding;
 
   public SonarProjectSelectionWizardPage(ProjectBindingModel model) {
-    super("sonar_project_page", "Choose the SonarQube/SonarCloud project", model, 1);
+    super("sonar_project_page", "Choose the SonarQube (Server, Cloud) project", model, 1);
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeChangeSetCommand.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeChangeSetCommand.java
index ca5b772fa..819ee6690 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeChangeSetCommand.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeChangeSetCommand.java
@@ -84,7 +84,7 @@ public void done(IJobChangeEvent event) {
               iw.getActivePage().showView(SonarLintReportView.ID, null, IWorkbenchPage.VIEW_ACTIVATE);
               SonarLintReportView.setReportTitle(reportTitle);
             } catch (PartInitException e) {
-              SonarLintLogger.get().error("Unable to open SonarLint Report View", e);
+              SonarLintLogger.get().error("Unable to open SonarQube Report View", e);
             }
           });
         } else if (Status.CANCEL_STATUS == event.getResult()) {
@@ -97,7 +97,7 @@ public void done(IJobChangeEvent event) {
               iw.getActivePage().showView(SonarLintReportView.ID, null, IWorkbenchPage.VIEW_ACTIVATE);
               SonarLintReportView.setReportTitle(event.getResult().getMessage());
             } catch (PartInitException e) {
-              SonarLintLogger.get().error("Unable to open SonarLint Report View", e);
+              SonarLintLogger.get().error("Unable to open SonarQube Report View", e);
             }
           });
         }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeCommand.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeCommand.java
index 5b6157db6..e2ee897fa 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeCommand.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/AnalyzeCommand.java
@@ -79,7 +79,7 @@ private static void runAnalysisJob(Shell shell, Map<ISonarLintProject, Collectio
 
     if (!SonarLintGlobalConfiguration.ignoreEnhancedFeatureNotifications()) {
       MessageDialogUtils.enhancedWithConnectedModeInformation(shell, "Are you working with a CI/CD pipeline?",
-        "Running an analysis with SonarQube / SonarCloud in your pipeline might be better suited for analyzing "
+        "Running an analysis with SonarQube (Server, Cloud) in your pipeline might be better suited for analyzing "
           + "multiple files or a whole project!");
     } else if (totalFileCount > 10 && !askConfirmation(shell)) {
       // Asking for a few files (e.g. analyzing a package) is annoying, increasing the threshold in order to not spam
@@ -117,8 +117,8 @@ private static boolean askConfirmation(Shell shell) {
     var dialog = MessageDialogWithToggle.open(
       MessageDialog.CONFIRM, shell, "Confirmation",
       "Analyzing multiple files may take a long time to complete. "
-        + "To get the best from SonarLint, you should preferably use the on-the-fly analysis for the files you're working on."
-        + "\n\nWould you like to proceed?",
+        + "To get the best from SonarQube for Eclipse, you should preferably use the on-the-fly analysis for the "
+        + "files you're working on.\n\nWould you like to proceed?",
       "Always proceed without asking", false, null, null, SWT.NONE);
 
     var proceed = dialog.getReturnCode() == 0;
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/MarkAsResolvedCommand.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/MarkAsResolvedCommand.java
index e259f4537..3e8823c7c 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/MarkAsResolvedCommand.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/MarkAsResolvedCommand.java
@@ -96,7 +96,7 @@ private void afterCheckSuccessful(IMarker marker, ISonarLintProject project, ISo
     if (!result.isPermitted()) {
       currentWindow.getShell().getDisplay()
         .asyncExec(() -> MessageDialog.openError(currentWindow.getShell(),
-          TITLE + " on " + (isSonarCloud ? "SonarCloud" : "SonarQube"),
+          TITLE + " on SonarQube " + (isSonarCloud ? "Cloud" : "Server"),
           result.getNotPermittedReason()));
       return;
     }
@@ -119,6 +119,6 @@ protected MarkAsResolvedDialog createDialog(IMarker marker, Shell parentShell, L
     var serverIssue = marker.getAttribute(MarkerUtils.SONAR_MARKER_SERVER_ISSUE_KEY_ATTR, null);
     return serverIssue != null
       ? new MarkAsResolvedDialog(parentShell, transitions, hostURL, isSonarCloud)
-        : new MarkAnticipatedIssueAsResolvedDialog(parentShell, transitions, hostURL);
+      : new MarkAnticipatedIssueAsResolvedDialog(parentShell, transitions, hostURL);
   }
 }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/ReOpenResolvedCommand.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/ReOpenResolvedCommand.java
index 7787fd203..cdf0ef020 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/ReOpenResolvedCommand.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/command/ReOpenResolvedCommand.java
@@ -83,7 +83,7 @@ private void afterCheckSuccessful(ISonarLintProject project, ISonarLintFile file
     if (!result.isSuccess()) {
       currentWindow.getShell().getDisplay()
         .asyncExec(() -> MessageDialog.openError(currentWindow.getShell(),
-          TITLE + " on " + (isSonarCloud ? "SonarCloud" : "SonarQube"),
+          TITLE + " on SonarQube " + (isSonarCloud ? "Cloud" : "Server"),
           "Could not re-open the resolved Issue!"));
       return;
     }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AbstractFixSuggestionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AbstractFixSuggestionDialog.java
index ba6f9b76b..fdcfefd6c 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AbstractFixSuggestionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AbstractFixSuggestionDialog.java
@@ -123,7 +123,7 @@ protected void buttonPressed(int buttonId) {
   protected void configureShell(Shell newShell) {
     super.configureShell(newShell);
 
-    newShell.setText(String.format("SonarLint Fix Suggestion (%d/%d)", snippetIndex + 1, absoluteNumberOfChanges));
+    newShell.setText(String.format("SonarQube Fix Suggestion (%d/%d)", snippetIndex + 1, absoluteNumberOfChanges));
     newShell.setSize(1000, 400);
   }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AwaitProjectConnectionReadyDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AwaitProjectConnectionReadyDialog.java
index f1bea4b08..9f78c0a6a 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AwaitProjectConnectionReadyDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/AwaitProjectConnectionReadyDialog.java
@@ -42,10 +42,11 @@ public AwaitProjectConnectionReadyDialog(Shell parentShell) {
       "Await Connected Mode to get ready",
       SonarLintImages.BALLOON_IMG,
       "In order to proceed we have to wait for the Connected Mode to get ready. Depending on your network connection "
-        + "it can take some time, at most SonarLint will wait for " + AwaitProjectConnectionReadyJob.maxWaitTime()
-        + " minute(s). When everything is finished this dialog will be closed automatically and SonarLint will "
-        + "proceed. If you click 'Cancel', the Connected Mode will still be established but the requested action will "
-        + "be cancelled.",
+        + "it can take some time, at most SonarQube for Eclipse will wait for "
+        + AwaitProjectConnectionReadyJob.maxWaitTime()
+        + " minute(s). When everything is finished this dialog will be closed automatically and SonarQube for Eclipse "
+        + "will proceed. If you click 'Cancel', the Connected Mode will still be established but the requested action "
+        + "will be cancelled.",
       INFORMATION,
       new String[] {"Cancel"},
       0);
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/MarkAsResolvedDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/MarkAsResolvedDialog.java
index 01c7f4514..d9388543d 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/MarkAsResolvedDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/MarkAsResolvedDialog.java
@@ -119,7 +119,7 @@ protected void createButtonsForButtonBar(Composite parent) {
   protected void configureShell(Shell newShell) {
     super.configureShell(newShell);
 
-    newShell.setText("Mark Issue as Resolved on " + (isSonarCloud ? "SonarCloud" : "SonarQube"));
+    newShell.setText("Mark Issue as Resolved on SonarQube " + (isSonarCloud ? "Cloud" : "Server"));
     newShell.setMinimumSize(500, 300);
   }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestConnectionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestConnectionDialog.java
index 9f043bd61..671b8354a 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestConnectionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestConnectionDialog.java
@@ -81,9 +81,9 @@ protected void configureShell(Shell newShell) {
     super.configureShell(newShell);
 
     if (serverUrlOrOrganization.isLeft()) {
-      newShell.setText("Connection suggestions for SonarQube at '" + serverUrlOrOrganization.getLeft() + "'");
+      newShell.setText("Connection suggestions for SonarQube Server at '" + serverUrlOrOrganization.getLeft() + "'");
     } else {
-      newShell.setText("Connection suggestions for SonarCloud organization '" + serverUrlOrOrganization.getRight() + "'");
+      newShell.setText("Connection suggestions for SonarQube Cloud organization '" + serverUrlOrOrganization.getRight() + "'");
     }
     newShell.setMinimumSize(600, 300);
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionSelectionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionSelectionDialog.java
index 96245d90a..a9c4edf63 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionSelectionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionSelectionDialog.java
@@ -57,11 +57,11 @@ private static String convertSuggestionToString(ConnectionSuggestionDto suggesti
     if (suggestion.getConnectionSuggestion().isLeft()) {
       var sonarQubeSuggestion = suggestion.getConnectionSuggestion().getLeft();
       projectInfo += sonarQubeSuggestion.getProjectKey();
-      connectionInfo = "SonarQube at '" + sonarQubeSuggestion.getServerUrl() + "'";
+      connectionInfo = "SonarQube Server at '" + sonarQubeSuggestion.getServerUrl() + "'";
     } else {
       var sonarCloudSuggestion = suggestion.getConnectionSuggestion().getRight();
       projectInfo += sonarCloudSuggestion.getProjectKey();
-      connectionInfo = "SonarCloud organization '" + sonarCloudSuggestion.getOrganization() + "'";
+      connectionInfo = "SonarQube Cloud organization '" + sonarCloudSuggestion.getOrganization() + "'";
     }
     projectInfo += "'";
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionsDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionsDialog.java
index 798034bcb..38bbffb23 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionsDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/dialog/SuggestMultipleConnectionsDialog.java
@@ -61,11 +61,11 @@ protected Control createDialogArea(Composite parent) {
       if (suggestion.getConnectionSuggestion().isLeft()) {
         var sonarQubeSuggestion = suggestion.getConnectionSuggestion().getLeft();
         projectKey += sonarQubeSuggestion.getProjectKey();
-        title = "SonarQube at '" + sonarQubeSuggestion.getServerUrl() + "':";
+        title = "SonarQube Server at '" + sonarQubeSuggestion.getServerUrl() + "':";
       } else {
         var sonarCloudSuggestion = suggestion.getConnectionSuggestion().getRight();
         projectKey += sonarCloudSuggestion.getProjectKey();
-        title = "SonarCloud organization '" + sonarCloudSuggestion.getOrganization() + "':";
+        title = "SonarQube Cloud organization '" + sonarCloudSuggestion.getOrganization() + "':";
       }
       projectKey += "'";
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/HotspotsView.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/HotspotsView.java
index c4952c67b..955060c2b 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/HotspotsView.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/hotspots/HotspotsView.java
@@ -99,7 +99,7 @@ private Control createNoHotspotsMessage(FormToolkit kit) {
     body.setLayout(layout);
 
     var emptyMsg = new Link(body, SWT.CENTER | SWT.WRAP);
-    emptyMsg.setText("You can open a Security Hotspot from SonarQube. <a>Learn more</a>");
+    emptyMsg.setText("You can open a Security Hotspot from SonarQube Server. <a>Learn more</a>");
     var gd = new GridData(SWT.LEFT, SWT.FILL, true, false);
     emptyMsg.setLayoutData(gd);
     emptyMsg.setBackground(emptyMsg.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/OpenIssueInEclipseJob.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/OpenIssueInEclipseJob.java
index ec74d4eec..0f6caeee7 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/OpenIssueInEclipseJob.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/OpenIssueInEclipseJob.java
@@ -169,7 +169,7 @@ private IStatus handlePossibleHiddenIssue() {
 
     // Ask the user if we are allowed to change the workspace preferences
     MessageDialogUtils.openInIdeQuestion("The issue might not be found due to the workspace preferences "
-      + "on the display of SonarLint markers. Please change the preferences and 'Apply and Close' them to continue!",
+      + "on the display of SonarQube markers. Please change the preferences and 'Apply and Close' them to continue!",
       () -> {
         var preferences = PlatformUtils.showPreferenceDialog(SonarLintPreferencePage.ID);
         var page = (SonarLintPreferencePage) preferences.getSelectedPage();
@@ -207,7 +207,7 @@ private void updateUI(IMarker marker) {
         ruleDescriptionView.setInput(marker);
         ruleDescriptionView.setFocus();
       } catch (PartInitException e) {
-        SonarLintLogger.get().error("Open in IDE: An error occoured while opening the SonarLint views", e);
+        SonarLintLogger.get().error("Open in IDE: An error occoured while opening the SonarQube views", e);
       } finally {
         if (editor != null) {
           editor.setFocus();
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/RulesConfigurationPageSaveJob.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/RulesConfigurationPageSaveJob.java
index 5d7d71ba4..9c677700c 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/RulesConfigurationPageSaveJob.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/job/RulesConfigurationPageSaveJob.java
@@ -42,12 +42,12 @@ protected IStatus run(IProgressMonitor monitor) {
       // all projects are bound, inform the user about local changes don't apply
       MessageDialogUtils.connectedModeOnlyInformation("Changing rule configuration has no effect",
         "As all the projects found in the workspace are already in Connected Mode, rule changes done locally "
-          + "will have no impact on the analysis and its results. This has to be done on SonarQube / SonarCloud.",
+          + "will have no impact on the analysis and its results. This has to be done on SonarQube (Server, Cloud).",
         LinkTelemetry.RULES_SELECTION_DOCS);
     } else if (!SonarLintGlobalConfiguration.ignoreEnhancedFeatureNotifications()) {
       MessageDialogUtils.enhancedWithConnectedModeInformation("Are you working in a team?",
         "When using Connected Mode you can benefit from having the rule configuration centralized. It is "
-          + "synchronized to all project contributers using SonarLint, no manual configuration has to be done "
+          + "synchronized to all project contributers using SonarQube for IDE, no manual configuration has to be done "
           + "locally.");
     }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/messages.properties b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/messages.properties
index b2f08767c..103da306c 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/messages.properties
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/messages.properties
@@ -18,17 +18,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 #
 
-SonarConsole_title=SonarLint Console
+SonarConsole_title=SonarQube Console
 
-SonarProjectPropertyPage_title=SonarLint Project Preferences
+SonarProjectPropertyPage_title=SonarQube for Eclipse Project Preferences
 
 SonarProjectPropertyBlock_label_override_workspace_settings=Override workspace settings
 
-SonarPreferencePage_title=General SonarLint Settings
-SonarPreferencePage_description=General SonarLint Settings
-SonarPreferencePage_label_marker_severity=SonarLint markers severity\:
-SonarPreferencePage_label_issue_filter=SonarLint markers shown for\:
-SonarPreferencePage_label_issue_period=SonarLint markers shown on\:
+SonarPreferencePage_title=General SonarQube for Eclipse Settings
+SonarPreferencePage_description=General SonarQube for Eclipse Settings that apply only to this IDE plug-in.
+SonarPreferencePage_label_marker_severity=SonarQube markers severity\:
 SonarPreferencePage_label_extra_args=Additional arguments for preview analysis\:
 SonarPreferencePage_label_test_file_glob_patterns=Test file glob patterns\:
 
@@ -48,8 +46,8 @@ PropertyAndPreferencePage_useprojectsettings_label=Enable project specific setti
 PropertyAndPreferencePage_useworkspacesettings_change=Configure Workspace Settings...
 PropertyAndPreferencePage_showprojectspecificsettings_label=Configure Project Specific
 
-ServersView_noServers=<a>Connect to SonarQube/SonarCloud...</a>
-ServersView_noServers_connectedMode=\n<a>Connected Mode</a> links SonarLint to SonarQube or SonarCloud to apply the same Clean Code standards as your team. Analyze more languages, detect more issues, receive notifications about the quality gate status, and more. Quality Profiles and file exclusion settings defined on the server are shared between all connected users.
+ServersView_noServers=<a>Connect to SonarQube (Server, Cloud)...</a>
+ServersView_noServers_connectedMode=\n<a>Connected Mode</a> links SonarQube for Eclipse to SonarQube (Server, Cloud) to apply the same Clean Code standards as your team. Analyze more languages, detect more issues, receive notifications about the quality gate status, and more. Quality Profiles and file exclusion settings defined on the server are shared between all connected users.
 jobInitializingBindingView=Initializing Bindings view
 viewInitializing=Initializing...
 
@@ -90,5 +88,5 @@ ServerLocationWizardPage_action_token_tooltip=Open server security page in your
 ServerLocationWizardPage_msg_error=Unable to test connection.
 
 SonarProjectPropertyBlock_label_server=Connection\:
-SonarProjectPropertyBlock_label_key=SonarQube/SonarCloud project key\:
+SonarProjectPropertyBlock_label_key=SonarQube (Server, Cloud) project key\:
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/AbstractBindingSuggestionPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/AbstractBindingSuggestionPopup.java
index 4599a5b50..04f4d66a1 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/AbstractBindingSuggestionPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/AbstractBindingSuggestionPopup.java
@@ -55,7 +55,7 @@ protected void addDontAskAgainLink() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint Binding Suggestion";
+    return "SonarQube - Binding Suggestion";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/DeveloperNotificationPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/DeveloperNotificationPopup.java
index 3c4ff3165..0ddc67d18 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/DeveloperNotificationPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/DeveloperNotificationPopup.java
@@ -39,7 +39,7 @@ public DeveloperNotificationPopup(ConnectionFacade connection, ShowSmartNotifica
     this.connection = connection;
     this.notification = notification;
     this.isSonarCloud = isSonarCloud;
-    sqOrSc = isSonarCloud ? "SonarCloud" : "SonarQube";
+    sqOrSc = isSonarCloud ? "SonarQube Cloud" : "SonarQube Server";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/FailedToOpenHotspotPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/FailedToOpenHotspotPopup.java
index 9dc31cb72..aaf2c76fc 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/FailedToOpenHotspotPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/FailedToOpenHotspotPopup.java
@@ -42,17 +42,15 @@ protected String getMessage() {
   protected void createContentArea(Composite composite) {
     super.createContentArea(composite);
 
-    addLink("Open console", e ->
-      Display.getDefault().asyncExec(() -> {
-        close();
-        SonarLintUiPlugin.getDefault().getSonarConsole().bringConsoleToFront();
-      })
-    );
+    addLink("Open console", e -> Display.getDefault().asyncExec(() -> {
+      close();
+      SonarLintUiPlugin.getDefault().getSonarConsole().bringConsoleToFront();
+    }));
   }
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - Unable to open hotspot";
+    return "SonarQube Server - Unable to open hotspot";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/GenericNotificationPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/GenericNotificationPopup.java
index 926f1adab..54d0d30f0 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/GenericNotificationPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/GenericNotificationPopup.java
@@ -62,7 +62,8 @@ protected void createContentArea(Composite composite) {
 
     if (longMsg != null) {
       addLink("More details...", e -> {
-        var dialog = new DialogWithLink(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "SonarLint - " + title, longMsg);
+        var dialog = new DialogWithLink(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+          "SonarQube - " + title, longMsg);
         dialog.open();
         close();
       });
@@ -125,7 +126,7 @@ public void widgetSelected(SelectionEvent e) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - " + title;
+    return "SonarQube - " + title;
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/LanguageFromConnectedModePopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/LanguageFromConnectedModePopup.java
index 945f79829..35f48d272 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/LanguageFromConnectedModePopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/LanguageFromConnectedModePopup.java
@@ -73,9 +73,9 @@ protected void createContentArea(Composite composite) {
       e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.RULES, getShell().getDisplay()));
 
     if (SonarLintCorePlugin.getConnectionManager().checkForSonarCloud()) {
-      addLink("Bind to SonarCloud", e -> ProjectBindingWizard.createDialog(getParentShell(), Set.of(project)));
+      addLink("Bind to SonarQube Cloud", e -> ProjectBindingWizard.createDialog(getParentShell(), Set.of(project)));
     } else {
-      addLink("Try SonarCloud for free",
+      addLink("Try SonarQube Cloud for free",
         e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.SONARCLOUD_SIGNUP_LINK, getShell().getDisplay()));
     }
 
@@ -89,7 +89,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - Language" + (languages.size() > 1 ? "s" : "") + " could not be analyzed";
+    return "SonarQube for Eclipse - Language" + (languages.size() > 1 ? "s" : "") + " could not be analyzed";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/MessagePopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/MessagePopup.java
index 52c949468..0700a136a 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/MessagePopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/MessagePopup.java
@@ -36,7 +36,7 @@ protected String getMessage() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint";
+    return "SonarQube";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NewerVersionAvailablePopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NewerVersionAvailablePopup.java
index 1bf39fd54..c966eb1e4 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NewerVersionAvailablePopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NewerVersionAvailablePopup.java
@@ -30,8 +30,8 @@
  */
 public class NewerVersionAvailablePopup extends AbstractSonarLintVersionPopup {
   public NewerVersionAvailablePopup(String version) {
-    super("SonarLint - New version available",
-      "A newer version of SonarLint for Eclipse has been released: " + version + ". Feel free to check it out or "
+    super("SonarQube for Eclipse - New version available",
+      "A newer version of SonarQube for Eclipse has been released: " + version + ". Feel free to check it out or "
         + "trigger an update. In case no update is available in your IDE, SonarLint might have been installed "
         + "manually or is managed by your organization.");
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NoBindingSuggestionFoundPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NoBindingSuggestionFoundPopup.java
index 55aff7541..407837639 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NoBindingSuggestionFoundPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/NoBindingSuggestionFoundPopup.java
@@ -42,8 +42,8 @@ public NoBindingSuggestionFoundPopup(String configurationScopeId, boolean isSona
 
   @Override
   protected String getMessage() {
-    return "The "
-      + (isSonarCloud ? "SonarCloud" : "SonarQube")
+    return "The SonarQube "
+      + (isSonarCloud ? "Cloud" : "Server")
       + " project '" + configurationScopeId + "' cannot be matched to any project in the workspace. "
       + "Please open your project, or bind it manually, and try again.";
   }
@@ -62,7 +62,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - No mathing open project found";
+    return "SonarQube " + (isSonarCloud ? "Cloud" : "Server") + " - No matching open project found";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectBoundPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectBoundPopup.java
index ca9809d8e..d9a1c1dea 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectBoundPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectBoundPopup.java
@@ -48,7 +48,7 @@ protected String getMessage() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "Project(s) bound to " + (isSonarCloud ? "SonarCloud" : "SonarQube");
+    return "Project(s) bound to SonarQube " + (isSonarCloud ? "Cloud" : "Server");
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectKeyNotFoundPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectKeyNotFoundPopup.java
index e9543f657..f0a589c10 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectKeyNotFoundPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ProjectKeyNotFoundPopup.java
@@ -53,8 +53,8 @@ protected String getMessage() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "Project key(s) not found on "
-      + (serverUrlOrOrganization.isLeft() ? "SonarQube" : "SonarCloud");
+    return "Project key(s) not found on SonarQube "
+      + (serverUrlOrOrganization.isLeft() ? "Server" : "Cloud");
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ReleaseNotesPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ReleaseNotesPopup.java
index 51525fdd7..a8344c645 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ReleaseNotesPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/ReleaseNotesPopup.java
@@ -30,7 +30,7 @@
  */
 public class ReleaseNotesPopup extends AbstractSonarLintVersionPopup {
   public ReleaseNotesPopup() {
-    super("SonarLint - Release Notes",
+    super("SonarQube for Eclipse - Release Notes",
       "Thank you for installing / updating SonarLint. We invite you to learn about the recent changes by taking a"
         + " look at the Release Notes. If you want to read them later, they can be found nested into the SonarLint "
         + "preferences.");
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SonarLintRpcClientSupportPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SonarLintRpcClientSupportPopup.java
index d8f96c6b7..473bd3827 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SonarLintRpcClientSupportPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SonarLintRpcClientSupportPopup.java
@@ -35,9 +35,10 @@ public class SonarLintRpcClientSupportPopup extends AbstractSonarLintPopup {
   @Override
   protected String getMessage() {
     return "As this should not happen, please provide us with a thread dump of the IDE process as well as a thread "
-      + "dump of the SonarLint process (can be identified by 'sloop') if available. To do that, please raise an issue "
-      + "on the Community Forum. \nWith that we can work on preventing such an issue in the future and make SonarLint "
-      + "more resiliant by recovering from this on its own! \nFor now the only possiblity is to restart the IDE :(";
+      + "dump of the SonarQube for Eclipse process (can be identified by 'sloop') if available. To do that, please "
+      + "raise an issue on the Community Forum. \nWith that we can work on preventing such an issue in the future and "
+      + "make SonarQube for Eclipse more resiliant by recovering from this on its own! \nFor now the only possiblity "
+      + "is to restart the IDE :(";
   }
 
   @Override
@@ -54,7 +55,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - RPC backend server unavailable or killed";
+    return "SonarQube for Eclipse - RPC backend server unavailable or killed";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SoonUnsupportedPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SoonUnsupportedPopup.java
index 48d005ff1..7c4bec53d 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SoonUnsupportedPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SoonUnsupportedPopup.java
@@ -54,7 +54,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarQube - Soon unsupported version";
+    return "SonarQube Server - Soon unsupported version";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestConnectionPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestConnectionPopup.java
index 2abbf2de3..a84c56a6f 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestConnectionPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestConnectionPopup.java
@@ -49,9 +49,9 @@ public SuggestConnectionPopup(Either<String, String> serverUrlOrOrganization,
   protected String getMessage() {
     String prefix;
     if (serverUrlOrOrganization.isLeft()) {
-      prefix = "For the SonarQube server '" + serverUrlOrOrganization.getLeft();
+      prefix = "For the SonarQube Server '" + serverUrlOrOrganization.getLeft();
     } else {
-      prefix = "For the SonarCloud organization '" + serverUrlOrOrganization.getRight();
+      prefix = "For the SonarQube Cloud organization '" + serverUrlOrOrganization.getRight();
     }
 
     if (projectMapping.keySet().size() > 1) {
@@ -87,7 +87,8 @@ protected void addMoreInformationLink() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint Connection Suggestion to " + (serverUrlOrOrganization.isLeft() ? "SonarQube" : "SonarCloud");
+    return "Connection Suggestion to "
+      + (serverUrlOrOrganization.isLeft() ? "SonarQube Server" : "SonarQube Cloud");
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestMultipleConnectionsPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestMultipleConnectionsPopup.java
index 96c35482b..497ae0c83 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestMultipleConnectionsPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SuggestMultipleConnectionsPopup.java
@@ -62,7 +62,7 @@ protected void addMoreInformationLink() {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint Multiple Connection Suggestions found";
+    return "SonarQube - Multiple Connection Suggestions found";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SurveyPopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SurveyPopup.java
index e3ac58cae..e43c7e080 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SurveyPopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/SurveyPopup.java
@@ -40,7 +40,7 @@ public SurveyPopup(String surveyURL) {
 
   @Override
   protected String getMessage() {
-    return "We are seeking your feedback to improve SonarLint for Eclipse with a short and simple user survey.";
+    return "We are seeking your feedback to improve SonarQube for Eclipse with a short and simple user survey.";
   }
 
   @Override
@@ -58,7 +58,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - New Eclipse user survey";
+    return "SonarQube for Eclipse - New user survey";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/TaintVulnerabilityAvailablePopup.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/TaintVulnerabilityAvailablePopup.java
index 70f4b6d41..629c854fc 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/TaintVulnerabilityAvailablePopup.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/popup/TaintVulnerabilityAvailablePopup.java
@@ -38,8 +38,8 @@ public TaintVulnerabilityAvailablePopup(boolean comeFromSonarCloud) {
 
   @Override
   protected String getMessage() {
-    return "Taint vulnerabilities have been detected by " + (comeFromSonarCloud ? "SonarCloud" : "SonarQube")
-      + " on this file. SonarLint can show you those vulnerabilities in your local code.";
+    return "Taint vulnerabilities have been detected by SonarQube" + (comeFromSonarCloud ? "Cloud" : "Server")
+      + " on this file. SonarQube for Eclipse can show you those vulnerabilities in your local code.";
   }
 
   @Override
@@ -58,7 +58,7 @@ protected void createContentArea(Composite composite) {
 
   @Override
   protected String getPopupShellTitle() {
-    return "SonarLint - Taint vulnerability found";
+    return "SonarQube - Taint vulnerability found";
   }
 
   @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/preferences/SonarLintPreferencePage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/preferences/SonarLintPreferencePage.java
index 99978211a..922e1ad74 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/preferences/SonarLintPreferencePage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/preferences/SonarLintPreferencePage.java
@@ -88,14 +88,14 @@ protected void createFieldEditors() {
     PlatformUtils.createHorizontalSpacer(getFieldEditorParent(), 1);
 
     addField(new BooleanFieldEditor(SonarLintGlobalConfiguration.PREF_ISSUE_INCLUDE_RESOLVED,
-      "Show SonarLint markers for resolved issues as well",
+      "Show SonarQube markers for resolved issues as well",
       getFieldEditorParent()));
 
     // INFO: For the label to take up all the horizontal space in the grid (the size we cannot get), we have to use a
     // high span as it will be set internally to the actual grid width if ours is too big: Otherwise the
     // settings label from the line below would shift one row up!
     var issueFilterLabel = new Link(getFieldEditorParent(), SWT.NONE);
-    issueFilterLabel.setText("SonarLint markers can be resolved from within your IDE. <a>Learn how</a>.");
+    issueFilterLabel.setText("SonarQube markers can be resolved from within your IDE. <a>Learn how</a>.");
     issueFilterLabel.setLayoutData(labelLayoutData);
     issueFilterLabel.addListener(SWT.Selection,
       e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.MARK_ISSUES_LINK, e.display));
@@ -103,14 +103,14 @@ protected void createFieldEditors() {
     PlatformUtils.createHorizontalSpacer(getFieldEditorParent(), 1);
 
     addField(new BooleanFieldEditor(SonarLintGlobalConfiguration.PREF_ISSUE_ONLY_NEW_CODE,
-      "Show SonarLint markers only for new code",
+      "Show SonarQube markers only for new code",
       getFieldEditorParent()));
 
     var issuePeriodLabel = new Link(getFieldEditorParent(), SWT.NONE);
     issuePeriodLabel.setText("Focusing on new code helps you practice <a>Clean as You Code</a>.");
     issuePeriodLabel.setToolTipText("In Standalone Mode, any code added or changed in the last 30 days is considered "
       + "new code. Projects in Connected Mode can benefit from a more accurate new code definition based on your "
-      + "SonarQube or SonarCloud settings.");
+      + "SonarQube (Server, Cloud) settings.");
     issuePeriodLabel.setLayoutData(labelLayoutData);
     issuePeriodLabel.addListener(SWT.Selection,
       e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.CLEAN_AS_YOU_CODE, e.display));
@@ -118,7 +118,8 @@ protected void createFieldEditors() {
     PlatformUtils.createHorizontalSpacer(getFieldEditorParent(), 1);
 
     var powerUserLabel = new Link(getFieldEditorParent(), SWT.NONE);
-    powerUserLabel.setText("This section targets power users who want to tweak SonarLint even more. Please refer to <a>the documentation</a>.");
+    powerUserLabel.setText("This section targets power users who want to tweak SonarQube for Eclipse even more. "
+      + "Please refer to <a>the documentation</a>.");
     powerUserLabel.setLayoutData(labelLayoutData);
     powerUserLabel.addListener(SWT.Selection,
       e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.PROVIDE_JAVA_RUNTIME_LINK, e.display));
@@ -127,7 +128,7 @@ protected void createFieldEditors() {
   }
 
   private static class NodeJsField extends AbstractPathField {
-    private static final String NODE_JS_TOOLTIP = "SonarLint requires Node.js to analyze some languages. You can "
+    private static final String NODE_JS_TOOLTIP = "SonarQube requires Node.js to analyze some languages. You can "
       + "provide an explicit path for the node executable here or leave this field blank to let SonarLint look for "
       + "it using your PATH environment variable.";
 
@@ -165,10 +166,10 @@ boolean checkStateFurther(Path value) {
   }
 
   private static class Java17Field extends AbstractPathField {
-    private static final String JAVA_17_TOOLTIP = "SonarLint provides its own JRE to run part of the plug-in out of "
-      + "process if Eclipse is not running with a Java 17+ one that can be used. You can provide an explicit Java 17+ "
-      + "installation to be used instead, e.g. when your IDE is running on Java 16 or lower. But be cautious as it is "
-      + "your responsibility to make sure that it works correctly!";
+    private static final String JAVA_17_TOOLTIP = "SonarQube for Eclipse provides its own JRE to run part of the "
+      + "plug-in out of process if Eclipse is not running with a Java 17+ one that can be used. You can provide an "
+      + "explicit Java 17+ installation to be used instead, e.g. when your IDE is running on Java 16 or lower. But be "
+      + "cautious as it is your responsibility to make sure that it works correctly!";
 
     public Java17Field(Composite parent) {
       super(SonarLintGlobalConfiguration.PREF_JAVA17_PATH, "Java 17+ installation path:", parent, true);
@@ -187,7 +188,7 @@ void provideDefaultValue() {
           getTextControl().setMessage("Using Java installation of Eclipse");
           break;
         case SONARLINT_BUNDLED:
-          getTextControl().setMessage("Using Java installation of SonarLint");
+          getTextControl().setMessage("Using Java installation of SonarQube for Eclipse");
       }
     }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/AboutPropertyPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/AboutPropertyPage.java
index 717322161..5333bc042 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/AboutPropertyPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/AboutPropertyPage.java
@@ -66,9 +66,9 @@ protected Control createContents(final Composite parent) {
     var text = new Link(composite, SWT.NONE);
     var textGd = new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1);
     text.setLayoutData(textGd);
-    text.setText("By sharing anonymous SonarLint usage statistics, you help us understand how SonarLint is used so "
+    text.setText("By sharing anonymous SonarQube for Eclipse usage statistics, you help us understand how it is used so "
       + "we can improve the plugin to work even better for you.\nWe don't collect source code, IP addresses, or any personally identifying "
-      + "information. And we don't share the data with anyone else.\n\nSee a <a href=\"#\">sample of the data.</a>");
+      + "information. And we don't share the data with anyone else.\nSee a <a href=\"#\">sample of the data.</a>");
 
     final var tip = new DefaultToolTip(text, ToolTip.RECREATE, true);
     tip.setText("{\n"
@@ -127,7 +127,7 @@ public void widgetSelected(SelectionEvent e) {
     });
 
     enabledBtn = new Button(composite, SWT.CHECK);
-    enabledBtn.setText("Share anonymous SonarLint statistics");
+    enabledBtn.setText("Share anonymous SonarQube for Eclipse statistics");
     enabledBtn.setSelection(SonarLintTelemetry.isEnabled());
     var layoutData = new GridData();
     layoutData.horizontalSpan = 2;
@@ -136,11 +136,11 @@ public void widgetSelected(SelectionEvent e) {
     /** Information on SonarLint for Eclipse user surveys */
     var surveyHeader = new Link(composite, SWT.NONE);
     surveyHeader.setLayoutData(textGd);
-    surveyHeader.setText("\nSonarLint for Eclipse user survey");
+    surveyHeader.setText("\nSonarQube for Eclipse user survey");
     var surveyText = new Link(composite, SWT.NONE);
     surveyText.setLayoutData(textGd);
     surveyText.setText("From time to time we might provide you with the link to a user survey as we are interested in "
-      + "your feedback to improve SonarLint for Eclipse.\nIt will pop-up for you on IDE startup and you are free to "
+      + "your feedback to improve SonarQube for\nEclipse. It will pop-up for you on IDE startup and you are free to "
       + "check it out, but there is no obligation to take part in the survey.\nYou can come back here anytime to find "
       + "the link to the survey once again, perhaps if you changed your mind and want to take part.");
     var link = SonarLintGlobalConfiguration.getUserSurveyLastLink();
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditGlobalExclusionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditGlobalExclusionDialog.java
index 58a47f1f9..fd21ae5bf 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditGlobalExclusionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditGlobalExclusionDialog.java
@@ -43,7 +43,7 @@ public class EditGlobalExclusionDialog extends EditExclusionDialog {
   /**
    * The standard message to be shown when there are no problems being reported.
    */
-  private static final String STANDARD_MESSAGE = "Define the GLOB pattern to exclude files from SonarLint analyses";
+  private static final String STANDARD_MESSAGE = "Define the GLOB pattern to exclude files from the analyses";
 
   public EditGlobalExclusionDialog(Shell parentShell, @Nullable String editItem) {
     super(parentShell);
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditProjectExclusionDialog.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditProjectExclusionDialog.java
index 1de5e4dd4..57d27c7b8 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditProjectExclusionDialog.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/EditProjectExclusionDialog.java
@@ -300,7 +300,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
     dialog.setAllowMultiple(false);
     dialog.addFilter(viewFilter);
     dialog.setValidator(validator);
-    dialog.setMessage("Select a project folder to be excluded from SonarLint analysis");
+    dialog.setMessage("Select a project folder to be excluded from analysis");
 
     if (editItem != null) {
       dialog.setInitialSelection(editItem.item());
@@ -359,7 +359,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) {
     dialog.setAllowMultiple(false);
     dialog.addFilter(viewFilter);
     dialog.setValidator(validator);
-    dialog.setMessage("Select a project file to be excluded from SonarLint analysis");
+    dialog.setMessage("Select a project file to be excluded from analysis");
     if (editItem != null) {
       dialog.setInitialSelection(editItem.item());
     }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/FileExclusionsPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/FileExclusionsPage.java
index d0affd314..7b1eeb9c7 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/FileExclusionsPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/FileExclusionsPage.java
@@ -78,7 +78,7 @@ public FileExclusionsPage() {
 
   @Override
   public void init(IWorkbench workbench) {
-    setDescription("Configure files to be excluded from SonarLint analysis");
+    setDescription("Configure files to be excluded from the analysis.");
     setPreferenceStore(SonarLintUiPlugin.getDefault().getPreferenceStore());
   }
 
@@ -261,7 +261,7 @@ private static void createLinkToGlobal(final Composite ancestor, Composite paren
 
   private static void createLinkToDocumentation(Composite parent, boolean isSonarCloud) {
     var fLink = new Link(parent, SWT.NONE);
-    fLink.setText("As this project is bound to " + (isSonarCloud ? "SonarCloud" : "SonarQube")
+    fLink.setText("As this project is bound to SonarQube " + (isSonarCloud ? "Cloud" : "Server")
       + ", the file exclusions must be configured there. <a>Learn more</a>");
     var gridData = new GridData();
     gridData.horizontalSpan = 2;
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/RulesConfigurationPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/RulesConfigurationPage.java
index 524d0cf6a..a091468b9 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/RulesConfigurationPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/RulesConfigurationPage.java
@@ -57,7 +57,7 @@ public RulesConfigurationPage() {
 
   @Override
   public void init(IWorkbench workbench) {
-    setDescription("Configure rules used for SonarLint analysis for projects not in Connected Mode.");
+    setDescription("Configure rules used for analysis for projects not in Connected Mode.");
   }
 
   @Override
@@ -68,8 +68,8 @@ protected Control createContents(Composite parent) {
     pageComponent.setLayout(layout);
 
     var label = new Link(pageComponent, SWT.NONE);
-    label.setText("When a project is connected to <a>SonarQube/SonarCloud</a>, "
-      + "configuration from the server applies.");
+    label.setText("When a project is connected to <a>SonarQube (Server, Cloud)</a>, "
+      + "configuration from the connection applies.");
     label.addListener(SWT.Selection,
       e -> BrowserUtils.openExternalBrowser(SonarLintDocumentation.CONNECTED_MODE_LINK, e.display));
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintExtraArgumentsPreferenceAndPropertyPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintExtraArgumentsPreferenceAndPropertyPage.java
index 89165a078..1b1ebee25 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintExtraArgumentsPreferenceAndPropertyPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintExtraArgumentsPreferenceAndPropertyPage.java
@@ -382,7 +382,7 @@ private void upPressed() {
 
   @Override
   public void init(IWorkbench workbench) {
-    setDescription("Additional properties passed to SonarLint analyzers");
+    setDescription("Additional properties passed to analyzers.");
     setPreferenceStore(SonarLintUiPlugin.getDefault().getPreferenceStore());
   }
 
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintProjectPropertyPage.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintProjectPropertyPage.java
index 488ea331e..97d3aae3f 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintProjectPropertyPage.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/properties/SonarLintProjectPropertyPage.java
@@ -99,7 +99,7 @@ protected Control createContents(Composite parent) {
 
     // Binding information and settings
     enabledBtn = new Button(container, SWT.CHECK);
-    enabledBtn.setText("Run SonarLint automatically");
+    enabledBtn.setText("Run SonarQube automatically");
     enabledBtn.setSelection(getProjectConfig().isAutoEnabled());
     var layoutData = new GridData();
     layoutData.horizontalSpan = 2;
@@ -160,8 +160,8 @@ public void widgetSelected(SelectionEvent e) {
 
     var indexExclusionsInformation = new Link(container, SWT.NONE);
     indexExclusionsInformation.setLayoutData(new GridData(SWT.LEFT, SWT.DOWN, true, false, 2, 1));
-    indexExclusionsInformation.setText("SonarLint uses some Eclipse plugins to index your project. Depending on the "
-      + "configuration, SonarLint relies on\nthe Eclipse <a>JDT</a>, <a>CDT</a>, <a>M2E</a> (Maven), or "
+    indexExclusionsInformation.setText("SonarQube for Eclipse uses some Eclipse plugins to index your project. "
+      + "Depending on the configuration, it relies\non the Eclipse <a>JDT</a>, <a>CDT</a>, <a>M2E</a> (Maven), or "
       + "<a>Buildship</a> (Gradle) plugins to exclude certain files and folders in your\ncompilation or build output "
       + "directories. This improves overall performance and lowers the memory footprint.\n\nOpting out of these "
       + "exclusions may impact performance but can be beneficial in certain cases. Each project\nshould be assessed "
@@ -211,14 +211,15 @@ private void updateConnectionState() {
       }
 
       boundDetails
-        .setText("Bound to the project '" + projectBinding.get().getProjectKey() + "' to "
-          + (connectionOpt.get().getOrganization() == null ? "SonarQube" : "SonarCloud")
+        .setText("Bound to the project '" + projectBinding.get().getProjectKey() + "' to SonarQube "
+          + (connectionOpt.get().getOrganization() == null ? "Server" : "Cloud")
           + " on connection '" + serverName(projectBinding.get().getConnectionId()) + "'.");
       bindLink.setText("<a>Change Binding...</a>");
       bindLink.setVisible(true);
     } else {
-      boundDetails.setText("Using SonarLint in Connected Mode with SonarQube/SonarCloud will offer you a lot of benefits. <a>Learn more</a>");
-      bindLink.setText("<a>Bind this Eclipse project to SonarQube/SonarCloud...</a>");
+      boundDetails.setText("Using SonarQube for Eclipse in Connected Mode with SonarQube (Server, Cloud) will offer "
+        + "you a lot of benefits. <a>Learn more</a>");
+      bindLink.setText("<a>Bind this Eclipse project to SonarQube (Server, Cloud)...</a>");
       bindLink.setVisible(true);
     }
   }
@@ -227,7 +228,8 @@ private void updateNewCodeState() {
     var projectBinding = getProjectConfig().getProjectBinding();
     if (SonarLintGlobalConfiguration.issuesOnlyNewCode()) {
       newCodeHeader.setText("Focus on New Code is enabled");
-      newCodeInformation.setText("Only SonarLint markers in new code are shown. Go to the <a>SonarLint preferences</a> to change this setting.");
+      newCodeInformation.setText("Only SonarQube markers in new code are shown. Go to the "
+        + "<a>SonarQube preferences</a> to change this setting.");
 
       newCodeProjectStatus.setVisible(true);
 
@@ -253,7 +255,8 @@ private void updateNewCodeState() {
       }
     } else {
       newCodeHeader.setText("Focus on New Code is disabled");
-      newCodeInformation.setText("SonarLint markers in overall code are shown. Go to the <a>SonarLint preferences</a> to change this setting.");
+      newCodeInformation.setText("SonarQube markers in overall code are shown. Go to the <a>SonarQube preferences</a> "
+        + "to change this setting.");
 
       newCodeProjectStatus.setVisible(false);
     }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/trim/StatusWidget.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/trim/StatusWidget.java
index 773007a4f..b96ca60bf 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/trim/StatusWidget.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/trim/StatusWidget.java
@@ -114,11 +114,11 @@ private static void fillMenu(IMenuManager menuMgr) {
     showViewSubMenu.add(new ShowViewAction("On-The-Fly", OnTheFlyIssuesView.ID, SonarLintImages.VIEW_ON_THE_FLY, "Display issues found by the on-the-fly analysis"));
     showViewSubMenu.add(new ShowViewAction("Report", SonarLintReportView.ID, SonarLintImages.VIEW_REPORT, "Display issues found by manually triggered analyses"));
     showViewSubMenu.add(new ShowViewAction("Rule Description", RuleDescriptionWebView.ID, SonarLintImages.VIEW_RULE, "Display rule description for the selected issue"));
-    showViewSubMenu.add(new ShowViewAction("Bindings", BindingsView.ID, SonarLintImages.VIEW_BINDINGS, "Allow to configure connections and bindings for SonarLint Connected Mode"));
-    showViewSubMenu.add(new ShowViewAction("Security Hotspots", HotspotsView.ID, SonarLintImages.VIEW_HOTSPOTS, "Show security hotspots opened from SonarQube"));
+    showViewSubMenu.add(new ShowViewAction("Bindings", BindingsView.ID, SonarLintImages.VIEW_BINDINGS, "Allow to configure connections and bindings for SonarQube Connected Mode"));
+    showViewSubMenu.add(new ShowViewAction("Security Hotspots", HotspotsView.ID, SonarLintImages.VIEW_HOTSPOTS, "Show security hotspots opened from SonarQube Server"));
     showViewSubMenu.add(new ShowViewAction("Issue locations", IssueLocationsView.ID, SonarLintImages.VIEW_LOCATIONS, "Show secondary locations or flows for the selected issue"));
     showViewSubMenu.add(new ShowViewAction("Taint Vulnerabilities", TaintVulnerabilitiesView.ID, SonarLintImages.VIEW_VULNERABILITIES,
-      "Show taint vulnerabilities found by SonarQube or SonarCloud"));
+      "Show taint vulnerabilities found by SonarQube (Server, Cloud)"));
     menuMgr.add(showViewSubMenu);
 
     menuMgr.add(new OpenGloblaSettingsAction());
@@ -127,7 +127,7 @@ private static void fillMenu(IMenuManager menuMgr) {
   }
 
   private static void updateToolTip(Control icon) {
-    var text = "SonarLint";
+    var text = "SonarQube";
     if (!text.equals(icon.getToolTipText())) {
       icon.setToolTipText(text);
     }
@@ -160,7 +160,7 @@ static class OpenGloblaSettingsAction extends Action {
 
     OpenGloblaSettingsAction() {
       super("Preferences...");
-      setDescription("Open SonarLint Global Preferences");
+      setDescription("Open SonarQube Global Preferences");
     }
 
     @Override
@@ -173,7 +173,7 @@ static class OpenReleaseNotesAction extends Action {
 
     OpenReleaseNotesAction() {
       super("Release Notes...");
-      setDescription("Open SonarLint Release Notes");
+      setDescription("Open SonarQube for Eclipse Release Notes");
     }
 
     @Override
@@ -187,7 +187,7 @@ static class ShowConsoleAction extends Action {
     ShowConsoleAction() {
       super("Show Console");
       setImageDescriptor(ConsolePlugin.getImageDescriptor(IConsoleConstants.IMG_VIEW_CONSOLE));
-      setDescription("Open SonarLint Logs in the Console View");
+      setDescription("Open Logs in the SonarQube Console");
     }
 
     @Override
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/util/MessageDialogUtils.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/util/MessageDialogUtils.java
index ea9a535ff..f564f94ea 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/util/MessageDialogUtils.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/util/MessageDialogUtils.java
@@ -79,7 +79,7 @@ public static void enhancedWithConnectedModeInformation(String title, String mes
   public static void enhancedWithConnectedModeInformation(Shell shell, String title, String message) {
     var result = new MessageDialog(shell, title, null,
       message, MessageDialog.INFORMATION,
-      new String[] {"Learn more", "Try SonarCloud for free", "Don't ask again"}, 0).open();
+      new String[] {"Learn more", "Try SonarQube Cloud for free", "Don't ask again"}, 0).open();
 
     // The result corresponds to the index in the array; totally confusing as the pre-selected button (in our case
     // "Learn more") is always the rightmost one.
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/MarkerViewWithBottomPanel.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/MarkerViewWithBottomPanel.java
index 742f94f40..9db2695eb 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/MarkerViewWithBottomPanel.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/MarkerViewWithBottomPanel.java
@@ -29,7 +29,7 @@
 import org.sonarlint.eclipse.ui.internal.SonarLintRpcClientSupportService;
 
 public abstract class MarkerViewWithBottomPanel extends MarkerSupportView {
-  protected static final String UNAVAILABLE_MESSAGE = "The analysis is not available as the SonarLint backend is not ready";
+  protected static final String UNAVAILABLE_MESSAGE = "The analysis is not available as the backend is not ready";
 
   @Nullable
   protected static MarkerViewWithBottomPanel instance;
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/OnTheFlyIssuesView.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/OnTheFlyIssuesView.java
index ed8f51204..f6b23038e 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/OnTheFlyIssuesView.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/OnTheFlyIssuesView.java
@@ -51,7 +51,7 @@ protected void populateBottomPanel(Composite bottom) {
   @Override
   public void resetDefaultText() {
     bottomLabel.setText(
-      "Issues reported \"on the fly\" by SonarLint on files you have recently opened/edited. <a>Learn more</a>");
+      "Issues reported \"on the fly\" on files you have recently opened/edited. <a>Learn more</a>");
     bottomLabel.getParent().layout();
   }
 }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/SonarLintReportView.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/SonarLintReportView.java
index 1b7c695b4..448ef2320 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/SonarLintReportView.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/SonarLintReportView.java
@@ -61,7 +61,7 @@ public void resetDefaultText() {
     if (reportTitle != null) {
       bottomLabel.setText(reportTitle + " (at " + DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm").format(reportDate) + "). <a>Learn more</a>");
     } else {
-      bottomLabel.setText("Run the analysis from the SonarLint context menu to find issues in the SCM change set or in all your project files. <a>Learn more</a>");
+      bottomLabel.setText("Run the analysis from the SonarQube context menu to find issues in the SCM change set or in all your project files. <a>Learn more</a>");
     }
     bottomLabel.getParent().layout();
   }
diff --git a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/TaintVulnerabilitiesView.java b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/TaintVulnerabilitiesView.java
index 3a81fdcdc..24bf74914 100644
--- a/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/TaintVulnerabilitiesView.java
+++ b/org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/views/issues/TaintVulnerabilitiesView.java
@@ -52,7 +52,8 @@ protected void populateBottomPanel(Composite bottom) {
   @Override
   public void resetDefaultText() {
     bottomLabel.setText(
-      "This view displays taint vulnerabilities detected by SonarQube or SonarCloud. SonarLint does not detect those issues locally. <a>Learn more</a>");
+      "This view displays taint vulnerabilities detected by SonarQube (Server, Cloud). SonarQube for Eclipse does not "
+        + "detect those issues locally. <a>Learn more</a>");
     bottomLabel.getParent().layout();
   }
 }