Index: tests/varresolutiontest.tcl
===================================================================
diff -u -r8274c68ad85f12b1e4a41a01273079405fa865ef -r89b5047e54e47a88a7de75d8523a07ffa5743407
--- tests/varresolutiontest.tcl	(.../varresolutiontest.tcl)	(revision 8274c68ad85f12b1e4a41a01273079405fa865ef)
+++ tests/varresolutiontest.tcl	(.../varresolutiontest.tcl)	(revision 89b5047e54e47a88a7de75d8523a07ffa5743407)
@@ -51,33 +51,33 @@
   set x 1
   set :y 2
   set ::z 3
-  set [self]::X 4
+  set [current]::X 4
   set g 1
   set :a(:b) 1
   set :a(::c) 1
 }
 ? {::nx::core::importvar o2 j} \
     "importvar cannot import variable 'j' into method scope; not called from a method frame"
 
-o method foo {} {::nx::core::importvar [self] :a}
+o method foo {} {::nx::core::importvar [current] :a}
 ? {o foo} "variable name \":a\" must not contain namespace separator or colon prefix"
 
-o method foo {} {::nx::core::importvar [self] ::a}
+o method foo {} {::nx::core::importvar [current] ::a}
 ? {o foo} "variable name \"::a\" must not contain namespace separator or colon prefix"
 
-o method foo {} {::nx::core::importvar [self] a(:b)}
+o method foo {} {::nx::core::importvar [current] a(:b)}
 ? {o foo} "can't make instance variable a(:b) on ::o: Variable cannot be an element in an array; use e.g. an alias."
 
-o method foo {} {::nx::core::importvar [self] {a(:b) ab}}
+o method foo {} {::nx::core::importvar [current] {a(:b) ab}}
 ? {o foo} ""
 
-o method foo {} {::nx::core::existsvar [self] ::a}
+o method foo {} {::nx::core::existsvar [current] ::a}
 ? {o foo} "variable name \"::a\" must not contain namespace separator or colon prefix"
 
-o method foo {} {::nx::core::existsvar [self] a(:b)}
+o method foo {} {::nx::core::existsvar [current] a(:b)}
 ? {o foo} 1
 
-o method foo {} {::nx::core::existsvar [self] a(::c)}
+o method foo {} {::nx::core::existsvar [current] a(::c)}
 ? {o foo} 1
 
 set ::o::Y 5
@@ -109,7 +109,7 @@
   set x 1
   set :y 2
   set ::z 3
-  set [self]::X 4
+  set [current]::X 4
   set g 1
 }
 set ::o::Y 5
@@ -371,7 +371,7 @@
 ###############################################
 Class create C
 C method bar {args} {
-  #puts stderr "[self] bar called with [list $args]"
+  #puts stderr "[current] bar called with [list $args]"
   return $args
 }
 C forward test %self bar