diff --git a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
index 328eb4eee87..0af184f4e99 100644
--- a/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
+++ b/src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
@@ -243,7 +243,7 @@ internal GeneralCommandErrorFeedback()
 
         public Guid Id => _guid;
 
-        public string Name => "general";
+        public string Name => "General Feedback";
 
         public string Description => "The built-in general feedback source for command errors.";
 
diff --git a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
index 9e5612189fa..003625791b1 100644
--- a/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
+++ b/src/System.Management.Automation/engine/hostifaces/HostUtilities.cs
@@ -8,7 +8,6 @@
 using System.Globalization;
 using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
-using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Subsystem.Feedback;
 using System.Runtime.InteropServices;
@@ -67,13 +66,6 @@ public static class HostUtilities
             $formatString -f $lastError.TargetObject,"".\$($lastError.TargetObject)""
         ";
 
-        private static readonly string s_getFuzzyMatchedCommands = @"
-            [System.Diagnostics.DebuggerHidden()]
-            param([string] $formatString)
-
-            $formatString -f [string]::Join(', ', (Get-Command $lastError.TargetObject -UseFuzzyMatching -FuzzyMinimumDistance 1 | Select-Object -First 5 -Unique -ExpandProperty Name))
-        ";
-
         private static readonly List<Hashtable> s_suggestions = InitializeSuggestions();
 
         private static bool HostSupportUnicode()
@@ -97,28 +89,17 @@ private static bool HostSupportUnicode()
 
         private static List<Hashtable> InitializeSuggestions()
         {
-            var suggestions = new List<Hashtable>(
-                new Hashtable[]
-                {
-                    NewSuggestion(
-                        id: 3,
-                        category: "General",
-                        matchType: SuggestionMatchType.Dynamic,
-                        rule: ScriptBlock.CreateDelayParsedScriptBlock(s_checkForCommandInCurrentDirectoryScript, isProductCode: true),
-                        suggestion: ScriptBlock.CreateDelayParsedScriptBlock(s_createCommandExistsInCurrentDirectoryScript, isProductCode: true),
-                        suggestionArgs: new object[] { CodeGeneration.EscapeSingleQuotedStringContent(SuggestionStrings.Suggestion_CommandExistsInCurrentDirectory) },
-                        enabled: true)
-                });
-
-            suggestions.Add(
+            var suggestions = new List<Hashtable>()
+            {
                 NewSuggestion(
-                    id: 4,
+                    id: 3,
                     category: "General",
-                    matchType: SuggestionMatchType.ErrorId,
-                    rule: "CommandNotFoundException",
-                    suggestion: ScriptBlock.CreateDelayParsedScriptBlock(s_getFuzzyMatchedCommands, isProductCode: true),
-                    suggestionArgs: new object[] { CodeGeneration.EscapeSingleQuotedStringContent(SuggestionStrings.Suggestion_CommandNotFound) },
-                    enabled: true));
+                    matchType: SuggestionMatchType.Dynamic,
+                    rule: ScriptBlock.CreateDelayParsedScriptBlock(s_checkForCommandInCurrentDirectoryScript, isProductCode: true),
+                    suggestion: ScriptBlock.CreateDelayParsedScriptBlock(s_createCommandExistsInCurrentDirectoryScript, isProductCode: true),
+                    suggestionArgs: new object[] { SuggestionStrings.Suggestion_CommandExistsInCurrentDirectory_Legacy },
+                    enabled: true)
+            };
 
             return suggestions;
         }
diff --git a/src/System.Management.Automation/resources/SuggestionStrings.resx b/src/System.Management.Automation/resources/SuggestionStrings.resx
index ea249db55e7..9e325b2616c 100644
--- a/src/System.Management.Automation/resources/SuggestionStrings.resx
+++ b/src/System.Management.Automation/resources/SuggestionStrings.resx
@@ -123,6 +123,9 @@ PowerShell does not load commands from the current location by default (see 'Get
 
 If you trust this command, run the following command instead:</value>
   </data>
+  <data name="Suggestion_CommandExistsInCurrentDirectory_Legacy" xml:space="preserve">
+    <value>The command "{0}" was not found, but does exist in the current location. PowerShell does not load commands from the current location by default. If you trust this command, instead type: "{1}". See "get-help about_Command_Precedence" for more details.</value>
+  </data>
   <data name="Suggestion_CommandNotFound" xml:space="preserve">
     <value>The most similar commands are:</value>
   </data>
diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index f611c36bf23..13a8d7d5ec5 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -636,7 +636,7 @@ static ApplicationInsightsTelemetry()
                 s_knownSubsystemNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
                     {
                         "Completion",
-                        "general",
+                        "General Feedback",
                         "Windows Package Manager - WinGet",
                         "Az Predictor"
                     };
diff --git a/test/xUnit/csharp/test_Feedback.cs b/test/xUnit/csharp/test_Feedback.cs
index 2c90118be55..eba627f7b0d 100644
--- a/test/xUnit/csharp/test_Feedback.cs
+++ b/test/xUnit/csharp/test_Feedback.cs
@@ -97,7 +97,7 @@ public static void GetFeedback()
 
                 // Test the result from the 'general' feedback provider.
                 Assert.Single(feedbacks);
-                Assert.Equal("general", feedbacks[0].Name);
+                Assert.Equal("General Feedback", feedbacks[0].Name);
                 Assert.Equal(expectedCmd, feedbacks[0].Item.RecommendedActions[0]);
 
                 // Expect the result from both 'general' and the 'slow' feedback providers.
@@ -107,7 +107,7 @@ public static void GetFeedback()
                 Assert.Equal(2, feedbacks.Count);
 
                 FeedbackResult entry1 = feedbacks[0];
-                Assert.Equal("general", entry1.Name);
+                Assert.Equal("General Feedback", entry1.Name);
                 Assert.Equal(expectedCmd, entry1.Item.RecommendedActions[0]);
 
                 FeedbackResult entry2 = feedbacks[1];