diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
similarity index 89%
rename from src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs
rename to src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
index aaf04b79..5a088ed8 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
@@ -6,8 +6,8 @@ using StardewModdingAPI.Framework.ModLoading.Framework;
 
 namespace StardewModdingAPI.Framework.ModLoading.Rewriters
 {
-    /// <summary>Rewrites references to fields which no longer exist, but which have an equivalent property with the exact same name.</summary>
-    internal class FieldToPropertyRewriter : BaseInstructionHandler
+    /// <summary>Automatically fix references to fields that have been replaced by a property.</summary>
+    internal class HeuristicFieldRewriter : BaseInstructionHandler
     {
         /*********
         ** Fields
@@ -21,7 +21,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="rewriteReferencesToAssemblies">The assembly names to which to rewrite broken references.</param>
-        public FieldToPropertyRewriter(string[] rewriteReferencesToAssemblies)
+        public HeuristicFieldRewriter(string[] rewriteReferencesToAssemblies)
             : base(defaultPhrase: "field changed to property") // ignored since we specify phrases
         {
             this.RewriteReferencesToAssemblies = new HashSet<string>(rewriteReferencesToAssemblies);
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/MethodWithMissingOptionalParameterRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
similarity index 94%
rename from src/SMAPI/Framework/ModLoading/Rewriters/MethodWithMissingOptionalParameterRewriter.cs
rename to src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
index 89c8ede7..21b42e12 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/MethodWithMissingOptionalParameterRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
@@ -6,8 +6,8 @@ using StardewModdingAPI.Framework.ModLoading.Framework;
 
 namespace StardewModdingAPI.Framework.ModLoading.Rewriters
 {
-    /// <summary>Rewrites references to methods which only broke because the definition has new optional parameters.</summary>
-    internal class MethodWithMissingOptionalParameterRewriter : BaseInstructionHandler
+    /// <summary>Automatically fix references to methods that had extra optional parameters added.</summary>
+    internal class HeuristicMethodRewriter : BaseInstructionHandler
     {
         /*********
         ** Fields
@@ -21,7 +21,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="rewriteReferencesToAssemblies">The assembly names to which to rewrite broken references.</param>
-        public MethodWithMissingOptionalParameterRewriter(string[] rewriteReferencesToAssemblies)
+        public HeuristicMethodRewriter(string[] rewriteReferencesToAssemblies)
             : base(defaultPhrase: "methods with missing parameters") // ignored since we specify phrases
         {
             this.RewriteReferencesToAssemblies = new HashSet<string>(rewriteReferencesToAssemblies);
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index 972ed91d..86e16e1e 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -38,9 +38,9 @@ namespace StardewModdingAPI.Metadata
             // rewrite for Stardew Valley 1.3
             yield return new StaticFieldToConstantRewriter<int>(typeof(Game1), "tileSize", Game1.tileSize);
 
-            // generic rewrites
-            yield return new FieldToPropertyRewriter(this.ValidateReferencesToAssemblies);
-            yield return new MethodWithMissingOptionalParameterRewriter(this.ValidateReferencesToAssemblies);
+            // heuristic rewrites
+            yield return new HeuristicFieldRewriter(this.ValidateReferencesToAssemblies);
+            yield return new HeuristicMethodRewriter(this.ValidateReferencesToAssemblies);
 
 #if HARMONY_2
             // rewrite for SMAPI 3.6 (Harmony 1.x => 2.0 update)