diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs
index 8185a1c6e..17dfea20f 100644
--- a/src/NzbDrone.Core/History/HistoryService.cs
+++ b/src/NzbDrone.Core/History/HistoryService.cs
@@ -186,7 +186,7 @@ namespace NzbDrone.Core.History
             {
                 EventType = HistoryEventType.Grabbed,
                 Date = DateTime.UtcNow,
-                Quality = message.Movie.ParsedEpisodeInfo.Quality,
+                Quality = message.Movie.ParsedMovieInfo.Quality,
                 SourceTitle = message.Movie.Release.Title,
                 SeriesId = 0,
                 EpisodeId = 0,
@@ -196,7 +196,7 @@ namespace NzbDrone.Core.History
 
                 history.Data.Add("Indexer", message.Movie.Release.Indexer);
                 history.Data.Add("NzbInfoUrl", message.Movie.Release.InfoUrl);
-                history.Data.Add("ReleaseGroup", message.Movie.ParsedEpisodeInfo.ReleaseGroup);
+                history.Data.Add("ReleaseGroup", message.Movie.ParsedMovieInfo.ReleaseGroup);
                 history.Data.Add("Age", message.Movie.Release.Age.ToString());
                 history.Data.Add("AgeHours", message.Movie.Release.AgeHours.ToString());
                 history.Data.Add("AgeMinutes", message.Movie.Release.AgeMinutes.ToString());
@@ -209,9 +209,9 @@ namespace NzbDrone.Core.History
                 history.Data.Add("TvRageId", message.Movie.Release.TvRageId.ToString());
                 history.Data.Add("Protocol", ((int)message.Movie.Release.DownloadProtocol).ToString());
 
-                if (!message.Movie.ParsedEpisodeInfo.ReleaseHash.IsNullOrWhiteSpace())
+                if (!message.Movie.ParsedMovieInfo.ReleaseHash.IsNullOrWhiteSpace())
                 {
-                    history.Data.Add("ReleaseHash", message.Movie.ParsedEpisodeInfo.ReleaseHash);
+                    history.Data.Add("ReleaseHash", message.Movie.ParsedMovieInfo.ReleaseHash);
                 }
 
                 var torrentRelease = message.Movie.Release as TorrentInfo;
diff --git a/src/UI/Cells/EventTypeCell.js b/src/UI/Cells/EventTypeCell.js
index 4ca9a85ae..5426c7efb 100644
--- a/src/UI/Cells/EventTypeCell.js
+++ b/src/UI/Cells/EventTypeCell.js
@@ -13,23 +13,23 @@ module.exports = NzbDroneCell.extend({
             switch (this.cellValue.get('eventType')) {
                 case 'grabbed':
                     icon = 'icon-sonarr-downloading';
-                    toolTip = 'Episode grabbed from {0} and sent to download client'.format(this.cellValue.get('data').indexer);
+                    toolTip = 'Movie grabbed from {0} and sent to download client'.format(this.cellValue.get('data').indexer);
                     break;
                 case 'seriesFolderImported':
                     icon = 'icon-sonarr-hdd';
-                    toolTip = 'Existing episode file added to library';
+                    toolTip = 'Existing movie file added to library';
                     break;
                 case 'downloadFolderImported':
                     icon = 'icon-sonarr-imported';
-                    toolTip = 'Episode downloaded successfully and picked up from download client';
+                    toolTip = 'Movie downloaded successfully and picked up from download client';
                     break;
                 case 'downloadFailed':
                     icon = 'icon-sonarr-download-failed';
-                    toolTip = 'Episode download failed';
+                    toolTip = 'Movie download failed';
                     break;
                 case 'episodeFileDeleted':
                     icon = 'icon-sonarr-deleted';
-                    toolTip = 'Episode file deleted';
+                    toolTip = 'Movie file deleted';
                     break;
                 default:
                     icon = 'icon-sonarr-unknown';
@@ -41,4 +41,4 @@ module.exports = NzbDroneCell.extend({
 
         return this;
     }
-});
\ No newline at end of file
+});