Merge 8.6

17 files changed, 466 insertions, 466 deletions

diff --git a/tests/bind.test b/tests/bind.test
index 9d581ea..c96720a 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7008,7 +7008,7 @@ test bind-35.3 {Events agree for modifier keys} -constraints {aqua} -setup {
 } -cleanup {
 } -result pass
 
-test bind-36.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+test bind-36.1 {pointer warp with grab on toplevel, bug [e3888d5820]} -setup {
     event generate {} <Motion> -warp 1 -x 50 -y 50
     toplevel .top
     grab release .top
diff --git a/tests/focus.test b/tests/focus.test
index 7da289d..7c40f1d 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -624,7 +624,7 @@ fixfocus
 test focus-6.1 {miscellaneous - embedded application in same process} -constraints {
     unix  testwrapper
 } -setup {
-    eval interp delete [interp slaves]
+    eval interp delete [interp children]
 } -body {
     toplevel .t
     wm geometry .t +0+0
diff --git a/tests/grid.test b/tests/grid.test
index 4cc4ece..7651193 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -193,7 +193,7 @@ test grid-3.9 {configure: basic argument checking} -body {
 } -cleanup {
     grid_reset 3.9
 } -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'}
-test grid-3.10 {ConfigureSlave procedure, bad -in option} -body {
+test grid-3.10 {ConfigureContent procedure, bad -in option} -body {
     frame .f
     grid .f -in .f
 } -cleanup {
@@ -516,34 +516,34 @@ test grid-8.6 {size} -body {
     grid_reset 8.6
 } -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
 
-test grid-9.1 {slaves} -body {
+test grid-9.1 {content} -body {
     grid content .
 } -returnCodes ok -result {}
-test grid-9.2 {slaves} -body {
+test grid-9.2 {content} -body {
     grid content .foo
 } -returnCodes error -result {bad window path name ".foo"}
-test grid-9.3 {slaves} -body {
+test grid-9.3 {content} -body {
     grid content a b
 } -returnCodes error -result {wrong # args: should be "grid content window ?-option value ...?"}
-test grid-9.4 {slaves} -body {
+test grid-9.4 {content} -body {
     grid content . a b
 } -returnCodes error -result {bad option "a": must be -column or -row}
-test grid-9.5 {slaves} -body {
+test grid-9.5 {content} -body {
     grid content . -column x
 } -returnCodes error -result {expected integer but got "x"}
-test grid-9.6 {slaves} -body {
+test grid-9.6 {content} -body {
     grid content . -row -3
 } -returnCodes error -result {-3 is an invalid value: should NOT be < 0}
-test grid-9.7 {slaves} -body {
+test grid-9.7 {content} -body {
     grid content . -foo 3
 } -returnCodes error -result {bad option "-foo": must be -column or -row}
-test grid-9.8 {slaves} -body {
+test grid-9.8 {content} -body {
     grid content .x -row 3
 } -returnCodes error -result {bad window path name ".x"}
-test grid-9.9 {slaves} -body {
+test grid-9.9 {content} -body {
     grid content . -row 3
 } -returnCodes ok -result {}
-test grid-9.10 {slaves} -body {
+test grid-9.10 {content} -body {
     foreach i {0 1 2} {
 	label .$i -text $i
 	grid .$i -row $i -column $i
@@ -552,7 +552,7 @@ test grid-9.10 {slaves} -body {
 } -cleanup {
     grid_reset 9.10
 } -result {.2 .1 .0}
-test grid-9.11 {slaves} -body {
+test grid-9.11 {content} -body {
     catch {unset a}
     foreach i {0 1 2} {
 	label .$i -text $i
@@ -1369,7 +1369,7 @@ test grid-14.3 {map notify: bug 1648} -constraints {nonPortable} -body {
     grid_reset 14.3
 } -result {.2 2 .0 1 . 2 .1 1}
 
-test grid-15.1 {lost slave} -body {
+test grid-15.1 {lost content} -body {
     button .b
     grid .b
     set a [grid content .]
@@ -1380,7 +1380,7 @@ test grid-15.1 {lost slave} -body {
 } -cleanup {
     grid_reset 15.1
 } -result {.b {} .b}
-test grid-15.2 {lost slave} -body {
+test grid-15.2 {lost content} -body {
     frame .f
     grid .f
     button .b
@@ -2023,7 +2023,7 @@ test grid-22.5 {remove} {
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.5
 
-test grid-23 {grid configure -in leaked from previous master - bug
+test grid-23 {grid configure -in leaked from previous container window - bug
               6aea69fccbb266b7f0437686379fbe5b55442958} {
     frame .f
     frame .g
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index f9fab4d..4f36b47 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -137,28 +137,28 @@ test imageBmap-2.2 {ImgBmapCreate procedure} -setup {
 } -result {image1 image1 0 0 #000000 {}}
 
 
-test imageBmap-3.1 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
+test imageBmap-3.1 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
     image create bitmap i1 -data $data1
     i1 configure -data $data1
 } -cleanup {
 	image delete i1
 } -result {}
-test imageBmap-3.2 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.2 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1
     list [catch {i1 configure -data bogus} msg] $msg [image width i1] \
 	    [image height i1]
 } -result {1 {format error in bitmap data} 16 16}
-test imageBmap-3.3 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
+test imageBmap-3.3 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
     image create bitmap i1 -data $data1 -maskdata $data2
     i1 configure -maskdata $data2
 } -cleanup {
 	image delete i1
 } -result {}
-test imageBmap-3.4 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.4 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1
     i1 configure -maskdata $data2
 } -returnCodes error -result {can't have mask without bitmap}
-test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.5 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1 -maskdata {
 	#define foo_width 8
 	#define foo_height 16
@@ -167,7 +167,7 @@ test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body {
 	   0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
 	}
 } -returnCodes error -result {bitmap and mask have different sizes}
-test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.6 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1 -maskdata {
 	#define foo_width 16
 	#define foo_height 8
@@ -176,7 +176,7 @@ test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body {
 	   0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
 	}
 } -returnCodes error -result {bitmap and mask have different sizes}
-test imageBmap-3.7 {ImgBmapConfigureMaster procedure} -setup {
+test imageBmap-3.7 {ImgBmapConfigureModel procedure} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 9c33738..88e4662 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -218,7 +218,7 @@ test imgPhoto-2.2 {ImgPhotoCreate procedure} -setup {
 #     set msg
 # } {couldn't open "bogus.img": no such file or directory}
 
-test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.1 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -226,7 +226,7 @@ test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
 } -cleanup {
     image delete photo1
 } -result {}
-test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.2 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -235,7 +235,7 @@ test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
 } -cleanup {
     image delete photo1
 } -result {1 {couldn't open "bogus": no such file or directory} 256 256}
-test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -setup {
     destroy .c
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 92c411d..94e0710 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -527,20 +527,20 @@ test oldpack-9.1 {information output} -body {
     pack append .pack .pack.blue {top fillx frame n} \
     .pack.red {bottom filly frame s} .pack.green {left fill frame w} \
     .pack.violet {right expand frame e}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor n -expand 0 -fill x -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor s -expand 0 -fill y -ipadx 0 -ipady 0 -padx 0 -pady 0 -side bottom} {-in .pack -anchor w -expand 0 -fill both -ipadx 0 -ipady 0 -padx 0 -pady 0 -side left} {-in .pack -anchor e -expand 1 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side right}}
 test oldpack-9.2 {information output} -body {
     pack append .pack .pack.blue {padx 10 frame nw} \
     .pack.red {pady 20 frame ne} .pack.green {frame se} \
     .pack.violet {frame sw}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor nw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 5 -pady 0 -side top} {-in .pack -anchor ne -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 10 -side top} {-in .pack -anchor se -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor sw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
 test oldpack-9.3 {information output} -body {
     pack append .pack .pack.blue {frame center} .pack.red {frame center} \
     .pack.green {frame c} .pack.violet {frame c}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
 
diff --git a/tests/pack.test b/tests/pack.test
index be607d2..c878a28 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -868,28 +868,28 @@ test pack-9.1 {window ordering} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.b
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.a .pack.c .pack.d}
 test pack-9.2 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.3 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -before .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.a .pack.d}
 test pack-9.4 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.d -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.d .pack.a .pack.b .pack.c}
 test pack-9.5 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -897,42 +897,42 @@ test pack-9.5 {window ordering} -setup {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack propagate .pack.c 0
     pack .pack.a -in .pack.c
-    list [pack slaves .pack] [pack slaves .pack.c]
+    list [pack content .pack] [pack content .pack.c]
 } -result {{.pack.b .pack.c .pack.d} .pack.a}
 test pack-9.6 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -in .pack
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.d .pack.a}
 test pack-9.7 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -padx 0
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.8 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c
     pack .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.9 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.b .pack.d .pack.c -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.d .pack.c .pack.a}
 test pack-9.10 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.a .pack.c .pack.d .pack.b -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.c .pack.d .pack.b}
 
 test pack-10.1 {retaining/clearing configuration state} -setup {
@@ -952,14 +952,14 @@ test pack-10.2 {retaining/clearing configuration state} -setup {
     pack .pack.a -pady 14
     pack info .pack.a
 } -result {-in .pack -anchor n -expand 1 -fill both -ipadx 3 -ipady 4 -padx 1 -pady 14 -side bottom}
-test pack-10.3 {bad -in window does not change master} -setup {
+test pack-10.3 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     set result [list [winfo manager .pack.a]]
     catch {pack .pack.a -in .pack.a}
     lappend result [winfo manager .pack.a]
 } -result {{} {}}
-test pack-10.4 {bad -in window does not change master} -setup {
+test pack-10.4 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     winfo manager .pack.a
@@ -1134,7 +1134,7 @@ test pack-12.4 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack configure .pack.b .pack.c
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.5 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1298,7 +1298,7 @@ test pack-12.36 {command options and errors} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack forget .pack.a .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.37 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1339,22 +1339,22 @@ test pack-12.41 {command options and errors} -setup {
 test pack-12.42 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves
+    pack content
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test pack-12.43 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves a b
-} -returnCodes error -result {wrong # args: should be "pack slaves window"}
+    pack content a b
+} -returnCodes error -result {wrong # args: should be "pack content window"}
 test pack-12.44 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .x
+    pack content .x
 } -returnCodes error -result {bad window path name ".x"}
 test pack-12.45 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .pack.a
+    pack content .pack.a
 } -returnCodes ok -result {}
 test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1371,7 +1371,7 @@ test pack-13.1 {window deletion} -setup {
     update
     destroy .pack.d
     update
-    set result [list [pack slaves .pack] [winfo geometry .pack.a] \
+    set result [list [pack content .pack] [winfo geometry .pack.a] \
         [winfo geometry .pack.b] [winfo geometry .pack.c]]
 } -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70}
 
@@ -1511,7 +1511,7 @@ test pack-16.1 {geometry manager name} -setup {
     lappend result [winfo manager .pack.a]
 } -result {{} pack {}}
 
-test pack-17.1 {PackLostSlaveProc procedure} -setup {
+test pack-17.1 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1520,7 +1520,7 @@ test pack-17.1 {PackLostSlaveProc procedure} -setup {
     update
     list [winfo manager .pack.a] [winfo geometry .pack.a]
 } -result {place 20x40+40+10}
-test pack-17.2 {PackLostSlaveProc procedure} -setup {
+test pack-17.2 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1541,7 +1541,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test pack-18.1 {unmap slaves when master unmapped} -constraints {
+test pack-18.1 {unmap content when container unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
@@ -1572,7 +1572,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 
-test pack-18.2 {unmap slaves when master unmapped} -setup {
+test pack-18.2 {unmap content when container unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
     # adjust the position of .pack before test to avoid a screen switch
@@ -1598,7 +1598,7 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
 } -result {1 0 100 30 0 1}
 
 test pack-19.1 {test respect for internalborder} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack 200x200
@@ -1616,7 +1616,7 @@ test pack-19.1 {test respect for internalborder} -setup {
     destroy .pack.l .pack.lf
 } -result {196x188+2+10 177x186+5+7}
 test pack-19.2 {test support for minreqsize} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack {}
diff --git a/tests/packgrid.test b/tests/packgrid.test
index b34b6eb..6dfba25 100644
--- a/tests/packgrid.test
+++ b/tests/packgrid.test
@@ -10,7 +10,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::*
 
-test packgrid-1.1 {pack and grid in same master} -setup {
+test packgrid-1.1 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -24,7 +24,7 @@ test packgrid-1.1 {pack and grid in same master} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-1.2 {pack and grid in same master} -setup {
+test packgrid-1.2 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -38,7 +38,7 @@ test packgrid-1.2 {pack and grid in same master} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-1.3 {pack and grid in same master} -setup {
+test packgrid-1.3 {pack and grid in same container window} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -52,7 +52,7 @@ test packgrid-1.3 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.4 {pack and grid in same master} -setup {
+test packgrid-1.4 {pack and grid in same container window} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -66,7 +66,7 @@ test packgrid-1.4 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.5 {pack and grid in same master} -setup {
+test packgrid-1.5 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -80,7 +80,7 @@ test packgrid-1.5 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.6 {pack and grid in same master} -setup {
+test packgrid-1.6 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -94,7 +94,7 @@ test packgrid-1.6 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.7 {pack and grid in same master} -setup {
+test packgrid-1.7 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -103,13 +103,13 @@ test packgrid-1.7 {pack and grid in same master} -setup {
     # Basic conflict should stop widget from being handled
     grid .g
     catch { pack .p }
-    pack slaves .
+    pack content .
 } -cleanup {
     destroy .p
     destroy .g
 } -result {}
 
-test packgrid-1.8 {pack and grid in same master} -setup {
+test packgrid-1.8 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -124,7 +124,7 @@ test packgrid-1.8 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-2.1 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.1 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -139,7 +139,7 @@ test packgrid-2.1 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-2.2 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.2 {pack and grid in same container window, change propagation} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -155,7 +155,7 @@ test packgrid-2.2 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-2.3 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.3 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . false
     label .p -text PACK
@@ -172,7 +172,7 @@ test packgrid-2.3 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-2.4 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.4 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . false
     label .p -text PACK
@@ -188,7 +188,7 @@ test packgrid-2.4 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-3.1 {stealing slave} -setup {
+test packgrid-3.1 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -202,7 +202,7 @@ test packgrid-3.1 {stealing slave} -setup {
     destroy .g
 } -result {}
 
-test packgrid-3.2 {stealing slave} -setup {
+test packgrid-3.2 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -216,7 +216,7 @@ test packgrid-3.2 {stealing slave} -setup {
     destroy .g
 } -result {}
 
-test packgrid-3.3 {stealing slave} -setup {
+test packgrid-3.3 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -231,7 +231,7 @@ test packgrid-3.3 {stealing slave} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-3.4 {stealing slave} -setup {
+test packgrid-3.4 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -246,7 +246,7 @@ test packgrid-3.4 {stealing slave} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup {
     frame .f
     button .b -text hello
 } -body {
@@ -261,7 +261,7 @@ test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -se
     destroy .b
 } -result {}
 
-test packgrid-4.2 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+test packgrid-4.2 {content stolen after container destruction - bug [aa7679685e]} -setup {
     frame .f
     button .b -text hello
 } -body {
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index 3786ef8..3e834e9 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -1022,7 +1022,7 @@ test panedwindow-12.6 {panedwindow takes explicit widget width over reqwidth} -s
 } -cleanup {
 	deleteWindows
 } -result [list 20 20]
-test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -setup {
+test panedwindow-12.7 {horizontal panedwindow reqheight is max pane height} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4
@@ -1033,7 +1033,7 @@ test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -se
 } -cleanup {
 	deleteWindows
 } -result {20 40}
-test panedwindow-12.8 {horizontal panedwindow reqheight is max slave height} -setup {
+test panedwindow-12.8 {horizontal panedwindow reqheight is max pane height} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4
@@ -1087,7 +1087,7 @@ test panedwindow-12.11 {panedwindow takes explicit height over reqheight} -setup
 } -cleanup {
 	deleteWindows
 } -result [list 20 20]
-test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup {
+test panedwindow-12.12 {vertical panedwindow reqwidth is max pane width} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \
@@ -1099,7 +1099,7 @@ test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup
 } -cleanup {
 	deleteWindows
 } -result {20 40}
-test panedwindow-12.13 {vertical panedwindow reqwidth is max slave width} -setup {
+test panedwindow-12.13 {vertical panedwindow reqwidth is max pane width} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \
@@ -1133,7 +1133,7 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup {
 	deleteWindows
 } -body {
     # Check that the panedwindow correctly yields geometry management of
-    # a slave when the slave is destroyed.
+    # a pane when the pane is destroyed.
 
     # This test should not cause a core dump, and it should not cause
     # a memory leak.
@@ -1144,11 +1144,11 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup {
     destroy .b
     set result ""
 } -result {}
-test panedwindow-13.2 {PanedWindowLostSlaveProc, widget yields management} -setup {
+test panedwindow-13.2 {PanedWindowLostPaneProc, widget yields management} -setup {
 	deleteWindows
 } -body {
     # Check that the paned window correctly yields geometry management of
-    # a slave when some other geometry manager steals the slave from us.
+    # a pane when some other geometry manager steals the pane from us.
 
     # This test should not cause a core dump, and it should not cause a
     # memory leak.
@@ -2241,10 +2241,10 @@ test panedwindow-19.6 {ComputeGeometry, reqwidth taken from widgets} -setup {
 	deleteWindows
 } -result [list [list 60 60] [list 80 60]]
 
-test panedwindow-19.7 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.7 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2282,7 +2282,7 @@ test panedwindow-19.9 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{20 0} {40 0}}
 
-test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.10 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2303,10 +2303,10 @@ test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {53 3 20 20} {95 3 20 20}}
 
-test panedwindow-19.11 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.11 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2349,7 +2349,7 @@ test panedwindow-19.13 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 20} {0 40}}
 
-test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.14 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2370,10 +2370,10 @@ test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 53 20 20} {3 95 20 20}}
-test panedwindow-19.15 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.15 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2411,7 +2411,7 @@ test panedwindow-19.17 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{23 0} {49 0}}
 
-test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.18 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2432,10 +2432,10 @@ test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
 
-test panedwindow-19.19 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.19 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2478,7 +2478,7 @@ test panedwindow-19.21 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 23} {0 49}}
 
-test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.22 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2499,10 +2499,10 @@ test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
-test panedwindow-19.23 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.23 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2540,7 +2540,7 @@ test panedwindow-19.25 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{20 0} {43 0}}
 
-test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.26 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2561,10 +2561,10 @@ test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {56 3 20 20} {101 3 20 20}}
 
-test panedwindow-19.27 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.27 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2607,7 +2607,7 @@ test panedwindow-19.29 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 20} {0 43}}
 
-test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.30 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2628,10 +2628,10 @@ test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 56 20 20} {3 101 20 20}}
-test panedwindow-19.31 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.31 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2669,7 +2669,7 @@ test panedwindow-19.33 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{21 0} {47 0}}
 
-test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.34 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2690,10 +2690,10 @@ test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
 
-test panedwindow-19.35 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.35 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2736,7 +2736,7 @@ test panedwindow-19.37 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 21} {0 47}}
 
-test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.38 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2757,10 +2757,10 @@ test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
-test panedwindow-19.39 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.39 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2798,7 +2798,7 @@ test panedwindow-19.41 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 0} {55 0}}
 
-test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.42 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2819,10 +2819,10 @@ test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {63 3 20 20} {115 3 20 20}}
 
-test panedwindow-19.43 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.43 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2865,7 +2865,7 @@ test panedwindow-19.45 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 25} {0 55}}
 
-test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.46 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2886,10 +2886,10 @@ test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 63 20 20} {3 115 20 20}}
-test panedwindow-19.47 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.47 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2927,7 +2927,7 @@ test panedwindow-19.49 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{28 0} {64 0}}
 
-test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.50 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2948,10 +2948,10 @@ test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
 
-test panedwindow-19.51 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.51 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2994,7 +2994,7 @@ test panedwindow-19.53 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 28} {0 64}}
 
-test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.54 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3015,10 +3015,10 @@ test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
-test panedwindow-19.55 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.55 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3056,7 +3056,7 @@ test panedwindow-19.57 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 0} {58 0}}
 
-test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.58 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3077,10 +3077,10 @@ test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {66 3 20 20} {121 3 20 20}}
 
-test panedwindow-19.59 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.59 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3123,7 +3123,7 @@ test panedwindow-19.61 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 25} {0 58}}
 
-test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.62 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3144,10 +3144,10 @@ test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 66 20 20} {3 121 20 20}}
-test panedwindow-19.63 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.63 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3185,7 +3185,7 @@ test panedwindow-19.65 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{26 0} {62 0}}
 
-test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.66 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3206,10 +3206,10 @@ test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
 
-test panedwindow-19.67 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.67 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3252,7 +3252,7 @@ test panedwindow-19.69 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 26} {0 62}}
 
-test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.70 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3273,10 +3273,10 @@ test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
-test panedwindow-19.71 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.71 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3314,7 +3314,7 @@ test panedwindow-19.73 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{22 2} {42 2}}
 
-test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.74 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3335,10 +3335,10 @@ test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {55 5 20 20} {97 5 20 20}}
 
-test panedwindow-19.75 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.75 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3381,7 +3381,7 @@ test panedwindow-19.77 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 22} {2 42}}
 
-test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.78 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3402,10 +3402,10 @@ test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 55 20 20} {5 97 20 20}}
-test panedwindow-19.79 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.79 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3443,7 +3443,7 @@ test panedwindow-19.81 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 2} {51 2}}
 
-test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.82 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3464,10 +3464,10 @@ test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
 
-test panedwindow-19.83 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.83 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3510,7 +3510,7 @@ test panedwindow-19.85 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 25} {2 51}}
 
-test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.86 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3531,10 +3531,10 @@ test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
-test panedwindow-19.87 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.87 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3572,7 +3572,7 @@ test panedwindow-19.89 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{22 2} {45 2}}
 
-test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.90 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3593,10 +3593,10 @@ test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {58 5 20 20} {103 5 20 20}}
 
-test panedwindow-19.91 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.91 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3639,7 +3639,7 @@ test panedwindow-19.93 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 22} {2 45}}
 
-test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.94 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3660,10 +3660,10 @@ test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 58 20 20} {5 103 20 20}}
-test panedwindow-19.95 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.95 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3701,7 +3701,7 @@ test panedwindow-19.97 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{23 2} {49 2}}
 
-test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.98 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3722,10 +3722,10 @@ test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
 
-test panedwindow-19.99 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.99 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3768,7 +3768,7 @@ test panedwindow-19.101 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 23} {2 49}}
 
-test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.102 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3789,10 +3789,10 @@ test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
-test panedwindow-19.103 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.103 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3830,7 +3830,7 @@ test panedwindow-19.105 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{27 2} {57 2}}
 
-test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.106 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3851,10 +3851,10 @@ test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {65 5 20 20} {117 5 20 20}}
 
-test panedwindow-19.107 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.107 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3897,7 +3897,7 @@ test panedwindow-19.109 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 27} {2 57}}
 
-test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.110 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3918,10 +3918,10 @@ test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 65 20 20} {5 117 20 20}}
-test panedwindow-19.111 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.111 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3959,7 +3959,7 @@ test panedwindow-19.113 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{30 2} {66 2}}
 
-test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.114 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3980,10 +3980,10 @@ test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
 
-test panedwindow-19.115 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.115 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4026,7 +4026,7 @@ test panedwindow-19.117 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 30} {2 66}}
 
-test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.118 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4047,10 +4047,10 @@ test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 71 20 20} {5 129 20 20}}
-test panedwindow-19.119 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.119 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4088,7 +4088,7 @@ test panedwindow-19.121 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{27 2} {60 2}}
 
-test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.122 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4109,10 +4109,10 @@ test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {68 5 20 20} {123 5 20 20}}
 
-test panedwindow-19.123 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.123 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4155,7 +4155,7 @@ test panedwindow-19.125 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 27} {2 60}}
 
-test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.126 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4176,10 +4176,10 @@ test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 68 20 20} {5 123 20 20}}
-test panedwindow-19.127 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.127 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4217,7 +4217,7 @@ test panedwindow-19.129 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{28 2} {64 2}}
 
-test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.130 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4238,10 +4238,10 @@ test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
 
-test panedwindow-19.131 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.131 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4284,7 +4284,7 @@ test panedwindow-19.133 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 28} {2 64}}
 
-test panedwindow-19.134 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.134 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4317,7 +4317,7 @@ test panedwindow-20.1 {destroyed widgets are removed from panedwindow} -setup {
 } -cleanup {
 	deleteWindows
 } -result {}
-test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup {
+test panedwindow-20.2 {destroyed pane causes geometry recomputation} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 2
@@ -4537,7 +4537,7 @@ test panedwindow-21.15 {ArrangePanes, last pane grows} -setup {
 } -result {50 150 1 1 211 50 150 1 89 300}
 
 
-test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -setup {
+test panedwindow-22.1 {PanedWindowReqProc, react to pane geometry changes} -setup {
 	deleteWindows
 } -body {
     # Basically just want to make sure that the PanedWindowReqProc is called
@@ -4550,7 +4550,7 @@ test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -set
 } -cleanup {
 	deleteWindows
 } -result {40 80}
-test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -setup {
+test panedwindow-22.2 {PanedWindowReqProc, react to pane geometry changes} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -orient horizontal -sashpad 0 -sashwidth 2
@@ -4824,7 +4824,7 @@ test panedwindow-23.21 {ConfigurePanes, -before, relocate existing windows} -set
 } -cleanup {
 	deleteWindows
 } -result {.d .b .a .c}
-test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup {
+test panedwindow-23.22 {ConfigurePanes, pane specified multiple times} -setup {
 	deleteWindows
 } -body {
     # This test should not cause a core dump
@@ -4839,7 +4839,7 @@ test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup {
 } -cleanup {
 	deleteWindows
 } -result {.a .b .c}
-test panedwindow-23.23 {ConfigurePanes, slave specified multiple times} -setup {
+test panedwindow-23.23 {ConfigurePanes, pane specified multiple times} -setup {
 	deleteWindows
 } -body {
     # This test should not cause a core dump
@@ -5146,7 +5146,7 @@ test panedwindow-25.1 {DestroyPanedWindow} -setup {
     }
     set result {}
 } -result {}
-test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to slaves} -setup {
+test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to panes} -setup {
     deleteWindows
 } -body {
     panedwindow .pw
diff --git a/tests/place.test b/tests/place.test
index 4a53bf4..ce2dee7 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -53,17 +53,17 @@ test place-1.3 {Tk_PlaceCmd procedure, "info" option} -setup {
 } -result {-in {.t.a b} -x 1 -relx 0.2 -y 2 -rely 0.2 -width {} -relwidth 0.3 -height 4 -relheight {} -anchor w -bordermode ignore}
 
 
-test place-2.1 {ConfigureSlave procedure, -height option} -body {
+test place-2.1 {ConfigureContent procedure, -height option} -body {
     place .t.f2 -height abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-2.2 {ConfigureSlave procedure, -height option} -setup {
+test place-2.2 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 40
     update
     winfo height .t.f2
 } -result 40
-test place-2.3 {ConfigureSlave procedure, -height option} -setup {
+test place-2.3 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 120
@@ -74,17 +74,17 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup {
 } -result 60
 
 
-test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
+test place-3.1 {ConfigureContent procedure, -relheight option} -body {
     place .t.f2 -relheight abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.2 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .5
     update
     winfo height .t.f2
 } -result 40
-test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.3 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .8
@@ -95,30 +95,30 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
 } -result 60
 
 
-test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
+test place-4.1 {ConfigureContent procedure, bad -in options} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.2 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.2 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     set result [list [winfo manager .t.f2]]
     catch {place .t.f2 -in .t.f2}
     lappend result [winfo manager .t.f2]
 } -result {{} {}}
-test place-4.3 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.3 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     winfo manager .t.f2
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.4 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.4 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .
 } -returnCodes error -result {can't place .t.f2 relative to .}
-test place-4.5 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.5 {ConfigureContent procedure, bad -in option} -setup {
 } -body {
     frame .t.f1
     place .t.f1 -in .t.f1
@@ -139,17 +139,17 @@ test place-4.7 {prevent management loops} -setup {
     place .t.f3 -in .t.f1
 } -returnCodes error -result {can't put .t.f3 inside .t.f1, would cause management loop}
 
-test place-5.1 {ConfigureSlave procedure, -relwidth option} -body {
+test place-5.1 {ConfigureContent procedure, -relwidth option} -body {
     place .t.f2 -relwidth abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.2 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .5
     update
     winfo width .t.f2
 } -result 75
-test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.3 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .8
@@ -159,17 +159,17 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     winfo width .t.f2
 } -result 30
 
-test place-6.1 {ConfigureSlave procedure, -width option} -body {
+test place-6.1 {ConfigureContent procedure, -width option} -body {
     place .t.f2 -width abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-6.2 {ConfigureSlave procedure, -width option} -setup {
+test place-6.2 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 100
     update
     winfo width .t.f2
 } -result 100
-test place-6.3 {ConfigureSlave procedure, -width option} -setup {
+test place-6.3 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 120
@@ -267,7 +267,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.1 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
 } -body {
@@ -283,7 +283,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.2 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
     update idletasks
@@ -380,17 +380,17 @@ test place-9.11 {PlaceObjCmd, info errors} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {wrong # args: should be "place info pathName"}
-test place-9.12 {PlaceObjCmd, slaves errors} -setup {
+test place-9.12 {PlaceObjCmd, content errors} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo bar
+    place content .foo bar
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {wrong # args: should be "place slaves pathName"}
+} -returnCodes error -result {wrong # args: should be "place content pathName"}
 
 
-test place-10.1 {ConfigureSlave} -setup {
+test place-10.1 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -398,7 +398,7 @@ test place-10.1 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {unknown option "-badopt"}
-test place-10.2 {ConfigureSlave} -setup {
+test place-10.2 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -406,7 +406,7 @@ test place-10.2 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-anchor" missing}
-test place-10.3 {ConfigureSlave} -setup {
+test place-10.3 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -414,7 +414,7 @@ test place-10.3 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore}
-test place-10.4 {ConfigureSlave} -setup {
+test place-10.4 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -424,21 +424,21 @@ test place-10.4 {ConfigureSlave} -setup {
 } -returnCodes error -result {value for "-y" missing}
 
 
-test place-11.1 {PlaceObjCmd, slaves command} -setup {
+test place-11.1 {PlaceObjCmd, content command} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo
 } -result {}
-test place-11.2 {PlaceObjCmd, slaves command} -setup {
+test place-11.2 {PlaceObjCmd, content command} -setup {
     destroy .foo .bar
 } -body {
     frame .foo
     frame .bar
     place .bar -in .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo .bar
 } -result [list .bar]
@@ -500,7 +500,7 @@ test place-14.1 {memory leak testing} -constraints memory -setup {
         return $res
     }
 } -body {
-    # Test all manners of forgetting a slave
+    # Test all manners of forgetting content
     frame .f
     frame .f.f
     stress {
diff --git a/tests/textIndex.test b/tests/textIndex.test
index 646c0a3..6dc5e8f 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -812,7 +812,7 @@ test textIndex-19.12.2 {Display lines} {
 } 1
 
 test textIndex-19.13 {Display lines} {
-    destroy {*}[pack slaves .]
+    destroy {*}[pack content .]
     text .txt -height 1 -wrap word -yscroll ".sbar set" -width 400
     scrollbar .sbar -command ".txt yview"
     grid .txt .sbar -sticky news
diff --git a/tests/textWind.test b/tests/textWind.test
index 4da56e5..fb3fcec 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -582,7 +582,7 @@ test textWind-6.1 {EmbWinRequestProc procedure} -setup {
     [list [expr {$padx+2*$fixedWidth+25}] [expr {$pady+((30-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
 
 
-test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
+test textWind-7.1 {EmbWinLostContentProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
@@ -599,7 +599,7 @@ test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
     10x20+[expr {$padx+100}]+[expr {$pady+50}] \
     [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
 
-test textWind-7.2 {EmbWinLostSlaveProc procedure} -setup {
+test textWind-7.2 {EmbWinLostContentProc procedure} -setup {
     .t delete 1.0 end
     destroy .t.f
 } -body {
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 649c35f..6b4761f 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -31,39 +31,39 @@ test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body {
 ###
 # See also series labelframe-4.x
 #
-test labelframe-3.1 "Add child slave" -body {
+test labelframe-3.1 "Add child content" -body {
     checkbutton .lf.cb -text "abcde"
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.2 "Remove child slave" -body {
+test labelframe-3.2 "Remove child content" -body {
     .lf configure -labelwidget {}
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 0 {}]
 
-test labelframe-3.3 "Re-add child slave" -body {
+test labelframe-3.3 "Re-add child content" -body {
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.4 "Re-manage child slave" -body {
+test labelframe-3.4 "Re-manage child content" -body {
     pack .lf.cb -side right
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] [.lf cget -labelwidget]
 } -result [list 1 pack {}]
 
-test labelframe-3.5 "Re-add child slave" -body {
+test labelframe-3.5 "Re-add child content" -body {
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.6 "Destroy child slave" -body {
+test labelframe-3.6 "Destroy child content" -body {
     destroy .lf.cb
     .lf cget -labelwidget
 } -result {}
 
 ###
-# Re-run series labelframe-3.x with nonchild slaves.
+# Re-run series labelframe-3.x with nonchild content.
 #
 # @@@ ODDITY, 14 Nov 2005:
 # @@@ labelframe-4.1 fails if .cb is a [checkbutton],
@@ -73,7 +73,7 @@ test labelframe-3.6 "Destroy child slave" -body {
 # @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc
 # @@@ (see manager.c r1.11). There's still probably a race condition in here.
 #
-test labelframe-4.1 "Add nonchild slave" -body {
+test labelframe-4.1 "Add nonchild content" -body {
     checkbutton .cb -text "abcde"
     .lf configure -labelwidget .cb
     update
@@ -81,32 +81,32 @@ test labelframe-4.1 "Add nonchild slave" -body {
 
 } -result [list 1 1 labelframe]
 
-test labelframe-4.2 "Remove nonchild slave" -body {
+test labelframe-4.2 "Remove nonchild content" -body {
     .lf configure -labelwidget {}
     update;
     list [winfo ismapped .cb] [winfo viewable .cb] [winfo manager .cb]
 } -result [list 0 0 {}]
 
-test labelframe-4.3 "Re-add nonchild slave" -body {
+test labelframe-4.3 "Re-add nonchild content" -body {
     .lf configure -labelwidget .cb
     list [update; winfo viewable .cb] [winfo manager .cb]
 } -result [list 1 labelframe]
 
-test labelframe-4.4 "Re-manage nonchild slave" -body {
+test labelframe-4.4 "Re-manage nonchild content" -body {
     pack .cb -side right
     list [update; winfo viewable .cb] \
     	[winfo manager .cb] \
 	[.lf cget -labelwidget]
 } -result [list 1 pack {}]
 
-test labelframe-4.5 "Re-add nonchild slave" -body {
+test labelframe-4.5 "Re-add nonchild content" -body {
     .lf configure -labelwidget .cb
     list [update; winfo viewable .cb] \
     	[winfo manager .cb] \
 	[.lf cget -labelwidget]
 } -result [list 1 labelframe .cb]
 
-test labelframe-4.6 "Destroy nonchild slave" -body {
+test labelframe-4.6 "Destroy nonchild content" -body {
     destroy .cb
     .lf cget -labelwidget
 } -result {}
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index c1fc6ac..ad2865c 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -262,7 +262,7 @@ test paned-propagation-1 "Initial request size" -body {
     list [winfo reqwidth .pw] [winfo reqheight .pw]
 } -result [list 100 105]
 
-test paned-propagation-2 "Slave change before map" -body {
+test paned-propagation-2 "Pane change before map" -body {
     .pw.f1 configure -width 200 -height 100
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw]
@@ -274,13 +274,13 @@ test paned-propagation-3 "Map window" -body {
     list [winfo width .pw] [winfo height .pw] [.pw sashpos 0]
 } -result [list 200 155 100]
 
-test paned-propagation-4 "Slave change after map, off-axis" -body {
+test paned-propagation-4 "Pane change after map, off-axis" -body {
     .pw.f1 configure -width 100 ;# should be granted
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]
 } -result [list 100 155 100]
 
-test paned-propagation-5 "Slave change after map, on-axis" -body {
+test paned-propagation-5 "Pane change after map, on-axis" -body {
     .pw.f1 configure -height 50 ;# should be denied
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 2496c43..aedc80b 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -150,21 +150,21 @@ test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constr
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
     pack .f1 .f2
-    slave alias w winfo id .f1
-    slave eval {
+    child alias w winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t -use [w]
         list [testembed] [expr {[lindex [lindex [testembed all] 0] 0] - [w]}]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX {} {} .t}} 0}
 test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints {
@@ -190,23 +190,23 @@ test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constr
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
     pack .f1 .f2
-    slave alias w1 winfo id .f1
-    slave alias w2 winfo id .f2
-    slave eval {
+    child alias w1 winfo id .f1
+    child alias w2 winfo id .f2
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         toplevel .t2 -use [w2]
         testembed
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{XXX {} {} .t2} {XXX {} {} .t1}}
 test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints {
@@ -253,21 +253,21 @@ test unixEmbed-2.1a {EmbeddedEventProc procedure} -constraints {
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         testembed
     }
     destroy .f1
     update
-    slave eval {
+    child eval {
         testembed
     }
 } -cleanup {
@@ -295,14 +295,14 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints {
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         testembed
@@ -310,7 +310,7 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints {
         testembed
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {}
 test unixEmbed-2.3 {EmbeddedEventProc procedure} -constraints {
@@ -361,22 +361,22 @@ test unixEmbed-3.1 {ContainerEventProc procedure, detect creation} -constraints
 test unixEmbed-3.1a {ContainerEventProc procedure, detect creation} -constraints {
     unix testembed
 } -setup {
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
+    child alias w1 winfo id .f1
     set x [testembed]
-    slave eval {
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         wm withdraw .t1
     }
     list $x [testembed]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX .f1 {} {}}} {{XXX .f1 {} {}}}}
 test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} -constraints {
@@ -418,14 +418,14 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -bd 2 -relief raised
         update
@@ -434,7 +434,7 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c
         wm geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {200x200+0+0}
 test unixEmbed-3.4 {ContainerEventProc procedure, disallow position changes} -constraints {
@@ -462,14 +462,14 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -478,7 +478,7 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c
         wm geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {300x100+0+0}
 test unixEmbed-3.5 {ContainerEventProc procedure, geometry requests} -constraints {
@@ -506,22 +506,22 @@ test unixEmbed-3.5a {ContainerEventProc procedure, geometry requests} -constrain
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         .t1 configure -width 300 -height 80
         update
     }
-    list [winfo width .f1] [winfo height .f1] [slave eval {wm geometry .t1}]
+    list [winfo width .f1] [winfo height .f1] [child eval {wm geometry .t1}]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {300 80 300x80+0+0}
 test unixEmbed-3.6 {ContainerEventProc procedure, map requests} -constraints {
@@ -551,14 +551,14 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         set x unmapped
@@ -569,7 +569,7 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints {
         set x
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {mapped}
 test unixEmbed-3.7 {ContainerEventProc procedure, destroy events} -constraints {
@@ -599,16 +599,16 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
+    child alias w1 winfo id .f1
     bind .f1 <Destroy> {set x dead}
     set x alive
-    slave eval {
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -617,7 +617,7 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints
     update
     list $x [winfo exists .f1]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {dead 0}
 
@@ -648,14 +648,14 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -664,7 +664,7 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint
         winfo geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {180x100+0+0}
 test unixEmbed-4.2 {EmbedStructureProc procedure, destroy events} -constraints {
@@ -691,15 +691,15 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
@@ -707,7 +707,7 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints
     destroy .f1
     list $x [testembed]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result "{{XXX .f1 {} {}}} {}"
 
@@ -737,14 +737,14 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         bind .t1 <FocusIn> {lappend x "focus in %W"}
@@ -754,9 +754,9 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints {
     }
     focus -force .f1
     update
-    slave eval {set x}
+    child eval {set x}
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{focus in .t1}}
 test unixEmbed-5.2 {EmbedFocusProc procedure, focusing on dead window} -constraints {
@@ -785,14 +785,14 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -802,7 +802,7 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra
     focus -force .f1
     update
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {}
 test unixEmbed-5.3 {EmbedFocusProc procedure, FocusOut events} -constraints {
@@ -833,14 +833,14 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         set x {}
@@ -850,12 +850,12 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints {
     }
     focus -force .f1
     update
-    set x [slave eval {update; set x }]
+    set x [child eval {update; set x }]
     focus .
     update
-    list $x [slave eval {update; set x}]
+    list $x [child eval {update; set x}]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{focus in .t1}} {{focus in .t1} {focus out .t1}}}
 
@@ -885,14 +885,14 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -903,7 +903,7 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const
         list $x [winfo geom .t1]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{configure .t1 300 120} 300x120+0+0}
 test unixEmbed-6.2 {EmbedGeometryRequest procedure, window changes size} -constraints {
@@ -931,15 +931,15 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     place .f1 -width 200 -height 200
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -950,7 +950,7 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const
         list $x [winfo geom .t1]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{configure .t1 200 200} 200x200+0+0}
 
@@ -991,22 +991,22 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai
     unix notAqua
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
     focus -force .
     bind . <Key> {lappend x {key %A %E}}
     set x {}
-    set y [slave eval {
+    set y [child eval {
         update
         bind .t1 <Key> {lappend y {key %A}}
         set y {}
@@ -1016,7 +1016,7 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai
     update
     list $x $y
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
     bind . <Key> {}
 } -result {{{key a 1}} {}}
@@ -1054,14 +1054,14 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
@@ -1070,7 +1070,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     update
     bind . <Key> {lappend x {key %A}}
     set x {}
-    set y [slave eval {
+    set y [child eval {
         update
         bind .t1 <Key> {lappend y {key %A}}
         set y {}
@@ -1080,7 +1080,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     update
     list $x $y
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
     bind . <Key> {}
 } -result {{} {{key b}}}
@@ -1113,30 +1113,30 @@ test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
 } -result {{{} .t1} .f1}
 test unixEmbed-8.1a {TkpClaimFocus procedure} -constraints unix -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -width 200 -height 50
     pack .f1 .f2
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
     }
     # This should clear focus from the application embedded in .f1
     focus -force .f2
     update
-    list [slave eval {
+    list [child eval {
         set x [list [focus]]
         focus .t1
 	update
         lappend x [focus]
     }] [focus]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{} .t1} .f1}
 test unixEmbed-8.2 {TkpClaimFocus procedure} -constraints unix -setup {
@@ -1211,14 +1211,14 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
         set x {}
@@ -1227,7 +1227,7 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
         lappend x [testembed]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX {} {} .t1}} {}}
 
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 3c9e46e..c7b10d0 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1298,7 +1298,7 @@ test unixWm-37.3 {Tk_WmCmd procedure, "transient" option} {unix testwrapper} {
     destroy .t2
     set result
 } {{} {} .t 0 {} {}}
-test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unix testwrapper} {
+test unixWm-37.4 {TkWmDeadWindow, destroy on toplevel should clear transient} {unix testwrapper} {
     destroy .t2
     toplevel .t2
     destroy .t3
@@ -1309,7 +1309,7 @@ test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {uni
     update
     list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
 } {{} {}}
-test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unix testwrapper} {
+test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create toplevel wrapper} {unix testwrapper} {
     destroy .t2
     destroy .t3
     toplevel .t2 -width 120 -height 300
@@ -1840,7 +1840,7 @@ test unixWm-50.3 {
 	Tk_CoordsToWindow procedure, finding a toplevel with embedding
 } tempNotWin {
     deleteWindows
-    catch {interp delete slave}
+    catch {interp delete child}
 
     toplevel .t -width 300 -height 400 -bg blue
     wm geom .t +100+100
@@ -1848,10 +1848,10 @@ test unixWm-50.3 {
     place .t.f -x 150 -y 50
     tkwait visibility .t.f
     update
-    interp create slave
-    load {} Tk slave
-    slave alias frameid winfo id .t.f
-    slave eval {
+    interp create child
+    load {} Tk child
+    child alias frameid winfo id .t.f
+    child eval {
 	wm withdraw .
         toplevel .x -width 100 -height 80 -use [frameid] -bg yellow
         tkwait visibility .x
@@ -1859,9 +1859,9 @@ test unixWm-50.3 {
         set x [winfo rootx .x]
         set y [winfo rooty .x]
     }
-    set result [list [slave eval {winfo containing [expr $x - 1]  [expr $y + 50]}] \
-	       	     [slave eval {winfo containing $x [expr $y + 50]}]]
-    interp delete slave
+    set result [list [child eval {winfo containing [expr $x - 1]  [expr $y + 50]}] \
+	       	     [child eval {winfo containing $x [expr $y + 50]}]]
+    interp delete child
     set x [winfo rootx .t]
     set y [winfo rooty .t]
     lappend result [winfo containing [expr $x + 200] [expr $y + 49]] \
@@ -1871,17 +1871,17 @@ test unixWm-50.3 {
 test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} unix {
     destroy .t
 
-    catch {interp delete slave}
+    catch {interp delete child}
     toplevel .t -width 200 -height 200 -bg green
     wm geometry .t +100+100
     tkwait visibility .t
     update
-    interp create slave
-    load {} Tk slave
-    slave eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
+    interp create child
+    load {} Tk child
+    child eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
     set result [list [winfo containing 200 200] \
-	    [slave eval {winfo containing 200 200}]]
-    interp delete slave
+	    [child eval {winfo containing 200 200}]]
+    interp delete child
     set result
 } {{} .}
 test unixWm-50.5 {Tk_CoordsToWindow procedure, handling menubars} {unix testmenubar} {
diff --git a/tests/wm.test b/tests/wm.test
index e7e75ea..285ea9b 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1608,9 +1608,9 @@ test wm-transient-1.3 {usage} -returnCodes error -body {
 } -result {bad window path name "foo"}
 deleteWindows
 test wm-transient-1.4 {usage} -returnCodes error -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     wm iconify .subject
 } -cleanup {
     deleteWindows
@@ -1634,11 +1634,11 @@ test wm-transient-1.6 {usage} -returnCodes error -body {
     deleteWindows
 } -result {can't make ".icon" a container: it is an icon for .top}
 test wm-transient-1.7 {usage} -returnCodes error -body {
-    toplevel .master
-    wm transient .master .master
+    toplevel .top
+    wm transient .top .top
 } -cleanup {
     deleteWindows
-} -result {setting ".master" as container creates a transient/container cycle}
+} -result {setting ".top" as container creates a transient/container cycle}
 test wm-transient-1.8 {usage} -returnCodes error -body {
     toplevel .t1
     toplevel .t2
@@ -1650,73 +1650,73 @@ test wm-transient-1.8 {usage} -returnCodes error -body {
     deleteWindows
 } -result {setting ".t3" as container creates a transient/container cycle}
 test wm-transient-1.9 {usage} -returnCodes error -body {
-    toplevel .master
-    frame .master.f
-    wm transient .master .master.f
+    toplevel .top
+    frame .top.f
+    wm transient .top .top.f
 } -cleanup {
     deleteWindows
-} -result {setting ".master" as container creates a transient/container cycle}
+} -result {setting ".top" as container creates a transient/container cycle}
 
-test wm-transient-2.1 {basic get/set of master} -setup {
+test wm-transient-2.1 {basic get/set of toplevel} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     lappend results [wm transient .subject]
-    wm transient .subject .master
+    wm transient .subject .top
     lappend results [wm transient .subject]
     wm transient .subject {}
     lappend results [wm transient .subject]
 } -cleanup {
     deleteWindows
-} -result {{} .master {}}
-test wm-transient-2.2 {first toplevel parent of non-toplevel master is used} -body {
-    toplevel .master
-    frame .master.f
+} -result {{} .top {}}
+test wm-transient-2.2 {first toplevel parent of non-toplevel container window is used} -body {
+    toplevel .top
+    frame .top.f
     toplevel .subject
-    wm transient .subject .master.f
+    wm transient .subject .top.f
     wm transient .subject
 } -cleanup {
     deleteWindows
-} -result {.master}
+} -result {.top}
 
 test wm-transient-3.1 {transient toplevel is withdrawn
-        when mapped if master is withdrawn} -body {
-    toplevel .master
-    wm withdraw .master
+        when mapped if toplevel is withdrawn} -body {
+    toplevel .top
+    wm withdraw .top
     update
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-3.2 {already mapped transient toplevel
-        takes on withdrawn state of master} -body {
-    toplevel .master
-    wm withdraw .master
+        takes on withdrawn state of toplevel} -body {
+    toplevel .top
+    wm withdraw .top
     update
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
-test wm-transient-3.3 {withdraw/deiconify on the master
+test wm-transient-3.3 {withdraw/deiconify on the toplevel
         also does a withdraw/deiconify on the transient} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
-    wm withdraw .master
+    wm transient .subject .top
+    wm withdraw .top
     update
     lappend results [wm state .subject] [winfo ismapped .subject]
-    wm deiconify .master
+    wm deiconify .top
     update
     lappend results [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
@@ -1724,43 +1724,43 @@ test wm-transient-3.3 {withdraw/deiconify on the master
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if master is iconic} -body {
-    toplevel .master
-    wm iconify .master
+        when mapped if toplevel is iconic} -body {
+    toplevel .top
+    wm iconify .top
     update
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.2 {already mapped transient toplevel
-        is withdrawn if master is iconic} -body {
-    toplevel .master
+        is withdrawn if toplevel is iconic} -body {
+    toplevel .top
     raiseDelay
-    wm iconify .master
+    wm iconify .top
     update idletasks
     toplevel .subject
     update idletasks
-    wm transient .subject .master
+    wm transient .subject .top
     update idletasks
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
-test wm-transient-4.3 {iconify/deiconify on the master
+test wm-transient-4.3 {iconify/deiconify on the toplevel
         does a withdraw/deiconify on the transient} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update idletasks
-    wm transient .subject .master
-    wm iconify .master
+    wm transient .subject .top
+    wm iconify .top
     update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
-    wm deiconify .master
+    wm deiconify .top
     update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
@@ -1771,53 +1771,53 @@ test wm-transient-5.1 {an error during transient command should not
         cause the map/unmap binding to be deleted} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     # Expect a bad window path error here
     lappend results [catch {wm transient .subject .bad}]
-    wm withdraw .master
+    wm withdraw .top
     update
     lappend results [wm state .subject]
-    wm deiconify .master
+    wm deiconify .top
     update
     lappend results [wm state .subject]
 } -cleanup {
     deleteWindows
 } -result {1 withdrawn normal}
-test wm-transient-5.2 {remove transient property when master
+test wm-transient-5.2 {remove transient property when toplevel
         is destroyed} -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
-    destroy .master
+    destroy .top
     update
     wm transient .subject
 } -cleanup {
     deleteWindows
 } -result {}
 test wm-transient-5.3 {remove transient property from window
-        that had never been mapped when master is destroyed} -body {
-    toplevel .master
+        that had never been mapped when toplevel is destroyed} -body {
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
-    destroy .master
+    wm transient .subject .top
+    destroy .top
     wm transient .subject
 } -cleanup {
     deleteWindows
 } -result {}
 
 test wm-transient-6.1 {a withdrawn transient does not track
-        state changes in the master} -body {
-    toplevel .master
+        state changes in the toplevel} -body {
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     wm withdraw .subject
-    wm withdraw .master
-    wm deiconify .master
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     wm state .subject
@@ -1825,24 +1825,24 @@ test wm-transient-6.1 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn}
 test wm-transient-6.2 {a withdrawn transient does not track
-        state changes in the master} -setup {
+        state changes in the toplevel} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     wm withdraw .subject
-    wm withdraw .master
-    wm deiconify .master
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     lappend results [wm state .subject]
     wm deiconify .subject
     lappend results [wm state .subject]
-    wm withdraw .master
+    wm withdraw .top
     lappend results [wm state .subject]
-    wm deiconify .master
+    wm deiconify .top
     # idle handler should map transient
     update
     lappend results [wm state .subject]
@@ -1850,15 +1850,15 @@ test wm-transient-6.2 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn normal withdrawn normal}
 test wm-transient-6.3 {a withdrawn transient does not track
-        state changes in the master} -body {
-    toplevel .master
+        state changes in the toplevel} -body {
+    toplevel .top
     toplevel .subject
     update
     # withdraw before making window a transient
     wm withdraw .subject
-    wm transient .subject .master
-    wm withdraw .master
-    wm deiconify .master
+    wm transient .subject .top
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     wm state .subject
@@ -1866,7 +1866,7 @@ test wm-transient-6.3 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn}
 
-# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two masters"
+# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two toplevels"
 # wm-transient-7.3 through 7.5 all caused panics on Unix in Tk 8.4b1.
 # 7.1 and 7.2 added to catch (potential) future errors.
 #
@@ -1880,16 +1880,16 @@ test wm-transient-7.1 {Destroying transient} -body {
 } -cleanup {
     deleteWindows
 }
-test wm-transient-7.2 {Destroying master} -body {
-    toplevel .t
+test wm-transient-7.2 {Destroying toplevel} -body {
+    toplevel .top
     toplevel .transient
-    wm transient .transient .t
-    destroy .t
+    wm transient .transient .top
+    destroy .top
     wm transient .transient
 } -cleanup {
     deleteWindows
 } -result {}
-test wm-transient-7.3 {Reassign transient, destroy old master} -body {
+test wm-transient-7.3 {Reassign transient, destroy old toplevel} -body {
     toplevel .t1
     toplevel .t2
     toplevel .transient
@@ -1901,7 +1901,7 @@ test wm-transient-7.3 {Reassign transient, destroy old master} -body {
 } -cleanup {
     deleteWindows
 }
-test wm-transient-7.4 {Reassign transient, destroy new master} -body {
+test wm-transient-7.4 {Reassign transient, destroy new toplevel} -body {
     toplevel .t1
     toplevel .t2
     toplevel .transient
@@ -1930,8 +1930,8 @@ test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
     deleteWindows
     set result {}
 } -body {
-    # Verifies that transients stay on top of their masters, even if they were
-    # made transients when those masters were withdrawn.
+    # Verifies that transients stay on top of their toplevels, even if they were
+    # made transients when those toplevels were withdrawn.
     toplevel .t1; wm withdraw  .t1;     update
     toplevel .t2; wm transient .t2 .t1; update
     lappend result [winfo ismapped .t1] [winfo ismapped .t2]