diff --git a/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
index 83ca65061..ba83f6048 100644
--- a/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
+++ b/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
@@ -91,7 +91,7 @@ namespace NzbDrone.Integration.Test.ApiTests
 
             var config = NamingConfig.GetSingle();
             config.RenameBooks = true;
-            config.ArtistFolderFormat = "This and That";
+            config.AuthorFolderFormat = "This and That";
 
             var errors = NamingConfig.InvalidPut(config);
             errors.Should().NotBeNull();
diff --git a/src/Readarr.Api.V1/Config/NamingConfigModule.cs b/src/Readarr.Api.V1/Config/NamingConfigModule.cs
index 8741a5237..2b62943eb 100644
--- a/src/Readarr.Api.V1/Config/NamingConfigModule.cs
+++ b/src/Readarr.Api.V1/Config/NamingConfigModule.cs
@@ -33,7 +33,7 @@ namespace Readarr.Api.V1.Config
             Get("/examples", x => GetExamples(this.Bind<NamingConfigResource>()));
 
             SharedValidator.RuleFor(c => c.StandardBookFormat).ValidBookFormat();
-            SharedValidator.RuleFor(c => c.ArtistFolderFormat).ValidAuthorFolderFormat();
+            SharedValidator.RuleFor(c => c.AuthorFolderFormat).ValidAuthorFolderFormat();
         }
 
         private void UpdateNamingConfig(NamingConfigResource resource)
diff --git a/src/Readarr.Api.V1/Config/NamingConfigResource.cs b/src/Readarr.Api.V1/Config/NamingConfigResource.cs
index 9be268dce..d6a03c7a8 100644
--- a/src/Readarr.Api.V1/Config/NamingConfigResource.cs
+++ b/src/Readarr.Api.V1/Config/NamingConfigResource.cs
@@ -7,7 +7,7 @@ namespace Readarr.Api.V1.Config
         public bool RenameBooks { get; set; }
         public bool ReplaceIllegalCharacters { get; set; }
         public string StandardBookFormat { get; set; }
-        public string ArtistFolderFormat { get; set; }
+        public string AuthorFolderFormat { get; set; }
         public bool IncludeArtistName { get; set; }
         public bool IncludeAlbumTitle { get; set; }
         public bool IncludeQuality { get; set; }
diff --git a/src/Readarr.Api.V1/Config/NamingExampleResource.cs b/src/Readarr.Api.V1/Config/NamingExampleResource.cs
index 8d4ea576b..f95102853 100644
--- a/src/Readarr.Api.V1/Config/NamingExampleResource.cs
+++ b/src/Readarr.Api.V1/Config/NamingExampleResource.cs
@@ -19,7 +19,7 @@ namespace Readarr.Api.V1.Config
                 RenameBooks = model.RenameBooks,
                 ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
                 StandardBookFormat = model.StandardBookFormat,
-                ArtistFolderFormat = model.AuthorFolderFormat
+                AuthorFolderFormat = model.AuthorFolderFormat
             };
         }
 
@@ -42,7 +42,7 @@ namespace Readarr.Api.V1.Config
                 RenameBooks = resource.RenameBooks,
                 ReplaceIllegalCharacters = resource.ReplaceIllegalCharacters,
                 StandardBookFormat = resource.StandardBookFormat,
-                AuthorFolderFormat = resource.ArtistFolderFormat,
+                AuthorFolderFormat = resource.AuthorFolderFormat,
             };
         }
     }