Index: client/1.0/neutral/pkgd.eagle
==================================================================
--- client/1.0/neutral/pkgd.eagle
+++ client/1.0/neutral/pkgd.eagle
@@ -525,20 +525,20 @@
     }
   }
 
   #
   # NOTE: This procedure, which is only used for native Tcl, generates a
-  #       "master" package index file (i.e. "pkgIndex.tcl") suitable for
+  #       "root" package index file (i.e. "pkgIndex.tcl") suitable for
   #       use with native Tcl 8.4 (or higher).  It will recursively scan
   #       for all other native Tcl package index files that are within the
   #       configured persistent root directory and [source] them, thereby
   #       causing all packages located within them to become available.
   #       Since Eagle (by default) already performs recursive searches for
   #       its package index files, this procedure is not needed for Eagle.
   #       The return value is undefined.
   #
-  proc maybeCreateMasterTclPackageIndex {} {
+  proc maybeCreateRootTclPackageIndex {} {
     variable persistentRootDirectory
 
     verifyPersistentRootDirectory
     set persistentDirectory $persistentRootDirectory
 
@@ -726,11 +726,11 @@
           return $::auto_path
         }
       }
     } elseif {$language eq "tcl"} then {
       if {[isEagle]} then {
-        tcl eval [tcl master] {
+        tcl eval [tcl primary] {
           if {![info exists ::auto_path]} then {
             return [list]
           }
 
           return $::auto_path
@@ -776,11 +776,11 @@
           }
         }]
       }
     } elseif {$language eq "tcl"} then {
       if {[isEagle]} then {
-        tcl eval [tcl master] [string map [list %directory% $directory] {
+        tcl eval [tcl primary] [string map [list %directory% $directory] {
           if {![info exists ::auto_path] || \
               [lsearch -exact $::auto_path {%directory%}] == -1} then {
             lappend ::auto_path {%directory%}
           }
         }]
@@ -2152,14 +2152,14 @@
         file delete -force -- $temporaryDirectory
       }
 
       #
       # NOTE: When the target language is native Tcl, try to create the
-      #       master package index, if necessary.
+      #       "root" package index, if necessary.
       #
       if {$language eq "tcl"} then {
-        maybeCreateMasterTclPackageIndex
+        maybeCreateRootTclPackageIndex
         set addPersistentDirectoryToAutoPath true
       }
     }
 
     #
@@ -2174,11 +2174,11 @@
       #       needs to be modified.
       #
       if {$addPersistentDirectoryToAutoPath} then {
         #
         # NOTE: The downloaded package was persisted -AND- will be handled
-        #       by the master package index; therefore, just make sure the
+        #       by the "root" package index; therefore, just make sure the
         #       package persistence root directory is in the auto-path and
         #       then return only that directory in the result.
         #
         maybeAddToAutoPath $language $persistentDirectory
         set downloadDirectories [list $persistentDirectory]

Index: client/1.0/neutral/pkgr.eagle
==================================================================
--- client/1.0/neutral/pkgr.eagle
+++ client/1.0/neutral/pkgr.eagle
@@ -1673,11 +1673,11 @@
                   Tcl {
                     #
                     # NOTE: The target language is Tcl; therefore, a bit of
                     #       special handling is needed here.
                     #
-                    {%tclMustBeReady%}; return [tcl eval [tcl master] [list \
+                    {%tclMustBeReady%}; return [tcl eval [tcl primary] [list \
                         uplevel #0 $script(inner)]]
                   }
                   default {
                     error "unsupported metadata language"
                   }
@@ -1838,11 +1838,11 @@
             #       the current language is Eagle, then try to use its [tcl]
             #       command in order to evaluate the inner script block in
             #       Tcl.
             #
             if {[isEagle]} then {
-              tclMustBeReady; return [tcl eval [tcl master] [list \
+              tclMustBeReady; return [tcl eval [tcl primary] [list \
                   uplevel #0 $script(inner)]]
             } else {
               return [uplevel #0 $script(inner)]
             }
           }

Index: packages/eagle/1.0/neutral/tdk1.0/tdk.eagle
==================================================================
--- packages/eagle/1.0/neutral/tdk1.0/tdk.eagle
+++ packages/eagle/1.0/neutral/tdk1.0/tdk.eagle
@@ -86,17 +86,17 @@
     }
 
     #
     # NOTE: This procedure attempts to load the TclDevKit remote debugger
     #       package into the specified Tcl interpreter.  By default, the
-    #       "master" Tcl interpreter will be used.  If the native Tcl
+    #       "primary" Tcl interpreter will be used.  If the native Tcl
     #       interface is not ready or if the remote debugger package
     #       cannot be loaded, an error will be raised.
     #
     proc tcl_debugger_setup { {interp ""} } {
       if {![tcl ready]} then {error "native Tcl interface is not ready"}
-      if {[string length $interp] == 0} then {set interp [tcl master]}
+      if {[string length $interp] == 0} then {set interp [tcl primary]}
 
       set directory [getTclDevKitDirectory]
 
       if {[string length $directory] == 0} then {
         error "the TclDevKit does not appear to be installed"
@@ -149,32 +149,32 @@
     }
 
     #
     # NOTE: This procedure attempts to initialize the TclDevKit remote
     #       debugger in the specified Tcl interpreter.  By default, the
-    #       "master" Tcl interpreter will be used.  If the native Tcl
+    #       "primary" Tcl interpreter will be used.  If the native Tcl
     #       interface is not ready or if the remote debugger package
     #       cannot be initialized, an error will be raised.
     #
     proc tcl_debugger_init {
             {interp ""} {host 127.0.0.1} {port 2576} {cdata {}} } {
       if {![tcl ready]} then {error "native Tcl interface is not ready"}
-      if {[string length $interp] == 0} then {set interp [tcl master]}
+      if {[string length $interp] == 0} then {set interp [tcl primary]}
 
       tcl_eval $interp [list debugger_init $host $port $cdata]
     }
 
     #
     # NOTE: This procedure attempts to evaluate a Tcl script under control
-    #       of the TclDevKit remote debugger.  By default, the "master" Tcl
+    #       of the TclDevKit remote debugger.  By default, the "primary" Tcl
     #       interpreter will be used.  If the native Tcl interface is not
     #       ready or if the remote debugger package fails to evaluate the
     #       Tcl script, an error will be raised.
     #
     proc tcl_debugger_eval { {interp ""} args } {
       if {![tcl ready]} then {error "native Tcl interface is not ready"}
-      if {[string length $interp] == 0} then {set interp [tcl master]}
+      if {[string length $interp] == 0} then {set interp [tcl primary]}
 
       tcl_eval $interp debugger_eval $args
     }
 
     #
@@ -181,11 +181,11 @@
     # NOTE: This procedure attempts to tell the TclDevKit remote debugger
     #       to break the execution of the Tcl script in progress.
     #
     proc tcl_debugger_break { {interp ""} {str ""} } {
       if {![tcl ready]} then {error "native Tcl interface is not ready"}
-      if {[string length $interp] == 0} then {set interp [tcl master]}
+      if {[string length $interp] == 0} then {set interp [tcl primary]}
 
       tcl_eval $interp [list debugger_break $str]
     }
   }