diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h
index 17dcf9cd..829777c2 100644
--- a/sleepyhead/SleepLib/common.h
+++ b/sleepyhead/SleepLib/common.h
@@ -123,7 +123,7 @@ const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck";
 const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency";
 const QString STR_GEN_DataFolder = "DataFolder";
 
-const QString STR_PREF_AllowEventRenaming = "AllowEventRenaming";
+const QString STR_PREF_ResetChannelNames = "ResetChannelNames";
 const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates";
 const QString STR_PREF_ReimportBackup = "ReimportBackup";
 const QString STR_PREF_LastCPAPPath = "LastCPAPPath";
diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp
index 4437d19e..2ce84b86 100644
--- a/sleepyhead/SleepLib/schema.cpp
+++ b/sleepyhead/SleepLib/schema.cpp
@@ -106,6 +106,7 @@ void init()
     DataTypes["datetime"] = DATETIME;
     DataTypes["time"] = TIME;
 
+    // Note: Old channel names stored in channels.xml are not translatable.. they need to be moved to be defined AFTER here instead
     if (!schema::channel.Load(":/docs/channels.xml")) {
         QMessageBox::critical(0, STR_MessageBox_Error,
                               QObject::tr("Couldn't parse Channels.xml, this build is seriously borked, no choice but to abort!!"),
@@ -753,7 +754,7 @@ bool ChannelList::Load(QString filename)
 
             scope = Scopes[scopestr];
 
-//            if (PREF[STR_PREF_AllowEventRenaming].toBool()) {
+//            if (PREF[STR_PREF_ResetEventNames].toBool()) {
                 name = e.attribute("name", "");
                 details = e.attribute("details", "");
                 label = e.attribute("label", "");
diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp
index 98da0244..0388a2bb 100644
--- a/sleepyhead/main.cpp
+++ b/sleepyhead/main.cpp
@@ -402,7 +402,7 @@ retry_directory:
     PREF.init(STR_GEN_UpdateCheckFrequency, 7);    // days
     PREF.init(STR_PREF_AllowEarlyUpdates, false);
 
-    PREF.init(STR_PREF_AllowEventRenaming, true);
+    PREF.init(STR_PREF_ResetChannelNames, false);
 
     ////////////////////////////////////////////////////////////////////////////////////////////
     // Check when last checked for updates..
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 7d65c519..f1a8d660 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -478,11 +478,12 @@ void loadChannels()
         chan->setDefaultColor(color);
 
         // Don't import channel descriptions if event renaming is turned off. (helps pick up new translations)
-        if (PREF[STR_PREF_AllowEventRenaming].toBool()) {
+        if (!PREF[STR_PREF_ResetChannelNames].toBool()) {
             chan->setFullname(fullname);
             chan->setLabel(label);
             chan->setDescription(description);
         }
+        PREF[STR_PREF_ResetChannelNames]=false;
 
         chan->setLowerThreshold(lowerThreshold);
         chan->setLowerThresholdColor(lowerThresholdColor);
@@ -2567,9 +2568,13 @@ void MainWindow::on_actionHelp_Support_SleepyHead_Development_triggered()
 
 void MainWindow::on_actionChange_Language_triggered()
 {
-    //QSettings *settings = new QSettings(getDeveloperName(), getAppName());
-    //settings->remove("Settings/Language");
-    //delete settings;
+    // Pop up a message box asking if you would like to reset Channel event/waveform names
+    // Sorry Translators who frequently language hop, this is an extra step, but this one is for the users. :/
+    if (QMessageBox::question(this,STR_MessageBox_Warning,tr("Changing the language will reset custom Event and Waveform names/labels/descriptions.")+"\n\n"+tr("Are you sure you want to do this?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
+        return;
+    }
+    PREF[STR_PREF_ResetChannelNames]=true;
+
     p_profile->Save();
     PREF.Save();
 
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index 50e7233c..60afa2da 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -201,8 +201,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
         RefreshLastChecked();
     } else { ui->updateLastChecked->setText("Never"); }
 
-    ui->allowEventRenaming->setChecked(PREF[STR_PREF_AllowEventRenaming].toBool());
-
     ui->overlayFlagsCombo->setCurrentIndex(profile->appearance->overlayType());
     ui->overviewLinecharts->setCurrentIndex(profile->appearance->overviewLinechartMode());
 
@@ -805,7 +803,6 @@ bool PreferencesDialog::Save()
     PREF[STR_GEN_UpdatesAutoCheck] = ui->automaticallyCheckUpdates->isChecked();
     PREF[STR_GEN_UpdateCheckFrequency] = ui->updateCheckEvery->value();
     PREF[STR_PREF_AllowEarlyUpdates] = ui->allowEarlyUpdates->isChecked();
-    PREF[STR_PREF_AllowEventRenaming] = ui->allowEventRenaming->isChecked();
 
 
     PREF["Fonts_Application_Name"] = ui->applicationFont->currentText();
diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui
index 3c4a43ef..8be4c266 100644
--- a/sleepyhead/preferencesdialog.ui
+++ b/sleepyhead/preferencesdialog.ui
@@ -57,7 +57,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>4</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">
@@ -1244,13 +1244,6 @@ Defaults to 60 minutes.. Highly recommend it's left at this value.</string>
               </item>
              </widget>
             </item>
-            <item row="3" column="2" colspan="2">
-             <widget class="QCheckBox" name="allowEventRenaming">
-              <property name="text">
-               <string>Allow Event Renaming</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </widget>
          </item>