Index: tests/forward.test
===================================================================
diff -u -N -r8bfe3ac01fe62c1917587fc5fe76952d3ff8f397 -rfc4e3f5f6a94ef7324baffab90d58cd7eb513907
--- tests/forward.test	(.../forward.test)	(revision 8bfe3ac01fe62c1917587fc5fe76952d3ff8f397)
+++ tests/forward.test	(.../forward.test)	(revision fc4e3f5f6a94ef7324baffab90d58cd7eb513907)
@@ -22,7 +22,7 @@
 Test case inscope {
     Class create X {
 	:attribute {x 1}
-	:public forward Incr -objscope incr
+	:public forward Incr -objframe incr
     }
 
     X create x1 -x 100
@@ -113,7 +113,7 @@
 Test case incr {
     Object create obj {
 	set :x 1
-	:public forward i1 -objscope incr x 
+	:public forward i1 -objframe incr x 
     }
 
     ? {obj i1} 2
@@ -143,7 +143,7 @@
 
     # check introspection for objects
     Object create obj {
-	:public forward i1 -objscope incr x 
+	:public forward i1 -objframe incr x 
 	:public forward Mixin mixin %1 %self
 	:public forward foo target %proc %self %%self %%p
 	:public forward addOne expr 1 +
@@ -153,7 +153,7 @@
     ? {obj info method definition Mixin} "::obj public forward Mixin mixin %1 %self"
     ? {obj info method definition addOne} "::obj public forward addOne expr 1 +"
     ? {obj info method definition foo} "::obj public forward foo target %proc %self %%self %%p"
-    ? {obj info method definition i1} "::obj public forward i1 -objscope ::incr x"
+    ? {obj info method definition i1} "::obj public forward i1 -objframe ::incr x"
 }
 
 ###########################################
@@ -176,7 +176,7 @@
 Test case optional-target {
     Object create obj {
 	set :x 2
-	:public forward append -objscope
+	:public forward append -objframe
     }
     ? {obj append x y z} 2yz
 
@@ -361,7 +361,7 @@
 # forward to expr + callstack
 ###########################################
 Test case callstack {
-    Object public forward expr -objscope
+    Object public forward expr -objframe
 
     Class create C {
 	:method xx {} {current}