diff --git a/UI/Series/Edit/EditSeriesView.js b/UI/Series/Edit/EditSeriesView.js
index 3943cf282..f4ded82ba 100644
--- a/UI/Series/Edit/EditSeriesView.js
+++ b/UI/Series/Edit/EditSeriesView.js
@@ -10,7 +10,7 @@ define(['app', 'Series/SeriesModel', 'Series/Delete/DeleteSeriesView', 'Quality/
             progressbar    : '.progress .bar',
             qualityProfile : '.x-quality-profile',
             backlogSettings: '.x-backlog-setting',
-            switch         : '.switch'
+            bsSwitch         : '.switch'
         },
 
         events: {
@@ -19,7 +19,7 @@ define(['app', 'Series/SeriesModel', 'Series/Delete/DeleteSeriesView', 'Quality/
         },
 
         onRender: function () {
-            this.ui.switch.bootstrapSwitch();
+            this.ui.bsSwitch.bootstrapSwitch();
         },
 
 
diff --git a/UI/Settings/DownloadClient/DownloadClientView.js b/UI/Settings/DownloadClient/DownloadClientView.js
index 23522c1c6..f954fe8b2 100644
--- a/UI/Settings/DownloadClient/DownloadClientView.js
+++ b/UI/Settings/DownloadClient/DownloadClientView.js
@@ -10,7 +10,7 @@ define([
         className: 'form-horizontal',
 
         ui: {
-            switch              : '.switch',
+            bsSwitch              : '.switch',
             tooltip             : '.help-inline i',
             pathInput           : '.x-path',
             sabConfig           : '.x-sab-config',
@@ -25,7 +25,7 @@ define([
         },
 
         onRender: function () {
-            this.ui.switch.bootstrapSwitch();
+            this.ui.bsSwitch.bootstrapSwitch();
             this.ui.tooltip.tooltip({ placement: 'right', html: true });
             this.ui.pathInput.autoComplete('/directories');
 
diff --git a/UI/Settings/Misc/MiscView.js b/UI/Settings/Misc/MiscView.js
index ad6f47c97..1ce5da591 100644
--- a/UI/Settings/Misc/MiscView.js
+++ b/UI/Settings/Misc/MiscView.js
@@ -10,12 +10,12 @@ define([
         className: 'form-horizontal',
 
         ui: {
-            switch : '.switch',
+            bsSwitch : '.switch',
             tooltip: '[class^="help-inline"] i'
         },
 
         onRender: function () {
-            this.ui.switch.bootstrapSwitch();
+            this.ui.bsSwitch.bootstrapSwitch();
             this.ui.tooltip.tooltip({ placement: 'right', html: true });
         }
     });
diff --git a/UI/Settings/Naming/NamingTemplate.html b/UI/Settings/Naming/NamingTemplate.html
index 283b90714..84e381644 100644
--- a/UI/Settings/Naming/NamingTemplate.html
+++ b/UI/Settings/Naming/NamingTemplate.html
@@ -68,7 +68,7 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Use Scene Folders</label>
+        <label class="control-label">Use Season Folders</label>
 
         <div class="controls">
             <div class="switch">
diff --git a/UI/Settings/Naming/NamingView.js b/UI/Settings/Naming/NamingView.js
index 69bebed35..17375ee75 100644
--- a/UI/Settings/Naming/NamingView.js
+++ b/UI/Settings/Naming/NamingView.js
@@ -10,7 +10,7 @@ define([
         className: 'form-horizontal',
 
         ui: {
-            switch : '.switch',
+            bsSwitch : '.switch',
             tooltip: '[class^="help-inline"] i'
         },
 
@@ -19,7 +19,7 @@ define([
         },
 
         onRender: function () {
-            this.ui.switch.bootstrapSwitch();
+            this.ui.bsSwitch.bootstrapSwitch();
             this.ui.tooltip.tooltip({ placement: 'right' });
         }
     });
diff --git a/UI/Settings/Quality/Profile/EditQualityProfileView.js b/UI/Settings/Quality/Profile/EditQualityProfileView.js
index 0e88b9702..803293149 100644
--- a/UI/Settings/Quality/Profile/EditQualityProfileView.js
+++ b/UI/Settings/Quality/Profile/EditQualityProfileView.js
@@ -7,7 +7,7 @@ define(['app', 'Quality/QualityProfileModel'], function () {
         className: "modal",
 
         ui: {
-            switch: '.switch'
+            bsSwitch: '.switch'
         },
 
         events: {
@@ -15,7 +15,7 @@ define(['app', 'Quality/QualityProfileModel'], function () {
         },
 
         onRender: function () {
-            this.ui.switch.bootstrapSwitch();
+            this.ui.bsSwitch.bootstrapSwitch();
         },
 
         saveQualityProfile: function () {