diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
index fefcce685..eb6bbfb43 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
@@ -21,13 +21,13 @@ namespace Orchard.Search.Controllers {
         protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
 
         public ActionResult Index(string q, int page = 1, int pageSize = 10) {
-            var searchFields = CurrentSite.As<SearchSettings>().Record.SearchedFields.Split(new[] {',', ' '}, StringSplitOptions.RemoveEmptyEntries);
+            var searchFields = CurrentSite.As<SearchSettingsPart>().Record.SearchedFields.Split(new[] {',', ' '}, StringSplitOptions.RemoveEmptyEntries);
 
             var searchViewModel = new SearchViewModel {
                 Query = q,
                 DefaultPageSize = 10, // <- yeah, I know :|
                 PageOfResults = _searchService.Query(q, page, pageSize, 
-                    CurrentSite.As<SearchSettings>().Record.FilterCulture,
+                    CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
                     searchFields, 
                     searchHit => new SearchResultViewModel {
                         Content = _contentManager.BuildDisplayModel(_contentManager.Get(searchHit.ContentItemId), "SummaryForSearch"),
diff --git a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
index b897c5a96..c87941c09 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
@@ -5,7 +5,7 @@ namespace Orchard.Search.DataMigrations {
 
         public int Create() {
 
-            SchemaBuilder.CreateTable("SearchSettingsRecord", table => table
+            SchemaBuilder.CreateTable("SearchSettingsPartRecord", table => table
                 .ContentPartRecord()
                 .Column<bool>("FilterCulture")
                 .Column<string>("SearchedFields")
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsHandler.cs b/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
similarity index 50%
rename from src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsHandler.cs
rename to src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
index 72dafc234..882d389f4 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
@@ -5,11 +5,11 @@ using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Search.Handlers {
     [UsedImplicitly]
-    public class SearchSettingsHandler : ContentHandler {
-        public SearchSettingsHandler(IRepository<SearchSettingsRecord> repository) {
-            Filters.Add(new ActivatingFilter<SearchSettings>("Site"));
+    public class SearchSettingsPartHandler : ContentHandler {
+        public SearchSettingsPartHandler(IRepository<SearchSettingsPartRecord> repository) {
+            Filters.Add(new ActivatingFilter<SearchSettingsPart>("Site"));
             Filters.Add(StorageFilter.For(repository));
-            Filters.Add(new TemplateFilterForRecord<SearchSettingsRecord>("CommentSettings", "Parts/Search.SiteSettings"));
+            Filters.Add(new TemplateFilterForRecord<SearchSettingsPartRecord>("CommentSettings", "Parts/Search.SiteSettings"));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettings.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettings.cs
deleted file mode 100644
index 4fa1b70ec..000000000
--- a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettings.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Orchard.ContentManagement;
-
-namespace Orchard.Search.Models {
-    public class SearchSettings : ContentPart<SearchSettingsRecord> {
-    }
-}
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs
new file mode 100644
index 000000000..c5d4ecec5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPart.cs
@@ -0,0 +1,6 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Search.Models {
+    public class SearchSettingsPart : ContentPart<SearchSettingsPartRecord> {
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsRecord.cs b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPartRecord.cs
similarity index 71%
rename from src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsRecord.cs
rename to src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPartRecord.cs
index f48178abb..c85efd9f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsRecord.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsPartRecord.cs
@@ -1,11 +1,11 @@
 using Orchard.ContentManagement.Records;
 
 namespace Orchard.Search.Models {
-    public class SearchSettingsRecord : ContentPartRecord {
+    public class SearchSettingsPartRecord : ContentPartRecord {
         public virtual bool FilterCulture { get; set; }
         public virtual string SearchedFields { get; set; }
         
-        public SearchSettingsRecord() {
+        public SearchSettingsPartRecord() {
             FilterCulture = false;
             SearchedFields = "body, title";
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index c99916558..39fe7de64 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -68,10 +68,10 @@
     <Compile Include="Controllers\SearchController.cs" />
     <Compile Include="DataMigrations\SearchDataMigration.cs" />
     <Compile Include="Filters\SearchFilter.cs" />
-    <Compile Include="Models\SearchSettings.cs" />
-    <Compile Include="Models\SearchSettingsRecord.cs" />
+    <Compile Include="Models\SearchSettingsPart.cs" />
+    <Compile Include="Models\SearchSettingsPartRecord.cs" />
     <Compile Include="Routes.cs" />
-    <Compile Include="Handlers\SearchSettingsHandler.cs" />
+    <Compile Include="Handlers\SearchSettingsPartHandler.cs" />
     <Compile Include="Services\ISearchService.cs" />
     <Compile Include="Services\SearchService.cs" />
     <Compile Include="ViewModels\SearchResultViewModel.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.ascx
index 9f3ad48ba..859b38720 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SearchSettingsRecord>" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SearchSettingsPartRecord>" %>
 <%@ Import Namespace="Orchard.Search.Models"%>
 <fieldset>
     <legend><%: T("Search")%></legend>