diff --git a/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs b/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
index fb6ef94e5..b2a7c9b65 100644
--- a/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
+++ b/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
@@ -6,10 +6,10 @@ namespace NzbDrone.Api.Config
 {
     public class MediaManagementConfigResource : RestResource
     {
-        public bool AutoUnmonitorPreviouslyDownloadedEpisodes { get; set; }
+        public bool AutoUnmonitorPreviouslyDownloadedTracks { get; set; }
         public string RecycleBin { get; set; }
         public bool AutoDownloadPropers { get; set; }
-        public bool CreateEmptySeriesFolders { get; set; }
+        public bool CreateEmptyArtistFolders { get; set; }
         public FileDateType FileDate { get; set; }
 
         public bool SetPermissionsLinux { get; set; }
@@ -31,10 +31,10 @@ namespace NzbDrone.Api.Config
         {
             return new MediaManagementConfigResource
             {
-                AutoUnmonitorPreviouslyDownloadedEpisodes = model.AutoUnmonitorPreviouslyDownloadedEpisodes,
+                AutoUnmonitorPreviouslyDownloadedTracks = model.AutoUnmonitorPreviouslyDownloadedTracks,
                 RecycleBin = model.RecycleBin,
                 AutoDownloadPropers = model.AutoDownloadPropers,
-                CreateEmptySeriesFolders = model.CreateEmptySeriesFolders,
+                CreateEmptyArtistFolders = model.CreateEmptyArtistFolders,
                 FileDate = model.FileDate,
 
                 SetPermissionsLinux = model.SetPermissionsLinux,
diff --git a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
index 794dfa2f7..2a8dd88bc 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
             GivenRootFolder(_otherArtistFolder);
 
             Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.CreateEmptySeriesFolders)
+                  .Setup(s => s.CreateEmptyArtistFolders)
                   .Returns(true);
 
             Subject.Scan(_artist);
@@ -126,7 +126,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
             GivenRootFolder(_otherArtistFolder);
 
             Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.CreateEmptySeriesFolders)
+                  .Setup(s => s.CreateEmptyArtistFolders)
                   .Returns(false);
 
             Subject.Scan(_artist);
@@ -158,7 +158,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
             GivenRootFolder(_otherArtistFolder);
 
             Mocker.GetMock<IConfigService>()
-                  .Setup(s => s.CreateEmptySeriesFolders)
+                  .Setup(s => s.CreateEmptyArtistFolders)
                   .Returns(true);
 
             Subject.Scan(_artist);
diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeServiceTests/HandleEpisodeFileDeletedFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeServiceTests/HandleEpisodeFileDeletedFixture.cs
index 96b5002ff..4cb575007 100644
--- a/src/NzbDrone.Core.Test/TvTests/EpisodeServiceTests/HandleEpisodeFileDeletedFixture.cs
+++ b/src/NzbDrone.Core.Test/TvTests/EpisodeServiceTests/HandleEpisodeFileDeletedFixture.cs
@@ -81,7 +81,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeServiceTests
             GivenSingleEpisodeFile();
 
             Mocker.GetMock<IConfigService>()
-                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedTracks)
                   .Returns(true);
 
             Subject.Handle(new EpisodeFileDeletedEvent(_episodeFile, DeleteMediaFileReason.MissingFromDisk));
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeServiceTests
             GivenSingleEpisodeFile();
 
             Mocker.GetMock<IConfigService>()
-                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedTracks)
                   .Returns(false);
 
             Subject.Handle(new EpisodeFileDeletedEvent(_episodeFile, DeleteMediaFileReason.Upgrade));
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeServiceTests
             GivenSingleEpisodeFile();
 
             Mocker.GetMock<IConfigService>()
-                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                  .SetupGet(s => s.AutoUnmonitorPreviouslyDownloadedTracks)
                   .Returns(true);
 
             Subject.Handle(new EpisodeFileDeletedEvent(_episodeFile, DeleteMediaFileReason.Upgrade));
diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs
index d9b57d68a..2ff500fa9 100644
--- a/src/NzbDrone.Core/Configuration/ConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigService.cs
@@ -81,10 +81,10 @@ namespace NzbDrone.Core.Configuration
             set { SetValue(ConfigKey.DownloadedEpisodesFolder.ToString(), value); }
         }
 
-        public bool AutoUnmonitorPreviouslyDownloadedEpisodes
+        public bool AutoUnmonitorPreviouslyDownloadedTracks
         {
-            get { return GetValueBoolean("AutoUnmonitorPreviouslyDownloadedEpisodes"); }
-            set { SetValue("AutoUnmonitorPreviouslyDownloadedEpisodes", value); }
+            get { return GetValueBoolean("AutoUnmonitorPreviouslyDownloadedTracks"); }
+            set { SetValue("AutoUnmonitorPreviouslyDownloadedTracks", value); }
         }
 
         public int Retention
@@ -148,11 +148,11 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("RemoveFailedDownloads", value); }
         }
 
-        public bool CreateEmptySeriesFolders
+        public bool CreateEmptyArtistFolders
         {
-            get { return GetValueBoolean("CreateEmptySeriesFolders", false); }
+            get { return GetValueBoolean("CreateEmptyArtistFolders", false); }
 
-            set { SetValue("CreateEmptySeriesFolders", value); }
+            set { SetValue("CreateEmptyArtistFolders", value); }
         }
 
         public FileDateType FileDate
diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs
index 589e003e1..27f763d1e 100644
--- a/src/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/IConfigService.cs
@@ -24,10 +24,10 @@ namespace NzbDrone.Core.Configuration
         bool RemoveFailedDownloads { get; set; }
 
         //Media Management
-        bool AutoUnmonitorPreviouslyDownloadedEpisodes { get; set; }
+        bool AutoUnmonitorPreviouslyDownloadedTracks { get; set; }
         string RecycleBin { get; set; }
         bool AutoDownloadPropers { get; set; }
-        bool CreateEmptySeriesFolders { get; set; }
+        bool CreateEmptyArtistFolders { get; set; }
         FileDateType FileDate { get; set; }
         bool SkipFreeSpaceCheckWhenImporting { get; set; }
         bool CopyUsingHardlinks { get; set; }
diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 9f8eb33bd..918440c59 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -91,7 +91,7 @@ namespace NzbDrone.Core.MediaFiles
 
             if (!_diskProvider.FolderExists(artist.Path))
             {
-                if (_configService.CreateEmptySeriesFolders)
+                if (_configService.CreateEmptyArtistFolders)
                 {
                     _logger.Debug("Creating missing artist folder: {0}", artist.Path);
                     _diskProvider.CreateFolder(artist.Path);
diff --git a/src/NzbDrone.Core/Music/TrackService.cs b/src/NzbDrone.Core/Music/TrackService.cs
index a93ac3746..76fc7a5ca 100644
--- a/src/NzbDrone.Core/Music/TrackService.cs
+++ b/src/NzbDrone.Core/Music/TrackService.cs
@@ -170,7 +170,7 @@ namespace NzbDrone.Core.Music
                 _logger.Debug("Detaching track {0} from file.", track.Id);
                 track.TrackFileId = 0;
 
-                if (message.Reason != DeleteMediaFileReason.Upgrade && _configService.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                if (message.Reason != DeleteMediaFileReason.Upgrade && _configService.AutoUnmonitorPreviouslyDownloadedTracks)
                 {
                     track.Monitored = false;
                 }
diff --git a/src/NzbDrone.Core/Tv/EpisodeService.cs b/src/NzbDrone.Core/Tv/EpisodeService.cs
index 32a46ec45..5a117ab11 100644
--- a/src/NzbDrone.Core/Tv/EpisodeService.cs
+++ b/src/NzbDrone.Core/Tv/EpisodeService.cs
@@ -204,7 +204,7 @@ namespace NzbDrone.Core.Tv
                 _logger.Debug("Detaching episode {0} from file.", episode.Id);
                 episode.EpisodeFileId = 0;
 
-                if (message.Reason != DeleteMediaFileReason.Upgrade && _configService.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                if (message.Reason != DeleteMediaFileReason.Upgrade && _configService.AutoUnmonitorPreviouslyDownloadedTracks)
                 {
                     episode.Monitored = false;
                 }
diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
index d86b4c440..6cb30cb87 100644
--- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs
@@ -2,12 +2,12 @@
     <legend>File Management</legend>
 
     <div class="form-group">
-        <label class="col-sm-3 control-label">Ignore Deleted Episodes</label>
+        <label class="col-sm-3 control-label">Ignore Deleted Tracks</label>
 
         <div class="col-sm-9">
             <div class="input-group">
                 <label class="checkbox toggle well">
-                    <input type="checkbox" name="autoUnmonitorPreviouslyDownloadedEpisodes"/>
+                    <input type="checkbox" name="autoUnmonitorPreviouslyDownloadedTracks"/>
                     <p>
                         <span>Yes</span>
                         <span>No</span>
@@ -17,7 +17,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-lidarr-form-info" title="Episodes deleted from disk are automatically unmonitored in Lidarr"/>
+                    <i class="icon-lidarr-form-info" title="Tracks deleted from disk are automatically unmonitored in Lidarr"/>
                 </span>
             </div>
         </div>
@@ -46,7 +46,7 @@
     </div>
 
     <div class="form-group advanced-setting">
-        <label class="col-sm-3 control-label">Analyse video files</label>
+        <label class="col-sm-3 control-label">Analyse Audio Files</label>
 
         <div class="col-sm-9">
             <div class="input-group">
@@ -61,7 +61,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-lidarr-form-info" title="Extract video information such as resolution, runtime and codec information from files. This requires Lidarr to read parts of the file which may cause high disk or network activity during scans."/>
+                    <i class="icon-lidarr-form-info" title="Extract audio information such as bitrate, runtime and codec information from files. This requires Lidarr to read parts of the file which may cause high disk or network activity during scans."/>
                 </span>
             </div>
         </div>
@@ -87,7 +87,7 @@
         <label class="col-sm-3 control-label">Recycling Bin</label>
 
         <div class="col-sm-1 col-sm-push-8 help-inline">
-            <i class="icon-lidarr-form-info" title="Episode files will go here when deleted instead of being permanently deleted"/>
+            <i class="icon-lidarr-form-info" title="Track files will go here when deleted instead of being permanently deleted"/>
         </div>
 
         <div class="col-sm-8 col-sm-pull-1">
diff --git a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
index ecc46b781..75f8ddf48 100644
--- a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.hbs
@@ -40,7 +40,7 @@
         <label class="col-sm-3 control-label">Folder chmod mask</label>
 
         <div class="col-sm-1 col-sm-push-4 help-inline">
-            <i class="icon-lidarr-form-info" title="Octal, applied to series/season folders created by Lidarr"/>
+            <i class="icon-lidarr-form-info" title="Octal, applied to artist/album folders created by Lidarr"/>
         </div>
 
         <div class="col-sm-4 col-sm-pull-1">
diff --git a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
index 5e77e2d7c..dcc6fa291 100644
--- a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
+++ b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs
@@ -2,12 +2,12 @@
     <legend>Folders</legend>
 
     <div class="form-group">
-        <label class="col-sm-3 control-label">Create empty series folders</label>
+        <label class="col-sm-3 control-label">Create Empty Artist Folders</label>
 
         <div class="col-sm-9">
             <div class="input-group">
                 <label class="checkbox toggle well">
-                    <input type="checkbox" name="createEmptySeriesFolders"/>
+                    <input type="checkbox" name="createEmptyArtistFolders"/>
 
                     <p>
                         <span>Yes</span>
@@ -18,7 +18,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-lidarr-form-info" title="Create missing series folders during disk scan"/>
+                    <i class="icon-lidarr-form-info" title="Create missing artist folders during disk scan"/>
                 </span>
             </div>
         </div>
@@ -46,7 +46,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-lidarr-form-info" title="Use when drone is unable to detect free space from your series root folder"/>
+                    <i class="icon-lidarr-form-info" title="Use when drone is unable to detect free space from your artist root folder"/>
                 </span>
             </div>
         </div>
@@ -94,7 +94,7 @@
                 </label>
 
                 <span class="help-inline-checkbox">
-                    <i class="icon-lidarr-form-info" title="Import matching extra files (subtitles, nfo, etc) after importing an episode file"/>
+                    <i class="icon-lidarr-form-info" title="Import matching extra files (subtitles, nfo, etc) after importing an album or track file"/>
                 </span>
             </div>
         </div>
diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
index f6b702f20..148d78118 100644
--- a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
@@ -33,7 +33,7 @@
                         </label>
 
                         <span class="help-inline-checkbox">
-                            <i class="icon-lidarr-form-info" title="Be notified when episodes are available for download and has been sent to a download client"/>
+                            <i class="icon-lidarr-form-info" title="Be notified when albums are available for download and has been sent to a download client"/>
                         </span>
                     </div>
                 </div>
@@ -55,7 +55,7 @@
                         </label>
 
                         <span class="help-inline-checkbox">
-                            <i class="icon-lidarr-form-info" title="Be notified when episodes are successfully downloaded"/>
+                            <i class="icon-lidarr-form-info" title="Be notified when albums are successfully downloaded"/>
                         </span>
                     </div>
                 </div>
@@ -77,7 +77,7 @@
                         </label>
 
                         <span class="help-inline-checkbox">
-                            <i class="icon-lidarr-form-info" title="Be notified when episodes are upgraded to a better quality"/>
+                            <i class="icon-lidarr-form-info" title="Be notified when albums are upgraded to a better quality"/>
                         </span>
                     </div>
                 </div>
@@ -99,7 +99,7 @@
                         </label>
 
                         <span class="help-inline-checkbox">
-                            <i class="icon-lidarr-form-info" title="Be notified when episodes are renamed"/>
+                            <i class="icon-lidarr-form-info" title="Be notified when albums are renamed"/>
                         </span>
                     </div>
                 </div>
@@ -113,7 +113,7 @@
                 </div>
 
                 <div class="col-sm-1 help-inline">
-                    <i class="icon-lidarr-form-info" title="Only send notifications for series with matching tags"/>
+                    <i class="icon-lidarr-form-info" title="Only send notifications for artist with matching tags"/>
                 </div>
             </div>
 
diff --git a/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
index 9ed85d156..894fb68cf 100644
--- a/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.hbs
@@ -22,7 +22,7 @@
     </div>
 
     <div class="col-sm-1 help-inline">
-        <i class="icon-lidarr-form-info" title="Series assigned this profile will be look for episodes with the selected language"/>
+        <i class="icon-lidarr-form-info" title="Artists assigned this profile will be looking for albums with the selected language"/>
     </div>
 </div>
 
@@ -40,6 +40,6 @@
     </div>
 
     <div class="col-sm-1 help-inline">
-        <i class="icon-lidarr-form-info" title="Once this quality is reached Lidarr will no longer download episodes"/>
+        <i class="icon-lidarr-form-info" title="Once this quality is reached Lidarr will no longer download albums"/>
     </div>
 </div>
diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
index 067a70fe3..ee0a5faef 100644
--- a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
+++ b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs
@@ -6,7 +6,7 @@
                 <div class="row">
                     <span class="col-md-2 col-sm-3">Quality</span>
                     <span class="col-md-2 col-sm-3">Title</span>
-                    <span class="col-md-4 col-sm-6">Size Limit <i class="icon-lidarr-info" title="Limits are automatically adjusted for the series runtime and number of episodes in the file." /></span>
+                    <span class="col-md-4 col-sm-6">Size Limit <i class="icon-lidarr-info" title="Limits are automatically adjusted for the number of tracks in the file." /></span>
                 </div>
             </div>
             <div class="rows x-rows">