diff --git a/Directory.Build.props b/Directory.Build.props
index f89696d867..7cd02a72d4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,6 +25,8 @@
     <AnalysisModeDocumentation>Recommended</AnalysisModeDocumentation>
     <AnalysisModeGlobalization>Recommended</AnalysisModeGlobalization>
     <AnalysisModeInteroperability>Recommended</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>Recommended</AnalysisModeMaintainability>
+    <AnalysisModeNaming>Default</AnalysisModeNaming>
   </PropertyGroup>
   <PropertyGroup Label="Documentation">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/osu.Game/Online/API/Requests/Responses/APIKudosuHistory.cs b/osu.Game/Online/API/Requests/Responses/APIKudosuHistory.cs
index 583def8eda..8e4cc387ed 100644
--- a/osu.Game/Online/API/Requests/Responses/APIKudosuHistory.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIKudosuHistory.cs
@@ -45,7 +45,9 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public KudosuAction Action;
 
+#pragma warning disable CA1507 // Happens to name the same because of casing preference
         [JsonProperty("action")]
+#pragma warning restore CA1507
         private string action
         {
             set
diff --git a/osu.Game/Online/API/Requests/Responses/APIUserMostPlayedBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIUserMostPlayedBeatmap.cs
index 6d5fd59f9c..38ad2bd02d 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserMostPlayedBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserMostPlayedBeatmap.cs
@@ -15,7 +15,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("count")]
         public int PlayCount { get; set; }
 
+#pragma warning disable CA1507 // Happens to name the same because of casing preference
         [JsonProperty("beatmap")]
+#pragma warning restore CA1507
         private APIBeatmap beatmap { get; set; }
 
         public APIBeatmap BeatmapInfo
diff --git a/osu.Game/Online/Notifications/WebSocket/Events/NewChatMessageData.cs b/osu.Game/Online/Notifications/WebSocket/Events/NewChatMessageData.cs
index ff9f5ee9f7..677286bb8a 100644
--- a/osu.Game/Online/Notifications/WebSocket/Events/NewChatMessageData.cs
+++ b/osu.Game/Online/Notifications/WebSocket/Events/NewChatMessageData.cs
@@ -19,7 +19,9 @@ namespace osu.Game.Online.Notifications.WebSocket.Events
         [JsonProperty(@"messages")]
         public List<Message> Messages { get; set; } = null!;
 
+#pragma warning disable CA1507 // Happens to name the same because of casing preference
         [JsonProperty(@"users")]
+#pragma warning restore CA1507
         private List<APIUser> users { get; set; } = null!;
 
         [OnDeserialized]
diff --git a/osu.Game/Utils/SpecialFunctions.cs b/osu.Game/Utils/SpecialFunctions.cs
index 0b0f0598bb..795a84a973 100644
--- a/osu.Game/Utils/SpecialFunctions.cs
+++ b/osu.Game/Utils/SpecialFunctions.cs
@@ -666,10 +666,7 @@ namespace osu.Game.Utils
         {
             // 2020-10-07 jbialogrodzki #730 Since this is public API we should probably
             // handle null arguments? It doesn't seem to have been done consistently in this class though.
-            if (coefficients == null)
-            {
-                throw new ArgumentNullException(nameof(coefficients));
-            }
+            ArgumentNullException.ThrowIfNull(coefficients);
 
             // 2020-10-07 jbialogrodzki #730 Zero polynomials need explicit handling.
             // Without this check, we attempted to peek coefficients at negative indices!