Index: doc/filter.man.inc
===================================================================
diff -u -r2eb328e4d7f6cb4f21144efdb08c87742d0a44f5 -rae7d7d03bf76d21dd52d45181c3ab310e51845ec
--- doc/filter.man.inc	(.../filter.man.inc)	(revision 2eb328e4d7f6cb4f21144efdb08c87742d0a44f5)
+++ doc/filter.man.inc	(.../filter.man.inc)	(revision ae7d7d03bf76d21dd52d45181c3ab310e51845ec)
@@ -36,7 +36,7 @@
 throw an error if there is no matching [term "filter"], unless
 [option -nocomplain] is set.
 
-[def "[arg obj] [const [vset SCOPE]] [method {filter unset}]"]
+[def "[arg obj] [const [vset SCOPE]] [method {filter clear}]"]
 Removes all [term "filter"]s from [arg obj]. This is equivalent
 to passing an empty list for [arg filterSpecList] to [const [vset SCOPE]] [method {filter set}].
 
Index: doc/mixin.man.inc
===================================================================
diff -u -r2eb328e4d7f6cb4f21144efdb08c87742d0a44f5 -rae7d7d03bf76d21dd52d45181c3ab310e51845ec
--- doc/mixin.man.inc	(.../mixin.man.inc)	(revision 2eb328e4d7f6cb4f21144efdb08c87742d0a44f5)
+++ doc/mixin.man.inc	(.../mixin.man.inc)	(revision ae7d7d03bf76d21dd52d45181c3ab310e51845ec)
@@ -31,7 +31,7 @@
 [def "[arg obj] [const [vset SCOPE]] [method {mixin delete}] [option -nocomplain] [arg specPattern]"]
 Removes a [term "mixin class"] from a current list of [term "mixin class"]es of [arg obj] whose spec matches [arg specPattern]. [arg specPattern] can contain special matching chars (see [cmd "string match"]). [const [vset SCOPE]] [method "mixin delete"] will throw an error if there is no matching [term "mixin class"], unless [option -nocomplain] is set.
 
-[def "[arg obj] [const [vset SCOPE]] [method {mixin unset}]"]
+[def "[arg obj] [const [vset SCOPE]] [method {mixin clear}]"]
 Removes all [term "mixin class"]es from [arg obj]. This is equivalent
 to passing an empty list for [arg mixinSpecList] to 
 [const [vset SCOPE]] [method {mixin set}].
Index: library/nx/nx.tcl
===================================================================
diff -u -r0a38046eb4aac6c36ac7c72dc8b0fe6da43f7c6e -rae7d7d03bf76d21dd52d45181c3ab310e51845ec
--- library/nx/nx.tcl	(.../nx.tcl)	(revision 0a38046eb4aac6c36ac7c72dc8b0fe6da43f7c6e)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision ae7d7d03bf76d21dd52d45181c3ab310e51845ec)
@@ -1522,7 +1522,7 @@
   ::nsf::method::alias RelationSlot value=set ::nsf::relation::set
   ::nsf::method::alias RelationSlot value=get ::nsf::relation::get
 
-  RelationSlot public method value=unset {obj prop} {
+  RelationSlot public method value=clear {obj prop} {
     ::nsf::relation::set $obj $prop {}
   }
 
Index: tests/interceptor-slot.test
===================================================================
diff -u -r3cbf24ff95e38976cdc905ec0e8014d9d754ad6f -rae7d7d03bf76d21dd52d45181c3ab310e51845ec
--- tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision 3cbf24ff95e38976cdc905ec0e8014d9d754ad6f)
+++ tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision ae7d7d03bf76d21dd52d45181c3ab310e51845ec)
@@ -27,7 +27,7 @@
   ? {C info mixin classes} ""
 
   ? {C mixin set ::M} "::M"
-  ? {C mixin unset} ""
+  ? {C mixin clear} ""
   ? {C info mixin classes} ""
 
   ? {C mixin add ::M} "::M"
@@ -69,7 +69,7 @@
 
   ? {c1 object mixin add M} {::M}
   ? {c1 info object mixin classes} {::M}
-  ? {c1 object mixin unset} {}
+  ? {c1 object mixin clear} {}
   ? {c1 info object mixin classes} {}
 }
 
@@ -196,7 +196,7 @@
   ? {::nsf::relation::get CC object-filter} "filterC"
   ? {CC info object filter methods} "filterC"
 
-  ? {CC object filter unset} ""
+  ? {CC object filter clear} ""
   ? {::nsf::relation::get CC object-filter} ""
   ? {CC info object filter methods} ""
   
@@ -218,7 +218,7 @@
   ? {::nsf::relation::get CC class-filter} "filterB"
   ? {CC info filter methods} "filterB"
 
-  ? {CC filter unset} ""
+  ? {CC filter clear} ""
   ? {::nsf::relation::get CC class-filter} ""
   ? {CC info filter methods} ""
 }
Index: tests/methods.test
===================================================================
diff -u -r27030b244334e022169ea7143ce6d91257a8b653 -rae7d7d03bf76d21dd52d45181c3ab310e51845ec
--- tests/methods.test	(.../methods.test)	(revision 27030b244334e022169ea7143ce6d91257a8b653)
+++ tests/methods.test	(.../methods.test)	(revision ae7d7d03bf76d21dd52d45181c3ab310e51845ec)
@@ -235,8 +235,8 @@
   ? {lsort [C object mixin get]} "::M2 ::M4"
   ? {lsort [C mixin get]} "::M1 ::M3"
 
-  ? {lsort [C object mixin]} {wrong # args: use "::C mixin add|delete|get|guard|set|unset"} ;# TODO: should be "C object mixin ..."
-  ? {lsort [C mixin]} {wrong # args: use "::C mixin add|delete|get|guard|set|unset"}
+  ? {lsort [C object mixin]} {wrong # args: use "::C mixin add|clear|delete|get|guard|set"} ;# TODO: should be "C object mixin ..."
+  ? {lsort [C mixin]} {wrong # args: use "::C mixin add|clear|delete|get|guard|set"}
 
   ? {catch {C mixin M5} errorMsg} 1
   ? {lsort [C info mixin classes]} "::M1 ::M3"