Merge 8.7

33 files changed, 636 insertions, 636 deletions

diff --git a/tests/appendComp.test b/tests/appendComp.test
index ebd48eb..fcbc32a 100644
--- a/tests/appendComp.test
+++ b/tests/appendComp.test
@@ -359,9 +359,9 @@ test appendComp-7.9 {append var does not trigger read trace} -setup {
 } -result {0}
 
 test appendComp-8.1 {defer error to runtime} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	proc foo {} {
 	    proc append args {}
 	    append
@@ -369,7 +369,7 @@ test appendComp-8.1 {defer error to runtime} -setup {
 	foo
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {}
 
 # New tests for bug 3057639 to show off the more consistent behaviour of
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index 85f7c0b..3e986c1 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -146,10 +146,10 @@ test autoMkindex-1.3 {examine tclIndex} -setup {
 
 test autoMkindex-2.1 {commands on the autoload path can be imported} -setup {
     file delete tclIndex
-    interp create slave
+    interp create child
 } -body {
     auto_mkindex . autoMkindex.tcl
-    slave eval {
+    child eval {
         namespace eval blt {}
         set auto_path [linsert $auto_path 0 .]
         set info [list [catch {namespace import buried::*} result] $result]
@@ -159,7 +159,7 @@ test autoMkindex-2.1 {commands on the autoload path can be imported} -setup {
         return $info
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result "0 {} pub_one ::buried::pub_one pub_two ::buried::pub_two"
 
 # Test auto_mkindex hooks
@@ -335,14 +335,14 @@ test autoMkindex-5.2 {correctly locate auto loaded procs with []} -setup {
 	proc {[magic mojo proc]} {} {}
     } [file join pkg magicchar2.tcl]
     set result {}
-    interp create slave
+    interp create child
 } -body {
     auto_mkindex . pkg/magicchar2.tcl
-    # Make a slave interp to test the autoloading
-    slave eval {lappend auto_path [pwd]}
-    slave eval {catch {{[magic mojo proc]}}}
+    # Make a child interp to test the autoloading
+    child eval {lappend auto_path [pwd]}
+    child eval {catch {{[magic mojo proc]}}}
 } -cleanup {
-    interp delete slave
+    interp delete child
     removeFile [file join pkg magicchar2.tcl]
     removeDirectory pkg
 } -result 0
diff --git a/tests/basic.test b/tests/basic.test
index 428fd93..089f154 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -999,13 +999,13 @@ test basic-49.2 {Tcl_EvalEx: verify TCL_EVAL_GLOBAL operation} testevalex {
 } {global}
 
 test basic-50.1 {[586e71dce4] EvalObjv level #0 exception handling} -setup {
-    interp create slave
-    interp alias {} foo slave return
+    interp create child
+    interp alias {} foo child return
 } -body {
     list [catch foo m] $m
 } -cleanup {
     unset -nocomplain m
-    interp delete slave
+    interp delete child
 } -result {0 {}}
 
 # Clean up after expand tests
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 0ded49a..b230a12 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -1632,7 +1632,7 @@ test cmdAH-31.9 {Tcl_FileObjCmd: channels in other interp} {
     lsort [safeInterp eval [list file channels]]
 } [lsort [list stdout $newFileId]]
 test cmdAH-31.10 {Tcl_FileObjCmd: channels in other interp} {
-    # we can now write to $newFileId from slave
+    # we can now write to $newFileId from child
     safeInterp eval [list puts $newFileId "hello"]
 } {}
 interp transfer {} $newFileId safeInterp
diff --git a/tests/compExpr.test b/tests/compExpr.test
index a2a021e..5042038 100644
--- a/tests/compExpr.test
+++ b/tests/compExpr.test
@@ -340,9 +340,9 @@ test compExpr-7.1 {Memory Leak} -constraints memory -setup {
 } -body {
     set end [getbytes]
     for {set i 0} {$i < 5} {incr i} {
-	interp create slave
-	slave eval expr 1+2+3+4+5+6+7+8+9+10+11+12+13
-	interp delete slave
+	interp create child
+	child eval expr 1+2+3+4+5+6+7+8+9+10+11+12+13
+	interp delete child
 	set tmp $end
 	set end [getbytes]
     }
diff --git a/tests/coroutine.test b/tests/coroutine.test
index 9546492..c8c8176 100644
--- a/tests/coroutine.test
+++ b/tests/coroutine.test
@@ -771,25 +771,25 @@ test coroutine-8.0.1 {coro inject after error} -body {
     lappend ::result [catch {demo} err] $err
 } -result {inject-executed 1 test}
 test coroutine-8.1.1 {coro inject, ticket 42202ba1e5ff566e} -body {
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
 	coroutine demo apply {{} { while {1} yield }}
 	demo
 	tcl::unsupported::inject demo set ::result inject-executed
     }
-    interp delete slave
+    interp delete child
 } -result {}
 test coroutine-8.1.2 {coro inject with result, ticket 42202ba1e5ff566e} -body {
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
 	coroutine demo apply {{} { while {1} yield }}
 	demo
 	tcl::unsupported::inject demo set ::result inject-executed
     }
-    slave eval demo
-    set result [slave eval {set ::result}]
+    child eval demo
+    set result [child eval {set ::result}]
 
-    interp delete slave
+    interp delete child
     set result
 } -result {inject-executed}
 
diff --git a/tests/env.test b/tests/env.test
index 774617c..0dc4a85 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -326,11 +326,11 @@ test env-5.2 {corner cases - unset the env array} -setup {
 } -result {0}
 
 
-test env-5.3 {corner cases: unset the env in master should unset child} -setup {
+test env-5.3 {corner cases: unset the env in parent should unset child} -setup {
     setup1
     interp create i
 } -body {
-    # Variables deleted in a master interp should be deleted in child interp
+    # Variables deleted in a parent interp should be deleted in child interp
     # too.
     i eval {set env(THIS_SHOULD_EXIST) a}
     set result [set env(THIS_SHOULD_EXIST)]
diff --git a/tests/execute.test b/tests/execute.test
index 19ca463..54d9e64 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -653,56 +653,56 @@ test execute-6.8 {TclCompEvalObj: bytecode name resolution epoch validation} -se
     namespace delete foo
 } -result {0 AHA!}
 test execute-6.9 {TclCompEvalObj: bytecode interp validation} -setup {
-    interp create slave
+    interp create child
 } -body {
     set script { llength {} }
-    slave eval {proc llength args {return AHA!}}
+    child eval {proc llength args {return AHA!}}
     set result {}
     lappend result [if 1 $script]
-    lappend result [slave eval $script]
+    lappend result [child eval $script]
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {0 AHA!}
 test execute-6.10 {TclCompEvalObj: bytecode interp validation} -body {
     set script { llength {} }
-    interp create slave
+    interp create child
     set result {}
-    lappend result [slave eval $script]
-    interp delete slave
-    interp create slave
-    lappend result [slave eval $script]
+    lappend result [child eval $script]
+    interp delete child
+    interp create child
+    lappend result [child eval $script]
 } -cleanup {
-    catch {interp delete slave}
+    catch {interp delete child}
 } -result {0 0}
 test execute-6.11 {Tcl_ExprObj: exprcode interp validation} -setup {
-    interp create slave
+    interp create child
 } -constraints testexprlongobj -body {
     set e { [llength {}]+1 }
     set result {}
-    load {} Tcltest slave
-    interp alias {} e slave testexprlongobj
+    load {} Tcltest child
+    interp alias {} e child testexprlongobj
     lappend result [e $e]
-    interp delete slave
-    interp create slave
-    load {} Tcltest slave
-    interp alias {} e slave testexprlongobj
+    interp delete child
+    interp create child
+    load {} Tcltest child
+    interp alias {} e child testexprlongobj
     lappend result [e $e]
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {{This is a result: 1} {This is a result: 1}}
 test execute-6.12 {Tcl_ExprObj: exprcode interp validation} -setup {
-    interp create slave
+    interp create child
 } -body {
     set e { [llength {}]+1 }
     set result {}
-    interp alias {} e slave expr
+    interp alias {} e child expr
     lappend result [e $e]
-    interp delete slave
-    interp create slave
-    interp alias {} e slave expr
+    interp delete child
+    interp create child
+    interp alias {} e child expr
     lappend result [e $e]
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {1 1}
 test execute-6.13 {Tcl_ExprObj: exprcode epoch validation} -body {
     set e { [llength {}]+1 }
@@ -743,16 +743,16 @@ test execute-6.15 {Tcl_ExprObj: exprcode name resolution epoch validation} -setu
     namespace delete foo
 } -result {1 2}
 test execute-6.16 {Tcl_ExprObj: exprcode interp validation} -setup {
-    interp create slave
+    interp create child
 } -body {
     set e { [llength {}]+1 }
-    interp alias {} e slave expr
-    slave eval {proc llength args {return 1}}
+    interp alias {} e child expr
+    child eval {proc llength args {return 1}}
     set result {}
     lappend result [expr $e]
     lappend result [e $e]
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {1 2}
 test execute-6.17 {Tcl_ExprObj: exprcode context validation} -body {
     proc foo e {set v 0; expr $e}
@@ -978,8 +978,8 @@ test execute-8.5 {Bug 2038069} -setup {
 "catch \[list error FOO\] m o"} -errorline 2}
 
 test execute-8.6 {Compile epoch bump in global level (bug [fa6bf38d07])} -setup {
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
 	package require tcltest
 	catch [list package require -exact Tcltest [info patchlevel]]
 	::tcltest::loadTestedCommands
@@ -988,31 +988,31 @@ test execute-8.6 {Compile epoch bump in global level (bug [fa6bf38d07])} -setup
 	}
     }
 } -body {
-    slave eval {
+    child eval {
 	lappend res A; testbumpinterpepoch; lappend res B; return; lappend res C;
     }
-    slave eval {
+    child eval {
 	set i 0; while {[incr i] < 3} {
 	    lappend res A; testbumpinterpepoch; lappend res B; return; lappend res C;
 	}
     }
-    slave eval {
+    child eval {
 	set i 0; while {[incr i] < 3} {
 	    lappend res A; testbumpinterpepoch; lappend res B; break; lappend res C;
 	}
     }
-    slave eval {
+    child eval {
 	catch {
 	    lappend res A; testbumpinterpepoch; lappend res B; error test; lappend res C;
 	}
     }
-    slave eval {set res}
+    child eval {set res}
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result [lrepeat 4 A B]
 test execute-8.7 {Compile epoch bump in global level (bug [fa6bf38d07]), exception case} -setup {
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
 	package require tcltest
 	catch [list package require -exact Tcltest [info patchlevel]]
 	::tcltest::loadTestedCommands
@@ -1023,28 +1023,28 @@ test execute-8.7 {Compile epoch bump in global level (bug [fa6bf38d07]), excepti
 } -body {
     set res {}
     lappend res [catch {
-	slave eval {
+	child eval {
 	   lappend res A; testbumpinterpepoch; lappend res B; return -code error test; lappend res C;
 	}
     } e] $e
     lappend res [catch {
-	slave eval {
+	child eval {
 	   lappend res A; testbumpinterpepoch; lappend res B; error test; lappend res C;
 	}
     } e] $e
     lappend res [catch {
-	slave eval {
+	child eval {
 	   lappend res A; testbumpinterpepoch; lappend res B; return -code return test; lappend res C;
 	}
     } e] $e
     lappend res [catch {
-	slave eval {
+	child eval {
 	   lappend res A; testbumpinterpepoch; lappend res B; break; lappend res C;
 	}
     } e] $e
-    list $res [slave eval {set res}]
+    list $res [child eval {set res}]
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result [list {1 test 1 test 2 test 3 {}} [lrepeat 4 A B]]
 
 test execute-9.1 {Interp result resetting [Bug 1522803]} {
@@ -1065,16 +1065,16 @@ test execute-10.1 {TclExecuteByteCode, INST_CONCAT1, bytearrays} {
     apply {s {binary scan $s c x; list $x [scan $s$s %c%c]}} \u0130
 } {48 {304 304}}
 test execute-10.2 {Bug 2802881} -setup {
-    interp create slave
+    interp create child
 } -body {
     # If [Bug 2802881] is not fixed, this will segfault
-    slave eval {
+    child eval {
 	trace add variable ::errorInfo write {expr {$foo} ;#}
 	proc demo {} {a {}{}}
 	demo
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -returnCodes error -match glob -result *
 test execute-10.3 {Bug 3072640} -setup {
     proc generate {n} {
@@ -1099,9 +1099,9 @@ test execute-10.3 {Bug 3072640} -setup {
 } -result 4
 
 test execute-11.1 {Bug 3142026: GrowEvaluationStack off-by-one} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	set x [lrepeat 1320 199]
 	for {set i 0} {$i < 20} {incr i} {
 	    lappend x $i
@@ -1111,7 +1111,7 @@ test execute-11.1 {Bug 3142026: GrowEvaluationStack off-by-one} -setup {
 	return ok
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result ok
 
 test execute-11.2 {Bug 268b23df11} -setup {
diff --git a/tests/http.test b/tests/http.test
index 8eac3c3..cd5996f 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -19,7 +19,7 @@ if {[catch {package require http 2} version]} {
 	catch {puts "Cannot load http 2.* package"}
 	return
     } else {
-	catch {puts "Running http 2.* tests in slave interp"}
+	catch {puts "Running http 2.* tests in child interp"}
 	set interp [interp create http2]
 	$interp eval [list set http2 "running"]
 	$interp eval [list set argv $argv]
diff --git a/tests/interp.test b/tests/interp.test
index 599ac08..18e6872 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -22,7 +22,7 @@ testConstraint testinterpdelete [llength [info commands testinterpdelete]]
 
 set hidden_cmds {cd encoding exec exit fconfigure file glob load open pwd socket source tcl:encoding:dirs tcl:encoding:system tcl:file:atime tcl:file:attributes tcl:file:copy tcl:file:delete tcl:file:dirname tcl:file:executable tcl:file:exists tcl:file:extension tcl:file:isdirectory tcl:file:isfile tcl:file:link tcl:file:lstat tcl:file:mkdir tcl:file:mtime tcl:file:nativename tcl:file:normalize tcl:file:owned tcl:file:readable tcl:file:readlink tcl:file:rename tcl:file:rootname tcl:file:size tcl:file:stat tcl:file:tail tcl:file:tempdir tcl:file:tempfile tcl:file:type tcl:file:volumes tcl:file:writable tcl:info:cmdtype tcl:info:nameofexecutable tcl:process:autopurge tcl:process:list tcl:process:purge tcl:process:status tcl:zipfs:lmkimg tcl:zipfs:lmkzip tcl:zipfs:mkimg tcl:zipfs:mkkey tcl:zipfs:mkzip tcl:zipfs:mount tcl:zipfs:mount_data tcl:zipfs:unmount unload}
 
-foreach i [interp slaves] {
+foreach i [interp children] {
   interp delete $i
 }
 
@@ -32,7 +32,7 @@ test interp-1.1 {options for interp command} -returnCodes error -body {
 } -result {wrong # args: should be "interp cmd ?arg ...?"}
 test interp-1.2 {options for interp command} -returnCodes error -body {
     interp frobox
-} -result {bad option "frobox": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
+} -result {bad option "frobox": must be alias, aliases, bgerror, cancel, children, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.3 {options for interp command} {
     interp delete
 } ""
@@ -46,17 +46,17 @@ test interp-1.5 {options for interp command} -returnCodes error -body {
 # test interp-0.6 was removed
 #
 test interp-1.6 {options for interp command} -returnCodes error -body {
-    interp slaves foo bar zop
-} -result {wrong # args: should be "interp slaves ?path?"}
+    interp children foo bar zop
+} -result {wrong # args: should be "interp children ?path?"}
 test interp-1.7 {options for interp command} -returnCodes error -body {
     interp hello
-} -result {bad option "hello": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
+} -result {bad option "hello": must be alias, aliases, bgerror, cancel, children, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.8 {options for interp command} -returnCodes error -body {
     interp -froboz
-} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
+} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, children, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.9 {options for interp command} -returnCodes error -body {
     interp -froboz -safe
-} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
+} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, children, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.10 {options for interp command} -returnCodes error -body {
     interp target
 } -result {wrong # args: should be "interp target path alias"}
@@ -120,45 +120,45 @@ test interp-2.13 {correct default when no $path arg is given} -body {
     interp create --
 } -match regexp -result {interp[0-9]+}
 
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 
-# Part 2: Testing "interp slaves" and "interp exists"
-test interp-3.1 {testing interp exists and interp slaves} {
-    interp slaves
+# Part 2: Testing "interp children" and "interp exists"
+test interp-3.1 {testing interp exists and interp children} {
+    interp children
 } ""
-test interp-3.2 {testing interp exists and interp slaves} {
+test interp-3.2 {testing interp exists and interp children} {
     interp create a
     interp exists a
 } 1
-test interp-3.3 {testing interp exists and interp slaves} {
+test interp-3.3 {testing interp exists and interp children} {
     interp exists nonexistent
 } 0
-test interp-3.4 {testing interp exists and interp slaves} -body {
-    interp slaves a b c
-} -returnCodes error -result {wrong # args: should be "interp slaves ?path?"}
-test interp-3.5 {testing interp exists and interp slaves} -body {
+test interp-3.4 {testing interp exists and interp children} -body {
+    interp children a b c
+} -returnCodes error -result {wrong # args: should be "interp children ?path?"}
+test interp-3.5 {testing interp exists and interp children} -body {
     interp exists a b c
 } -returnCodes error -result {wrong # args: should be "interp exists ?path?"}
-test interp-3.6 {testing interp exists and interp slaves} {
+test interp-3.6 {testing interp exists and interp children} {
     interp exists
 } 1
-test interp-3.7 {testing interp exists and interp slaves} -setup {
+test interp-3.7 {testing interp exists and interp children} -setup {
     catch {interp create a}
 } -body {
-    interp slaves
+    interp children
 } -result a
-test interp-3.8 {testing interp exists and interp slaves} -body {
-    interp slaves a b c
-} -returnCodes error -result {wrong # args: should be "interp slaves ?path?"}
-test interp-3.9 {testing interp exists and interp slaves} -setup {
+test interp-3.8 {testing interp exists and interp children} -body {
+    interp children a b c
+} -returnCodes error -result {wrong # args: should be "interp children ?path?"}
+test interp-3.9 {testing interp exists and interp children} -setup {
     catch {interp create a}
 } -body {
     interp create {a a2} -safe
-    expr {"a2" in [interp slaves a]}
+    expr {"a2" in [interp children a]}
 } -result 1
-test interp-3.10 {testing interp exists and interp slaves} -setup {
+test interp-3.10 {testing interp exists and interp children} -setup {
     catch {interp create a}
     catch {interp create {a a2}}
 } -body {
@@ -186,7 +186,7 @@ test interp-4.5 {testing interp delete} {
     interp create a
     interp create {a x1}
     interp delete {a x1}
-    expr {"x1" in [interp slaves a]}
+    expr {"x1" in [interp children a]}
 } 0
 test interp-4.6 {testing interp delete} {
     interp create c1
@@ -203,14 +203,14 @@ test interp-4.8 {testing interp delete} -returnCodes error -body {
     interp delete {}
 } -result {cannot delete the current interpreter}
 
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 
 # Part 4: Consistency checking - all nondeleted interpreters should be
 # there:
 test interp-5.1 {testing consistency} {
-    interp slaves
+    interp children
 } ""
 test interp-5.2 {testing consistency} {
     interp exists a
@@ -247,27 +247,27 @@ test interp-6.6 {testing eval} -returnCodes error -body {
     interp eval {a x2} foo
 } -result {invalid command name "foo"}
 
-# UTILITY PROCEDURE RUNNING IN MASTER INTERPRETER:
-proc in_master {args} {
-     return [list seen in master: $args]
+# UTILITY PROCEDURE RUNNING IN PARENT INTERPRETER:
+proc in_parent {args} {
+     return [list seen in parent: $args]
 }
 
 # Part 6: Testing basic alias creation
 test interp-7.1 {testing basic alias creation} {
-    a alias foo in_master
+    a alias foo in_parent
 } foo
-catch {a alias foo in_master}
+catch {a alias foo in_parent}
 test interp-7.2 {testing basic alias creation} {
-    a alias bar in_master a1 a2 a3
+    a alias bar in_parent a1 a2 a3
 } bar
-catch {a alias bar in_master a1 a2 a3}
+catch {a alias bar in_parent a1 a2 a3}
 # Test 6.3 has been deleted.
 test interp-7.3 {testing basic alias creation} {
     a alias foo
-} in_master
+} in_parent
 test interp-7.4 {testing basic alias creation} {
     a alias bar
-} {in_master a1 a2 a3}
+} {in_parent a1 a2 a3}
 test interp-7.5 {testing basic alias creation} {
     lsort [a aliases]
 } {bar foo}
@@ -278,14 +278,14 @@ test interp-7.6 {testing basic aliases arg checking} -returnCodes error -body {
 # Part 7: testing basic alias invocation
 test interp-8.1 {testing basic alias invocation} {
     catch {interp create a}
-    a alias foo in_master
+    a alias foo in_parent
     a eval foo s1 s2 s3
-} {seen in master: {s1 s2 s3}}
+} {seen in parent: {s1 s2 s3}}
 test interp-8.2 {testing basic alias invocation} {
     catch {interp create a}
-    a alias bar in_master a1 a2 a3
+    a alias bar in_parent a1 a2 a3
     a eval bar s1 s2 s3
-} {seen in master: {a1 a2 a3 s1 s2 s3}}
+} {seen in parent: {a1 a2 a3 s1 s2 s3}}
 test interp-8.3 {testing basic alias invocation} -returnCodes error -body {
    catch {interp create a}
    a alias
@@ -294,13 +294,13 @@ test interp-8.3 {testing basic alias invocation} -returnCodes error -body {
 # Part 8: Testing aliases for non-existent or hidden targets
 test interp-9.1 {testing aliases for non-existent targets} {
     catch {interp create a}
-    a alias zop nonexistent-command-in-master
+    a alias zop nonexistent-command-in-parent
     list [catch {a eval zop} msg] $msg
-} {1 {invalid command name "nonexistent-command-in-master"}}
+} {1 {invalid command name "nonexistent-command-in-parent"}}
 test interp-9.2 {testing aliases for non-existent targets} {
     catch {interp create a}
-    a alias zop nonexistent-command-in-master
-    proc nonexistent-command-in-master {} {return i_exist!}
+    a alias zop nonexistent-command-in-parent
+    proc nonexistent-command-in-parent {} {return i_exist!}
     a eval zop
 } i_exist!
 test interp-9.3 {testing aliases for hidden commands} {
@@ -329,8 +329,8 @@ test interp-9.4 {testing aliases and namespace commands} {
     set res
  } {GLOBAL GLOBAL}
 
-if {[info command nonexistent-command-in-master] != ""} {
-    rename nonexistent-command-in-master {}
+if {[info command nonexistent-command-in-parent] != ""} {
+    rename nonexistent-command-in-parent {}
 }
 
 # Part 9: Aliasing between interpreters
@@ -380,9 +380,9 @@ test interp-10.6 {testing aliasing between interpreters} {
     interp create a
     interp create b
     interp alias a a_command b b_command a1 a2 a3
-    b alias b_command in_master b1 b2 b3
+    b alias b_command in_parent b1 b2 b3
     a eval a_command m1 m2 m3
-} {seen in master: {b1 b2 b3 a1 a2 a3 m1 m2 m3}}
+} {seen in parent: {b1 b2 b3 a1 a2 a3 m1 m2 m3}}
 test interp-10.7 {testing aliases between interpreters} {
     catch {interp delete a}
     interp create a
@@ -513,7 +513,7 @@ test interp-14.3 {testing interp aliases} {
     interp alias {a x3} froboz "" puts
     interp aliases {a x3}
 } froboz
-test interp-14.4 {testing interp alias - alias over master} {
+test interp-14.4 {testing interp alias - alias over parent} {
     # SF Bug 641195
     catch {interp delete a}
     interp create a
@@ -793,32 +793,32 @@ test interp-17.6 {alias loop prevention} {
 } {1 {cannot define or rename alias "b": would create a loop}}
 
 #
-# Test robustness of Tcl_DeleteInterp when applied to a slave interpreter.
+# Test robustness of Tcl_DeleteInterp when applied to a child interpreter.
 # If there are bugs in the implementation these tests are likely to expose
 # the bugs as a core dump.
 #
 
-test interp-18.1 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.1 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     list [catch {testinterpdelete} msg] $msg
 } {1 {wrong # args: should be "testinterpdelete path"}}
-test interp-18.2 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.2 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     catch {interp delete a}
     interp create a
     testinterpdelete a
 } ""
-test interp-18.3 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.3 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     catch {interp delete a}
     interp create a
     interp create {a b}
     testinterpdelete {a b}
 } ""
-test interp-18.4 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.4 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     catch {interp delete a}
     interp create a
     interp create {a b}
     testinterpdelete a
 } ""
-test interp-18.5 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.5 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     catch {interp delete a}
     interp create a
     interp create {a b}
@@ -826,7 +826,7 @@ test interp-18.5 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
     proc dodel {x} {testinterpdelete $x}
     list [catch {interp eval {a b} {dodel {a b}}} msg] $msg
 } {0 {}}
-test interp-18.6 {testing Tcl_DeleteInterp vs slaves} testinterpdelete {
+test interp-18.6 {testing Tcl_DeleteInterp vs children} testinterpdelete {
     catch {interp delete a}
     interp create a
     interp create {a b}
@@ -1615,36 +1615,36 @@ test interp-20.49 {interp invokehidden -namespace} -setup {
     set script [makeFile {
 	set x [namespace current]
     } script]
-    interp create -safe slave
+    interp create -safe child
 } -body {
-    slave invokehidden -namespace ::foo source $script
-    slave eval {set ::foo::x}
+    child invokehidden -namespace ::foo source $script
+    child eval {set ::foo::x}
 } -cleanup {
-    interp delete slave
+    interp delete child
     removeFile script
 } -result ::foo
 test interp-20.50 {Bug 2486550} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave hide coroutine
-    slave invokehidden coroutine
+    child hide coroutine
+    child invokehidden coroutine
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -returnCodes error -match glob -result *
 test interp-20.50.1 {Bug 2486550} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave hide coroutine
-    catch {slave invokehidden coroutine} m o
+    child hide coroutine
+    catch {child invokehidden coroutine} m o
     dict get $o -errorinfo
 } -cleanup {
     unset -nocomplain m 0
-    interp delete slave
+    interp delete child
 } -returnCodes ok -result {wrong # args: should be "coroutine name cmd ?arg ...?"
     while executing
 "coroutine"
     invoked from within
-"slave invokehidden coroutine"}
+"child invokehidden coroutine"}
 
 test interp-21.1 {interp hidden} {
     interp hidden {}
@@ -2058,8 +2058,8 @@ test interp-25.1 {testing aliasing of string commands} -setup {
 
 test interp-26.1 {result code transmission : interp eval direct} {
     # Test that all the possibles error codes from Tcl get passed up
-    # from the slave interp's context to the master, even though the
-    # slave nominally thinks the command is running at the root level.
+    # from the child interp's context to the parent, even though the
+    # child nominally thinks the command is running at the root level.
     catch {interp delete a}
     interp create a
     set res {}
@@ -2085,7 +2085,7 @@ test interp-26.2 {result code transmission : interp eval indirect} {
 } {-1 ret-1 0 ret0 1 ret1 0 ret2 3 ret3 4 ret4 5 ret5}
 test interp-26.3 {result code transmission : aliases} {
     # Test that all the possibles error codes from Tcl get passed up from the
-    # slave interp's context to the master, even though the slave nominally
+    # child interp's context to the parent, even though the child nominally
     # thinks the command is running at the root level.
     catch {interp delete a}
     interp create a
@@ -2180,7 +2180,7 @@ test interp-26.8 {errorInfo transmission: safe interps--bug 1637} -setup {
 } -constraints knownBug -body {
     # this test fails because the errorInfo is fully transmitted whether the
     # interp is safe or not.  The errorInfo should never report data from the
-    # master interpreter because it could contain sensitive information.
+    # parent interpreter because it could contain sensitive information.
     proc MyError {secret} {
 	return -code error "msg"
     }
@@ -2275,22 +2275,22 @@ test interp-27.5 {interp hidden & namespaces} -setup {
 test interp-27.6 {interp hidden & aliases & namespaces} -setup {
     set i [interp create]
 } -constraints knownBug -body {
-    set v root-master
+    set v root-parent
     namespace eval foo {
-	variable v foo-master
+	variable v foo-parent
 	proc bar {interp args} {
 	    variable v
-	    list "master bar called ($v) ([namespace current]) ($args)"\
+	    list "parent bar called ($v) ([namespace current]) ($args)"\
 		[interp invokehidden $interp foo::bar $args]
 	}
     }
     interp eval $i {
 	namespace eval foo {
 	    namespace export *
-	    variable v foo-slave
+	    variable v foo-child
 	    proc bar {args} {
 		variable v
-		return "slave bar called ($v) ([namespace current]) ($args)"
+		return "child bar called ($v) ([namespace current]) ($args)"
 	    }
 	}
     }
@@ -2298,7 +2298,7 @@ test interp-27.6 {interp hidden & aliases & namespaces} -setup {
     $i hide foo::bar
     $i alias foo::bar foo::bar $i
     set res [concat $res [interp eval $i {
-	set v root-slave
+	set v root-child
 	namespace eval test {
 	    variable v foo-test
 	    namespace import ::foo::*
@@ -2308,29 +2308,29 @@ test interp-27.6 {interp hidden & aliases & namespaces} -setup {
 } -cleanup {
     namespace delete foo
     interp delete $i
-} -result {{slave bar called (foo-slave) (::foo) (test1)} {master bar called (foo-master) (::foo) (test2)} {slave bar called (foo-slave) (::foo) (test2)}}
+} -result {{child bar called (foo-child) (::foo) (test1)} {parent bar called (foo-parent) (::foo) (test2)} {child bar called (foo-child) (::foo) (test2)}}
 test interp-27.7 {interp hidden & aliases & imports & namespaces} -setup {
     set i [interp create]
 } -constraints knownBug -body {
-    set v root-master
+    set v root-parent
     namespace eval mfoo {
-	variable v foo-master
+	variable v foo-parent
 	proc bar {interp args} {
 	    variable v
-	    list "master bar called ($v) ([namespace current]) ($args)"\
+	    list "parent bar called ($v) ([namespace current]) ($args)"\
 		[interp invokehidden $interp test::bar $args]
 	}
     }
     interp eval $i {
 	namespace eval foo {
 	    namespace export *
-	    variable v foo-slave
+	    variable v foo-child
 	    proc bar {args} {
 		variable v
-		return "slave bar called ($v) ([info level 0]) ([uplevel namespace current]) ([namespace current]) ($args)"
+		return "child bar called ($v) ([info level 0]) ([uplevel namespace current]) ([namespace current]) ($args)"
 	    }
 	}
-	set v root-slave
+	set v root-child
 	namespace eval test {
 	    variable v foo-test
 	    namespace import ::foo::*
@@ -2343,7 +2343,7 @@ test interp-27.7 {interp hidden & aliases & imports & namespaces} -setup {
 } -cleanup {
     namespace delete mfoo
     interp delete $i
-} -result {{slave bar called (foo-slave) (bar test1) (::tcltest) (::foo) (test1)} {master bar called (foo-master) (::mfoo) (test2)} {slave bar called (foo-slave) (test::bar test2) (::) (::foo) (test2)}}
+} -result {{child bar called (foo-child) (bar test1) (::tcltest) (::foo) (test1)} {parent bar called (foo-parent) (::mfoo) (test2)} {child bar called (foo-child) (test::bar test2) (::) (::foo) (test2)}}
 test interp-27.8 {hiding, namespaces and integrity} knownBug {
     namespace eval foo {
 	variable v 3
@@ -2355,25 +2355,25 @@ test interp-27.8 {hiding, namespaces and integrity} knownBug {
     list [catch {interp invokehidden {} foo::bar} msg] $msg
 } {1 {invalid hidden command name "foo"}}
 
-test interp-28.1 {getting fooled by slave's namespace ?} -setup {
+test interp-28.1 {getting fooled by child's namespace ?} -setup {
     set i [interp create -safe]
-    proc master {interp args} {interp hide $interp list}
+    proc parent {interp args} {interp hide $interp list}
 } -body {
-    $i alias master master $i
+    $i alias parent parent $i
     set r [interp eval $i {
         namespace eval foo {
 	    proc list {args} {
 		return "dummy foo::list"
 	    }
-	    master
+	    parent
 	}
 	info commands list
     }]
 } -cleanup {
-    rename master {}
+    rename parent {}
     interp delete $i
 } -result {}
-test interp-28.2 {master's nsName cache should not cross} -setup {
+test interp-28.2 {parent's nsName cache should not cross} -setup {
     set i [interp create]
     $i eval {proc filter lst {lsearch -all -inline -not $lst "::tcl"}}
 } -body {
@@ -2432,31 +2432,31 @@ test interp-29.1.7 {interp recursionlimit argument checking} {
     interp delete moo
     list $result [string range $msg 0 35]
 } {1 {integer value too large to represent}}
-test interp-29.1.8 {slave recursionlimit argument checking} {
+test interp-29.1.8 {child recursionlimit argument checking} {
     interp create moo
     set result [catch {moo recursionlimit foo bar} msg]
     interp delete moo
     list $result $msg
 } {1 {wrong # args: should be "moo recursionlimit ?newlimit?"}}
-test interp-29.1.9 {slave recursionlimit argument checking} {
+test interp-29.1.9 {child recursionlimit argument checking} {
     interp create moo
     set result [catch {moo recursionlimit foo} msg]
     interp delete moo
     list $result $msg
 } {1 {expected integer but got "foo"}}
-test interp-29.1.10 {slave recursionlimit argument checking} {
+test interp-29.1.10 {child recursionlimit argument checking} {
     interp create moo
     set result [catch {moo recursionlimit 0} msg]
     interp delete moo
     list $result $msg
 } {1 {recursion limit must be > 0}}
-test interp-29.1.11 {slave recursionlimit argument checking} {
+test interp-29.1.11 {child recursionlimit argument checking} {
     interp create moo
     set result [catch {moo recursionlimit -1} msg]
     interp delete moo
     list $result $msg
 } {1 {recursion limit must be > 0}}
-test interp-29.1.12 {slave recursionlimit argument checking} {
+test interp-29.1.12 {child recursionlimit argument checking} {
     interp create moo
     set result [catch {moo recursionlimit [expr {wide(1)<<32}]} msg]
     interp delete moo
@@ -2549,8 +2549,8 @@ test interp-29.3.3 {recursion limit} {
    set r
 } {1 {too many nested evaluations (infinite loop?)} 49}
 test interp-29.3.4 {recursion limit error reporting} {
-    interp create slave
-    set r1 [slave eval {
+    interp create child
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2564,13 +2564,13 @@ test interp-29.3.4 {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {falling back due to new recursion limit}}
 test interp-29.3.5 {recursion limit error reporting} {
-    interp create slave
-    set r1 [slave eval {
+    interp create child
+    set r1 [child eval {
         catch {			# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2584,13 +2584,13 @@ test interp-29.3.5 {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {falling back due to new recursion limit}}
 test interp-29.3.6 {recursion limit error reporting} {
-    interp create slave
-    set r1 [slave eval {
+    interp create child
+    set r1 [child eval {
         catch {			# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2604,8 +2604,8 @@ test interp-29.3.6 {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 #
@@ -2613,9 +2613,9 @@ test interp-29.3.6 {recursion limit error reporting} {
 # level will only be verified when it invokes a non-bcc'd command.
 #
 test interp-29.3.7a {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 5}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 5}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2629,14 +2629,14 @@ test interp-29.3.7a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.7b {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 5}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 5}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2650,14 +2650,14 @@ test interp-29.3.7b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.7c {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 5}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 5}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2672,14 +2672,14 @@ test interp-29.3.7c {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {too many nested evaluations (infinite loop?)}}
 test interp-29.3.8a {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 4}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 4}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2693,14 +2693,14 @@ test interp-29.3.8a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.8b {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 4}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 4}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2714,14 +2714,14 @@ test interp-29.3.8b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {too many nested evaluations (infinite loop?)}}
 test interp-29.3.9a {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 6}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 6}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2735,14 +2735,14 @@ test interp-29.3.9a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.9b {recursion limit error reporting} {
-    interp create slave
-    after 0 {interp recursionlimit slave 6}
-    set r1 [slave eval {
+    interp create child
+    after 0 {interp recursionlimit child 6}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2756,14 +2756,14 @@ test interp-29.3.9b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.10a {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 4}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 4}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2777,14 +2777,14 @@ test interp-29.3.10a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.10b {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 4}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 4}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2798,14 +2798,14 @@ test interp-29.3.10b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {too many nested evaluations (infinite loop?)}}
 test interp-29.3.11a {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 5}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 5}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2819,14 +2819,14 @@ test interp-29.3.11a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.11b {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 5}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 5}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2841,14 +2841,14 @@ test interp-29.3.11b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {1 {too many nested evaluations (infinite loop?)}}
 test interp-29.3.12a {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 6}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 6}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2862,14 +2862,14 @@ test interp-29.3.12a {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.3.12b {recursion limit error reporting} {
-    interp create slave
-    after 0 {slave recursionlimit 6}
-    set r1 [slave eval {
+    interp create child
+    after 0 {child recursionlimit 6}
+    set r1 [child eval {
         catch { 		# nesting level 1
 	    eval {		# 2
 	        eval {		# 3
@@ -2884,8 +2884,8 @@ test interp-29.3.12b {recursion limit error reporting} {
 	    }
 	} msg
     }]
-    set r2 [slave eval { set msg }]
-    interp delete slave
+    set r2 [child eval { set msg }]
+    interp delete child
     list $r1 $r2
 } {0 ok}
 test interp-29.4.1 {recursion limit inheritance} {
@@ -2916,121 +2916,121 @@ test interp-29.4.2 {recursion limit inheritance} {
    interp delete $i
    set r
 } 50
-test interp-29.5.1 {does slave recursion limit affect master?} {
+test interp-29.5.1 {does child recursion limit affect parent?} {
     set before [interp recursionlimit {}]
     set i [interp create]
     interp recursionlimit $i 20000
     set after [interp recursionlimit {}]
-    set slavelimit [interp recursionlimit $i]
+    set childlimit [interp recursionlimit $i]
     interp delete $i
-    list [expr {$before == $after}] $slavelimit
+    list [expr {$before == $after}] $childlimit
 } {1 20000}
-test interp-29.5.2 {does slave recursion limit affect master?} {
+test interp-29.5.2 {does child recursion limit affect parent?} {
     set before [interp recursionlimit {}]
     set i [interp create]
     interp recursionlimit $i 20000
     set after [interp recursionlimit {}]
-    set slavelimit [$i recursionlimit]
+    set childlimit [$i recursionlimit]
     interp delete $i
-    list [expr {$before == $after}] $slavelimit
+    list [expr {$before == $after}] $childlimit
 } {1 20000}
-test interp-29.5.3 {does slave recursion limit affect master?} {
+test interp-29.5.3 {does child recursion limit affect parent?} {
     set before [interp recursionlimit {}]
     set i [interp create]
     $i recursionlimit 20000
     set after [interp recursionlimit {}]
-    set slavelimit [interp recursionlimit $i]
+    set childlimit [interp recursionlimit $i]
     interp delete $i
-    list [expr {$before == $after}] $slavelimit
+    list [expr {$before == $after}] $childlimit
 } {1 20000}
-test interp-29.5.4 {does slave recursion limit affect master?} {
+test interp-29.5.4 {does child recursion limit affect parent?} {
     set before [interp recursionlimit {}]
     set i [interp create]
     $i recursionlimit 20000
     set after [interp recursionlimit {}]
-    set slavelimit [$i recursionlimit]
+    set childlimit [$i recursionlimit]
     interp delete $i
-    list [expr {$before == $after}] $slavelimit
+    list [expr {$before == $after}] $childlimit
 } {1 20000}
 test interp-29.6.1 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n [interp recursionlimit slave]
-    interp delete slave
+    interp create child -safe
+    set n [interp recursionlimit child]
+    interp delete child
     set n
 } 1000
 test interp-29.6.2 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n [slave recursionlimit]
-    interp delete slave
+    interp create child -safe
+    set n [child recursionlimit]
+    interp delete child
     set n
 } 1000
 test interp-29.6.3 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n1 [interp recursionlimit slave 42]
-    set n2 [interp recursionlimit slave]
-    interp delete slave
+    interp create child -safe
+    set n1 [interp recursionlimit child 42]
+    set n2 [interp recursionlimit child]
+    interp delete child
     list $n1 $n2
 } {42 42}
 test interp-29.6.4 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n1 [slave recursionlimit 42]
-    set n2 [interp recursionlimit slave]
-    interp delete slave
+    interp create child -safe
+    set n1 [child recursionlimit 42]
+    set n2 [interp recursionlimit child]
+    interp delete child
     list $n1 $n2
 } {42 42}
 test interp-29.6.5 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n1 [interp recursionlimit slave 42]
-    set n2 [slave recursionlimit]
-    interp delete slave
+    interp create child -safe
+    set n1 [interp recursionlimit child 42]
+    set n2 [child recursionlimit]
+    interp delete child
     list $n1 $n2
 } {42 42}
 test interp-29.6.6 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n1 [slave recursionlimit 42]
-    set n2 [slave recursionlimit]
-    interp delete slave
+    interp create child -safe
+    set n1 [child recursionlimit 42]
+    set n2 [child recursionlimit]
+    interp delete child
     list $n1 $n2
 } {42 42}
 test interp-29.6.7 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n1 [slave recursionlimit 42]
-    set n2 [slave recursionlimit]
-    interp delete slave
+    interp create child -safe
+    set n1 [child recursionlimit 42]
+    set n2 [child recursionlimit]
+    interp delete child
     list $n1 $n2
 } {42 42}
 test interp-29.6.8 {safe interpreter recursion limit} {
-    interp create slave -safe
-    set n [catch {slave eval {interp recursionlimit {} 42}} msg]
-    interp delete slave
+    interp create child -safe
+    set n [catch {child eval {interp recursionlimit {} 42}} msg]
+    interp delete child
     list $n $msg
 } {1 {permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.9 {safe interpreter recursion limit} {
-    interp create slave -safe
+    interp create child -safe
     set result [
-	slave eval {
-	    interp create slave2 -safe
+	child eval {
+	    interp create child2 -safe
 	    set n [catch {
-	        interp recursionlimit slave2 42
+	        interp recursionlimit child2 42
             } msg]
             list $n $msg
         }
     ]
-    interp delete slave
+    interp delete child
     set result
 } {1 {permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.10 {safe interpreter recursion limit} {
-    interp create slave -safe
+    interp create child -safe
     set result [
-        slave eval {
-	    interp create slave2 -safe
+        child eval {
+	    interp create child2 -safe
 	    set n [catch {
-	        slave2 recursionlimit 42
+	        child2 recursionlimit 42
             } msg]
             list $n $msg
         }
     ]
-    interp delete slave
+    interp delete child
     set result
 } {1 {permission denied: safe interpreters cannot change recursion limit}}
 
@@ -3559,44 +3559,44 @@ test interp-36.2 {interp bgerror syntax} -body {
     interp bgerror x y z
 } -returnCodes error -result {wrong # args: should be "interp bgerror path ?cmdPrefix?"}
 test interp-36.3 {interp bgerror syntax} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave bgerror x y
+    child bgerror x y
 } -cleanup {
-    interp delete slave
-} -returnCodes error -result {wrong # args: should be "slave bgerror ?cmdPrefix?"}
-test interp-36.4 {SlaveBgerror syntax} -setup {
-    interp create slave
+    interp delete child
+} -returnCodes error -result {wrong # args: should be "child bgerror ?cmdPrefix?"}
+test interp-36.4 {ChildBgerror syntax} -setup {
+    interp create child
 } -body {
-    slave bgerror \{
+    child bgerror \{
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -returnCodes error -result {cmdPrefix must be list of length >= 1}
-test interp-36.5 {SlaveBgerror syntax} -setup {
-    interp create slave
+test interp-36.5 {ChildBgerror syntax} -setup {
+    interp create child
 } -body {
-    slave bgerror {}
+    child bgerror {}
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -returnCodes error -result {cmdPrefix must be list of length >= 1}
-test interp-36.6 {SlaveBgerror returns handler} -setup {
-    interp create slave
+test interp-36.6 {ChildBgerror returns handler} -setup {
+    interp create child
 } -body {
-    slave bgerror {foo bar soom}
+    child bgerror {foo bar soom}
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {foo bar soom}
-test interp-36.7 {SlaveBgerror sets error handler of slave [1999035]} -setup {
-    interp create slave
-    slave alias handler handler
-    slave bgerror handler
+test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
+    interp create child
+    child alias handler handler
+    child bgerror handler
     variable result {untouched}
     proc handler {args} {
         variable result
         set result [lindex $args 0]
     }
 } -body {
-    slave eval {
+    child eval {
         variable done {}
         after 0 error foo
         after 10 [list ::set [namespace which -variable done] {}]
@@ -3606,7 +3606,7 @@ test interp-36.7 {SlaveBgerror sets error handler of slave [1999035]} -setup {
 } -cleanup {
     variable result {}
     unset -nocomplain result
-    interp delete slave
+    interp delete child
 } -result foo
 
 test interp-37.1 {safe interps and min() and max(): Bug 2895741} -setup {
@@ -3667,7 +3667,7 @@ test interp-38.8 {interp debug basic setup} -body {
 
 # cleanup
 unset -nocomplain hidden_cmds
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 ::tcltest::cleanupTests
diff --git a/tests/io.test b/tests/io.test
index ca37870..000bdf1 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8758,16 +8758,16 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
     set fn [makeFile {} io-74.1]
     set rfd [open $fn r]
     testobj freeallvars
-    interp create slave
+    interp create child
 } -constraints testobj -body {
     teststringobj set 1 [string range $rfd 0 end]
     read [teststringobj get 1]
     testobj duplicate 1 2
-    interp transfer {} $rfd slave
+    interp transfer {} $rfd child
     catch {read [teststringobj get 1]}
     read [teststringobj get 2]
 } -cleanup {
-    interp delete slave
+    interp delete child
     testobj freeallvars
     removeFile io-74.1
 } -returnCodes error -match glob -result {can not find channel named "*"}
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index d1f1ebe..749d225 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -2084,7 +2084,7 @@ test iocmd-32.0 {origin interpreter of moved channel gone} -match glob -body {
     set ida [interp create];#puts <<$ida>>
     set idb [interp create];#puts <<$idb>>
 
-    # Magic to get the test* commands in the slaves
+    # Magic to get the test* commands in the children
     load {} Tcltest $ida
     load {} Tcltest $idb
 
@@ -2122,7 +2122,7 @@ test iocmd-32.1 {origin interpreter of moved channel destroyed during access} -m
     set ida [interp create];#puts <<$ida>>
     set idb [interp create];#puts <<$idb>>
 
-    # Magic to get the test* commands in the slaves
+    # Magic to get the test* commands in the children
     load {} Tcltest $ida
     load {} Tcltest $idb
 
@@ -2164,13 +2164,13 @@ test iocmd-32.2 {delete interp of reflected chan} {
     # Bug 3034840
     # Run this test in an interp with memory debugging to panic
     # on the double free
-    interp create slave
-    slave eval {
+    interp create child
+    child eval {
         proc no-op args {}
         proc driver {sub args} {return {initialize finalize watch read}}
         chan event [chan create read driver] readable no-op
     }
-    interp delete slave
+    interp delete child
 } {}
 
 # ### ### ### ######### ######### #########
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index fe85c94..95055f1 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -1162,7 +1162,7 @@ test iortrans-8.3 {chan flush, bug 2921116} -match glob -setup {
 test iortrans-11.0 {origin interpreter of moved transform gone} -setup {
     set ida [interp create];	#puts <<$ida>>
     set idb [interp create];	#puts <<$idb>>
-    # Magic to get the test* commands in the slaves
+    # Magic to get the test* commands in the children
     load {} Tcltest $ida
     load {} Tcltest $idb
 } -constraints {testchannel} -match glob -body {
@@ -1205,7 +1205,7 @@ test iortrans-11.0 {origin interpreter of moved transform gone} -setup {
 test iortrans-11.1 {origin interpreter of moved transform destroyed during access} -setup {
     set ida [interp create];	#puts <<$ida>>
     set idb [interp create];	#puts <<$idb>>
-    # Magic to get the test* commands in the slaves
+    # Magic to get the test* commands in the children
     load {} Tcltest $ida
     load {} Tcltest $idb
 } -constraints {testchannel} -match glob -body {
@@ -1244,16 +1244,16 @@ test iortrans-11.1 {origin interpreter of moved transform destroyed during acces
     tempdone
 } -result {Owner lost}
 test iortrans-11.2 {delete interp of reflected transform} -setup {
-    interp create slave
-    # Magic to get the test* commands into the slave
-    load {} Tcltest slave
+    interp create child
+    # Magic to get the test* commands into the child
+    load {} Tcltest child
 } -constraints {testchannel} -body {
-    # Get base channel into the slave
+    # Get base channel into the child
     set c [tempchan]
     testchannel cut $c
-    interp eval slave [list testchannel splice $c]
-    interp eval slave [list set c $c]
-    slave eval {
+    interp eval child [list testchannel splice $c]
+    interp eval child [list set c $c]
+    child eval {
 	proc no-op args {}
 	proc driver {c sub args} {
 	    return {initialize finalize read write}
@@ -1261,7 +1261,7 @@ test iortrans-11.2 {delete interp of reflected transform} -setup {
 	set t [chan push $c [list driver $c]]
 	chan event $c readable no-op
     }
-    interp delete slave
+    interp delete child
 } -cleanup {
     tempdone
 } -result {}
diff --git a/tests/load.test b/tests/load.test
index 13dd7ef..54faa75 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -103,7 +103,7 @@ test load-3.1 {error in _Init procedure, same interpreter} \
 "if 44 {open non_existent}"
     invoked from within
 "load [file join $testDir pkge$ext] pkge"} {POSIX ENOENT {no such file or directory}}}
-test load-3.2 {error in _Init procedure, slave interpreter} \
+test load-3.2 {error in _Init procedure, child interpreter} \
 	[list $dll $loaded] {
     catch {interp delete x}
     interp create x
diff --git a/tests/namespace.test b/tests/namespace.test
index a683f2a..7bc69aa 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -179,21 +179,21 @@ test namespace-7.6 {recursive Tcl_DeleteNamespace, no active call frames in ns}
     namespace delete test_ns_2
 } {}
 test namespace-7.7 {Bug 1655305} -setup {
-    interp create slave
+    interp create child
     # Can't invoke through the ensemble, since deleting the global namespace
     # (indirectly, via deleting ::tcl) deletes the ensemble.
-    slave eval {rename ::tcl::info::commands ::infocommands}
-    slave hide infocommands
-    slave eval {
+    child eval {rename ::tcl::info::commands ::infocommands}
+    child hide infocommands
+    child eval {
 	proc foo {} {
 	    namespace delete ::
 	}
     }
 } -body {
-    slave eval foo
-    slave invokehidden infocommands
+    child eval foo
+    child invokehidden infocommands
 } -cleanup {
-    interp delete slave
+    interp delete child
 } -result {}
 
 test namespace-7.8 {Bug ba1419303b4c} -setup {
@@ -269,28 +269,28 @@ test namespace-8.4 {TclTeardownNamespace, cmds imported from deleted ns go away}
          [info commands test_ns_import::*]
 } [list [lsort {::test_ns_import::p ::test_ns_import::cmd1 ::test_ns_import::cmd2}] {} ::test_ns_import::p]
 test namespace-8.5 {TclTeardownNamespace: preserve errorInfo; errorCode values} {
-    interp create slave
-    slave eval {trace add execution error leave {namespace delete :: ;#}}
-    catch {slave eval error foo bar baz}
-    interp delete slave
+    interp create child
+    child eval {trace add execution error leave {namespace delete :: ;#}}
+    catch {child eval error foo bar baz}
+    interp delete child
     set ::errorInfo
 } {bar
     invoked from within
-"slave eval error foo bar baz"}
+"child eval error foo bar baz"}
 test namespace-8.6 {TclTeardownNamespace: preserve errorInfo; errorCode values} {
-    interp create slave
-    slave eval {trace add variable errorCode write {namespace delete :: ;#}}
-    catch {slave eval error foo bar baz}
-    interp delete slave
+    interp create child
+    child eval {trace add variable errorCode write {namespace delete :: ;#}}
+    catch {child eval error foo bar baz}
+    interp delete child
     set ::errorInfo
 } {bar
     invoked from within
-"slave eval error foo bar baz"}
+"child eval error foo bar baz"}
 test namespace-8.7 {TclTeardownNamespace: preserve errorInfo; errorCode values} {
-    interp create slave
-    slave eval {trace add execution error leave {namespace delete :: ;#}}
-    catch {slave eval error foo bar baz}
-    interp delete slave
+    interp create child
+    child eval {trace add execution error leave {namespace delete :: ;#}}
+    catch {child eval error foo bar baz}
+    interp delete child
     set ::errorCode
 } baz
 
@@ -2809,9 +2809,9 @@ test namespace-51.15 {namespace resolution path control} -body {
     namespace delete ::test_ns_2
 }
 test namespace-51.16 {Bug 1566526} {
-    interp create slave
-    slave eval namespace eval demo namespace path ::
-    interp delete slave
+    interp create child
+    child eval namespace eval demo namespace path ::
+    interp delete child
 } {}
 test namespace-51.17 {resolution epoch handling: Bug 2898722} -setup {
     set result {}
@@ -3012,19 +3012,19 @@ test namespace-52.11 {unknown: with TCL_EVAL_INVOKE} -setup {
 	}
     }
     catch {rename ::noSuchCommand {}}
-    set ::slave [interp create]
+    set ::child [interp create]
 } -body {
-    $::slave alias bar noSuchCommand
+    $::child alias bar noSuchCommand
     namespace eval test_ns_1 {
 	namespace unknown unknown
 	proc unknown args {
 	    return FAIL
 	}
-	$::slave eval bar
+	$::child eval bar
     }
 } -cleanup {
-    interp delete $::slave
-    unset ::slave
+    interp delete $::child
+    unset ::child
     namespace delete test_ns_1
     rename ::unknown {}
     rename unknown.save ::unknown
@@ -3385,7 +3385,7 @@ test namespace-57.0 {
     rename ns2::p2 {}
     return $res
 } -cleanup {
-    unset res 
+    unset res
     namespace delete ns2
     namespace delete ns3
 } -result success
diff --git a/tests/oo.test b/tests/oo.test
index c73c36c..16beaf9 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -304,19 +304,19 @@ test oo-1.18.2 {Bug 75b8433707: memory leak in oo-1.18} -setup {
     rename test-oo-1.18 {}
 } -result 0
 test oo-1.18.3 {Bug 21c144f0f5} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	oo::define [oo::class create foo] superclass oo::class
 	oo::class destroy
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
 }
 test oo-1.18.4 {correct handling of cleanup in superclass set error} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	oo::class create A
 	oo::class create B {
 	    superclass oo::class
@@ -328,12 +328,12 @@ test oo-1.18.4 {correct handling of cleanup in superclass set error} -setup {
 	[B create C] create d
     }
 } -returnCodes error -cleanup {
-    interp delete slave
+    interp delete child
 } -result {class should only be a direct superclass once}
 test oo-1.18.5 {correct handling of cleanup in superclass set error} -setup {
-    interp create slave
+    interp create child
 } -body {
-    slave eval {
+    child eval {
 	oo::class create A
 	oo::class create B {
 	    superclass oo::class
@@ -345,7 +345,7 @@ test oo-1.18.5 {correct handling of cleanup in superclass set error} -setup {
 	[B create C {B C}] create d
     }
 } -returnCodes error -cleanup {
-    interp delete slave
+    interp delete child
 } -result {attempt to form circular dependency graph}
 test oo-1.19 {basic test of OO functionality: teardown order} -body {
     oo::object create o
@@ -1439,16 +1439,16 @@ test oo-7.8 {OO: next at the end of the method chain} -setup {
 } -result {foo2 foo 1 {no next method implementation}}
 test oo-7.9 {OO: defining inheritance in namespaces} -setup {
     set ::result {}
-    oo::class create ::master
+    oo::class create ::parent
     namespace eval ::foo {
-	oo::class create mixin {superclass ::master}
+	oo::class create mixin {superclass ::parent}
     }
 } -cleanup {
-    ::master destroy
+    ::parent destroy
     namespace delete ::foo
 } -body {
     namespace eval ::foo {
-	oo::class create bar {superclass master}
+	oo::class create bar {superclass parent}
 	oo::class create boo
 	oo::define boo {superclass bar}
 	oo::define boo {mixin mixin}
@@ -2135,18 +2135,18 @@ test oo-14.5 {OO and mixins and filters - advanced case} -setup {
     mix destroy
 } -result >>foobar<<
 test oo-14.6 {OO and mixins of mixins - Bug 1960703} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create A {
-	superclass master
+	superclass parent
 	method egg {} {
 	    return chicken
 	}
     }
     oo::class create B {
-	superclass master
+	superclass parent
 	mixin A
 	method bar {} {
 	    # mixin from A
@@ -2154,7 +2154,7 @@ test oo-14.6 {OO and mixins of mixins - Bug 1960703} -setup {
 	}
     }
     oo::class create C {
-	superclass master
+	superclass parent
 	mixin B
 	method foo {} {
 	    # mixin from B
@@ -2164,12 +2164,12 @@ test oo-14.6 {OO and mixins of mixins - Bug 1960703} -setup {
     [C new] foo
 } -result chicken
 test oo-14.7 {OO and filters from mixins of mixins} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create A {
-	superclass master
+	superclass parent
 	method egg {} {
 	    return chicken
 	}
@@ -2180,7 +2180,7 @@ test oo-14.7 {OO and filters from mixins of mixins} -setup {
 	}
     }
     oo::class create B {
-	superclass master
+	superclass parent
 	mixin A
 	filter f
 	method bar {} {
@@ -2189,7 +2189,7 @@ test oo-14.7 {OO and filters from mixins of mixins} -setup {
 	}
     }
     oo::class create C {
-	superclass master
+	superclass parent
 	mixin B
 	filter f
 	method foo {} {
@@ -2201,18 +2201,18 @@ test oo-14.7 {OO and filters from mixins of mixins} -setup {
 } -result {(foo) (bar) (egg) chicken (egg) (bar) (foo)}
 test oo-14.8 {OO: class mixin order - Bug 1998221} -setup {
     set ::result {}
-    oo::class create master {
+    oo::class create parent {
 	method test {} {}
     }
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create mix {
-	superclass master
+	superclass parent
 	method test {} {lappend ::result mix; next; return $::result}
     }
     oo::class create cls {
-	superclass master
+	superclass parent
 	mixin mix
 	method test {} {lappend ::result cls; next; return $::result}
     }
@@ -2915,13 +2915,13 @@ test oo-18.7 {OO: objdefine command support} -setup {
     invoked from within
 "oo::objdefine inst {rename ::inst ::INST;error foo}"}}
 test oo-18.8 {OO: define/self command support} -setup {
-    oo::class create master
-    oo::class create ::foo {superclass master}
+    oo::class create parent
+    oo::class create ::foo {superclass parent}
 } -body {
     catch {oo::define foo {rename ::foo ::bar; self {error foobar}}} msg opt
     dict get $opt -errorinfo
 } -cleanup {
-    master destroy
+    parent destroy
 } -result {foobar
     while executing
 "error foobar"
@@ -2932,15 +2932,15 @@ test oo-18.8 {OO: define/self command support} -setup {
     invoked from within
 "oo::define foo {rename ::foo ::bar; self {error foobar}}"}
 test oo-18.9 {OO: define/self command support} -setup {
-    oo::class create master
+    oo::class create parent
     set c [oo::class create now_this_is_a_very_very_long_class_name_indeed {
-        superclass master
+        superclass parent
     }]
 } -body {
     catch {oo::define $c {error err}} msg opt
     dict get $opt -errorinfo
 } -cleanup {
-    master destroy
+    parent destroy
 } -result {err
     while executing
 "error err"
@@ -2948,13 +2948,13 @@ test oo-18.9 {OO: define/self command support} -setup {
     invoked from within
 "oo::define $c {error err}"}
 test oo-18.10 {OO: define/self command support} -setup {
-    oo::class create master
-    oo::class create ::foo {superclass master}
+    oo::class create parent
+    oo::class create ::foo {superclass parent}
 } -body {
     catch {oo::define foo {self {rename ::foo {}; error foobar}}} msg opt
     dict get $opt -errorinfo
 } -cleanup {
-    master destroy
+    parent destroy
 } -result {foobar
     while executing
 "error foobar"
@@ -2965,13 +2965,13 @@ test oo-18.10 {OO: define/self command support} -setup {
     invoked from within
 "oo::define foo {self {rename ::foo {}; error foobar}}"}
 test oo-18.11 {OO: define/self command support} -setup {
-    oo::class create master
-    oo::class create ::foo {superclass master}
+    oo::class create parent
+    oo::class create ::foo {superclass parent}
 } -body {
     catch {oo::define foo {rename ::foo {}; self {error foobar}}} msg opt
     dict get $opt -errorinfo
 } -cleanup {
-    master destroy
+    parent destroy
 } -result {this command cannot be called when the object has been deleted
     while executing
 "self {error foobar}"
@@ -3594,12 +3594,12 @@ test oo-27.2 {variables declaration - object introspection} -setup {
     info object variables foo
 } -result {a b c}
 test oo-27.3 {variables declaration - basic behaviour} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x!
 	constructor {} {set x! 1}
 	method y {} {incr x!}
@@ -3609,13 +3609,13 @@ test oo-27.3 {variables declaration - basic behaviour} -setup {
     bar y
 } -result 3
 test oo-27.4 {variables declaration - destructors too} -setup {
-    oo::class create master
+    oo::class create parent
     set result bad!
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x!
 	constructor {} {set x! 1}
 	method y {} {incr x!}
@@ -3640,12 +3640,12 @@ test oo-27.5 {variables declaration - object-bound variables} -setup {
     foo y
 } -result 2
 test oo-27.6 {variables declaration - non-interference of levels} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x!
 	constructor {} {set x! 1}
 	method y {} {incr x!}
@@ -3660,12 +3660,12 @@ test oo-27.6 {variables declaration - non-interference of levels} -setup {
     list [bar y] [lsort [info object vars bar]] [bar eval {info vars *!}]
 } -result {{3 2 y! {}} {x! y!} {x! y!}}
 test oo-27.7 {variables declaration - one underlying variable space} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x!
 	constructor {} {set x! 1}
 	method y {} {incr x!}
@@ -3692,12 +3692,12 @@ test oo-27.9 {variables declaration - error cases - arrays} -body {
     oo::define oo::object variable bad(var)
 } -returnCodes error -result {invalid declared variable name "bad(var)": must not refer to an array element}
 test oo-27.10 {variables declaration - no instance var leaks with class resolvers} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable clsvar
 	constructor {} {
 	    set clsvar 0
@@ -3720,12 +3720,12 @@ test oo-27.10 {variables declaration - no instance var leaks with class resolver
     list [inst1 value] [inst2 value]
 } -result {3 2}
 test oo-27.11 {variables declaration - no instance var leaks with class resolvers} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable clsvar
 	constructor {} {
 	    set clsvar 0
@@ -3793,12 +3793,12 @@ test oo-27.13 {variables declaration: Bug 3185009: require refcount management}
     foo destroy
 } -result {0 7 1 7 {} 0 1 {can't read "x": no such variable}}
 test oo-27.14 {variables declaration - multiple use} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x
 	variable y
 	method boo {} {
@@ -3809,12 +3809,12 @@ test oo-27.14 {variables declaration - multiple use} -setup {
     list [bar boo] [bar boo]
 } -result {1,1 2,2}
 test oo-27.15 {variables declaration - multiple use} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable
 	variable x y
 	method boo {} {
@@ -3825,12 +3825,12 @@ test oo-27.15 {variables declaration - multiple use} -setup {
     list [bar boo] [bar boo]
 } -result {1,1 2,2}
 test oo-27.16 {variables declaration - multiple use} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x
 	variable -clear
 	variable y
@@ -3842,12 +3842,12 @@ test oo-27.16 {variables declaration - multiple use} -setup {
     list [bar boo] [bar boo]
 } -result {1,1 1,2}
 test oo-27.17 {variables declaration - multiple use} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x
 	variable -set y
 	method boo {} {
@@ -3858,12 +3858,12 @@ test oo-27.17 {variables declaration - multiple use} -setup {
     list [bar boo] [bar boo]
 } -result {1,1 1,2}
 test oo-27.18 {variables declaration - multiple use} -setup {
-    oo::class create master
+    oo::class create parent
 } -cleanup {
-    master destroy
+    parent destroy
 } -body {
     oo::class create foo {
-	superclass master
+	superclass parent
 	variable x
 	variable -? y
 	method boo {} {
@@ -3961,12 +3961,12 @@ test oo-27.22 {variables declaration uniqueifies: Bug 3396896} -setup {
 } -result {v t}
 test oo-27.23 {variable resolver leakage: Bug 1493a43044} -setup {
     oo::class create Super
-    oo::class create Master {
+    oo::class create Parent {
 	superclass Super
 	variable member1 member2
 	constructor {} {
-	    set member1 master1
-	    set member2 master2
+	    set member1 parent1
+	    set member2 parent2
 	}
 	method getChild {} {
 	    Child new [self]
@@ -3987,10 +3987,10 @@ test oo-27.23 {variable resolver leakage: Bug 1493a43044} -setup {
 	method result {} {return $result}
     }
 } -body {
-    [[Master new] getChild] result
+    [[Parent new] getChild] result
 } -cleanup {
     Super destroy
-} -result {master1 master2 master1 master2 master1 master2 master1 master2}
+} -result {parent1 parent2 parent1 parent2 parent1 parent2 parent1 parent2}
 
 # A feature that's not supported because the mechanism may change without
 # warning, but is supposed to work...
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index 6a48d28..59925e7 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -882,9 +882,9 @@ test oo-call-3.4 {current call introspection: in destructors} -setup {
 #	caller
 set testopts {
     -setup {
-	oo::class create Master
+	oo::class create Parent
 	oo::class create Foo {
-	    superclass Master
+	    superclass Parent
 	    method bar {} {
 		puts abc
 		tailcall puts hi
@@ -892,11 +892,11 @@ set testopts {
 	    }
 	}
 	oo::class create Foo2 {
-	    superclass Master
+	    superclass Parent
 	}
     }
     -cleanup {
-	Master destroy
+	Parent destroy
     }
 }
 
diff --git a/tests/ooUtil.test b/tests/ooUtil.test
index ff7093f..4f4bea7 100644
--- a/tests/ooUtil.test
+++ b/tests/ooUtil.test
@@ -153,7 +153,7 @@ test ooUtil-1.8 {TIP 478: classmethod in child interp} -setup {
 	oo::class create Table {
 	    superclass ActiveRecord
 	}
-	# This is confirming that this is not the master interpreter
+	# This is confirming that this is not the parent interpreter
 	list [Table find foo bar] [info globals childinterp]
     }
 } -cleanup {
diff --git a/tests/opt.test b/tests/opt.test
index a90e6b6..915a7c9 100644
--- a/tests/opt.test
+++ b/tests/opt.test
@@ -17,7 +17,7 @@ if {"::tcltest" ni [namespace children]} {
 }
 
 # the package we are going to test
-package require opt 0.4.7
+package require opt 0.4.8
 
 # we are using implementation specifics to test the package
 
diff --git a/tests/parse.test b/tests/parse.test
index d36472e..35e67b4 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -405,14 +405,14 @@ test parse-8.11 {Tcl_EvalObjv procedure, TCL_EVAL_INVOKE} testevalobjv {
     proc ::unknown args {lappend ::info [info level]; uplevel 1 foo}
     proc ::foo args {lappend ::info global}
     catch {rename ::noSuchCommand {}}
-    set ::slave [interp create]
-    $::slave alias bar noSuchCommand
+    set ::child [interp create]
+    $::child alias bar noSuchCommand
     set ::info {}
     namespace eval test_ns_1 {
        proc foo args {lappend ::info namespace}
-       $::slave eval bar
-       testevalobjv 1 [list $::slave eval bar]
-       uplevel #0 [list $::slave eval bar]
+       $::child eval bar
+       testevalobjv 1 [list $::child eval bar]
+       uplevel #0 [list $::child eval bar]
     }
     namespace delete test_ns_1
     rename ::foo {}
@@ -429,14 +429,14 @@ test parse-8.12 {Tcl_EvalObjv procedure, TCL_EVAL_INVOKE} {
             lappend ::info ns
         }]
     catch {rename ::noSuchCommand {}}
-    set ::slave [interp create]
-    $::slave alias bar noSuchCommand
+    set ::child [interp create]
+    $::child alias bar noSuchCommand
     set ::info {}
     namespace eval test_ns_1 {
-        $::slave eval bar
+        $::child eval bar
     }
     namespace delete test_ns_1
-    interp delete $::slave
+    interp delete $::child
     catch {rename ::noSuchCommand {}}
     set ::info
 } global
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 8ff806c..37afafa 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -72,11 +72,11 @@ proc pkgtest::parseArgs { args } {
 #  of the command line.
 
 proc pkgtest::parseIndex { filePath } {
-    # create a slave interpreter, where we override "package ifneeded"
+    # create a child interpreter, where we override "package ifneeded"
 
-    set slave [interp create]
+    set child [interp create]
     if {[catch {
-	$slave eval {
+	$child eval {
 	    rename package package_original
 	    proc package { args } {
 		if {[lindex $args 0] eq "ifneeded"} {
@@ -91,17 +91,17 @@ proc pkgtest::parseIndex { filePath } {
 	}
 
 	set dir [file dirname $filePath]
-	$slave eval {set curdir [pwd]}
-	$slave eval [list cd $dir]
-	$slave eval [list set dir $dir]
-	$slave eval [list source [file tail $filePath]]
-	$slave eval {cd $curdir}
+	$child eval {set curdir [pwd]}
+	$child eval [list cd $dir]
+	$child eval [list set dir $dir]
+	$child eval [list source [file tail $filePath]]
+	$child eval {cd $curdir}
 
 	# Create the list in sorted order, so that we don't get spurious
 	# errors because the order has changed.
 
 	array set P {}
-	foreach {k v} [$slave eval {array get ::PKGS}] {
+	foreach {k v} [$child eval {array get ::PKGS}] {
 	    set P($k) $v
 	}
 
@@ -113,12 +113,12 @@ proc pkgtest::parseIndex { filePath } {
 	set ei [dict get $opts -errorinfo]
 	set ec [dict get $opts -errorcode]
 
-	catch {interp delete $slave}
+	catch {interp delete $child}
 
 	error $ei $ec
     }
 
-    interp delete $slave
+    interp delete $child
 
     return $PKGS
 }
diff --git a/tests/proc.test b/tests/proc.test
index 43d76d8..585efa5 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -389,9 +389,9 @@ test proc-7.3 {Returning loop exception from redefined cmd: Bug 729692} -body {
 test proc-7.4 {Proc struct outlives its interp: Bug 3532959} {
     set lambda x
     lappend lambda {set a 1}
-    interp create slave
-    slave eval [list apply $lambda foo]
-    interp delete slave
+    interp create child
+    child eval [list apply $lambda foo]
+    interp delete child
     unset lambda
 } {}
 
diff --git a/tests/resolver.test b/tests/resolver.test
index b0b395d..db524a0 100644
--- a/tests/resolver.test
+++ b/tests/resolver.test
@@ -203,7 +203,7 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
 # resolver-agnostic).
 #
 # In order to make the test cases for the per-interpreter cmd literal pool
-# reproducable and to minimize interactions between test cases, we use a slave
+# reproducable and to minimize interactions between test cases, we use a child
 # interpreter per test-case.
 #
 #
diff --git a/tests/safe-stock87.test b/tests/safe-stock87.test
index 3ba1558..39ffa2d 100644
--- a/tests/safe-stock87.test
+++ b/tests/safe-stock87.test
@@ -35,7 +35,7 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 
@@ -114,7 +114,7 @@ test safe-stock87-7.1 {tests that everything works at high level, uses pkg opt}
 } -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
+    #  package require in a child works like in the parent)
     set v [interp eval $i {package require opt}]
     # no error shall occur:
     interp eval $i {::tcl::Lempty {a list}}
@@ -127,7 +127,7 @@ test safe-stock87-7.2 {tests specific path and interpFind/AddToAccessPath, uses
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # an error shall occur (opt is not anymore in the secure 0-level
     # provided deep path)
@@ -144,7 +144,7 @@ test safe-stock87-7.4 {tests specific path and positive search, uses pkg opt} -s
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
diff --git a/tests/safe-zipfs.test b/tests/safe-zipfs.test
index ed473ca..70f822a 100644
--- a/tests/safe-zipfs.test
+++ b/tests/safe-zipfs.test
@@ -20,7 +20,7 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 
@@ -60,7 +60,7 @@ testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
 
 # Tests 5.* test the example files before using them to test safe interpreters.
 
-test safe-zipfs-5.1 {example tclIndex commands, test in master interpreter; zipfs} -setup {
+test safe-zipfs-5.1 {example tclIndex commands, test in parent interpreter; zipfs} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $ZipMountPoint auto0 auto1] [file join $ZipMountPoint auto0 auto2]
 } -body {
@@ -74,7 +74,7 @@ test safe-zipfs-5.1 {example tclIndex commands, test in master interpreter; zipf
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {0 ok1 0 ok2}
-test safe-zipfs-5.2 {example tclIndex commands, negative test in master interpreter; zipfs} -setup {
+test safe-zipfs-5.2 {example tclIndex commands, negative test in parent interpreter; zipfs} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $ZipMountPoint auto0]
 } -body {
@@ -88,7 +88,7 @@ test safe-zipfs-5.2 {example tclIndex commands, negative test in master interpre
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
-test safe-zipfs-5.3 {example pkgIndex.tcl packages, test in master interpreter, child directories; zipfs} -setup {
+test safe-zipfs-5.3 {example pkgIndex.tcl packages, test in parent interpreter, child directories; zipfs} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $ZipMountPoint auto0]
 } -body {
@@ -105,7 +105,7 @@ test safe-zipfs-5.3 {example pkgIndex.tcl packages, test in master interpreter,
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-test safe-zipfs-5.4 {example pkgIndex.tcl packages, test in master interpreter, main directories; zipfs} -setup {
+test safe-zipfs-5.4 {example pkgIndex.tcl packages, test in parent interpreter, main directories; zipfs} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $ZipMountPoint auto0 auto1] \
                         [file join $ZipMountPoint auto0 auto2]
@@ -123,7 +123,7 @@ test safe-zipfs-5.4 {example pkgIndex.tcl packages, test in master interpreter,
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-test safe-zipfs-5.5 {example modules packages, test in master interpreter, replace path; zipfs} -setup {
+test safe-zipfs-5.5 {example modules packages, test in parent interpreter, replace path; zipfs} -setup {
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -149,7 +149,7 @@ test safe-zipfs-5.5 {example modules packages, test in master interpreter, repla
     catch {namespace delete ::test0}
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
-test safe-zipfs-5.6 {example modules packages, test in master interpreter, append to path; zipfs} -setup {
+test safe-zipfs-5.6 {example modules packages, test in parent interpreter, append to path; zipfs} -setup {
     tcl::tm::path add [file join $ZipMountPoint auto0 modules]
 } -body {
     # Try to load the modules and run a command from each one.
@@ -179,7 +179,7 @@ test safe-zipfs-7.1 {tests that everything works at high level; zipfs} -setup {
 } -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
+    #  package require in a child works like in the parent)
     set v [interp eval $i {package require SafeTestPackage1}]
     # no error shall occur:
     interp eval $i {HeresPackage1}
@@ -192,9 +192,9 @@ test safe-zipfs-7.2 {tests specific path and interpFind/AddToAccessPath; zipfs}
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # should add as p* (not p2 if master has a module path)
+    # should add as p* (not p2 if parent has a module path)
     set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
@@ -212,7 +212,7 @@ test safe-zipfs-7.4 {tests specific path and positive search; zipfs} -setup {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0 auto1]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
@@ -457,8 +457,8 @@ test safe-zipfs-9.20 {check module loading; zipfs} -setup {
         0 0.5 0 1.0 0 2.0 --\
         {TCLLIB ZIPDIR/auto0/modules ZIPDIR/auto0/modules/mod1\
          ZIPDIR/auto0/modules/mod2} -- res0 res1 res2}
-# - The command safe::InterpSetConfig adds the master's [tcl::tm::list] in
-#   tokenized form to the slave's access path, and then adds all the
+# - The command safe::InterpSetConfig adds the parent's [tcl::tm::list] in
+#   tokenized form to the child's access path, and then adds all the
 #   descendants, discovered recursively by using glob.
 # - The order of the directories in the list returned by glob is system-dependent,
 #   and therefore this is true also for (a) the order of token assignment to
diff --git a/tests/safe.test b/tests/safe.test
index 4dae8f4..46a2b98 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -27,7 +27,7 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-foreach i [interp slaves] {
+foreach i [interp children] {
     interp delete $i
 }
 
@@ -62,16 +62,16 @@ testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
 
 test safe-1.1 {safe::interpConfigure syntax} -returnCodes error -body {
     safe::interpConfigure
-} -result {no value given for parameter "slave" (use -help for full usage) :
-    slave name () name of the slave}
+} -result {no value given for parameter "child" (use -help for full usage) :
+    child name () name of the child}
 test safe-1.2 {safe::interpCreate syntax} -returnCodes error -body {
     safe::interpCreate -help
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
     ------------  ----     -----   ----
     (-help                         gives this help)
-    ?slave?       name     ()      name of the slave (optional)
-    -accessPath   list     ()      access path for the slave
+    ?child?       name     ()      name of the child (optional)
+    -accessPath   list     ()      access path for the child
     -noStatics    boolflag (false) prevent loading of statically linked pkgs
     -statics      boolean  (true)  loading of statically linked pkgs
     -nestedLoadOk boolflag (false) allow nested loading
@@ -80,7 +80,7 @@ test safe-1.2 {safe::interpCreate syntax} -returnCodes error -body {
 test safe-1.3 {safe::interpInit syntax} -returnCodes error -body {
     safe::interpInit -noStatics
 } -result {bad value "-noStatics" for parameter
-    slave name () name of the slave}
+    child name () name of the child}
 
 test safe-2.1 {creating interpreters, should have no aliases} emptyTest {
     # Disabled this test.  It tests nothing sensible.  [Bug 999612]
@@ -175,7 +175,7 @@ test safe-4.6 {safe::interpDelete, indirectly} -setup {
 # A replacement test using example files is "safe-9.8".
 # Tests 5.* test the example files before using them to test safe interpreters.
 
-test safe-5.1 {example tclIndex commands, test in master interpreter} -setup {
+test safe-5.1 {example tclIndex commands, test in parent interpreter} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0 auto1] [file join $TestsDir auto0 auto2]
 } -body {
@@ -189,7 +189,7 @@ test safe-5.1 {example tclIndex commands, test in master interpreter} -setup {
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {0 ok1 0 ok2}
-test safe-5.2 {example tclIndex commands, negative test in master interpreter} -setup {
+test safe-5.2 {example tclIndex commands, negative test in parent interpreter} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
 } -body {
@@ -203,7 +203,7 @@ test safe-5.2 {example tclIndex commands, negative test in master interpreter} -
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
-test safe-5.3 {example pkgIndex.tcl packages, test in master interpreter, child directories} -setup {
+test safe-5.3 {example pkgIndex.tcl packages, test in parent interpreter, child directories} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
 } -body {
@@ -220,7 +220,7 @@ test safe-5.3 {example pkgIndex.tcl packages, test in master interpreter, child
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-test safe-5.4 {example pkgIndex.tcl packages, test in master interpreter, main directories} -setup {
+test safe-5.4 {example pkgIndex.tcl packages, test in parent interpreter, main directories} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0 auto1] \
                         [file join $TestsDir auto0 auto2]
@@ -238,7 +238,7 @@ test safe-5.4 {example pkgIndex.tcl packages, test in master interpreter, main d
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-test safe-5.5 {example modules packages, test in master interpreter, replace path} -setup {
+test safe-5.5 {example modules packages, test in parent interpreter, replace path} -setup {
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -264,7 +264,7 @@ test safe-5.5 {example modules packages, test in master interpreter, replace pat
     catch {namespace delete ::test0}
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
-test safe-5.6 {example modules packages, test in master interpreter, append to path} -setup {
+test safe-5.6 {example modules packages, test in parent interpreter, append to path} -setup {
     tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
     # Try to load the modules and run a command from each one.
@@ -324,7 +324,7 @@ test safe-7.1 {tests that everything works at high level} -setup {
 } -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
+    #  package require in a child works like in the parent)
     set v [interp eval $i {package require SafeTestPackage1}]
     # no error shall occur:
     interp eval $i {HeresPackage1}
@@ -337,9 +337,9 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -setup {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # should add as p* (not p2 if master has a module path)
+    # should add as p* (not p2 if parent has a module path)
     set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
@@ -353,7 +353,7 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -setup {
         1 {can't find package SafeTestPackage1} --\
         {TCLLIB */dummy/unixlike/test/path TESTSDIR/auto0} -- {}}
 test safe-7.3 {check that safe subinterpreters work} {
-    set g [interp slaves]
+    set g [interp children]
     if {$g ne {}} {
         append g { -- residue of an earlier test}
     }
@@ -368,7 +368,7 @@ test safe-7.3 {check that safe subinterpreters work} {
 } {{} {} ok {} 0 {}}
 test safe-7.3.1 {check that safe subinterpreters work with namespace names} -setup {
 } -body {
-    set g [interp slaves]
+    set g [interp children]
     if {$g ne {}} {
         append g { -- residue of an earlier test}
     }
@@ -388,7 +388,7 @@ test safe-7.4 {tests specific path and positive search} -setup {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
+    # should add as p* (not p1 if parent has a module path)
     set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
@@ -438,7 +438,7 @@ test safe-8.3 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result {1 {permission denied} {{ERROR for slave a : ".": is a directory}}}
+} -result {1 {permission denied} {{ERROR for child a : ".": is a directory}}}
 test safe-8.4 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -454,7 +454,7 @@ test safe-8.4 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result {1 {permission denied} {{ERROR for slave a : "/abc/def": not in access_path}}}
+} -result {1 {permission denied} {{ERROR for child a : "/abc/def": not in access_path}}}
 test safe-8.5 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -474,7 +474,7 @@ test safe-8.5 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] blah]:no such file or directory"]]
+} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] blah]:no such file or directory"]]
 test safe-8.6 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -492,7 +492,7 @@ test safe-8.6 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] blah.tcl]:no such file or directory"]]
+} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] blah.tcl]:no such file or directory"]]
 test safe-8.7 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -512,7 +512,7 @@ test safe-8.7 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for slave a : [file join [info library] xxxxxxxxxxx.tcl]:no such file or directory"]]
+} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] xxxxxxxxxxx.tcl]:no such file or directory"]]
 test safe-8.8 {safe source forbids -rsrc} emptyTest {
     # Disabled this test.  It was only useful for long unsupported
     # Mac OS 9 systems. [Bug 860a9f1945]
@@ -590,7 +590,7 @@ test safe-9.2 {safe interps' error in deleteHook} -setup {
     catch {rename testDelHook {}}
     rename safe-test-log {}
     unset i log res
-} -result {{} {arg1 arg2 a} {{NOTICE for slave a : About to delete} {ERROR for slave a : Delete hook error (being catched)} {NOTICE for slave a : Deleted}}}
+} -result {{} {arg1 arg2 a} {{NOTICE for child a : About to delete} {ERROR for child a : Delete hook error (being catched)} {NOTICE for child a : Deleted}}}
 test safe-9.3 {dual specification of statics} -returnCodes error -body {
     safe::interpCreate -stat true -nostat
 } -result {conflicting values given for -statics and -noStatics}
@@ -901,8 +901,8 @@ test safe-9.20 {check module loading} -setup {
         0 0.5 0 1.0 0 2.0 --\
         {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
          TESTSDIR/auto0/modules/mod2} -- res0 res1 res2}
-# - The command safe::InterpSetConfig adds the master's [tcl::tm::list] in
-#   tokenized form to the slave's access path, and then adds all the
+# - The command safe::InterpSetConfig adds the parent's [tcl::tm::list] in
+#   tokenized form to the child's access path, and then adds all the
 #   descendants, discovered recursively by using glob.
 # - The order of the directories in the list returned by glob is system-dependent,
 #   and therefore this is true also for (a) the order of token assignment to
@@ -1509,7 +1509,7 @@ rename buildEnvironment {}
 rename buildEnvironment2 {}
 
 #### Test for the module path
-test safe-14.1 {Check that module path is the same as in the master interpreter [Bug 2964715]} -setup {
+test safe-14.1 {Check that module path is the same as in the parent interpreter [Bug 2964715]} -setup {
     set i [safe::interpCreate]
 } -body {
     set tm {}
diff --git a/tests/socket.test b/tests/socket.test
index 66a1bf1..5e4c1fb 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1867,12 +1867,12 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
       }
     }
     tcltest::DebugPuts 1 "== test \[$::localhost\]:$port $testmode =="
-    set ::master [thread::id]
-    # helper thread creating async connection and initiating transfer (detach) to master:
+    set ::parent [thread::id]
+    # helper thread creating async connection and initiating transfer (detach) to parent:
     set ::helper [thread::create]
     thread::send -async $::helper [list \
-      lassign [list $::master $::localhost $port $testmode] \
-                     ::master ::localhost ::port ::testmode
+      lassign [list $::parent $::localhost $port $testmode] \
+                     ::parent ::localhost ::port ::testmode
     ]
     thread::send -async $::helper {
       set ::helper [thread::id]
@@ -1881,29 +1881,29 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
         if {"helper-writable" in $::testmode} {;# to test both sides during connect
           fileevent $fd writable [list apply {{fd} {
             if {[thread::id] ne $::helper} {
-              thread::send -async $::master {set ::count "ERROR: invalid thread, $::helper is expecting"}
+              thread::send -async $::parent {set ::count "ERROR: invalid thread, $::helper is expecting"}
               close $fd
               return
             }
           }} $fd]
         };#
         thread::detach $fd
-        thread::send -async $::master [list transf_master $fd {*}$args]
+        thread::send -async $::parent [list transf_parent $fd {*}$args]
       }
       iteration first
     }
-    # master proc commiting transfer attempt (attach) and checking acquire was successful:
-    proc transf_master {fd args} {
+    # parent proc commiting transfer attempt (attach) and checking acquire was successful:
+    proc transf_parent {fd args} {
       tcltest::DebugPuts 1 "** trma / $::count ** $args **"
       thread::attach $fd
-      if {"master-close" in $::testmode} {;# to test close during connect
+      if {"parent-close" in $::testmode} {;# to test close during connect
         set ::count $::count
         close $fd
         return
       };#
       fileevent $fd writable [list apply {{fd} {
-        if {[thread::id] ne $::master} {
-          thread::send -async $::master {set ::count "ERROR: invalid thread, $::master is expecting"}
+        if {[thread::id] ne $::parent} {
+          thread::send -async $::parent {set ::count "ERROR: invalid thread, $::parent is expecting"}
           close $fd
           return
         }
@@ -1931,7 +1931,7 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
     if {$srvsock ne {}} {close $srvsock}
     if {[info exists ::helper]} {thread::release -wait $::helper}
     tcltest::DebugPuts 1 "== stop / $::count =="
-    unset -nocomplain ::count ::testmode ::master ::helper
+    unset -nocomplain ::count ::testmode ::parent ::helper
   }
 }
 test socket_$af-13.2.tr1 {Testing socket transfer between threads during async connect} -body {
@@ -1941,12 +1941,12 @@ test socket_$af-13.2.tr2 {Testing socket transfer between threads during async c
     transf_test {transfer helper-writable} 100
 } -result 100 -constraints [list socket supported_$af thread]
 test socket_$af-13.2.cl1 {Testing socket transfer between threads during async connect} -body {
-    transf_test {master-close} 100
+    transf_test {parent-close} 100
 } -result 100 -constraints [list socket supported_$af thread]
 test socket_$af-13.2.cl2 {Testing socket transfer between threads during async connect} -body {
-    transf_test {master-close helper-writable} 100
+    transf_test {parent-close helper-writable} 100
 } -result 100 -constraints [list socket supported_$af thread]
-catch {rename transf_master {}}
+catch {rename transf_parent {}}
 rename transf_test {}
 
 # ----------------------------------------------------------------------
diff --git a/tests/subst.test b/tests/subst.test
index 0d0614d..e203ad2 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -282,18 +282,18 @@ test subst-13.1 {Bug 3081065} -setup {
 	demo name2
     } subst13.tcl]
 } -body {
-    interp create slave
-    slave eval [list source $script]
-    interp delete slave
-    interp create slave
-    slave eval {
+    interp create child
+    child eval [list source $script]
+    interp delete child
+    interp create child
+    child eval {
 	set count 400
 	while {[incr count -1]} {
 	    lappend bloat [expr {rand()}]
 	}
     }
-    slave eval [list source $script]
-    interp delete slave
+    child eval [list source $script]
+    interp delete child
 } -cleanup {
     removeFile subst13.tcl
 }
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 01c5d10..72c971f 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -13,7 +13,7 @@
 # testing to run the test itself.  Ditto on things like [verbose].
 #
 # It would be better to have the -body of the tests run the tcltest
-# commands in a slave interp so the [test] being tested would not
+# commands in a child interp so the [test] being tested would not
 # interfere with the [test] doing the testing.
 #
 
@@ -63,11 +63,11 @@ test tcltest-1.3 {tcltest -h} {exec} {
 } {1 0}
 
 # -verbose, implicit & explicit testing of [verbose]
-proc slave {msgVar args} {
+proc child {msgVar args} {
     upvar 1 $msgVar msg
 
     interp create [namespace current]::i
-    # Fake the slave interp into dumping output to a file
+    # Fake the child interp into dumping output to a file
     i eval {namespace eval ::tcltest {}}
     i eval "set tcltest::outputChannel\
 	    \[[list open [set of [makeFile {} output]] w]]"
@@ -99,44 +99,44 @@ proc slave {msgVar args} {
     return $code
 }
 test tcltest-2.0 {tcltest (verbose default - 'b')} {unixOrWin} {
-    set result [slave msg test.tcl]
+    set result [child msg test.tcl]
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 1 0 0 1}
 test tcltest-2.1 {tcltest -verbose 'b'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose 'b']
+    set result [child msg test.tcl -verbose 'b']
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 1 0 0 1}
 test tcltest-2.2 {tcltest -verbose 'p'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose 'p']
+    set result [child msg test.tcl -verbose 'p']
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 0 1 0 1}
 test tcltest-2.3 {tcltest -verbose 's'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose 's']
+    set result [child msg test.tcl -verbose 's']
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 0 0 1 1}
 test tcltest-2.4 {tcltest -verbose 'ps'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose 'ps']
+    set result [child msg test.tcl -verbose 'ps']
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 0 1 1 1}
 test tcltest-2.5 {tcltest -verbose 'psb'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose 'psb']
+    set result [child msg test.tcl -verbose 'psb']
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 1 1 1 1}
 
 test tcltest-2.5a {tcltest -verbose 'pass skip body'} {unixOrWin} {
-    set result [slave msg test.tcl -verbose "pass skip body"]
+    set result [child msg test.tcl -verbose "pass skip body"]
     list $result [regexp "Contents of test case" $msg] [regexp a-1.0 $msg] \
 	    [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
@@ -145,7 +145,7 @@ test tcltest-2.5a {tcltest -verbose 'pass skip body'} {unixOrWin} {
 test tcltest-2.6 {tcltest -verbose 't'}  {
     -constraints {unixOrWin}
     -body {
-	set result [slave msg test.tcl -verbose 't']
+	set result [child msg test.tcl -verbose 't']
 	list $result $msg
     }
     -result {^0 .*a-1.0 start.*b-1.0 start}
@@ -155,7 +155,7 @@ test tcltest-2.6 {tcltest -verbose 't'}  {
 test tcltest-2.6a {tcltest -verbose 'start'}  {
     -constraints {unixOrWin}
     -body {
-	set result [slave msg test.tcl -verbose start]
+	set result [child msg test.tcl -verbose start]
 	list $result $msg
     }
     -result {^0 .*a-1.0 start.*b-1.0 start}
@@ -178,7 +178,7 @@ test tcltest-2.7 {tcltest::verbose}  {
 test tcltest-2.8 {tcltest -verbose 'error'} {
     -constraints {unixOrWin}
     -body {
-	set result [slave msg test.tcl -verbose error]
+	set result [child msg test.tcl -verbose error]
 	list $result $msg
     }
     -result {errorInfo: foo.*errorCode: 9}
@@ -186,22 +186,22 @@ test tcltest-2.8 {tcltest -verbose 'error'} {
 }
 # -match, [match]
 test tcltest-3.1 {tcltest -match 'a*'} {unixOrWin} {
-    set result [slave msg test.tcl -match a* -verbose 'ps']
+    set result [child msg test.tcl -match a* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+3.+Failed.+0" $msg]
 } {0 1 0 0 1}
 test tcltest-3.2 {tcltest -match 'b*'} {unixOrWin} {
-    set result [slave msg test.tcl -match b* -verbose 'ps']
+    set result [child msg test.tcl -match b* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+0.+Skipped.+3.+Failed.+1" $msg]
 } {0 0 1 0 1}
 test tcltest-3.3 {tcltest -match 'c*'} {unixOrWin} {
-    set result [slave msg test.tcl -match c* -verbose 'ps']
+    set result [child msg test.tcl -match c* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+0.+Skipped.+4.+Failed.+0" $msg]
 } {0 0 0 1 1}
 test tcltest-3.4 {tcltest -match 'a* b*'} {unixOrWin} {
-    set result [slave msg test.tcl -match {a* b*} -verbose 'ps']
+    set result [child msg test.tcl -match {a* b*} -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+2.+Failed.+1" $msg]
 } {0 1 1 0 1}
@@ -221,27 +221,27 @@ test tcltest-3.5 {tcltest::match}  {
 
 # -skip, [skip]
 test tcltest-4.1 {tcltest -skip 'a*'} {unixOrWin} {
-    set result [slave msg test.tcl -skip a* -verbose 'ps']
+    set result [child msg test.tcl -skip a* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+0.+Skipped.+2.+Failed.+1" $msg]
 } {0 0 1 1 1}
 test tcltest-4.2 {tcltest -skip 'b*'} {unixOrWin} {
-    set result [slave msg test.tcl -skip b* -verbose 'ps']
+    set result [child msg test.tcl -skip b* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+2.+Failed.+1" $msg]
 } {0 1 0 1 1}
 test tcltest-4.3 {tcltest -skip 'c*'} {unixOrWin} {
-    set result [slave msg test.tcl -skip c* -verbose 'ps']
+    set result [child msg test.tcl -skip c* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+1.+Failed.+2" $msg]
 } {0 1 1 0 1}
 test tcltest-4.4 {tcltest -skip 'a* b*'} {unixOrWin} {
-    set result [slave msg test.tcl -skip {a* b*} -verbose 'ps']
+    set result [child msg test.tcl -skip {a* b*} -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+0.+Skipped.+3.+Failed.+1" $msg]
 } {0 0 0 1 1}
 test tcltest-4.5 {tcltest -match 'a* b*' -skip 'b*'} {unixOrWin} {
-    set result [slave msg test.tcl -match {a* b*} -skip b* -verbose 'ps']
+    set result [child msg test.tcl -match {a* b*} -skip b* -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+3.+Failed.+0" $msg]
 } {0 1 0 0 1}
@@ -262,12 +262,12 @@ test tcltest-4.6 {tcltest::skip} {
 # -constraints, -limitconstraints, [testConstraint],
 # $constraintsSpecified, [limitConstraints]
 test tcltest-5.1 {tcltest -constraints 'knownBug'} {unixOrWin} {
-    set result [slave msg test.tcl -constraints knownBug -verbose 'ps']
+    set result [child msg test.tcl -constraints knownBug -verbose 'ps']
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+2.+Skipped.+0.+Failed.+2" $msg]
 } {0 1 1 1 1}
 test tcltest-5.2 {tcltest -constraints 'knownBug' -limitconstraints 1} {unixOrWin} {
-    set result [slave msg test.tcl -constraints knownBug -verbose 'p' -limitconstraints 1]
+    set result [child msg test.tcl -constraints knownBug -verbose 'p' -limitconstraints 1]
     list $result [regexp a-1.0 $msg] [regexp b-1.0 $msg] [regexp c-1.0 $msg] \
 	    [regexp "Total.+4.+Passed.+1.+Skipped.+3.+Failed.+0" $msg]
 } {0 0 0 1 1}
@@ -357,28 +357,28 @@ set printerror [makeFile {
 test tcltest-6.1 {tcltest -outfile, -errfile defaults} {
     -constraints unixOrWin
     -body {
-	slave msg $printerror
+	child msg $printerror
 	return $msg
     }
     -result {a test.*a really}
     -match regexp
 }
 test tcltest-6.2 {tcltest -outfile a.tmp} {unixOrWin unixExecs} {
-    slave msg $printerror -outfile a.tmp
+    child msg $printerror -outfile a.tmp
     set result1 [catch {exec grep "a test" a.tmp}]
     set result2 [catch {exec grep "a really" a.tmp}]
     list [regexp "a test" $msg] [regexp "a really" $msg] \
 	    $result1 $result2 [file exists a.tmp] [file delete a.tmp]
 } {0 1 0 1 1 {}}
 test tcltest-6.3 {tcltest -errfile a.tmp} {unixOrWin unixExecs} {
-    slave msg $printerror -errfile a.tmp
+    child msg $printerror -errfile a.tmp
     set result1 [catch {exec grep "a test" a.tmp}]
     set result2 [catch {exec grep "a really" a.tmp}]
     list [regexp "a test" $msg] [regexp "a really" $msg] \
 	    $result1 $result2 [file exists a.tmp] [file delete a.tmp]
 } {1 0 1 0 1 {}}
 test tcltest-6.4 {tcltest -outfile a.tmp -errfile b.tmp} {unixOrWin unixExecs} {
-    slave msg $printerror -outfile a.tmp -errfile b.tmp
+    child msg $printerror -outfile a.tmp -errfile b.tmp
     set result1 [catch {exec grep "a test" a.tmp}]
     set result2 [catch {exec grep "a really" b.tmp}]
     list [regexp "a test" $msg] [regexp "a really" $msg] \
@@ -463,7 +463,7 @@ test tcltest-6.8 {tcltest::outputFile (implicit outputFile)} {
 # -debug, [debug]
 # Must use child processes to test -debug because it always writes
 # messages to stdout, and we have no way to capture stdout of a
-# slave interp
+# child interp
 test tcltest-7.1 {tcltest test.tcl -debug 0} {unixOrWin} {
     catch {exec [interpreter] test.tcl -debug 0} msg
     regexp "Flags passed into tcltest" $msg
@@ -525,7 +525,7 @@ normalizePath normaldirectory
 test tcltest-8.1 {tcltest a.tcl -tmpdir a} -constraints unixOrWin -setup {
     file delete -force thisdirectorydoesnotexist
 } -body {
-    slave msg $a -tmpdir thisdirectorydoesnotexist
+    child msg $a -tmpdir thisdirectorydoesnotexist
     file exists [file join thisdirectorydoesnotexist a.tmp]
 } -cleanup {
     file delete -force thisdirectorydoesnotexist
@@ -533,7 +533,7 @@ test tcltest-8.1 {tcltest a.tcl -tmpdir a} -constraints unixOrWin -setup {
 test tcltest-8.2 {tcltest a.tcl -tmpdir thisdirectoryisafile} {
     -constraints unixOrWin
     -body {
-	slave msg $a -tmpdir $tdiaf
+	child msg $a -tmpdir $tdiaf
 	return $msg
     }
     -result {*not a directory*}
@@ -559,7 +559,7 @@ switch -- $::tcl_platform(platform) {
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
     -constraints {unix notRoot}
     -body {
-	slave msg $a -tmpdir $notReadableDir
+	child msg $a -tmpdir $notReadableDir
 	return $msg
     }
     -result {*not readable*}
@@ -575,7 +575,7 @@ testConstraint notFAT [expr {
 test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
     -constraints {unixOrWin notRoot notFAT}
     -body {
-	slave msg $a -tmpdir $notWriteableDir
+	child msg $a -tmpdir $notWriteableDir
 	return $msg
     }
     -result {*not writeable*}
@@ -584,7 +584,7 @@ test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
 test tcltest-8.5 {tcltest a.tcl -tmpdir normaldirectory} {
     -constraints unixOrWin
     -body {
-	slave msg $a -tmpdir $normaldirectory
+	child msg $a -tmpdir $normaldirectory
 	# The join is necessary because the message can be split on multiple
 	# lines
 	file exists [file join $normaldirectory a.tmp]
@@ -630,7 +630,7 @@ test tcltest-8.10 {tcltest a.tcl -testdir thisdirectorydoesnotexist} {
 	file delete -force thisdirectorydoesnotexist
     }
     -body {
-	slave msg $a -testdir thisdirectorydoesnotexist
+	child msg $a -testdir thisdirectorydoesnotexist
 	return $msg
     }
     -match glob
@@ -639,7 +639,7 @@ test tcltest-8.10 {tcltest a.tcl -testdir thisdirectorydoesnotexist} {
 test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {
     -constraints unixOrWin
     -body {
-	slave msg $a -testdir $tdiaf
+	child msg $a -testdir $tdiaf
 	return $msg
     }
     -match glob
@@ -648,7 +648,7 @@ test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {
 test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {
     -constraints {unix notRoot}
     -body {
-	slave msg $a -testdir $notReadableDir
+	child msg $a -testdir $notReadableDir
 	return $msg
     }
     -match glob
@@ -657,7 +657,7 @@ test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {
 test tcltest-8.13 {tcltest a.tcl -testdir normaldirectory} {
     -constraints unixOrWin
     -body {
-	slave msg $a -testdir $normaldirectory
+	child msg $a -testdir $normaldirectory
 	# The join is necessary because the message can be split on multiple
 	# lines
 	list [string first "testdir: $normaldirectory" [join $msg]] \
@@ -736,7 +736,7 @@ test tcltest-9.1 {-file d*.tcl} -constraints {unixOrWin} -setup {
     set old [testsDirectory]
     testsDirectory [file dirname [info script]]
 } -body {
-    slave msg [file join [testsDirectory] all.tcl] -file d*.test
+    child msg [file join [testsDirectory] all.tcl] -file d*.test
     return $msg
 } -cleanup {
     testsDirectory $old
@@ -746,7 +746,7 @@ test tcltest-9.2 {-file d*.tcl} -constraints {unixOrWin} -setup {
     set old [testsDirectory]
     testsDirectory [file dirname [info script]]
 } -body {
-    slave msg [file join [testsDirectory] all.tcl] \
+    child msg [file join [testsDirectory] all.tcl] \
 	    -file d*.test -notfile dstring*
     regexp {dstring\.test} $msg
 } -cleanup {
@@ -785,7 +785,7 @@ test tcltest-9.5 {GetMatchingFiles: Bug 1119798} -setup {
     makeFile {} fee $d
     file copy [file join [file dirname [info script]] all.tcl] $d
 } -body {
-    slave msg [file join [temporaryDirectory] all.tcl] -file f*
+    child msg [file join [temporaryDirectory] all.tcl] -file f*
     regexp {exiting with errors:} $msg
 } -cleanup {
     file delete [file join $d all.tcl]
@@ -808,23 +808,23 @@ set mc [makeFile {
 
 cd [temporaryDirectory]
 test tcltest-10.1 {-preservecore 0} {unixOrWin} {
-    slave msg $mc -preservecore 0
+    child msg $mc -preservecore 0
     file delete core
     regexp "Core file produced" $msg
 } {0}
 test tcltest-10.2 {-preservecore 1} {unixOrWin} {
-    slave msg $mc -preservecore 1
+    child msg $mc -preservecore 1
     file delete core
     regexp "Core file produced" $msg
 } {1}
 test tcltest-10.3 {-preservecore 2} {unixOrWin} {
-    slave msg $mc -preservecore 2
+    child msg $mc -preservecore 2
     file delete core
     list [regexp "Core file produced" $msg] [regexp "Moving file to" $msg] \
 	    [regexp "core-" $msg] [file delete core-makecore]
 } {1 1 1 {}}
 test tcltest-10.4 {-preservecore 3} {unixOrWin} {
-    slave msg $mc -preservecore 3
+    child msg $mc -preservecore 3
     file delete core
     list [regexp "Core file produced" $msg] [regexp "Moving file to" $msg] \
 	    [regexp "core-" $msg] [file delete core-makecore]
@@ -855,7 +855,7 @@ set contents {
 set loadfile [makeFile $contents load.tcl]
 
 test tcltest-12.1 {-load xxx} {unixOrWin} {
-    slave msg $loadfile -load xxx
+    child msg $loadfile -load xxx
     return $msg
 } {xxx}
 
@@ -953,7 +953,7 @@ cd [workingDirectory]
 test tcltest-14.1 {-singleproc - single process} {
     -constraints {unixOrWin}
     -body {
-	slave msg $allfile -singleproc 0 -tmpdir [temporaryDirectory]
+	child msg $allfile -singleproc 0 -tmpdir [temporaryDirectory]
 	return $msg
     }
     -result {Test file error: can't unset .foo.: no such variable}
@@ -963,7 +963,7 @@ test tcltest-14.1 {-singleproc - single process} {
 test tcltest-14.2 {-singleproc - multiple process} {
     -constraints {unixOrWin}
     -body {
-	slave msg $allfile -singleproc 1 -tmpdir [temporaryDirectory]
+	child msg $allfile -singleproc 1 -tmpdir [temporaryDirectory]
 	return $msg
     }
     -result {single1.test.*single2.test.*all\-single.tcl:.*Total.*0.*Passed.*0.*Skipped.*0.*Failed.*0}
@@ -1027,7 +1027,7 @@ makeFile {
 test tcltest-15.1 {basic directory walking} {
     -constraints {unixOrWin}
     -body {
-	if {[slave msg \
+	if {[child msg \
 		[file join $dtd all.tcl] \
 		-tmpdir [temporaryDirectory]] == 1} {
 	    error $msg
@@ -1041,7 +1041,7 @@ test tcltest-15.1 {basic directory walking} {
 test tcltest-15.2 {-asidefromdir} {
     -constraints {unixOrWin}
     -body {
-	if {[slave msg \
+	if {[child msg \
 		[file join $dtd all.tcl] \
 		-asidefromdir dirtestdir2.3 \
 		-tmpdir [temporaryDirectory]] == 1} {
@@ -1059,7 +1059,7 @@ Error:  No test files remain after applying your match and skip patterns!$}
 test tcltest-15.3 {-relateddir, non-existent dir} {
     -constraints {unixOrWin}
     -body {
-	if {[slave msg \
+	if {[child msg \
 		[file join $dtd all.tcl] \
 		-relateddir [file join [temporaryDirectory] dirtestdir0] \
 		-tmpdir [temporaryDirectory]] == 1} {
@@ -1074,7 +1074,7 @@ test tcltest-15.3 {-relateddir, non-existent dir} {
 test tcltest-15.4 {-relateddir, subdir} {
     -constraints {unixOrWin}
     -body {
-	if {[slave msg \
+	if {[child msg \
 		[file join $dtd all.tcl] \
 		-relateddir dirtestdir2.1 -tmpdir [temporaryDirectory]] == 1} {
 	    error $msg
@@ -1087,7 +1087,7 @@ test tcltest-15.4 {-relateddir, subdir} {
 test tcltest-15.5 {-relateddir, -asidefromdir} {
     -constraints {unixOrWin}
     -body {
-	if {[slave msg \
+	if {[child msg \
 		[file join $dtd all.tcl] \
 		-relateddir "dirtestdir2.1 dirtestdir2.2" \
 		-asidefromdir dirtestdir2.2 \
@@ -1148,25 +1148,25 @@ test tcltest-19.1 {TCLTEST_OPTIONS default} -setup {
 	# set this to { } instead of just {} to get around quirk in
 	# Windows env handling that removes empty elements from env array.
 	set ::env(TCLTEST_OPTIONS) { }
-	interp create slave1
-	slave1 eval [list set argv {-debug 2}]
-	slave1 alias puts puts
-	interp create slave2
-	slave2 alias puts puts
+	interp create child1
+	child1 eval [list set argv {-debug 2}]
+	child1 alias puts puts
+	interp create child2
+	child2 alias puts puts
     } -cleanup {
-	interp delete slave2
-	interp delete slave1
+	interp delete child2
+	interp delete child1
 	if {$oldoptions eq "none"} {
 	    unset ::env(TCLTEST_OPTIONS)
 	} else {
 	    set ::env(TCLTEST_OPTIONS) $oldoptions
 	}
     } -body {
-	slave1 eval [package ifneeded tcltest [package provide tcltest]]
-	slave1 eval tcltest::debug
+	child1 eval [package ifneeded tcltest [package provide tcltest]]
+	child1 eval tcltest::debug
 	set ::env(TCLTEST_OPTIONS) "-debug 3"
-	slave2 eval [package ifneeded tcltest [package provide tcltest]]
-	slave2 eval tcltest::debug
+	child2 eval [package ifneeded tcltest [package provide tcltest]]
+	child2 eval tcltest::debug
     } -result {^3$} -match regexp -output\
 {tcltest::debug\s+= 2.*tcltest::debug\s+= 3}
 
@@ -1175,7 +1175,7 @@ test tcltest-19.1 {TCLTEST_OPTIONS default} -setup {
 cd [temporaryDirectory]
 # PrintError
 test tcltest-20.1 {PrintError} {unixOrWin} {
-    set result [slave msg $printerror]
+    set result [child msg $printerror]
     list $result [regexp "Error:  a really short string" $msg] \
 	    [regexp "     \"quotes\"" $msg] [regexp "    \"Path" $msg] \
 	    [regexp "    \"Really" $msg] [regexp Problem $msg]
@@ -1408,7 +1408,7 @@ makeFile {
 } test.test $atd
 
 # Must use a child process because stdout/stderr parsing can't be
-# duplicated in slave interp.
+# duplicated in child interp.
 test tcltest-22.1 {runAllTests} {
     -constraints {unixOrWin}
     -body {
@@ -1807,7 +1807,7 @@ test tcltest-26.1 {Bug/RFE 1017151} -setup {
 	tcltest::cleanupTests
     } test.tcl
 } -body {
-    slave msg [file join [temporaryDirectory] test.tcl]
+    child msg [file join [temporaryDirectory] test.tcl]
     return $msg
 } -cleanup {
     removeFile test.tcl
@@ -1827,7 +1827,7 @@ test tcltest-26.2 {Bug/RFE 1017151} -setup {
 	tcltest::cleanupTests
     } test.tcl
 } -body {
-    slave msg [file join [temporaryDirectory] test.tcl]
+    child msg [file join [temporaryDirectory] test.tcl]
     return $msg
 } -cleanup {
     removeFile test.tcl
diff --git a/tests/thread.test b/tests/thread.test
index 2524911..48edd02 100644
--- a/tests/thread.test
+++ b/tests/thread.test
@@ -805,7 +805,7 @@ test thread-7.21 {cancel: subst -unwind} -constraints {thread drainEventQueue} -
 } -cleanup {
     unset -nocomplain ::threadSawError ::threadError ::threadId ::threadIdStarted
 } -result {{} 1 1 {eval unwound}}
-test thread-7.22 {cancel: slave interp} -constraints {thread drainEventQueue} -setup {
+test thread-7.22 {cancel: child interp} -constraints {thread drainEventQueue} -setup {
     unset -nocomplain ::threadSawError ::threadError ::threadId ::threadIdStarted
 } -body {
     set serverthread [thread::create -joinable \
@@ -835,7 +835,7 @@ test thread-7.22 {cancel: slave interp} -constraints {thread drainEventQueue} -s
 } -cleanup {
     unset -nocomplain ::threadSawError ::threadError ::threadId ::threadIdStarted
 } -result {{} 1 1 {eval canceled}}
-test thread-7.23 {cancel: slave interp -unwind} -constraints {thread drainEventQueue} -setup {
+test thread-7.23 {cancel: child interp -unwind} -constraints {thread drainEventQueue} -setup {
     unset -nocomplain ::threadSawError ::threadError ::threadId ::threadIdStarted
 } -body {
     set serverthread [thread::create -joinable \
diff --git a/tests/timer.test b/tests/timer.test
index 5e729ef..cf7cead 100644
--- a/tests/timer.test
+++ b/tests/timer.test
@@ -568,15 +568,15 @@ test timer-9.1 {AfterCleanupProc procedure} -setup {
 } -result {before after2 after4}
 
 test timer-10.1 {Bug 1016167: [after] overwrites imports} -setup {
-    interp create slave
-    slave eval namespace export after
-    slave eval namespace eval foo namespace import ::after
+    interp create child
+    child eval namespace export after
+    child eval namespace eval foo namespace import ::after
 } -body {
-    slave eval foo::after 1
-    slave eval namespace origin foo::after
+    child eval foo::after 1
+    child eval namespace origin foo::after
 } -cleanup {
     # Bug will cause crash here; would cause failure otherwise
-    interp delete slave
+    interp delete child
 } -result ::after
 
 test timer-11.1 {Bug 1350291: [after] overflowing 32-bit field} -body {
diff --git a/tests/trace.test b/tests/trace.test
index 1099f48..7646f03 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -2197,11 +2197,11 @@ foo {if {[catch {bar}]} {
 	}} 2 error leavestep
 foo foo 0 error leave}}
 
-test trace-28.4 {exec traces in slave with 'return -code error'} {
-    interp create slave
-    interp alias slave traceExecute {} traceExecute
+test trace-28.4 {exec traces in child with 'return -code error'} {
+    interp create child
+    interp alias child traceExecute {} traceExecute
     set info {}
-    set res [interp eval slave {
+    set res [interp eval child {
 	set info {}
 	set res {}
 
@@ -2229,7 +2229,7 @@ test trace-28.4 {exec traces in slave with 'return -code error'} {
 
 	list $res
     }]
-    interp delete slave
+    interp delete child
     lappend res [join $info \n]
 } {{error error} {foo foo enter
 foo {if {[catch {bar}]} {
diff --git a/tests/var.test b/tests/var.test
index 59f64ef..12f423f 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -1041,15 +1041,15 @@ test var-22.0 {leak in array element unset: Bug a3309d01db} -setup {
 } -result 0
 test var-22.1 {leak in localVarName intrep: Bug 80304238ac} -setup {
     proc doit {} {
-	interp create slave
-	slave eval {
+	interp create child
+	child eval {
 	    proc doit script {
 		eval $script
 		set foo bar
 	    }
 	    doit {foreach foo baz {}}
 	}
-	interp delete slave
+	interp delete child
     }
 } -constraints memory -body {
     set end [getbytes]