diff --git a/src/Menus.cpp b/src/Menus.cpp
index eccae5e49..815dfd274 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1792,6 +1792,7 @@ void AudacityProject::PopulateEffectsMenu(CommandManager* c,
          // Move Nyquist prompt into nyquist group.
          && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Effects Prompt"))
          && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Tools Prompt"))
+         && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Prompt"))
 #endif
          )
          defplugs.push_back(plug);
diff --git a/src/effects/nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp
index 3b933bf57..6a8f08afd 100644
--- a/src/effects/nyquist/LoadNyquist.cpp
+++ b/src/effects/nyquist/LoadNyquist.cpp
@@ -175,12 +175,15 @@ bool NyquistEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
    wxArrayString files;
    wxString ignoredErrMsg;
 
+#if 0
    if (!pm.IsPluginRegistered(NYQUIST_EFFECTS_PROMPT_ID))
    {
       // No checking of error ?
       DiscoverPluginsAtPath(NYQUIST_EFFECTS_PROMPT_ID, ignoredErrMsg,
          PluginManagerInterface::DefaultRegistrationCallback);
    }
+#endif
+
    if (!pm.IsPluginRegistered(NYQUIST_TOOLS_PROMPT_ID))
    {
       // No checking of error ?
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index 0013ce944..5db8c1260 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -166,7 +166,7 @@ NyquistEffect::NyquistEffect(const wxString &fName)
 
    // Interactive Nyquist (for general tools)
    if (fName == NYQUIST_TOOLS_PROMPT_ID) {
-      mName = XO("Nyquist Tools Prompt");
+      mName = XO("Nyquist Prompt");
       mType = EffectTypeTool;
       mIsTool = true;
       mPromptName = mName;
@@ -212,7 +212,7 @@ IdentInterfaceSymbol NyquistEffect::GetSymbol()
 {
    if (mIsPrompt)
       return (mType == EffectTypeTool) ? 
-         XO("Nyquist Tools Prompt") :
+         XO("Nyquist Prompt") :
          XO("Nyquist Effects Prompt");
 
    return mName;
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index d43688ea4..40df21b0d 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -35,7 +35,7 @@
 #define NYQUISTEFFECTS_FAMILY ( IdentInterfaceSymbol{ XO("Nyquist") } )
 
 #define NYQUIST_EFFECTS_PROMPT_ID wxT("Nyquist Effects Prompt")
-#define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Tools Prompt")
+#define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Prompt")
 #define NYQUIST_WORKER_ID wxT("Nyquist Worker")
 
 enum NyqControlType
@@ -221,7 +221,7 @@ private:
    bool              mIsSpectral;
    bool              mIsTool;
    /** True if the code to execute is obtained interactively from the user via
-    * the "Nyquist Effect Prompt", or "Nyquist Tools Prompt", false for all other effects (lisp code read from
+    * the "Nyquist Effect Prompt", or "Nyquist Prompt", false for all other effects (lisp code read from
     * files)
     */
    bool              mIsPrompt;