diff --git a/src/Features/Core/Portable/CodeFixes/NamingStyle/AbstractNamingStyleCodeFixProvider.cs b/src/Features/Core/Portable/CodeFixes/NamingStyle/AbstractNamingStyleCodeFixProvider.cs
index cd52087fd91895d95d30a10507ded2c5af7c7354..7bc2186ae0852249a2b7b39aacce8e1bb9c303b2 100644
--- a/src/Features/Core/Portable/CodeFixes/NamingStyle/AbstractNamingStyleCodeFixProvider.cs
+++ b/src/Features/Core/Portable/CodeFixes/NamingStyle/AbstractNamingStyleCodeFixProvider.cs
@@ -43,17 +43,21 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
                 context.RegisterCodeFix(
                     new FixNameCodeAction(
                         string.Format(FeaturesResources.Fix_Name_Violation_colon_0, fixedName),
-                        async c => await Renamer.RenameSymbolAsync(
-                            solution,
-                            symbol,
-                            fixedName,
-                            await document.GetOptionsAsync(c).ConfigureAwait(false),
-                            c).ConfigureAwait(false),
+                        c => FixAsync(document, symbol, fixedName, c),
                         nameof(NamingStyleCodeFixProvider)),
                     diagnostic);
             }
         }
 
+        private static async Task<Solution> FixAsync(
+            Document document, ISymbol symbol, string fixedName, CancellationToken cancellationToken)
+        {
+            return await Renamer.RenameSymbolAsync(
+                document.Project.Solution, symbol, fixedName,
+                await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false),
+                cancellationToken).ConfigureAwait(false);
+        }
+
         private class FixNameCodeAction : CodeAction.SolutionChangeAction
         {
             public FixNameCodeAction(string title, Func<CancellationToken, Task<Solution>> createChangedSolution, string equivalenceKey)
diff --git a/src/Workspaces/Core/Portable/NamingStyles/Serialization/MutableNamingStyle.cs b/src/Workspaces/Core/Portable/NamingStyles/Serialization/MutableNamingStyle.cs
index aff894e536d6a0a6ecf09cd090a51edbb0244dd2..fbb57c7616e48ad43813e1b925f40724ec929431 100644
--- a/src/Workspaces/Core/Portable/NamingStyles/Serialization/MutableNamingStyle.cs
+++ b/src/Workspaces/Core/Portable/NamingStyles/Serialization/MutableNamingStyle.cs
@@ -52,11 +52,5 @@ public MutableNamingStyle(NamingStyle namingStyle)
 
         internal MutableNamingStyle Clone()
             => new MutableNamingStyle(NamingStyle);
-
-        internal XElement CreateXElement()
-            => NamingStyle.CreateXElement();
-
-        internal static MutableNamingStyle FromXElement(XElement namingStyleElement)
-            => new MutableNamingStyle(NamingStyle.FromXElement(namingStyleElement));
     }
 }
\ No newline at end of file