4 files changed, 17 insertions, 15 deletions
diff --git a/launcher/setupwizard/AnalyticsWizardPage.cpp b/launcher/setupwizard/AnalyticsWizardPage.cpp
index 4fb0bcca..f1d7b006 100644
--- a/launcher/setupwizard/AnalyticsWizardPage.cpp
+++ b/launcher/setupwizard/AnalyticsWizardPage.cpp
@@ -1,5 +1,5 @@
 #include "AnalyticsWizardPage.h"
-#include <MultiMC.h>
+#include <Launcher.h>
 
 #include <QVBoxLayout>
 #include <QTextBrowser>
@@ -33,8 +33,8 @@ AnalyticsWizardPage::~AnalyticsWizardPage()
 
 bool AnalyticsWizardPage::validatePage()
 {
-    auto settings = MMC->settings();
-    auto analytics = MMC->analytics();
+    auto settings = LAUNCHER->settings();
+    auto analytics = LAUNCHER->analytics();
     auto status = checkBox->isChecked();
     settings->set("AnalyticsSeen", analytics->version());
     settings->set("Analytics", status);
@@ -47,13 +47,13 @@ void AnalyticsWizardPage::retranslate()
     setSubTitle(tr("We track some anonymous statistics about users."));
     textBrowser->setHtml(tr(
         "<html><body>"
-        "<p>MultiMC sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
+        "<p>The launcher sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p>"
         "<p>The data is processed by Google Analytics, see their <a href=\"https://support.google.com/analytics/answer/6004245?hl=en\">article on the "
         "matter</a>.</p>"
         "<p>The following data is collected:</p>"
-        "<ul><li>A random unique ID of the MultiMC installation.<br />It is stored in the application settings (multimc.cfg).</li>"
+        "<ul><li>A random unique ID of the installation.<br />It is stored in the application settings file.</li>"
         "<li>Anonymized (partial) IP address.</li>"
-        "<li>MultiMC version.</li>"
+        "<li>Launcher version.</li>"
         "<li>Operating system name, version and architecture.</li>"
         "<li>CPU architecture (kernel architecture on linux).</li>"
         "<li>Size of system memory.</li>"
diff --git a/launcher/setupwizard/JavaWizardPage.cpp b/launcher/setupwizard/JavaWizardPage.cpp
index ad571c09..a60090ce 100644
--- a/launcher/setupwizard/JavaWizardPage.cpp
+++ b/launcher/setupwizard/JavaWizardPage.cpp
@@ -1,5 +1,5 @@
 #include "JavaWizardPage.h"
-#include <MultiMC.h>
+#include <Launcher.h>
 
 #include <QVBoxLayout>
 #include <QGroupBox>
@@ -55,7 +55,7 @@ bool JavaWizardPage::wantsRefreshButton()
 
 bool JavaWizardPage::validatePage()
 {
-    auto settings = MMC->settings();
+    auto settings = LAUNCHER->settings();
     auto result = m_java_widget->validate();
     switch(result)
     {
@@ -71,7 +71,7 @@ bool JavaWizardPage::validatePage()
         case JavaSettingsWidget::ValidationStatus::JavaBad:
         {
             // Memory
-            auto s = MMC->settings();
+            auto s = LAUNCHER->settings();
             s->set("MinMemAlloc", m_java_widget->minHeapSize());
             s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
             if (m_java_widget->permGenEnabled())
diff --git a/launcher/setupwizard/LanguageWizardPage.cpp b/launcher/setupwizard/LanguageWizardPage.cpp
index ca93c6f5..e352ccca 100644
--- a/launcher/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/setupwizard/LanguageWizardPage.cpp
@@ -1,9 +1,10 @@
 #include "LanguageWizardPage.h"
-#include <MultiMC.h>
+#include <Launcher.h>
 #include <translations/TranslationsModel.h>
 
 #include "widgets/LanguageSelectionWidget.h"
 #include <QVBoxLayout>
+#include <BuildConfig.h>
 
 LanguageWizardPage::LanguageWizardPage(QWidget *parent)
     : BaseWizardPage(parent)
@@ -28,13 +29,13 @@ bool LanguageWizardPage::wantsRefreshButton()
 
 void LanguageWizardPage::refresh()
 {
-    auto translations = MMC->translations();
+    auto translations = LAUNCHER->translations();
     translations->downloadIndex();
 }
 
 bool LanguageWizardPage::validatePage()
 {
-    auto settings = MMC->settings();
+    auto settings = LAUNCHER->settings();
     QString key = mainWidget->getSelectedLanguageKey();
     settings->set("Language", key);
     return true;
@@ -43,6 +44,6 @@ bool LanguageWizardPage::validatePage()
 void LanguageWizardPage::retranslate()
 {
     setTitle(tr("Language"));
-    setSubTitle(tr("Select the language to use in MultiMC"));
+    setSubTitle(tr("Select the language to use in %1").arg(BuildConfig.LAUNCHER_NAME));
     mainWidget->retranslate();
 }
diff --git a/launcher/setupwizard/SetupWizard.cpp b/launcher/setupwizard/SetupWizard.cpp
index 60a78b8d..46b2ef79 100644
--- a/launcher/setupwizard/SetupWizard.cpp
+++ b/launcher/setupwizard/SetupWizard.cpp
@@ -5,11 +5,12 @@
 #include "AnalyticsWizardPage.h"
 
 #include "translations/TranslationsModel.h"
-#include <MultiMC.h>
+#include <Launcher.h>
 #include <FileSystem.h>
 #include <ganalytics.h>
 
 #include <QAbstractButton>
+#include <BuildConfig.h>
 
 SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
 {
@@ -30,7 +31,7 @@ void SetupWizard::retranslate()
     setButtonText(QWizard::BackButton, tr("< &Back"));
     setButtonText(QWizard::FinishButton, tr("&Finish"));
     setButtonText(QWizard::CustomButton1, tr("&Refresh"));
-    setWindowTitle(tr("MultiMC Quick Setup"));
+    setWindowTitle(tr("%1 Quick Setup").arg(BuildConfig.LAUNCHER_NAME));
 }
 
 BaseWizardPage * SetupWizard::getBasePage(int id)