diff --git a/Squidex.ruleset b/Squidex.ruleset
index 8a8cb7d9c..ef2fa90ac 100644
--- a/Squidex.ruleset
+++ b/Squidex.ruleset
@@ -54,16 +54,10 @@
     <Rule Id="SA1612" Action="None" />
     <Rule Id="SA1615" Action="None" />
     <Rule Id="SA1623" Action="None" />
-    <Rule Id="SA1633" Action="Error" />
+    <Rule Id="SA1633" Action="None" />
     <Rule Id="SA1649" Action="Error" />
+    <Rule Id="SA1634" Action="None" />
+    <Rule Id="SA1635" Action="None" />
     <Rule Id="SA1652" Action="None" />
-    <Rule Id="SA1634" Action="Error" />
-    <Rule Id="SA1635" Action="Error" />
-    <Rule Id="SA1636" Action="Error" />
-    <Rule Id="SA1637" Action="Error" />
-    <Rule Id="SA1638" Action="Error" />
-    <Rule Id="SA1639" Action="None" />
-    <Rule Id="SA1640" Action="Error" />
-    <Rule Id="SA1641" Action="Error" />
   </Rules>
 </RuleSet>
\ No newline at end of file
diff --git a/Squidex.sln b/Squidex.sln
index e9cfa76b7..bd07f14e5 100644
--- a/Squidex.sln
+++ b/Squidex.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.15
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex", "src\Squidex\Squidex.csproj", "{61F6BBCE-A080-4400-B194-70E2F5D2096E}"
 EndProject
@@ -58,7 +58,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Infrastructure.GetEventStore", "src\Squidex.Infrastructure.GetEventStore\Squidex.Infrastructure.GetEventStore.csproj", "{EF75E488-1324-4E18-A1BD-D3A05AE67B1F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Infrastructure.Azure", "src\Squidex.Infrastructure.Azure\Squidex.Infrastructure.Azure.csproj", "{7931187E-A1E6-4F89-8BC8-20A1E445579F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Infrastructure.Azure", "src\Squidex.Infrastructure.Azure\Squidex.Infrastructure.Azure.csproj", "{7931187E-A1E6-4F89-8BC8-20A1E445579F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{360C300D-0F7E-439D-A437-714C959E3CAD}"
+	ProjectSection(SolutionItems) = preProject
+		stylecop.json = stylecop.json
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -324,4 +329,7 @@ Global
 		{EF75E488-1324-4E18-A1BD-D3A05AE67B1F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
 		{7931187E-A1E6-4F89-8BC8-20A1E445579F} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {02F2E872-3141-44F5-BD6A-33CD84E9FE08}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Squidex.Domain.Apps.Core/Schemas/Field_Generic.cs b/src/Squidex.Domain.Apps.Core/Schemas/Field{T}.cs
similarity index 96%
rename from src/Squidex.Domain.Apps.Core/Schemas/Field_Generic.cs
rename to src/Squidex.Domain.Apps.Core/Schemas/Field{T}.cs
index 79617e212..72ecabaa1 100644
--- a/src/Squidex.Domain.Apps.Core/Schemas/Field_Generic.cs
+++ b/src/Squidex.Domain.Apps.Core/Schemas/Field{T}.cs
@@ -8,9 +8,6 @@
 
 using System;
 using Squidex.Infrastructure;
-
-#pragma warning disable SA1649 // File name must match first type name
-
 namespace Squidex.Domain.Apps.Core.Schemas
 {
     public abstract class Field<T> : Field where T : FieldProperties
diff --git a/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult_T.cs b/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult{T}.cs
similarity index 99%
rename from src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult_T.cs
rename to src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult{T}.cs
index 5d6146868..0c3971caa 100644
--- a/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult_T.cs
+++ b/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult{T}.cs
@@ -7,7 +7,6 @@
 // ==========================================================================
 
 #pragma warning disable SA1649 // File name must match first type name
-
 namespace Squidex.Infrastructure.CQRS.Commands
 {
     public sealed class EntityCreatedResult<T> : EntitySavedResult
diff --git a/src/Squidex.Infrastructure/CQRS/Events/Envelope_1.cs b/src/Squidex.Infrastructure/CQRS/Events/Envelope{T}.cs
similarity index 99%
rename from src/Squidex.Infrastructure/CQRS/Events/Envelope_1.cs
rename to src/Squidex.Infrastructure/CQRS/Events/Envelope{T}.cs
index 51cb27b0c..ac0b8644f 100644
--- a/src/Squidex.Infrastructure/CQRS/Events/Envelope_1.cs
+++ b/src/Squidex.Infrastructure/CQRS/Events/Envelope{T}.cs
@@ -7,7 +7,6 @@
 // ==========================================================================
 
 #pragma warning disable SA1649 // File name must match first type name
-
 namespace Squidex.Infrastructure.CQRS.Events
 {
     public class Envelope<TPayload> where TPayload : class
diff --git a/stylecop.json b/stylecop.json
deleted file mode 100644
index 12da548d2..000000000
--- a/stylecop.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
-  "settings": {
-    "orderingRules": {
-      "elementOrder": [
-        "kind",
-        "constant",
-        "static",
-        "readonly"
-      ],
-      "usingDirectivesPlacement": "outsideNamespace"
-    },
-    "layoutRules": {
-      "newlineAtEndOfFile": "omit"
-    },
-    "documentationRules": {
-      "companyName": "Squidex UG (haftungsbeschränkt)",
-      "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license.",
-      "variables": {
-        "licenseName": "MIT",
-        "licenseFile": "LICENSE"
-      },
-      "headerDecoration": "==========================================================================",
-      "fileNamingConvention": "stylecop"
-    }
-  }
-}
\ No newline at end of file