     (from) excluding-words exclude boa ;
 
 : add-words-excluding ( vocab words -- )
-    <exclude> (add-qualified) ;
+    <exclude> qualified-vocabs push ;
 
 TUPLE: rename word vocab words ;
 
 : <rename> ( word vocab new-name -- rename )
-    [ 2dup load-vocab words>> dupd at [ ] [ swap no-word-in-vocab ] ?if ] dip
-    associate rename boa ;
+    [
+        2dup load-vocab words>> dupd at
+        [ ] [ swap no-word-in-vocab ] ?if
+    ] dip associate rename boa ;
 
 : add-renamed-word ( word vocab new-name -- )
-    <rename> (add-qualified) ;
-
-: use-words ( assoc -- ) (use-words) push ;
-
-: unuse-words ( assoc -- ) (use-words) remove! drop ;
+    <rename> qualified-vocabs push ;
+
+: use-words ( assoc -- )
+    <extra-words> qualified-vocabs push ;
+
+: unuse-words ( assoc -- )
+    <extra-words> qualified-vocabs remove! drop ;
 
 TUPLE: ambiguous-use-error words ;
 

<PRIVATE

: (vocab-search) ( name assocs -- words n )
    [ words>> (lookup) ] with map
    sift dup length ;

: vocab-search ( name manifest -- word/f )
    search-vocabs>>


<PRIVATE

: (from) ( vocab words -- vocab words words' vocab )
    2dup swap load-vocab ;

