diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
index 2032be636..27a0faeb7 100644
--- a/docs/source/cmd/index_passes_hierarchy.rst
+++ b/docs/source/cmd/index_passes_hierarchy.rst
@@ -1,5 +1,5 @@
-hierarchy
-------------------
+Working with hierarchy
+----------------------
 
 .. autocmdgroup:: passes/hierarchy
    :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
index 1f2c6904d..a2571fedb 100644
--- a/docs/source/cmd/index_passes_sat.rst
+++ b/docs/source/cmd/index_passes_sat.rst
@@ -1,5 +1,5 @@
-sat
-------------------
+Simulating circuits
+-------------------
 
 .. autocmdgroup:: passes/sat
    :members:
diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc
index 9afe00d5c..1e975db0f 100644
--- a/passes/sat/expose.cc
+++ b/passes/sat/expose.cc
@@ -17,11 +17,10 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -217,6 +216,11 @@ RTLIL::Wire *add_new_wire(RTLIL::Module *module, RTLIL::IdString name, int width
 
 struct ExposePass : public Pass {
 	ExposePass() : Pass("expose", "convert internal signals to module ports") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/cmds");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/recover_names.cc b/passes/sat/recover_names.cc
index cddd8771c..7ed8b1304 100644
--- a/passes/sat/recover_names.cc
+++ b/passes/sat/recover_names.cc
@@ -23,6 +23,7 @@
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
 #include "kernel/satgen.h"
+#include "kernel/log_help.h"
 
 #include <algorithm>
 #include <queue>
@@ -690,6 +691,11 @@ struct RecoverNamesWorker {
 
 struct RecoverNamesPass : public Pass {
     RecoverNamesPass() : Pass("recover_names", "Execute a lossy mapping command and recover original netnames") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/opt");
+		return false;
+	}
     void help() override
     {
         //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|