diff --git a/basis/cpu/architecture/architecture-docs.factor b/basis/cpu/architecture/architecture-docs.factor
index d5217a6b27..1c1746a7c6 100644
--- a/basis/cpu/architecture/architecture-docs.factor
+++ b/basis/cpu/architecture/architecture-docs.factor
@@ -1,7 +1,8 @@
-USING: assocs alien classes compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.stack-frame cpu.x86.assembler cpu.x86.assembler.operands
-help.markup help.syntax kernel layouts literals math multiline system words ;
-QUALIFIED: vm
+USING: alien assocs classes compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.stack-frame
+cpu.x86.assembler cpu.x86.assembler.operands help.markup
+help.syntax kernel layouts literals math multiline system vm
+words ;
 IN: cpu.architecture
 
 <<
@@ -293,7 +294,7 @@ HELP: stack-cleanup
 HELP: gc-root-offset
 { $values { "spill-slot" spill-slot } { "n" integer } }
 { $description "Offset in the " { $link stack-frame } " for the word being constructed where the spill slot is located. The value is given in " { $link cell } " units." }
-{ $see-also vm:gc-info } ;
+{ $see-also gc-info } ;
 
 ARTICLE: "cpu.architecture" "CPU architecture description model"
 "The " { $vocab-link "cpu.architecture" } " vocab contains generic words and hooks that serves as an api for the compiler towards the cpu architecture."
diff --git a/core/classes/intersection/intersection-docs.factor b/core/classes/intersection/intersection-docs.factor
index 8ff1ef4e53..6efdbdb010 100644
--- a/core/classes/intersection/intersection-docs.factor
+++ b/core/classes/intersection/intersection-docs.factor
@@ -8,7 +8,7 @@ ARTICLE: "intersections" "Intersection classes"
 { $subsections POSTPONE: INTERSECTION: }
 { $subsections define-intersection-class }
 "Intersection classes can be introspected:"
-{ $subsections participants }
+{ $subsections class-participants }
 "The set of intersection classes is a class:"
 { $subsections
     intersection-class
diff --git a/core/classes/union/union-docs.factor b/core/classes/union/union-docs.factor
index 4819cdf186..bd7e520f61 100644
--- a/core/classes/union/union-docs.factor
+++ b/core/classes/union/union-docs.factor
@@ -10,7 +10,7 @@ ARTICLE: "unions" "Union classes"
     define-union-class
 }
 "Union classes can be introspected:"
-{ $subsections members }
+{ $subsections class-members }
 "The set of union classes is a class:"
 { $subsections
     union-class