diff --git a/NzbDrone.Core/Datastore/Migration/009_fix_renameEpisodes.cs b/NzbDrone.Core/Datastore/Migration/009_fix_renameEpisodes.cs
new file mode 100644
index 000000000..7fcd13d66
--- /dev/null
+++ b/NzbDrone.Core/Datastore/Migration/009_fix_renameEpisodes.cs
@@ -0,0 +1,18 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Tags("")]
+    [Migration(9)]
+    public class fix_rename_episodes : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            SQLiteAlter.DropColumns("NamingConfig", new[] { "SeasonFolderFormat" });
+
+            Execute.Sql("UPDATE NamingConfig SET RenameEpisodes = 1 WHERE RenameEpisodes = -1");
+            Execute.Sql("UPDATE NamingConfig SET RenameEpisodes = 0 WHERE RenameEpisodes = -2");
+        }
+    }
+}
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 91dd4f5be..ca596935c 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -214,6 +214,7 @@
     <Compile Include="Datastore\Migration\006_add_index_to_log_time.cs" />
     <Compile Include="Datastore\Migration\007_add_renameEpisodes_to_naming.cs" />
     <Compile Include="Datastore\Migration\008_remove_backlog.cs" />
+    <Compile Include="Datastore\Migration\009_fix_renameEpisodes.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationExtension.cs" />
diff --git a/NzbDrone.Core/Organizer/NamingConfig.cs b/NzbDrone.Core/Organizer/NamingConfig.cs
index 837325acd..962fd5777 100644
--- a/NzbDrone.Core/Organizer/NamingConfig.cs
+++ b/NzbDrone.Core/Organizer/NamingConfig.cs
@@ -17,8 +17,7 @@ namespace NzbDrone.Core.Organizer
                         MultiEpisodeStyle = 0,
                         IncludeEpisodeTitle = true,
                         IncludeQuality = true,
-                        ReplaceSpaces = false,
-                        SeasonFolderFormat = "DO_NOT_USE"
+                        ReplaceSpaces = false
                     };
             }
         }
@@ -38,7 +37,5 @@ namespace NzbDrone.Core.Organizer
         public int MultiEpisodeStyle { get; set; }
 
         public bool ReplaceSpaces { get; set; }
-
-        public string SeasonFolderFormat { get; set; }
     }
 }
\ No newline at end of file