diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
index 1ee16e1d1..48837ba83 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             _parsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew()
                                                            .With(p => p.Quality = new QualityModel(Quality.SDTV,
-                                                               new Revision(2, 0, false)))
+                                                               new Revision(2, 0, 0, false)))
                                                            .With(p => p.ReleaseGroup = "Sonarr")
                                                            .Build();
 
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityFullFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityFullFixture.cs
new file mode 100644
index 000000000..4e3e05732
--- /dev/null
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityFullFixture.cs
@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+    public class QualityFullFixture : CoreTest<FileNameBuilder>
+    {
+        private Series _series;
+        private Episode _episode;
+        private EpisodeFile _episodeFile;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _series = Builder<Series>
+                    .CreateNew()
+                    .Build();
+
+            _episode = Builder<Episode>.CreateNew()
+                            .With(e => e.Title = "City Sushi")
+                            .With(e => e.SeasonNumber = 15)
+                            .With(e => e.EpisodeNumber = 6)
+                            .With(e => e.AbsoluteEpisodeNumber = 100)
+                            .Build();
+
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameEpisodes = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
+        }
+
+        [Test]
+        public void should_get_quality()
+        {
+            _episodeFile.Quality.Revision = new Revision();
+            _namingConfig.StandardEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                   .Should().Be("HDTV-720p");
+        }
+
+        [Test]
+        public void should_get_quality_with_proper()
+        {
+            _episodeFile.Quality.Revision = new Revision(2);
+            _namingConfig.StandardEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("HDTV-720p Proper");
+        }
+
+        [Test]
+        public void should_get_quality_with_repack()
+        {
+            _episodeFile.Quality.Revision = new Revision(2, 0, 0, true);
+            _namingConfig.StandardEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("HDTV-720p Repack");
+        }
+
+        [Test]
+        public void should_get_quality_with_proper_and_repack()
+        {
+            _episodeFile.Quality.Revision = new Revision(3, 0, 1, true);
+            _namingConfig.StandardEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("HDTV-720p Proper Repack");
+        }
+
+        [Test]
+        public void should_get_quality_with_proper_repack_and_real()
+        {
+            _episodeFile.Quality.Revision = new Revision(3, 1, 1, true);
+            _namingConfig.StandardEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("HDTV-720p Proper Repack REAL");
+        }
+
+        [Test]
+        public void should_get_quality_with_proper_for_anime()
+        {
+            _series.SeriesType = SeriesTypes.Anime;
+            _episodeFile.Quality.Revision = new Revision(3, 0, 1, true);
+            _namingConfig.AnimeEpisodeFormat = "{Quality Full}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("HDTV-720p v3");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityProperFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityProperFixture.cs
new file mode 100644
index 000000000..83150ff27
--- /dev/null
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/QualityProperFixture.cs
@@ -0,0 +1,105 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+    public class QualityProperFixture : CoreTest<FileNameBuilder>
+    {
+        private Series _series;
+        private Episode _episode;
+        private EpisodeFile _episodeFile;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _series = Builder<Series>
+                    .CreateNew()
+                    .Build();
+
+            _episode = Builder<Episode>.CreateNew()
+                            .With(e => e.Title = "City Sushi")
+                            .With(e => e.SeasonNumber = 15)
+                            .With(e => e.EpisodeNumber = 6)
+                            .With(e => e.AbsoluteEpisodeNumber = 100)
+                            .Build();
+
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameEpisodes = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
+        }
+
+        [Test]
+        public void should_get_quality_proper_without_quality()
+        {
+            _episodeFile.Quality.Revision = new Revision();
+            _namingConfig.StandardEpisodeFormat = "{Quality Proper}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                   .Should().Be("");
+        }
+
+        [Test]
+        public void should_get_quality_proper()
+        {
+            _episodeFile.Quality.Revision = new Revision(2);
+            _namingConfig.StandardEpisodeFormat = "{Quality Proper}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("Proper");
+        }
+
+        [Test]
+        public void should_get_quality_repack()
+        {
+            _episodeFile.Quality.Revision = new Revision(2, 0, 0, true);
+            _namingConfig.StandardEpisodeFormat = "{Quality Proper}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("Repack");
+        }
+
+        [Test]
+        public void should_get_quality_proper_and_repack()
+        {
+            _episodeFile.Quality.Revision = new Revision(3, 0, 1, true);
+            _namingConfig.StandardEpisodeFormat = "{Quality Proper}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("Proper Repack");
+        }
+
+        [Test]
+        public void should_get_quality_proper_for_anime()
+        {
+            _series.SeriesType = SeriesTypes.Anime;
+            _episodeFile.Quality.Revision = new Revision(3, 0, 1, true);
+            _namingConfig.AnimeEpisodeFormat = "{Quality Proper}";
+
+            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
+                .Should().Be("v3");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 1732d34fa..05ddd596d 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -1097,7 +1097,17 @@ namespace NzbDrone.Core.Organizer
                     return "v" + quality.Revision.Version;
                 }
 
-                return "Proper";
+                if (!quality.Revision.IsRepack)
+                {
+                    return "Proper";
+                }
+
+                if (quality.Revision.Repack > 0 && quality.Revision.Version - quality.Revision.Repack > 1)
+                {
+                    return "Proper Repack";
+                }
+
+                return "Repack";
             }
 
             return string.Empty;
diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs
index bcad95dba..337bf3466 100644
--- a/src/NzbDrone.Core/Parser/QualityParser.cs
+++ b/src/NzbDrone.Core/Parser/QualityParser.cs
@@ -693,6 +693,7 @@ namespace NzbDrone.Core.Parser
             if (RepackRegex.IsMatch(normalizedName))
             {
                 result.Revision.Version = versionRegexResult.Success ? Convert.ToInt32(versionRegexResult.Groups["version"].Value) + 1 : 2;
+                result.Revision.Repack = RepackRegex.Count(normalizedName);
                 result.Revision.IsRepack = true;
                 result.RevisionDetectionSource = QualityDetectionSource.Name;
             }
diff --git a/src/NzbDrone.Core/Qualities/Revision.cs b/src/NzbDrone.Core/Qualities/Revision.cs
index 4847150ff..ec7e1e416 100644
--- a/src/NzbDrone.Core/Qualities/Revision.cs
+++ b/src/NzbDrone.Core/Qualities/Revision.cs
@@ -9,15 +9,17 @@ namespace NzbDrone.Core.Qualities
         {
         }
 
-        public Revision(int version = 1, int real = 0, bool isRepack = false)
+        public Revision(int version = 1, int real = 0, int repack = 0, bool isRepack = false)
         {
             Version = version;
             Real = real;
+            Repack = repack;
             IsRepack = isRepack;
         }
 
         public int Version { get; set; }
         public int Real { get; set; }
+        public int Repack { get; set; }
         public bool IsRepack { get; set; }
 
         public bool Equals(Revision other)