diff --git a/src/FSharpLint.Core/Application/Configuration.fs b/src/FSharpLint.Core/Application/Configuration.fs
index de6621336..5bd1b86d2 100644
--- a/src/FSharpLint.Core/Application/Configuration.fs
+++ b/src/FSharpLint.Core/Application/Configuration.fs
@@ -577,7 +577,7 @@ let loadConfig (configPath:string) =
 let defaultConfiguration =
     let assembly = typeof<Rules.Rule>.GetTypeInfo().Assembly
     let resourceName = Assembly.GetExecutingAssembly().GetManifestResourceNames()
-                       |> Seq.find (fun n -> n.EndsWith("fsharplint.json", System.StringComparison.Ordinal))
+                       |> Seq.find (fun n -> n.EndsWith(SettingsFileName, System.StringComparison.Ordinal))
     use stream = assembly.GetManifestResourceStream(resourceName)
     match stream with
     | null -> failwithf "Resource '%s' not found in assembly '%s'" resourceName (assembly.FullName)
diff --git a/src/FSharpLint.Core/Application/Lint.fs b/src/FSharpLint.Core/Application/Lint.fs
index a8170f0fc..eda79c957 100644
--- a/src/FSharpLint.Core/Application/Lint.fs
+++ b/src/FSharpLint.Core/Application/Lint.fs
@@ -113,7 +113,7 @@ module Lint =
         { CancellationToken:CancellationToken option
           ErrorReceived:Suggestion.LintWarning -> unit
           ReportLinterProgress:ProjectProgress -> unit
-          Configuration:Configuration.Configuration }
+          Rules:Configuration.LoadedRules }
 
     type Context =
         { IndentationRuleContext:Map<int,bool*int>
@@ -207,7 +207,7 @@ module Lint =
             | Some(x) -> not x.IsCancellationRequested
             | None -> true
 
-        let enabledRules = Configuration.flattenConfig lintInfo.Configuration
+        let enabledRules = lintInfo.Rules
 
         let lines = String.toLines fileInfo.Text |> Array.map (fun (line, _, _) -> line)
         let allRuleNames =
@@ -384,7 +384,7 @@ module Lint =
             | ex -> Error (string ex)
         | Default ->
             try
-                Configuration.loadConfig "./fsharplint.json"
+                Configuration.loadConfig $"./{Configuration.SettingsFileName}"
                 |> Ok
             with
             | :? System.IO.FileNotFoundException ->
@@ -411,7 +411,7 @@ module Lint =
 
                 let parseFilesInProject files projectOptions =
                     let lintInformation =
-                        { Configuration = config
+                        { Rules = Configuration.flattenConfig config
                           CancellationToken = optionalParams.CancellationToken
                           ErrorReceived = warningReceived
                           ReportLinterProgress = projectProgress }
@@ -517,7 +517,7 @@ module Lint =
 
                 optionalParams.ReceivedWarning |> Option.iter (fun func -> func warning)
             let lintInformation =
-                { Configuration = config
+                { Rules = Configuration.flattenConfig config
                   CancellationToken = optionalParams.CancellationToken
                   ErrorReceived = warningReceived
                   ReportLinterProgress = Option.defaultValue ignore optionalParams.ReportLinterProgress }
@@ -560,7 +560,7 @@ module Lint =
                 optionalParams.ReceivedWarning |> Option.iter (fun func -> func warning)
 
             let lintInformation =
-                { Configuration = config
+                { Rules = Configuration.flattenConfig config
                   CancellationToken = optionalParams.CancellationToken
                   ErrorReceived = warningReceived
                   ReportLinterProgress = Option.defaultValue ignore optionalParams.ReportLinterProgress }