diff --git a/src/bootsupport/modules/punk/lib-0.5.1.tm b/src/bootsupport/modules/punk/lib-0.6.0.tm
similarity index 98%
rename from src/bootsupport/modules/punk/lib-0.5.1.tm
rename to src/bootsupport/modules/punk/lib-0.6.0.tm
index 7013a8e5..11a1e0c6 100644
--- a/src/bootsupport/modules/punk/lib-0.5.1.tm
+++ b/src/bootsupport/modules/punk/lib-0.6.0.tm
@@ -8,7 +8,7 @@
 # (C) 2024
 #
 # @@ Meta Begin
-# Application punk::lib 0.5.1
+# Application punk::lib 0.6.0
 # Meta platform     tcl
 # Meta license      BSD
 # @@ Meta End
@@ -18,7 +18,7 @@
 # doctools header
 # ++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++
 #*** !doctools
-#[manpage_begin punkshell_module_punk::lib 0 0.5.1]
+#[manpage_begin punkshell_module_punk::lib 0 0.6.0]
 #[copyright "2024"]
 #[titledesc {punk general utility functions}]  [comment {-- Name section and table of contents description --}]
 #[moddesc {punk library}]             [comment {-- Description at end of page heading --}]
@@ -295,7 +295,7 @@ tcl::namespace::eval punk::lib::check {
         if {$replversion eq ""} {
             #not loaded - determine what version would be provided, without loading it:
             #an unsatisfiable require triggers the package unknown scan (registering ifneeded
-            #scripts) then fails before any load (0.5.1 dev modules are alpha - below 999999).
+            #scripts) then fails before any load (0.6.0 dev modules are alpha - below 999999).
             catch {package require punk::repl 999999}
             set available [package versions punk::repl]
             if {[llength $available]} {
@@ -2519,7 +2519,7 @@ namespace eval punk::lib {
         #for each of the above strings we should get a command recognised for the 'puts e*' items as well as the 'list' item, but not for the 'puts n' items since they are within curly braces and not subject to command substitution.
     #---------------------------------
     proc tclscript_info {script {nscontext ""}} {
-        package require parser
+        tclparser_prefer ;#c library preferred, punk::tclparser pure-Tcl fallback wired otherwise (G-070)
         #if the script is ANSI highlighted - the square brackets within the ANSI will disrupt our parsing.
         if {[punk::ansi::ta::detect $script]} {
             #we will strip it - but be noisy on stderr since a) it's a bi inefficient to pass in ansi highlighted scripts.
@@ -3555,27 +3555,107 @@ namespace eval punk::lib {
         }
         return $resultd
     }
+    namespace eval argdoc {
+        lappend PUNKARGS [list {
+            @id     -id     ::punk::lib::tclparser_prefer
+            @cmd    -name   punk::lib::tclparser_prefer\
+                -summary\
+                    "Resolve which tclparser implementation serves punk::lib's script analysis."\
+                -help\
+                    "Resolve which tclparser implementation serves punk::lib's
+                    script-analysis procs (tclscript_info and the
+                    tclscript_info::* helpers), returning 'c' or 'tcl'.
+
+                    With no argument the decision is automatic and memoized for
+                    the process: the tclparser c library is preferred when
+                    'package require parser' succeeds (it provides the global
+                    ::parse command the analysis procs call); otherwise the
+                    punk::tclparser pure-Tcl engine (G-070, parity-tested
+                    against the c library) is wired in as namespace-local
+                    'parse' aliases so the same call sites fall back with no
+                    body changes. A c library loaded later is not consulted
+                    once the fallback is wired.
+
+                    With the optional argument the preference is forced: 'c'
+                    requires the c library (error if unavailable) and removes
+                    any fallback aliases; 'tcl' wires the pure-Tcl engine even
+                    when the c library is present (testing/benchmarks)."
+            @values -min 0 -max 1
+                which -type string -choices {c tcl} -optional 1 -help\
+                    "Force the preference instead of deciding automatically"
+        }]
+    }
+    proc tclparser_prefer {args} {
+        #manual parsing - see PUNKARGS documentation above
+        variable tclparser_which
+        if {[llength $args] > 1} {
+            error "wrong # args: should be \"punk::lib::tclparser_prefer ?c|tcl?\""
+        }
+        if {[llength $args] == 1} {
+            set want [lindex $args 0]
+            switch -exact -- $want {
+                c {
+                    package require parser
+                    catch {interp alias {} ::punk::lib::parse {}}
+                    catch {interp alias {} ::punk::lib::tclscript_info::parse {}}
+                    set tclparser_which c
+                }
+                tcl {
+                    package require punk::tclparser
+                    interp alias {} ::punk::lib::parse {} ::punk::tclparser::parse
+                    interp alias {} ::punk::lib::tclscript_info::parse {} ::punk::tclparser::parse
+                    set tclparser_which tcl
+                }
+                default {
+                    error "punk::lib::tclparser_prefer: unknown preference '$want' - must be c or tcl"
+                }
+            }
+            return $tclparser_which
+        }
+        if {[info exists tclparser_which]} {
+            return $tclparser_which
+        }
+        if {![catch {package require parser}]} {
+            set tclparser_which c
+        } else {
+            package require punk::tclparser
+            interp alias {} ::punk::lib::parse {} ::punk::tclparser::parse
+            interp alias {} ::punk::lib::tclscript_info::parse {} ::punk::tclparser::parse
+            set tclparser_which tcl
+        }
+        return $tclparser_which
+    }
+    namespace eval argdoc {
+        lappend PUNKARGS [list {
+            @id     -id     ::punk::lib::tclparser_tcl
+            @cmd    -name   punk::lib::tclparser_tcl\
+                -summary\
+                    "Pure-Tcl 'parse' with the same API as the tclparser c library."\
+                -help\
+                    "Pure-Tcl implementation of the tclparser c library's 'parse'
+                    command API (G-070) - a thin delegation to
+                    punk::tclparser::parse, which covers the subcommands
+                    punkshell consumes (command, getstring, countnewline) with
+                    parity-tested result shapes and byte ranges. The c library
+                    remains preferred where present - see tclparser_prefer."
+            @values -min 3 -max 3
+                subcmd -type string -help\
+                    "parse subcommand (covered set: command, getstring, countnewline)"
+                string -type string -help\
+                    "the string to operate on"
+                range  -type list -help\
+                    "byte range {start length} - {} means the whole string"
+        }]
+    }
     proc tclparser_tcl {subcmd string range} {
-        #provide a tcl parser with the same API as the tclparser c library.
+        #pure-Tcl fallback for the tclparser c library (G-070).
+        #Historical upstream references (now vendored/pinned in the
+        #punkshell-maintained fork c:/repo/jn/tclparser_punk - see
+        #goals/G-070-pure-tcl-tclparser.md):
         #https://chiselapp.com/user/aspect/repository/tclparser/index
-        #or
-        #https://github.com/ActiveState/teapot/tree/master/lib/tclparser
-
-        set scriptlist [list]
-        set argchars [split $string ""]
-        set in_dq 0 ;#in double quotes
-        set in_cb 0 ;#in curly braces
-        set in_commandsub 0 ;#in command substitution (i.e within square brackets)
-        #when we are in a command substitution - we should be able to keep appending whilst testing for info complete. review
-        set escaped 0
-        set nesting_level 0
-        set scripttoken ""
-        for {set i 0} {$i < [llength $argchars]} {incr i} {
-            set ch [lindex $argchars $i]
-            #todo
-            error "tclparser_tcl not yet implemented - in the meantime install the tclparser c library (package require parser)"
-        }
-
+        #https://github.com/tcltk-depot/tcl-parser
+        package require punk::tclparser
+        tailcall ::punk::tclparser::parse $subcmd $string $range
     }
     namespace eval tclscript_info {
 
@@ -3671,7 +3751,39 @@ namespace eval punk::lib {
         #- commonly just a variable e.g 'set cmdname foo; $cmdname arg1 arg2'
         # but it could also have command subtitutions e.g 'cmdname_[get_suffix] arg1 arg2'
 
+        namespace eval argdoc {
+            lappend PUNKARGS [list {
+                @id     -id     ::punk::lib::tclscript_info::tclword_to_scriptlist
+                @cmd    -name   punk::lib::tclscript_info::tclword_to_scriptlist\
+                    -summary\
+                        "List the toplevel command substitutions within a single tcl word."\
+                    -help\
+                        "Analyse a string representing a single tcl word (a bareword,
+                        double quoted string or curly braced string as it appears in
+                        source - possibly spanning multiple lines) and return the list
+                        of toplevel commands that would be substituted into it, in
+                        order of evaluation. Each element is itself a command list.
+                        A fully brace-quoted word is opaque and returns an empty list.
+                        Command substitutions nested within array-variable indexes are
+                        included; commands nested within OTHER commands' substitutions
+                        are not (this proc is deliberately non-recursive - see
+                        tclscript_info for the recursive analysis).
+
+                        Parsing uses the tclparser c library when available, else the
+                        punk::tclparser pure-Tcl engine (G-070) - see
+                        punk::lib::tclparser_prefer. Works under a plain tclsh with no
+                        parser binary on the package path."
+                @leaders
+                    string -type string -help\
+                        "the tcl word to analyse"
+                @values -min 0 -max 1
+                    nscontext -type string -optional 1 -help\
+                        "namespace context for the analysis (defaults to the caller's
+                          current namespace)"
+            }]
+        }
         proc tclword_to_scriptlist {string {nscontext ""}} {
+            #manual args (simple positional signature) - see PUNKARGS documentation above
             #consider 'list [puts a]$v(x,[puts b])[puts c]'
             # the command substitutions are [puts a], [puts b] and [puts c]
             #The order of evaluation is [puts a] then [puts b] then [puts c] but [puts b] is within the variable array syntax and so parses differently to the other two command substitutions.
@@ -3680,7 +3792,7 @@ namespace eval punk::lib {
             if {$nscontext eq ""} {
                 set nscontext [uplevel 1 {namespace current}]
             }
-            puts stderr "------------tclword_to_scriptlist called with string: $string nscontext: $nscontext------------"
+            #puts stderr "------------tclword_to_scriptlist called with string: $string nscontext: $nscontext------------"
             #analyse a string that will undergo command substitution to determine the list of commands that will be substituted into the string.
             #e.g for "a string with [puts hello] and [puts world]" we would return a list of 2 items, each being a list of the command and its arguments, e.g {puts hello} and {puts world}
             #we need to do a full parse of the string to determine which square brackets are actually command substitutions that need to be analysed for complexity, and which are just literal characters within the string.
@@ -3697,11 +3809,11 @@ namespace eval punk::lib {
 
             set scriptlist [list]
 
-            if {![catch {package require parser}]} {
-                #use tclparser library if available
+            if {[punk::lib::tclparser_prefer] eq "c"} {
+                #tclparser c library (preferred where present - performance)
                 set parseinfo [::parse command $boguscmdline {0 end}]
             } else {
-                puts stderr "tclparser library not available - using fallback tcl parser which may be less accurate - review"
+                #punk::tclparser pure-Tcl engine (G-070) - parity-tested against the c library
                 set parseinfo [::punk::lib::tclparser_tcl command $boguscmdline {0 end}]
             }
             #returns 4 items.
@@ -3780,7 +3892,7 @@ namespace eval punk::lib {
                         #set var_subscript_cmds [punk::lib::tclscript_info::tclword_to_scriptlist $varstringfull $nscontext]
                         set varsubnodes [lindex $subnode 2]
                         foreach varsubnode $varsubnodes {
-                            puts stderr "[a+ cyan]varsubnodes: $varsubnodes type: [lindex $varsubnode 0][a]"
+                            #puts stderr "varsubnodes: $varsubnodes type: [lindex $varsubnode 0]"
                             if {[lindex $varsubnode 0] eq "command"} {
                                 set pos_bytes [lindex $varsubnode 1]
                                 set cmdstringfull [parse getstring $boguscmdline $pos_bytes] ;#this must be used instead of string range to correctly handle any multibyte characters in the original string
@@ -3796,7 +3908,7 @@ namespace eval punk::lib {
                             } elseif {[lindex $varsubnode 0] eq "variable"} {
                                 set pos_bytes [lindex $varsubnode 1]
                                 set varstringfull [parse getstring $boguscmdline $pos_bytes]
-                                puts stderr "[a+ cyan]varstringfull: $varstringfull[a]"
+                                #puts stderr "varstringfull: $varstringfull"
                                 set varscriptlist [punk::lib::tclscript_info::tclword_to_scriptlist $varstringfull $nscontext]
                                 lappend scriptlist {*}$varscriptlist
                             }
@@ -9390,7 +9502,7 @@ namespace eval ::punk::args::register {
 package provide punk::lib [tcl::namespace::eval punk::lib {
     variable pkg punk::lib
     variable version
-    set version 0.5.1
+    set version 0.6.0
 }]
 return
 
diff --git a/src/bootsupport/modules/punk/mix/base-0.1.2.tm b/src/bootsupport/modules/punk/mix/base-0.2.0.tm
similarity index 92%
rename from src/bootsupport/modules/punk/mix/base-0.1.2.tm
rename to src/bootsupport/modules/punk/mix/base-0.2.0.tm
index b91bdca2..10efc821 100644
--- a/src/bootsupport/modules/punk/mix/base-0.1.2.tm
+++ b/src/bootsupport/modules/punk/mix/base-0.2.0.tm
@@ -1,10 +1,10 @@
 # Maintenance Instruction: leave the 999999.xxx.x as is and use 'deck make' or src/make.tcl to update from <pkg>-buildversion.txt
 # @@ Meta Begin
-# Application punk::mix::base 0.1.2
+# Application punk::mix::base 0.2.0
 # @@ Meta End
 package provide punk::mix::base [namespace eval punk::mix::base {
 	variable version
-	set version 0.1.2
+	set version 0.2.0
 }]
 
 package require punk::path
@@ -344,7 +344,7 @@ namespace eval punk::mix::base {
             }
             #we can return module paths even if the project isn't yet under revision control
             set src_subs [glob -nocomplain -dir [file join $candidate src] -type d -tail *]
-            set antipatterns [list *.vfs vendor* lib _build doc embedded runtime bootsupport]
+            set antipatterns [list *.vfs vendor* lib _build _mint _bake doc embedded runtime bootsupport]
             set tm_folders [list]
             foreach sub $src_subs {
                 set is_ok 1
@@ -411,17 +411,23 @@ namespace eval punk::mix::base {
             return [string map {:: /} $nsq]
         }
 
-        proc get_build_workdir {path} {
+        proc get_bake_workdir {path} {
             set repo_info [punk::repo::find_repos $path]
             set base [lindex [dict get $repo_info project] 0]
             if {![string length $base]} {
-                error "get_build_workdir unable to determine project base for path '$path'"
+                error "get_bake_workdir unable to determine project base for path '$path'"
             }
             if {![file exists $base/src] || ![file writable $base/src]} {
-                error "get_build_workdir unable to access $base/src"
+                error "get_bake_workdir unable to access $base/src"
             }
-            file mkdir $base/src/_build
-            return $base/src/_build
+            file mkdir $base/src/_bake
+            return $base/src/_bake
+        }
+        #legacy name (pre-G-155 stage vocabulary; workdir was src/_build) - old make.tcl copies in
+        #generated projects may still call this. Delegates to the renamed resolver; retirement is a
+        #G-156 decision.
+        proc get_build_workdir {path} {
+            return [get_bake_workdir $path]
         }
 
 
@@ -963,86 +969,12 @@ namespace eval punk::mix::base {
             return [dict create $storedpath $keyvals]
         }
 
-        #calculate the runtime checksum and vfs checksums
-        proc get_all_vfs_build_cksums {path {cksum_opts {}}} {
-            set buildfolder [get_build_workdir $path]
-            set cksum_base_folder [file dirname $buildfolder] ;#this is the <project>/src folder - a reasonable base for our vfs cksums
-            set dict_cksums [dict create]
-
-            set buildrelpath [punk::repo::path_strip_alreadynormalized_prefixdepth $buildfolder $cksum_base_folder]
-            set vfs_tail_list [glob -nocomplain -dir $cksum_base_folder -type d -tails *.vfs]
-
-            foreach vfstail $vfs_tail_list {
-                set vname [file rootname $vfstail]
-                dict set dict_cksums $vfstail [list cksum ""]
-                dict set dict_cksums [file join $buildrelpath $vname.exe] [list cksum ""]
-            }
-
-            #buildruntime.exe obsolete..
-            puts stderr "warning obsolete? get_all_vfs_build_cksums 'buildruntime.exe'???"
-            set fullpath_buildruntime $buildfolder/buildruntime.exe
-
-            set ckinfo_buildruntime [cksum_path $fullpath_buildruntime]
-            set ck [dict get $ckinfo_buildruntime cksum]
-
-
-            set relpath [file join $buildrelpath "buildruntime.exe"]
-            dict set dict_cksums $relpath [list cksum $ck opts $cksum_opts]
-
-            set dict_cksums [fill_relativecksums_from_base_and_relativepathdict $cksum_base_folder $dict_cksums]
-
-            return $dict_cksums
-        }
-
-        proc get_vfs_build_cksums_stored {vfsfolder} {
-            set vfscontainer [file dirname $vfsfolder]
-            set buildfolder $vfscontainer/_build
-            set vfs [file tail $vfsfolder]
-            set vname [file rootname $vfs]
-            set dict_vfs [list $vname.vfs "" $vname.exe "" buildruntime.exe ""]
-            set ckfile $buildfolder/$vname.cksums
-            if {[file exists $ckfile]} {
-                set data [punk::mix::util::fcat -translation binary $ckfile]
-                foreach ln [split $data \n] {
-                    if {[string trim $ln] eq ""} {continue}
-                    lassign $ln path cksum
-                    dict set dict_vfs $path $cksum
-                }
-            }
-            return $dict_vfs
-        }
-        proc get_all_build_cksums_stored {path} {
-            set buildfolder [get_build_workdir $path]
-
-            set vfscontainer [file dirname $buildfolder]
-            set vfslist [glob -nocomplain -dir $vfscontainer -type d -tail *.vfs]
-            set dict_cksums [dict create]
-            foreach vfs $vfslist {
-                set vname [file rootname $vfs]
-                set dict_vfs [get_vfs_build_cksums_stored $vfscontainer/$vfs]
-
-                dict set dict_cksums $vname $dict_vfs
-            }
-            return $dict_cksums
-        }
-
-        proc store_vfs_build_cksums {vfsfolder} {
-            if {![file isdirectory $vfsfolder]} {
-                error "Unable to find supplied vfsfolder: $vfsfolder"
-            }
-            set vfscontainer [file dirname $vfsfolder]
-            set buildfolder $vfscontainer/_build
-            set dict_vfs [get_vfs_build_cksums $vfsfolder]
-            set data ""
-            dict for {path cksum} $dict_vfs {
-                append data "$path $cksum" \n
-            }
-            set fd [open $buildfolder/$vname.cksums w]
-            chan configure $fd -translation binary
-            puts $fd $data
-            close $fd
-            return $dict_vfs
-        }
+        #The legacy vfs-cksums quartet (get_all_vfs_build_cksums, get_vfs_build_cksums_stored,
+        #get_all_build_cksums_stored, store_vfs_build_cksums) was RETIRED under G-155: repo-wide
+        #caller search found none, store_vfs_build_cksums called an undefined get_vfs_build_cksums
+        #(and an unset vname) so it can never have executed, and punkcheck records own the
+        #change-detection role the cksums files aimed at. Historical copies remain in older
+        #snapshots (src/vfs/*.vfs, mkzipfix.vfs).
 
 
 
diff --git a/src/bootsupport/modules/punk/mix/cli-0.5.2.tm b/src/bootsupport/modules/punk/mix/cli-0.6.0.tm
similarity index 95%
rename from src/bootsupport/modules/punk/mix/cli-0.5.2.tm
rename to src/bootsupport/modules/punk/mix/cli-0.6.0.tm
index 47d523f7..99de7593 100644
--- a/src/bootsupport/modules/punk/mix/cli-0.5.2.tm
+++ b/src/bootsupport/modules/punk/mix/cli-0.6.0.tm
@@ -7,7 +7,7 @@
 # (C) 2023
 #
 # @@ Meta Begin
-# Application punk::mix::cli 0.5.2
+# Application punk::mix::cli 0.6.0
 # Meta platform     tcl
 # Meta license      <unspecified>
 # @@ Meta End
@@ -169,11 +169,11 @@ namespace eval punk::mix::cli {
 
         set lc_this_exe [string tolower [info nameofexecutable]]
         set lc_proj_bin [string tolower $project_base/bin]
-        set lc_build_bin [string tolower $project_base/src/_build]
+        set lc_bake_bin [string tolower $project_base/src/_bake]
 
         if {"project" in $args} {
             set is_own_exe 0
-            if {[string match "${lc_proj_bin}*" $lc_this_exe] || [string match "${lc_build_bin}" $lc_this_exe]} {
+            if {[string match "${lc_proj_bin}*" $lc_this_exe] || [string match "${lc_bake_bin}" $lc_this_exe]} {
                 set is_own_exe 1
                 puts stderr "WARNING - running make using executable that may be created by the project being built"
                 set answer [util::askuser "Do you want to proceed using this executable? (build will probably stop when it is unable to  update the executable) Y|N"]
@@ -346,7 +346,7 @@ namespace eval punk::mix::cli {
             set opt_errorprefix            [dict get $opts -errorprefix]
             # -- --- --- --- --- --- --- --- --- --- --- --- --- ---
             validate_name_not_empty_or_spaced $projectname -errorprefix $opt_errorprefix
-            set reserved_words [list etc lib bin modules src doc vendorlib vendormodules embedded runtime _aside _build]
+            set reserved_words [list etc lib bin modules src doc vendorlib vendormodules embedded runtime _aside _build _mint _bake]
             if {$projectname in $reserved_words } {
                 error "$opt_errorprefix '$projectname' cannot be one of reserved_words: $reserved_words"
             }
@@ -707,7 +707,7 @@ namespace eval punk::mix::cli {
         }
 
         proc build_modules_from_source_to_base {srcdir basedir args} {
-            set antidir [list "#*" "_build" "_aside" ".git" ".fossil*"] ;#exact or glob patterns for folders (at any level) we don't want to search in or copy.
+            set antidir [list "#*" "_build" "_mint" "_bake" "_aside" ".git" ".fossil*"] ;#exact or glob patterns for folders (at any level) we don't want to search in or copy.
             set defaults [list {*}{
                 -installer              punk::mix::cli::build_modules_from_source_to_base
                 -call-depth-internal    0
@@ -742,14 +742,13 @@ namespace eval punk::mix::cli {
             if {[file tail [file dirname $srcdir]] ne "src"} {
                 puts stderr "ERROR build_modules_from_source_to_base can only be called with a srcdir that is a subfolder of your 'src' directory"
                 puts stderr "The .tm modules are namespaced based on their directory depth - so we need to start at the root"
-                puts stderr "To build a subtree of your modules - use an appropriate src/modules folder and pass in the -subdirlist."
-                puts stderr "e.g if your modules are based at /x/src/modules2 and you wish to build only the .tm files at /x/src/modules2/skunkworks/lib"
+                puts stderr "To mint a subtree of your modules - use an appropriate src/modules folder and pass in the -subdirlist."
+                puts stderr "e.g if your modules are based at /x/src/modules2 and you wish to mint only the .tm files at /x/src/modules2/skunkworks/lib"
                 puts stderr "Use: >build_modules_from_source_to_base /x/src/modules2 /x/modules2 -subdirlist {skunkworks lib}"
                 exit 2
             }
             set srcdirname [file tail $srcdir]
 
-            set build [file dirname $srcdir]/_build/$srcdirname ;#relative to *original* srcdir - not current_source_dir
             if {[llength $subdirlist] == 0} {
                 set target_module_dir $basedir
                 set current_source_dir $srcdir
@@ -859,8 +858,8 @@ namespace eval punk::mix::cli {
                             set module_build_version $tmfile_versionsegment
                         }
 
-                        set buildfolder $current_source_dir/_build
-                        file mkdir $buildfolder
+                        set mintfolder $current_source_dir/_mint
+                        file mkdir $mintfolder
                         # -- ---
                         set config [dict create {*}{
                             -glob       *
@@ -870,13 +869,13 @@ namespace eval punk::mix::cli {
 
                         # -max-depth -1 for no limit
                         set build_installername pods_in_$current_source_dir
-                        set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
-                        #set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck stderr] ;#with debugchannel
-                        $build_installer set_source_target $current_source_dir/$modpath $buildfolder
+                        set build_installer [punkcheck::installtrack new $build_installername $mintfolder/.punkcheck]
+                        #set build_installer [punkcheck::installtrack new $build_installername $mintfolder/.punkcheck stderr] ;#with debugchannel
+                        $build_installer set_source_target $current_source_dir/$modpath $mintfolder
                         set build_event [$build_installer start_event $config]
                         # -- ---
-                        set podtree_copy $buildfolder/#modpod-$basename-$module_build_version
-                        set modulefile $buildfolder/$basename-$module_build_version.tm
+                        set podtree_copy $mintfolder/#modpod-$basename-$module_build_version
+                        set modulefile $mintfolder/$basename-$module_build_version.tm
 
                         #todo - use modpod version as a source for change detection
                         #package require modpod
@@ -894,12 +893,12 @@ namespace eval punk::mix::cli {
                             if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
 
                             set delete_failed 0
-                            if {[file exists $buildfolder/]} {
-                                puts stderr "deleting existing _build copy at $podtree_copy"
+                            if {[file exists $mintfolder/]} {
+                                puts stderr "deleting existing _mint copy at $podtree_copy"
                                 if {[catch {
                                     file delete -force $podtree_copy
                                     } errMsg]} {
-                                    puts stderr "[punk::ansi::a+ red]deletion of _build copy at $podtree_copy failed: $errMsg[punk::ansi::a]"
+                                    puts stderr "[punk::ansi::a+ red]deletion of _mint copy at $podtree_copy failed: $errMsg[punk::ansi::a]"
                                     set delete_failed 1
                                 }
                             }
@@ -911,9 +910,9 @@ namespace eval punk::mix::cli {
                                 flush stdout
                                 file copy $current_source_dir/$modpath $podtree_copy
                                 if {$tmfile_versionsegment eq $magicversion} {
-                                    set tmfile $buildfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm
+                                    set tmfile $mintfolder/#modpod-$basename-$module_build_version/$basename-$magicversion.tm
                                     if {[file exists $tmfile]} {
-                                        set newname $buildfolder/#modpod-$basename-$module_build_version/$basename-$module_build_version.tm
+                                        set newname $mintfolder/#modpod-$basename-$module_build_version/$basename-$module_build_version.tm
                                         file rename $tmfile $newname
                                         set tmfile $newname
                                     }
@@ -927,20 +926,20 @@ namespace eval punk::mix::cli {
                                 #delete and regenerate zip and modpod stubbed zip
                                 set notes [list]
                                 if {[catch {
-                                    file delete $buildfolder/$basename-$module_build_version.zip
+                                    file delete $mintfolder/$basename-$module_build_version.zip
                                 } err] } {
                                     set had_error 1
                                     lappend notes "zip_delete_failed"
                                 }
                                 if {[catch {
-                                    file delete $buildfolder/$basename-$module_build_version.tm
+                                    file delete $mintfolder/$basename-$module_build_version.tm
                                 } err]} {
                                     set had_error 1
                                     lappend notes "tm_delete_failed"
                                 }
                                 #create ordinary zip file without using external executable
                                 package require punk::zip
-                                set zipfile $buildfolder/$basename-$module_build_version.zip ;#ordinary zip file (deflate)
+                                set zipfile $mintfolder/$basename-$module_build_version.zip ;#ordinary zip file (deflate)
 
                                 #zipfs mkzip does exactly what we need anyway in this case
                                 #unfortunately it's not available in all Tclsh versions we might be running..
@@ -949,7 +948,7 @@ namespace eval punk::mix::cli {
                                     #(Therefore no timestamps)
                                     #zip reading utils generally intuit their existence and display them - but often an editor can't add comments to them
                                     set wd [pwd]
-                                    cd $buildfolder
+                                    cd $mintfolder
                                     puts "zipfs mkzip $zipfile #modpod-$basename-$module_build_version"
                                     set mkzip_failed [catch {zipfs mkzip $zipfile #modpod-$basename-$module_build_version} errMkzip]
                                     cd $wd
@@ -963,14 +962,14 @@ namespace eval punk::mix::cli {
                                         #archive variant; modpod stubs read both shapes).
                                         puts stderr "zipfs mkzip failed under Tcl [info patchlevel] ($errMkzip) - falling back to punk::zip::mkzip (known pre-c971e6c7c4 Tcl 8.7 zipfs dotfile defect - core tkt 7d5f1c13089d463e7796)"
                                         catch {file delete -- $zipfile} ;#a failed zipfs mkzip can leave a partial target zip - punk::zip::mkzip refuses to overwrite
-                                        punk::zip::mkzip -base $buildfolder -directory $buildfolder/#modpod-$basename-$module_build_version  -- $zipfile *
+                                        punk::zip::mkzip -base $mintfolder -directory $mintfolder/#modpod-$basename-$module_build_version  -- $zipfile *
                                     }
 
                                 } else {
-                                    #use -base $buildfolder so that -directory is included in the archive - the modpod stub relies on this - and extraction would be potentially messy otherwise
+                                    #use -base $mintfolder so that -directory is included in the archive - the modpod stub relies on this - and extraction would be potentially messy otherwise
                                     #put in an archive-level comment to aid in debugging
                                     #punk
-                                    punk::zip::mkzip -base $buildfolder -directory $buildfolder/#modpod-$basename-$module_build_version  -- $zipfile *
+                                    punk::zip::mkzip -base $mintfolder -directory $mintfolder/#modpod-$basename-$module_build_version  -- $zipfile *
                                     #punk::zip::mkzip stores permissions - (unix style) - which zipfs mkzip doesn't
                                     #Directory ident in zipfs relies on folders ending with trailing slash - if missing, it misidentifies dirs as files.
                                     #(ie it can't use permissions/attributes alone to determine directory vs file)
@@ -1078,8 +1077,8 @@ namespace eval punk::mix::cli {
                             set module_build_version $tmfile_versionsegment
                         }
 
-                        set buildfolder $current_source_dir/_build
-                        file mkdir $buildfolder
+                        set mintfolder $current_source_dir/_mint
+                        file mkdir $mintfolder
                         # -- ---
                         set config [dict create {*}{
                             -glob       *
@@ -1089,12 +1088,12 @@ namespace eval punk::mix::cli {
 
                         # -max-depth -1 for no limit
                         set build_installername tarjars_in_$current_source_dir
-                        set build_installer [punkcheck::installtrack new $build_installername $buildfolder/.punkcheck]
-                        $build_installer set_source_target $current_source_dir/$modpath $buildfolder
+                        set build_installer [punkcheck::installtrack new $build_installername $mintfolder/.punkcheck]
+                        $build_installer set_source_target $current_source_dir/$modpath $mintfolder
                         set build_event [$build_installer start_event $config]
                         # -- ---
-                        set podtree_copy $buildfolder/#tarjar-$basename-$module_build_version
-                        set modulefile $buildfolder/$basename-$module_build_version.tm
+                        set podtree_copy $mintfolder/#tarjar-$basename-$module_build_version
+                        set modulefile $mintfolder/$basename-$module_build_version.tm
 
 
                         $build_event targetset_init INSTALL $podtree_copy
@@ -1110,12 +1109,12 @@ namespace eval punk::mix::cli {
                             if {$did_skip} {set did_skip 0; puts -nonewline stdout \n}
 
                             set delete_failed 0
-                            if {[file exists $buildfolder/]} {
-                                puts stderr "deleting existing _build copy at $podtree_copy"
+                            if {[file exists $mintfolder/]} {
+                                puts stderr "deleting existing _mint copy at $podtree_copy"
                                 if {[catch {
                                     file delete -force $podtree_copy
                                     } errMsg]} {
-                                    puts stderr "[punk::ansi::a+ red]deletion of _build copy at $podtree_copy failed: $errMsg[punk::ansi::a]"
+                                    puts stderr "[punk::ansi::a+ red]deletion of _mint copy at $podtree_copy failed: $errMsg[punk::ansi::a]"
                                     set delete_failed 1
                                 }
                             }
@@ -1126,7 +1125,7 @@ namespace eval punk::mix::cli {
                                 puts stdout "$podtree_copy"
                                 file copy $current_source_dir/$modpath $podtree_copy
                                 if {$tmfile_versionsegment eq $magicversion} {
-                                    set tmfile $buildfolder/#tarjar-$basename-$module_build_version/#tarjar-loadscript-$basename.tcl
+                                    set tmfile $mintfolder/#tarjar-$basename-$module_build_version/#tarjar-loadscript-$basename.tcl
                                     #we don't need to modify version or name of the loadscript
                                     if {![file exists $tmfile]} {
                                         set had_error 1
@@ -1150,16 +1149,16 @@ namespace eval punk::mix::cli {
                                 #delete and regenerate .tm
                                 set notes [list]
                                 if {[catch {
-                                    file delete $buildfolder/$basename-$module_build_version.tm
+                                    file delete $mintfolder/$basename-$module_build_version.tm
                                 } err]} {
                                     set had_error 1
                                     lappend notes "tm_delete_failed"
                                 }
                                 #create ordinary tar file without using external executable
                                 package require tar ;#tcllib
-                                set tarfile $buildfolder/$basename-$module_build_version.tm ;#ordinary tar file (no compression - store)
+                                set tarfile $mintfolder/$basename-$module_build_version.tm ;#ordinary tar file (no compression - store)
                                 set wd [pwd]
-                                cd $buildfolder
+                                cd $mintfolder
                                 puts "tar::create $tarfile #tarjar-$basename-$module_build_version"
                                 if {[catch {
                                     tar::create $tarfile #tarjar-$basename-$module_build_version
@@ -1269,23 +1268,23 @@ namespace eval punk::mix::cli {
                                 #} else {
 
                                 #}
-                                ##REVIEW - should be in same structure/depth as $target_module_dir  in _build?
+                                ##REVIEW - should be in same structure/depth as $target_module_dir  in _mint?
 
                                 ##TODO
-                                #set buildfolder $current_sourcedir/_build
-                                #file mkdir $buildfolder
+                                #set mintfolder $current_sourcedir/_mint
+                                #file mkdir $mintfolder
 
-                                #set tmfile $buildfolder/$basename-$module_build_version.tm
-                                #file delete -force $buildfolder/#tarjar-$basename-$module_build_version
+                                #set tmfile $mintfolder/$basename-$module_build_version.tm
+                                #file delete -force $mintfolder/#tarjar-$basename-$module_build_version
                                 #file delete -force $tmfile
 
 
-                                #file copy -force $current_source_dir/#tarjar-$basename-$magicversion $buildfolder/#tarjar-$basename-$module_build_version
+                                #file copy -force $current_source_dir/#tarjar-$basename-$magicversion $mintfolder/#tarjar-$basename-$module_build_version
                                 ##
                                 ##bsdtar doesn't seem to work.. or I haven't worked out the right options?
-                                ##exec tar -cvf $buildfolder/$basename-$module_build_version.tm $buildfolder/#tarjar-$basename-$module_build_version
+                                ##exec tar -cvf $mintfolder/$basename-$module_build_version.tm $mintfolder/#tarjar-$basename-$module_build_version
                                 #package require tar
-                                #tar::create $tmfile $buildfolder/#tarjar-$basename-$module_build_version
+                                #tar::create $tmfile $mintfolder/#tarjar-$basename-$module_build_version
                                 #if {![file exists $tmfile]} {
                                 #    puts stdout "ERROR: failed to build tarjar file $tmfile"
                                 #    exit 4
@@ -1664,6 +1663,6 @@ namespace eval punk::mix::cli {
 ##  Ready
 package provide punk::mix::cli [namespace eval punk::mix::cli {
     variable version
-    set version 0.5.2
+    set version 0.6.0
 }]
 return
diff --git a/src/bootsupport/modules/punk/mix/templates-0.2.0.tm b/src/bootsupport/modules/punk/mix/templates-0.2.0.tm
index 0a9395e2..13fb1158 100644
Binary files a/src/bootsupport/modules/punk/mix/templates-0.2.0.tm and b/src/bootsupport/modules/punk/mix/templates-0.2.0.tm differ
diff --git a/src/bootsupport/modules/punkboot/utils-0.6.0.tm b/src/bootsupport/modules/punkboot/utils-0.6.2.tm
similarity index 98%
rename from src/bootsupport/modules/punkboot/utils-0.6.0.tm
rename to src/bootsupport/modules/punkboot/utils-0.6.2.tm
index 43372880..da683f94 100644
--- a/src/bootsupport/modules/punkboot/utils-0.6.0.tm
+++ b/src/bootsupport/modules/punkboot/utils-0.6.2.tm
@@ -7,7 +7,7 @@
 # (C) 2023
 #
 # @@ Meta Begin
-# Application punkboot::utils 0.6.0
+# Application punkboot::utils 0.6.2
 # Meta platform     tcl
 # Meta license      BSD
 # @@ Meta End
@@ -126,7 +126,7 @@ namespace eval punkboot::utils {
                 -help\
                     "Walks up from path to the nearest fossil and/or git root and
                     returns warning lines describing uncommitted changes.
-                    Artifacts built from a dirty source tree have no committed
+                    Artifacts produced from a dirty source tree have no committed
                     provenance - callers such as make.tcl vendorupdate use this
                     to flag source projects that should be committed first.
 
@@ -206,7 +206,7 @@ namespace eval punkboot::utils {
                     lappend flines $line
                 }
                 if {[llength $flines]} {
-                    lappend warnings "WARNING: ${label}source project at $fossilroot has uncommitted fossil changes${scopedesc} ([llength $flines] file(s)) - artifacts built from a dirty tree have no committed provenance"
+                    lappend warnings "WARNING: ${label}source project at $fossilroot has uncommitted fossil changes${scopedesc} ([llength $flines] file(s)) - artifacts produced from a dirty tree have no committed provenance"
                 }
             }
             cd $original_cwd
@@ -222,7 +222,7 @@ namespace eval punkboot::utils {
             } errM]} {
                 lappend warnings "WARNING: ${label}could not determine git state of source project at $gitroot ($errM)"
             } elseif {$gchanges ne ""} {
-                lappend warnings "WARNING: ${label}source project at $gitroot has uncommitted git changes${scopedesc} ([llength [split $gchanges \n]] file(s)) - artifacts built from a dirty tree have no committed provenance"
+                lappend warnings "WARNING: ${label}source project at $gitroot has uncommitted git changes${scopedesc} ([llength [split $gchanges \n]] file(s)) - artifacts produced from a dirty tree have no committed provenance"
             }
         }
         return $warnings
@@ -749,7 +749,7 @@ namespace eval punkboot::utils {
                     punkshell bake pipeline emits ARCHIVE-relative payloads by
                     construction; this probe makes that a checked contract - a
                     'file' result is the pipeline-regression signal make.tcl
-                    surfaces as a recapped BUILD-WARNING (advisory: the kit still
+                    surfaces as a recapped BAKE-WARNING (advisory: the kit still
                     builds and deploys). 'plain' (the file is a bare zip), 'none'
                     (no zip attached - e.g the metakit kit shape, or any non-zip
                     file) and 'unreadable' are silence, not warnings: the pin
@@ -805,8 +805,8 @@ namespace eval ::punk::args::register {
 ##  Ready
 package provide punkboot::utils [tcl::namespace::eval punkboot::utils {
     variable version
-    #- this version number, exactly 0.6.0, is a literal used in src module folders
+    #- this version number, exactly 0.6.2, is a literal used in src module folders
     #- we refer to this sometimes as the magic version number
-    set version 0.6.0
+    set version 0.6.2
 }]
 return
diff --git a/src/bootsupport/modules/voo-1.0.0.tm b/src/bootsupport/modules/voo-1.0.0.tm
index a70a19be..64262b07 100644
--- a/src/bootsupport/modules/voo-1.0.0.tm
+++ b/src/bootsupport/modules/voo-1.0.0.tm
@@ -1,768 +1,768 @@
-
-#https://github.com/AlaoPrado/voo
-#License: MIT
-
-namespace eval voo {
-    # package version
-    variable version 1.0.0
-    variable handlerToObjectMap {}
-    variable handlerCounter 0
-
-
-    ##\brief Check if a namespace is a valid voo class
-    # \param[in] namespaceName the namespace to check
-    # \return 1 if valid voo class, 0 otherwise
-    proc isVooClass {namespaceName} {
-        if {![uplevel [list namespace exists $namespaceName]]} {
-            return 0
-        }
-        return [expr {[uplevel [list namespace eval $namespaceName {
-            info exists __defaultObj
-        }]]}]
-    }
-
-    ##\brief Declare a new voo class namespace and process its class body
-    # \param[in] args Arguments for class declaration: <className> <body> and optional -extends parent
-    # \note Creates the class namespace, imports parent fields/methods when using -extends,
-    # and registers constructors and exports
-    proc class {args} {
-        set optDict {}
-        set defaultArgs {}
-        set numArgs [llength $args]
-        for {set i 0} {$i < $numArgs} {incr i} {
-        set arg [lindex $args $i]
-        if {$arg eq "-extends"} {
-        if {$i + 1 >= $numArgs} {
-        error "Constructor option ’$arg’ requires an argument"
-        }
-        dict set optDict $arg [lindex $args [incr i]]
-        } elseif {$arg eq "-virtual" || $arg eq "-v"} {
-            dict set optDict "-virtual" {}
-        } else {
-            lappend defaultArgs $arg
-        }
-        }
-        lassign $defaultArgs className body
-        set vooNs [namespace current]
-        # create the namespace for the class
-        uplevel [list namespace eval $className [subst -nocommands {
-            namespace path [list $vooNs]
-            variable __defaultObj {}
-            variable __fields {}
-            variable __tmp_isPublicEnabled 1
-        }]]
-
-        uplevel [list namespace eval $className {
-            ##\brief Access default object for this class
-            # \return Default class instance (list)
-            # \note Used for inheritance and constructor defaults
-            proc class.defaultObj {} {
-                variable __defaultObj
-                return $__defaultObj
-            }
-            ##\brief Get list of field names for this class
-            # \return List of field names in declaration order
-            # \note Useful for introspection and constructor -name new.args
-            proc class.fields {} {
-                variable __fields
-                return $__fields
-            }
-        }]
-
-        if {[dict exists $optDict -virtual] && [dict exists $optDict -extends]} {
-            error "voo::class: cannot use -virtual with -extends; child classes inherit virtual automatically from a -virtual parent"
-        }
-
-        if {[dict exists $optDict -virtual]} {
-            set normalizedClassName [uplevel [list namespace eval $className {namespace current}]]
-            uplevel [list namespace eval $className [list variable __voo_is_virtual_class 1]]
-            uplevel [list namespace eval $className [list variable __voo_class_namespace $normalizedClassName]]
-            # Pre-populate __defaultObj with namespace tag at index 0 BEFORE field declarations
-            # so that _getClassCurrNumFields returns 1 for the first field declared
-            uplevel [list namespace eval $className [list set __defaultObj [list $normalizedClassName]]]
-        }
-
-        #81
-        # variable __parentClassNamespace {}
-        if {[dict exists $optDict -extends]} {
-            set parentClassName [dict get $optDict -extends]
-            
-            if {![uplevel [list namespace exists $parentClassName]]} {
-                error "Parent class ’$parentClassName’ does not exist."
-            }
-
-            # check if parent class exists
-            if {![uplevel [list namespace eval $parentClassName {info exists __defaultObj}]]} {
-                error "Parent class ’$parentClassName’ is not a valid voo class."
-            }
-
-            # normalize namespace name of parent class
-            set parentClassName [uplevel [list namespace eval $parentClassName {
-                namespace current
-            }]]
-
-            uplevel [list namespace eval $className [subst -nocommands {
-                variable __parentClassNamespace $parentClassName
-            }]]
-
-            # import parent’s default object values
-            set parentDefaultObj [${parentClassName}::class.defaultObj]
-            uplevel [list namespace eval $className [list set __defaultObj $parentDefaultObj]]
-
-
-            # if parent is virtual, update namespace tag at index 0 to child’s namespace
-            set parentIsVirtual [uplevel [list namespace eval $parentClassName {info exists __voo_is_virtual_class}]]
-            if {$parentIsVirtual} {
-                set normalizedChildName [uplevel [list namespace eval $className {namespace current}]]
-                uplevel [list namespace eval $className \
-                    [list set __defaultObj [lreplace $parentDefaultObj 0 0 $normalizedChildName]]]
-                uplevel [list namespace eval $className [list variable __voo_is_virtual_class 1]]
-                uplevel [list namespace eval $className [list variable __voo_class_namespace $normalizedChildName]]
-            }
-
-            # 121
-            # import parent’s field index variables by copying actual index values from parent
-            set parentFields [${parentClassName}::class.fields]
-            foreach field $parentFields {
-                set fieldIdx [uplevel [list namespace eval $parentClassName [list set $field]]]
-                uplevel [list namespace eval $className [list variable $field $fieldIdx]]
-                uplevel [list namespace eval $className [list lappend __fields $field]]
-            }
-
-            # import parent’s acessors in child class with namespace import
-            uplevel [list namespace eval $className [subst -nocommands {
-                namespace import ${parentClassName}::get.*
-                namespace import ${parentClassName}::set.*
-                namespace import ${parentClassName}::update.*
-            }]]
-        }
-
-
-        # 136
-
-        uplevel [list namespace eval $className $body]
-
-        uplevel [list namespace eval $className {
-            if {[info commands new] eq ""} {
-                constructor
-            }
-            if {[info commands new()] eq ""} {
-                constructor -noargs [_buildConstructorNoArgsBody]
-            }
-            if {[info commands new.args] eq ""} {
-                constructor -name new.args {args} [_buildConstructorArgsBody]
-            }
-        }]
-
-
-        # 151
-        uplevel [list namespace eval $className {
-            # export class methods
-            namespace export *
-        }]
-
-        uplevel [list namespace eval $className {
-            # clean temporary variable
-            unset __tmp_isPublicEnabled
-        }]
-        return
-    }
-
-    # 161
-    ##\brief Return the default value for a given field type
-    # \param[in] type the field type token (double,int,bool,...)
-    # \return The default value appropriate for the type
-    proc _getDefaultValueByType {type} {
-        switch -- $type {
-            double { return 0.0 }
-            int { return 0 }
-            bool { return 0 }
-            default { return {} }
-        }
-    }
-
-    ##\brief Get the current number of fields declared in the current class
-    # \return Number of fields (integer)
-    proc _getClassCurrNumFields {} {
-        return [uplevel 2 {llength $__defaultObj}]
-    }
-
-    ##\brief Check whether public mode is enabled during class body parsing
-    # \return 1 if public mode is enabled, 0 otherwise
-    proc _getClassIsPublicEnabled {} {
-        return [uplevel 2 {set __tmp_isPublicEnabled}]
-    }
-
-    ##\brief Declare getter/setter/updater accessors for a class field
-    # \param[in] fieldName name of the field
-    # \param[in] isPublic boolean whether accessors are public
-    # \param[in] isStatic boolean whether field is static (class-level)
-    proc _declareFieldAcessors {fieldName isPublic isStatic} {
-        set prefix {}
-
-        if {$isStatic} {
-            append prefix class.
-        }
-        if {!$isPublic} {
-            append prefix my.
-        }
-        set getterName "${prefix}get.$fieldName"
-        set setterName "${prefix}set.$fieldName"
-        set updaterName "${prefix}update.$fieldName"
-        if {$isStatic} {
-            uplevel 2 [list proc $getterName {} [subst -nocommands {
-                variable $fieldName
-                return $$fieldName
-            }]]
-            uplevel 2 [list proc $setterName {value} [subst -nocommands {
-                variable $fieldName
-                set $fieldName "\$value"
-            }]]
-
-            uplevel 2 [list proc $updaterName {tempVar body} [subst -nocommands {
-                variable $fieldName
-                upvar "\$tempVar" temp
-                set temp $$fieldName
-                # break link with class variable to avoid copy-on-write
-                set $fieldName {}
-                try {
-                    uplevel \$body
-                } finally {
-                    set $fieldName "\$temp"
-                }
-            }]]
-
-        } else {
-            uplevel 2 [list getter $getterName $fieldName]
-            uplevel 2 [list setter $setterName $fieldName]
-            uplevel 2 [list updater $updaterName $fieldName]
-        }
-        return
-    }
-
-    ##\brief Validate a field name for illegal characters
-    # \param[in] fieldName the field name to validate
-    # \return Raises an error if invalid
-    proc _validateFieldName {fieldName} {
-        if {[string first "." $fieldName] != -1 || [string first "::" $fieldName] != -1} {
-            error "Field name ’$fieldName’ cannot contain ’.’ or ’::’ substrings."
-        }
-    }
-
-    ##\brief Ensure a field name does not already exist in the class
-    # \param[in] fieldName the field name to check
-    # \return Raises an error if the field already exists
-    # \note Uses __fields for instance fields and fully-qualified namespace lookup for static
-    # fields to avoid false positives from global variables with the same name
-    proc _validateFieldDoesNotExist {fieldName} {
-        # Check instance fields tracked in __fields (class-scoped, no global bleed)
-        if {$fieldName in [uplevel 2 {set __fields}]} {
-            error "Field name ’$fieldName’ already exists in the class."
-        }
-        # Check static fields via fully-qualified namespace variable; info exists ::Ns::var
-        # only matches that exact namespace variable, never a same-named global
-        set classNs [uplevel 2 {namespace current}]
-        if {[info exists ${classNs}::$fieldName]} {
-            error "Field name ’$fieldName’ already exists in the class."
-        }
-    }
-
-    ##\brief Validate a variable initial value according to its declared type
-    # \param[in] type the declared type (double,int,bool,list,dict)
-    # \param[in] value the value to validate
-    # \return Raises an error if the value does not match the type
-    proc _validateVarValueByType {type value} {
-        switch -- $type {
-            double {
-                if {[string is double -strict $value] == 0} {
-                    error "Value for t_double must be a double, got ’$value’"
-                }
-            }
-            int {
-                if {[string is integer -strict $value] == 0} {
-                    error "Value for t_int must be an integer, got ’$value’"
-                }
-            }
-            bool {
-                if {[string is boolean -strict $value] == 0} {
-                    error "Value for t_bool must be a boolean, got ’$value’"
-                }
-            }
-            list {
-                if {[catch {llength $value}]} {
-                    error "Value for t_list must be a list, got ’$value’"
-                }
-            }
-            dict {
-                if {[catch {dict size $value}]} {
-                    error "Value for t_dict must be a dict, got ’$value’"
-                }
-            }
-        }
-    }
-
-    ##\brief Declare a field variable inside the class body
-    # \param[in] type the field type token (double,int,string,bool,list,dict,obj)
-    # \param[in] argList arguments: ?-static? <name> ?<initialValue>?
-    proc _var {type argList} {
-        set defaultArgs {}
-        set optDict {}
-        set numArgs [llength $argList]
-        for {set i 0} {$i < $numArgs} {incr i} {
-            set arg [lindex $argList $i]
-            if {$arg eq "-static"} {
-                dict set optDict $arg {}
-            } else {
-                lappend defaultArgs $arg
-            }
-        }
-        if {[llength $defaultArgs] == 0} {
-            error "Variable definition requires: ?<option>? <name> ?<initialValue>?"
-        }
-        if {[llength $defaultArgs] == 2} {
-            lassign $defaultArgs name initVal
-        } else {
-            lassign $defaultArgs name
-            set initVal [_getDefaultValueByType $type]
-        }
-
-        _validateFieldName $name
-        _validateFieldDoesNotExist $name
-        _validateVarValueByType $type $initVal
-        if {[dict exists $optDict -static]} {
-            # static field
-            uplevel [list variable $name $initVal]
-        } else {
-            set currNumFields [_getClassCurrNumFields]
-            uplevel [list variable $name $currNumFields]
-            uplevel [list lappend __defaultObj $initVal]
-            uplevel [list lappend __fields $name]
-        }
-        set isPublicEnabled [_getClassIsPublicEnabled]
-        _declareFieldAcessors $name $isPublicEnabled [dict exists $optDict -static]
-        return
-    }
-    # 341
-
-    ##\brief Declare a double-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc double_t {args} {
-        uplevel [list _var "double" $args]
-    }
-
-    ##\brief Declare an integer-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc int_t {args} {
-        uplevel [list _var "int" $args]
-    }
-
-    ##\brief Declare a string-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc string_t {args} {
-        uplevel [list _var "string" $args]
-    }
-
-    ##\brief Declare a boolean-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc bool_t {args} {
-        uplevel [list _var "bool" $args]
-    }
-
-    ##\brief Declare a list-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc list_t {args} {
-        uplevel [list _var "list" $args]
-    }
-    
-    ##\brief Declare a dict-typed field
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc dict_t {args} {
-        uplevel [list _var "dict" $args]
-    }
-
-    ##\brief Declare an object-typed field (nested vanilla object)
-    # \param[in] args same arguments accepted by _var (name and optional initial value)
-    proc obj_t {args} {
-        uplevel [list _var "object" $args]
-    }
-
-    # 386
-    ##\brief Enable public mode for declarations inside the provided body
-    # \param[in] body script to execute with public accessors enabled
-    # \return Result of executing body
-    proc public {body} {
-        uplevel $body
-    }
-
-    ##\brief Execute the provided body with private mode enabled (temporarily disables public accessors)
-    # \param[in] body script to execute with private accessors
-    # \return Result of executing body
-    proc private {body} {
-        uplevel {variable __tmp_isPublicEnabled 0}
-        try {
-            uplevel $body
-        } finally {
-            uplevel {variable __tmp_isPublicEnabled 1}
-        }
-    }
-
-    ##\brief Build the body for a no-argument constructor
-    # \return A script chunk used as constructor body that returns the class default object
-    proc _buildConstructorNoArgsBody {} {
-        return {
-            variable __defaultObj
-            return $__defaultObj;
-        }
-    }
-
-    ##\brief Build the body for a constructor that accepts named args (-field value pairs)
-    # \return A script chunk used as constructor body that applies named arguments to the default object
-    proc _buildConstructorArgsBody {} {
-        return {
-            variable __defaultObj
-            set obj $__defaultObj
-            if {[catch {dict size $args}]} {
-                error "Constructor argument must be a list of ’-<field> <value>’ pairs"
-            }
-            dict for {key value} $args {
-                if {[string index $key 0] ne "-"} {
-                    error "Constructor argument keys must start with ’-’, got ’$key’"
-                }
-                set field [string range $key 1 end]
-                set setter set.$field
-                if {[info commands $setter] ne ""} {
-                    $setter obj $value
-                } else {
-                    set setter my.set.$field
-                    if {[info commands $setter] ne ""} {
-                        $setter obj $value
-                    } else {
-                        error "Unknown field option: $field"
-                    }
-                }
-            }
-            return $obj
-        }
-    }
-
-    ##\brief Build constructor parameter list and body for positional constructors
-    # \return A list of two elements: argument names list and a body script that returns them as a list
-    # \note For virtual classes, the concrete class namespace is embedded as a literal string at
-    # class-definition time (not looked up at runtime), producing:
-    # return [list ::ClassName $f1 $f2 ...]
-    # This avoids all runtime proc calls (class.defaultObj, set.*) and variable lookups,
-    # making virtual object creation as cheap as non-virtual.
-    proc _buildConstructorParams {} {
-        set argList [uplevel 2 {set __fields}]
-        set isVirtual [uplevel 2 {info exists __voo_is_virtual_class}]
-        set spacedArgVarListStr {}
-        foreach arg $argList {
-            append spacedArgVarListStr "\$$arg "
-        }
-        if {$isVirtual} {
-            # Read the normalized class namespace at definition time so subst embeds it
-            # as a literal in the generated body - no runtime variable lookup required.
-            set classNs [uplevel 2 {set __voo_class_namespace}]
-            set spacedArgVarListStr "{$classNs} $spacedArgVarListStr"
-            set body [subst -nocommands {
-                return [list $spacedArgVarListStr]
-            }]
-        } else {
-            set body [subst -nocommands {
-                return [list $spacedArgVarListStr]
-            }]
-        }
-        return [list $argList $body]
-    }
-
-    ##\brief Define a constructor for the current class
-    # \param[in] args Constructor declaration options and body
-    # \note Supports -name, -noargs and -typed variants
-    proc constructor {args} {
-        set defaultArgs {}
-        set optDict {}
-        set numArgs [llength $args]
-        for {set i 0} {$i < $numArgs} {incr i} {
-            set arg [lindex $args $i]
-            if {$arg eq "-name" || $arg eq "-noargs" || $arg eq "-typed"} {
-                if {$i + 1 >= $numArgs} {
-                    error "Constructor option ’$arg’ requires an argument"
-                }
-                dict set optDict $arg [lindex $args [incr i]]
-            } else {
-                lappend defaultArgs $arg
-            }
-        }
-        # check valid option combinations
-        if {[dict exists $optDict -name]} {
-            if {[dict exists $optDict -noargs] || [dict exists $optDict -typed]} {
-                error "Constructor cannot have -name option with -noargs or -typed options"
-            }
-        }
-        if {[dict exists $optDict -noargs] && [dict exists $optDict -typed]} {
-            error "Constructor cannot have both -noargs and -typed options"
-        }
-        if {[dict exists $optDict -name]} {
-            set constructorName [dict get $optDict -name]
-        } elseif {[dict exists $optDict -noargs]} {
-            set constructorName "new()"
-        } elseif {[dict exists $optDict -typed]} {
-            set constructorName "new([join [dict get $optDict -typed] ,])"
-        } else {
-            set constructorName "new"
-        }
-        if {[dict exists $optDict -noargs]} {
-            if {[llength $defaultArgs] != 0} {
-                error "Invalid constructor definition, expected ’?...? ?<body>?’ for -noargs"
-            }
-            set argList {}
-            set body [dict get $optDict -noargs]
-        } else {
-            if {[llength $defaultArgs] == 0} {
-                lassign [_buildConstructorParams] argList body
-            } else {
-            if {[llength $defaultArgs] != 2} {
-                error "Invalid constructor definition, expected ’?...? ?<argList> <body>?’"
-            }
-            lassign $defaultArgs argList body
-            }
-        }
-        uplevel [list proc $constructorName $argList $body]
-        return
-    }
-
-
-# 531
-    ##\brief Generate a getter procedure for a field
-    # \param[in] methodName name of the generated getter (may include namespace prefix)
-    # \param[in] fieldName name of the field to read
-    proc getter {methodName fieldName} {
-        # implementation of getter definition
-        set fieldIdx [uplevel [list set $fieldName]]
-        uplevel [subst -nocommands {
-            ##\\brief Getter for $fieldName
-            # \\param\[in\] this class instance
-            # \\return $fieldName value
-            proc $methodName {this} {
-                return [lindex \$this $fieldIdx]
-            }
-        }]
-        return
-    }
-
-    ##\brief Generate a setter procedure for a field
-    # \param[in] methodName name of the generated setter (may include namespace prefix)
-    # \param[in] fieldName name of the field to write
-    proc setter {methodName fieldName} {
-        # implementation of setter definition
-        set fieldIdx [uplevel [list set $fieldName]]
-        uplevel [subst -nocommands {
-            ##\\brief Setter for $fieldName
-            # \\param\[in\] thisVar name of variable containing class instance
-            # \\param\[in\] value new value for $fieldName
-            proc $methodName {thisVar value} {
-                upvar \$thisVar this
-                lset this $fieldIdx \$value
-            }
-        }]
-        return
-    }
-
-    ##\brief Generate an updater procedure for a field (copy-on-write safe)
-    # \param[in] methodName name of the generated updater (may include namespace prefix)
-    # \param[in] fieldName name of the field to update by reference
-    # \note The updater detaches the field to avoid unnecessary copying during updates
-    proc updater {methodName fieldName} {
-        # implementation of updater definition
-        set fieldIdx [uplevel [list set $fieldName]]
-        uplevel [subst -nocommands {
-            ##\\brief Update $fieldName by reference
-            # \\param\[in\] thisVar name of variable containing class instance
-            # \\param\[out\] tempVar name of variable to hold $fieldName during update
-            # \\param\[in\] body script to execute with $fieldName in tempVar
-            # \\note Avoids copy-on-write by detaching field during update
-            proc $methodName {thisVar tempVar body} {
-                upvar \$thisVar this
-                upvar \$tempVar temp
-                set temp [lindex \$this $fieldIdx]
-                # break link with object to avoid copy-on-write
-                lset this $fieldIdx {}
-                try {
-                    uplevel \$body
-                } finally {
-                    lset this $fieldIdx \$temp
-                }
-            }
-        }]
-    }
-
-    ##\brief Declare a method in the current class namespace
-    # \param[in] args Method declaration arguments: name, argList, body and options (-static, -upvar, -update, -override)
-    proc method {args} {
-        set isPublicEnabled [_getClassIsPublicEnabled]
-        set defaultArgs {}
-        set optDict {}
-        set numArgs [llength $args]
-        for {set i 0} {$i < $numArgs} {incr i} {
-            set arg [lindex $args $i]
-            if {$arg eq "-static" || $arg eq "-upvar"} {
-                dict set optDict $arg {}
-            } elseif {$arg eq "-update"} {
-                if {$i + 1 >= $numArgs} {
-                    error "Method option ’$arg’ requires an argument"
-                }
-                dict set optDict $arg [lindex $args [incr i]]
-            } elseif {$arg eq "-override"} {
-                # Explicit override indicator
-                dict set optDict $arg {}
-            } elseif {$arg eq "-virtual"} {
-                dict set optDict $arg {}
-            } else {
-                lappend defaultArgs $arg
-            }
-        }
-        lassign $defaultArgs name argList body
-
-        # check valid option combinations
-        if {[dict exists $optDict -static]} {
-            if {[dict exists $optDict -upvar] || [dict exists $optDict -update]} {
-                error "Method cannot have both -static and -upvar or -update options"
-            }
-        }
-        if {[dict exists $optDict -update]} {
-            if {![dict exists $optDict -upvar]} {
-                # automatically add -upvar if -update is specified
-                dict set optDict -upvar {}
-            }
-        }
-        set finalArgList {}
-        set finalBody {}
-        if {[dict exists $optDict -upvar]} {
-            lappend finalArgList "thisVar"
-            append finalBody {
-                upvar $thisVar this
-            }
-        } elseif {![dict exists $optDict -static]} {
-            lappend finalArgList "this"
-        }
-        lappend finalArgList {*}$argList
-        set className [uplevel {namespace current}]
-        if {[dict exists $optDict -update]} {
-            set updateFields [dict get $optDict -update]
-            if {[llength $updateFields] == 0} {
-                error "-update option requires at least one field name"
-            }
-            foreach field $updateFields {
-                try {
-                    set fieldIdx [uplevel [list set $field]]
-                } trap {} {} {
-                    error "Field ’$field’ specified in -update option does not exist in class ’$className’"
-                }
-                append finalBody [subst -nocommands {
-                    set $field [lindex \$this $fieldIdx]
-                    lset this $fieldIdx {}
-                }]
-            }
-            append finalBody "try \{"
-        }
-        append finalBody $body
-        if {[dict exists $optDict -update]} {
-            append finalBody "\} finally \{"
-            foreach field $updateFields {
-                set fieldIdx [uplevel [list set $field]]
-                append finalBody [subst -nocommands {
-                    lset this $fieldIdx \$$field
-                }]
-            }
-            append finalBody "\}"
-        }
-        if {!$isPublicEnabled} {
-            set name "my.$name"
-        }
-        if {[dict exists $optDict -override]} {
-            set parentNs [uplevel {set __parentClassNamespace}]
-            if {[info commands "${parentNs}::$name"] eq ""} {
-                error "Method ’$name’ does not override any method in parent class ’$parentNs’"
-            }
-            # If parent’s method is virtual (has base.<name>), auto-promote this override
-            # to a dispatcher so that deep inheritance dispatch works correctly
-            if {[uplevel {info exists __voo_is_virtual_class}] && \
-                [info commands "${parentNs}::base.$name"] ne ""} {
-                dict set optDict -virtual {}
-            }
-        }
-        if {[dict exists $optDict -virtual]} {
-            if {![uplevel {info exists __voo_is_virtual_class}]} {
-                error "Method ’$name’ is declared -virtual but ’[uplevel {namespace current}]’ is not a virtual class"
-            }
-            if {[dict exists $optDict -upvar] || [dict exists $optDict -update] || [dict exists $optDict -static]} {
-                error "Method ’$name’ cannot combine -virtual with -upvar, -update, or -static"
-            }
-            # Register base.<name> with the original body for direct parent calls from subclasses
-            uplevel [list proc "base.$name" $finalArgList $finalBody]
-            # Build dispatch body: route to concrete class implementation at runtime
-            set dispatchBody "set __voo_cls \[lindex \$this 0\]\n"
-            append dispatchBody "if \{\$__voo_cls ne \[namespace current\] && \[info commands \${__voo_cls}::$name\] ne {}\} \{\n"
-            append dispatchBody " return \[\${__voo_cls}::$name \$this"
-            foreach arg $argList {
-                append dispatchBody " \$$arg"
-            }
-            append dispatchBody "\]\n\}\n"
-            append dispatchBody "return \[base.$name \$this"
-            foreach arg $argList {
-                append dispatchBody " \$$arg"
-            }
-            append dispatchBody "\]"
-            set finalBody $dispatchBody
-        }
-        uplevel [list proc $name $finalArgList $finalBody]
-        return
-    }
-
-
-
-
-
-
-
-
-
-# 726
-
-    ##\brief Import one or more methods from parent class into the current (child) class namespace.
-    # \param[in] methods List of method names (or a single method name) to import from parent.
-    # \note Must be called inside a class declared with -extends. Methods are copied at class-definition time.
-    proc importMethods {methods} {
-        set parentNs [uplevel {set __parentClassNamespace}]
-        # Validate caller context and get parent namespace stored by -extends handling
-        if {$parentNs eq ""} {
-            error "importMethods can only be used inside a class declared with -extends"
-        }
-        # Normalize to a list of method names
-        if {[string length [string trim $methods]] == 0} {
-            return
-        }
-        if {[catch {llength $methods}]} {
-            set methodList [list $methods]
-        } else {
-            set methodList $methods
-        }
-        foreach methodName $methodList {
-            set fullMethodName "${parentNs}::$methodName"
-            # Validate parent method exists
-            if {[info commands $fullMethodName] eq ""} {
-                error "Method ’$methodName’ not found in parent class ’$parentNs’"
-            }
-            # Define a copy in the child namespace so unqualified calls resolve to child
-            set argList [info args $fullMethodName]
-            set body [info body $fullMethodName]
-            uplevel [list proc $methodName $argList $body]
-        }
-        return
-    }
-
-    namespace export *    
-}
-# provide the package
-package provide voo $::voo::version
-
+
+#https://github.com/AlaoPrado/voo
+#License: MIT
+
+namespace eval voo {
+    # package version
+    variable version 1.0.0
+    variable handlerToObjectMap {}
+    variable handlerCounter 0
+
+
+    ##\brief Check if a namespace is a valid voo class
+    # \param[in] namespaceName the namespace to check
+    # \return 1 if valid voo class, 0 otherwise
+    proc isVooClass {namespaceName} {
+        if {![uplevel [list namespace exists $namespaceName]]} {
+            return 0
+        }
+        return [expr {[uplevel [list namespace eval $namespaceName {
+            info exists __defaultObj
+        }]]}]
+    }
+
+    ##\brief Declare a new voo class namespace and process its class body
+    # \param[in] args Arguments for class declaration: <className> <body> and optional -extends parent
+    # \note Creates the class namespace, imports parent fields/methods when using -extends,
+    # and registers constructors and exports
+    proc class {args} {
+        set optDict {}
+        set defaultArgs {}
+        set numArgs [llength $args]
+        for {set i 0} {$i < $numArgs} {incr i} {
+        set arg [lindex $args $i]
+        if {$arg eq "-extends"} {
+        if {$i + 1 >= $numArgs} {
+        error "Constructor option ’$arg’ requires an argument"
+        }
+        dict set optDict $arg [lindex $args [incr i]]
+        } elseif {$arg eq "-virtual" || $arg eq "-v"} {
+            dict set optDict "-virtual" {}
+        } else {
+            lappend defaultArgs $arg
+        }
+        }
+        lassign $defaultArgs className body
+        set vooNs [namespace current]
+        # create the namespace for the class
+        uplevel [list namespace eval $className [subst -nocommands {
+            namespace path [list $vooNs]
+            variable __defaultObj {}
+            variable __fields {}
+            variable __tmp_isPublicEnabled 1
+        }]]
+
+        uplevel [list namespace eval $className {
+            ##\brief Access default object for this class
+            # \return Default class instance (list)
+            # \note Used for inheritance and constructor defaults
+            proc class.defaultObj {} {
+                variable __defaultObj
+                return $__defaultObj
+            }
+            ##\brief Get list of field names for this class
+            # \return List of field names in declaration order
+            # \note Useful for introspection and constructor -name new.args
+            proc class.fields {} {
+                variable __fields
+                return $__fields
+            }
+        }]
+
+        if {[dict exists $optDict -virtual] && [dict exists $optDict -extends]} {
+            error "voo::class: cannot use -virtual with -extends; child classes inherit virtual automatically from a -virtual parent"
+        }
+
+        if {[dict exists $optDict -virtual]} {
+            set normalizedClassName [uplevel [list namespace eval $className {namespace current}]]
+            uplevel [list namespace eval $className [list variable __voo_is_virtual_class 1]]
+            uplevel [list namespace eval $className [list variable __voo_class_namespace $normalizedClassName]]
+            # Pre-populate __defaultObj with namespace tag at index 0 BEFORE field declarations
+            # so that _getClassCurrNumFields returns 1 for the first field declared
+            uplevel [list namespace eval $className [list set __defaultObj [list $normalizedClassName]]]
+        }
+
+        #81
+        # variable __parentClassNamespace {}
+        if {[dict exists $optDict -extends]} {
+            set parentClassName [dict get $optDict -extends]
+            
+            if {![uplevel [list namespace exists $parentClassName]]} {
+                error "Parent class ’$parentClassName’ does not exist."
+            }
+
+            # check if parent class exists
+            if {![uplevel [list namespace eval $parentClassName {info exists __defaultObj}]]} {
+                error "Parent class ’$parentClassName’ is not a valid voo class."
+            }
+
+            # normalize namespace name of parent class
+            set parentClassName [uplevel [list namespace eval $parentClassName {
+                namespace current
+            }]]
+
+            uplevel [list namespace eval $className [subst -nocommands {
+                variable __parentClassNamespace $parentClassName
+            }]]
+
+            # import parent’s default object values
+            set parentDefaultObj [${parentClassName}::class.defaultObj]
+            uplevel [list namespace eval $className [list set __defaultObj $parentDefaultObj]]
+
+
+            # if parent is virtual, update namespace tag at index 0 to child’s namespace
+            set parentIsVirtual [uplevel [list namespace eval $parentClassName {info exists __voo_is_virtual_class}]]
+            if {$parentIsVirtual} {
+                set normalizedChildName [uplevel [list namespace eval $className {namespace current}]]
+                uplevel [list namespace eval $className \
+                    [list set __defaultObj [lreplace $parentDefaultObj 0 0 $normalizedChildName]]]
+                uplevel [list namespace eval $className [list variable __voo_is_virtual_class 1]]
+                uplevel [list namespace eval $className [list variable __voo_class_namespace $normalizedChildName]]
+            }
+
+            # 121
+            # import parent’s field index variables by copying actual index values from parent
+            set parentFields [${parentClassName}::class.fields]
+            foreach field $parentFields {
+                set fieldIdx [uplevel [list namespace eval $parentClassName [list set $field]]]
+                uplevel [list namespace eval $className [list variable $field $fieldIdx]]
+                uplevel [list namespace eval $className [list lappend __fields $field]]
+            }
+
+            # import parent’s acessors in child class with namespace import
+            uplevel [list namespace eval $className [subst -nocommands {
+                namespace import ${parentClassName}::get.*
+                namespace import ${parentClassName}::set.*
+                namespace import ${parentClassName}::update.*
+            }]]
+        }
+
+
+        # 136
+
+        uplevel [list namespace eval $className $body]
+
+        uplevel [list namespace eval $className {
+            if {[info commands new] eq ""} {
+                constructor
+            }
+            if {[info commands new()] eq ""} {
+                constructor -noargs [_buildConstructorNoArgsBody]
+            }
+            if {[info commands new.args] eq ""} {
+                constructor -name new.args {args} [_buildConstructorArgsBody]
+            }
+        }]
+
+
+        # 151
+        uplevel [list namespace eval $className {
+            # export class methods
+            namespace export *
+        }]
+
+        uplevel [list namespace eval $className {
+            # clean temporary variable
+            unset __tmp_isPublicEnabled
+        }]
+        return
+    }
+
+    # 161
+    ##\brief Return the default value for a given field type
+    # \param[in] type the field type token (double,int,bool,...)
+    # \return The default value appropriate for the type
+    proc _getDefaultValueByType {type} {
+        switch -- $type {
+            double { return 0.0 }
+            int { return 0 }
+            bool { return 0 }
+            default { return {} }
+        }
+    }
+
+    ##\brief Get the current number of fields declared in the current class
+    # \return Number of fields (integer)
+    proc _getClassCurrNumFields {} {
+        return [uplevel 2 {llength $__defaultObj}]
+    }
+
+    ##\brief Check whether public mode is enabled during class body parsing
+    # \return 1 if public mode is enabled, 0 otherwise
+    proc _getClassIsPublicEnabled {} {
+        return [uplevel 2 {set __tmp_isPublicEnabled}]
+    }
+
+    ##\brief Declare getter/setter/updater accessors for a class field
+    # \param[in] fieldName name of the field
+    # \param[in] isPublic boolean whether accessors are public
+    # \param[in] isStatic boolean whether field is static (class-level)
+    proc _declareFieldAcessors {fieldName isPublic isStatic} {
+        set prefix {}
+
+        if {$isStatic} {
+            append prefix class.
+        }
+        if {!$isPublic} {
+            append prefix my.
+        }
+        set getterName "${prefix}get.$fieldName"
+        set setterName "${prefix}set.$fieldName"
+        set updaterName "${prefix}update.$fieldName"
+        if {$isStatic} {
+            uplevel 2 [list proc $getterName {} [subst -nocommands {
+                variable $fieldName
+                return $$fieldName
+            }]]
+            uplevel 2 [list proc $setterName {value} [subst -nocommands {
+                variable $fieldName
+                set $fieldName "\$value"
+            }]]
+
+            uplevel 2 [list proc $updaterName {tempVar body} [subst -nocommands {
+                variable $fieldName
+                upvar "\$tempVar" temp
+                set temp $$fieldName
+                # break link with class variable to avoid copy-on-write
+                set $fieldName {}
+                try {
+                    uplevel \$body
+                } finally {
+                    set $fieldName "\$temp"
+                }
+            }]]
+
+        } else {
+            uplevel 2 [list getter $getterName $fieldName]
+            uplevel 2 [list setter $setterName $fieldName]
+            uplevel 2 [list updater $updaterName $fieldName]
+        }
+        return
+    }
+
+    ##\brief Validate a field name for illegal characters
+    # \param[in] fieldName the field name to validate
+    # \return Raises an error if invalid
+    proc _validateFieldName {fieldName} {
+        if {[string first "." $fieldName] != -1 || [string first "::" $fieldName] != -1} {
+            error "Field name ’$fieldName’ cannot contain ’.’ or ’::’ substrings."
+        }
+    }
+
+    ##\brief Ensure a field name does not already exist in the class
+    # \param[in] fieldName the field name to check
+    # \return Raises an error if the field already exists
+    # \note Uses __fields for instance fields and fully-qualified namespace lookup for static
+    # fields to avoid false positives from global variables with the same name
+    proc _validateFieldDoesNotExist {fieldName} {
+        # Check instance fields tracked in __fields (class-scoped, no global bleed)
+        if {$fieldName in [uplevel 2 {set __fields}]} {
+            error "Field name ’$fieldName’ already exists in the class."
+        }
+        # Check static fields via fully-qualified namespace variable; info exists ::Ns::var
+        # only matches that exact namespace variable, never a same-named global
+        set classNs [uplevel 2 {namespace current}]
+        if {[info exists ${classNs}::$fieldName]} {
+            error "Field name ’$fieldName’ already exists in the class."
+        }
+    }
+
+    ##\brief Validate a variable initial value according to its declared type
+    # \param[in] type the declared type (double,int,bool,list,dict)
+    # \param[in] value the value to validate
+    # \return Raises an error if the value does not match the type
+    proc _validateVarValueByType {type value} {
+        switch -- $type {
+            double {
+                if {[string is double -strict $value] == 0} {
+                    error "Value for t_double must be a double, got ’$value’"
+                }
+            }
+            int {
+                if {[string is integer -strict $value] == 0} {
+                    error "Value for t_int must be an integer, got ’$value’"
+                }
+            }
+            bool {
+                if {[string is boolean -strict $value] == 0} {
+                    error "Value for t_bool must be a boolean, got ’$value’"
+                }
+            }
+            list {
+                if {[catch {llength $value}]} {
+                    error "Value for t_list must be a list, got ’$value’"
+                }
+            }
+            dict {
+                if {[catch {dict size $value}]} {
+                    error "Value for t_dict must be a dict, got ’$value’"
+                }
+            }
+        }
+    }
+
+    ##\brief Declare a field variable inside the class body
+    # \param[in] type the field type token (double,int,string,bool,list,dict,obj)
+    # \param[in] argList arguments: ?-static? <name> ?<initialValue>?
+    proc _var {type argList} {
+        set defaultArgs {}
+        set optDict {}
+        set numArgs [llength $argList]
+        for {set i 0} {$i < $numArgs} {incr i} {
+            set arg [lindex $argList $i]
+            if {$arg eq "-static"} {
+                dict set optDict $arg {}
+            } else {
+                lappend defaultArgs $arg
+            }
+        }
+        if {[llength $defaultArgs] == 0} {
+            error "Variable definition requires: ?<option>? <name> ?<initialValue>?"
+        }
+        if {[llength $defaultArgs] == 2} {
+            lassign $defaultArgs name initVal
+        } else {
+            lassign $defaultArgs name
+            set initVal [_getDefaultValueByType $type]
+        }
+
+        _validateFieldName $name
+        _validateFieldDoesNotExist $name
+        _validateVarValueByType $type $initVal
+        if {[dict exists $optDict -static]} {
+            # static field
+            uplevel [list variable $name $initVal]
+        } else {
+            set currNumFields [_getClassCurrNumFields]
+            uplevel [list variable $name $currNumFields]
+            uplevel [list lappend __defaultObj $initVal]
+            uplevel [list lappend __fields $name]
+        }
+        set isPublicEnabled [_getClassIsPublicEnabled]
+        _declareFieldAcessors $name $isPublicEnabled [dict exists $optDict -static]
+        return
+    }
+    # 341
+
+    ##\brief Declare a double-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc double_t {args} {
+        uplevel [list _var "double" $args]
+    }
+
+    ##\brief Declare an integer-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc int_t {args} {
+        uplevel [list _var "int" $args]
+    }
+
+    ##\brief Declare a string-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc string_t {args} {
+        uplevel [list _var "string" $args]
+    }
+
+    ##\brief Declare a boolean-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc bool_t {args} {
+        uplevel [list _var "bool" $args]
+    }
+
+    ##\brief Declare a list-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc list_t {args} {
+        uplevel [list _var "list" $args]
+    }
+    
+    ##\brief Declare a dict-typed field
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc dict_t {args} {
+        uplevel [list _var "dict" $args]
+    }
+
+    ##\brief Declare an object-typed field (nested vanilla object)
+    # \param[in] args same arguments accepted by _var (name and optional initial value)
+    proc obj_t {args} {
+        uplevel [list _var "object" $args]
+    }
+
+    # 386
+    ##\brief Enable public mode for declarations inside the provided body
+    # \param[in] body script to execute with public accessors enabled
+    # \return Result of executing body
+    proc public {body} {
+        uplevel $body
+    }
+
+    ##\brief Execute the provided body with private mode enabled (temporarily disables public accessors)
+    # \param[in] body script to execute with private accessors
+    # \return Result of executing body
+    proc private {body} {
+        uplevel {variable __tmp_isPublicEnabled 0}
+        try {
+            uplevel $body
+        } finally {
+            uplevel {variable __tmp_isPublicEnabled 1}
+        }
+    }
+
+    ##\brief Build the body for a no-argument constructor
+    # \return A script chunk used as constructor body that returns the class default object
+    proc _buildConstructorNoArgsBody {} {
+        return {
+            variable __defaultObj
+            return $__defaultObj;
+        }
+    }
+
+    ##\brief Build the body for a constructor that accepts named args (-field value pairs)
+    # \return A script chunk used as constructor body that applies named arguments to the default object
+    proc _buildConstructorArgsBody {} {
+        return {
+            variable __defaultObj
+            set obj $__defaultObj
+            if {[catch {dict size $args}]} {
+                error "Constructor argument must be a list of ’-<field> <value>’ pairs"
+            }
+            dict for {key value} $args {
+                if {[string index $key 0] ne "-"} {
+                    error "Constructor argument keys must start with ’-’, got ’$key’"
+                }
+                set field [string range $key 1 end]
+                set setter set.$field
+                if {[info commands $setter] ne ""} {
+                    $setter obj $value
+                } else {
+                    set setter my.set.$field
+                    if {[info commands $setter] ne ""} {
+                        $setter obj $value
+                    } else {
+                        error "Unknown field option: $field"
+                    }
+                }
+            }
+            return $obj
+        }
+    }
+
+    ##\brief Build constructor parameter list and body for positional constructors
+    # \return A list of two elements: argument names list and a body script that returns them as a list
+    # \note For virtual classes, the concrete class namespace is embedded as a literal string at
+    # class-definition time (not looked up at runtime), producing:
+    # return [list ::ClassName $f1 $f2 ...]
+    # This avoids all runtime proc calls (class.defaultObj, set.*) and variable lookups,
+    # making virtual object creation as cheap as non-virtual.
+    proc _buildConstructorParams {} {
+        set argList [uplevel 2 {set __fields}]
+        set isVirtual [uplevel 2 {info exists __voo_is_virtual_class}]
+        set spacedArgVarListStr {}
+        foreach arg $argList {
+            append spacedArgVarListStr "\$$arg "
+        }
+        if {$isVirtual} {
+            # Read the normalized class namespace at definition time so subst embeds it
+            # as a literal in the generated body - no runtime variable lookup required.
+            set classNs [uplevel 2 {set __voo_class_namespace}]
+            set spacedArgVarListStr "{$classNs} $spacedArgVarListStr"
+            set body [subst -nocommands {
+                return [list $spacedArgVarListStr]
+            }]
+        } else {
+            set body [subst -nocommands {
+                return [list $spacedArgVarListStr]
+            }]
+        }
+        return [list $argList $body]
+    }
+
+    ##\brief Define a constructor for the current class
+    # \param[in] args Constructor declaration options and body
+    # \note Supports -name, -noargs and -typed variants
+    proc constructor {args} {
+        set defaultArgs {}
+        set optDict {}
+        set numArgs [llength $args]
+        for {set i 0} {$i < $numArgs} {incr i} {
+            set arg [lindex $args $i]
+            if {$arg eq "-name" || $arg eq "-noargs" || $arg eq "-typed"} {
+                if {$i + 1 >= $numArgs} {
+                    error "Constructor option ’$arg’ requires an argument"
+                }
+                dict set optDict $arg [lindex $args [incr i]]
+            } else {
+                lappend defaultArgs $arg
+            }
+        }
+        # check valid option combinations
+        if {[dict exists $optDict -name]} {
+            if {[dict exists $optDict -noargs] || [dict exists $optDict -typed]} {
+                error "Constructor cannot have -name option with -noargs or -typed options"
+            }
+        }
+        if {[dict exists $optDict -noargs] && [dict exists $optDict -typed]} {
+            error "Constructor cannot have both -noargs and -typed options"
+        }
+        if {[dict exists $optDict -name]} {
+            set constructorName [dict get $optDict -name]
+        } elseif {[dict exists $optDict -noargs]} {
+            set constructorName "new()"
+        } elseif {[dict exists $optDict -typed]} {
+            set constructorName "new([join [dict get $optDict -typed] ,])"
+        } else {
+            set constructorName "new"
+        }
+        if {[dict exists $optDict -noargs]} {
+            if {[llength $defaultArgs] != 0} {
+                error "Invalid constructor definition, expected ’?...? ?<body>?’ for -noargs"
+            }
+            set argList {}
+            set body [dict get $optDict -noargs]
+        } else {
+            if {[llength $defaultArgs] == 0} {
+                lassign [_buildConstructorParams] argList body
+            } else {
+            if {[llength $defaultArgs] != 2} {
+                error "Invalid constructor definition, expected ’?...? ?<argList> <body>?’"
+            }
+            lassign $defaultArgs argList body
+            }
+        }
+        uplevel [list proc $constructorName $argList $body]
+        return
+    }
+
+
+# 531
+    ##\brief Generate a getter procedure for a field
+    # \param[in] methodName name of the generated getter (may include namespace prefix)
+    # \param[in] fieldName name of the field to read
+    proc getter {methodName fieldName} {
+        # implementation of getter definition
+        set fieldIdx [uplevel [list set $fieldName]]
+        uplevel [subst -nocommands {
+            ##\\brief Getter for $fieldName
+            # \\param\[in\] this class instance
+            # \\return $fieldName value
+            proc $methodName {this} {
+                return [lindex \$this $fieldIdx]
+            }
+        }]
+        return
+    }
+
+    ##\brief Generate a setter procedure for a field
+    # \param[in] methodName name of the generated setter (may include namespace prefix)
+    # \param[in] fieldName name of the field to write
+    proc setter {methodName fieldName} {
+        # implementation of setter definition
+        set fieldIdx [uplevel [list set $fieldName]]
+        uplevel [subst -nocommands {
+            ##\\brief Setter for $fieldName
+            # \\param\[in\] thisVar name of variable containing class instance
+            # \\param\[in\] value new value for $fieldName
+            proc $methodName {thisVar value} {
+                upvar \$thisVar this
+                lset this $fieldIdx \$value
+            }
+        }]
+        return
+    }
+
+    ##\brief Generate an updater procedure for a field (copy-on-write safe)
+    # \param[in] methodName name of the generated updater (may include namespace prefix)
+    # \param[in] fieldName name of the field to update by reference
+    # \note The updater detaches the field to avoid unnecessary copying during updates
+    proc updater {methodName fieldName} {
+        # implementation of updater definition
+        set fieldIdx [uplevel [list set $fieldName]]
+        uplevel [subst -nocommands {
+            ##\\brief Update $fieldName by reference
+            # \\param\[in\] thisVar name of variable containing class instance
+            # \\param\[out\] tempVar name of variable to hold $fieldName during update
+            # \\param\[in\] body script to execute with $fieldName in tempVar
+            # \\note Avoids copy-on-write by detaching field during update
+            proc $methodName {thisVar tempVar body} {
+                upvar \$thisVar this
+                upvar \$tempVar temp
+                set temp [lindex \$this $fieldIdx]
+                # break link with object to avoid copy-on-write
+                lset this $fieldIdx {}
+                try {
+                    uplevel \$body
+                } finally {
+                    lset this $fieldIdx \$temp
+                }
+            }
+        }]
+    }
+
+    ##\brief Declare a method in the current class namespace
+    # \param[in] args Method declaration arguments: name, argList, body and options (-static, -upvar, -update, -override)
+    proc method {args} {
+        set isPublicEnabled [_getClassIsPublicEnabled]
+        set defaultArgs {}
+        set optDict {}
+        set numArgs [llength $args]
+        for {set i 0} {$i < $numArgs} {incr i} {
+            set arg [lindex $args $i]
+            if {$arg eq "-static" || $arg eq "-upvar"} {
+                dict set optDict $arg {}
+            } elseif {$arg eq "-update"} {
+                if {$i + 1 >= $numArgs} {
+                    error "Method option ’$arg’ requires an argument"
+                }
+                dict set optDict $arg [lindex $args [incr i]]
+            } elseif {$arg eq "-override"} {
+                # Explicit override indicator
+                dict set optDict $arg {}
+            } elseif {$arg eq "-virtual"} {
+                dict set optDict $arg {}
+            } else {
+                lappend defaultArgs $arg
+            }
+        }
+        lassign $defaultArgs name argList body
+
+        # check valid option combinations
+        if {[dict exists $optDict -static]} {
+            if {[dict exists $optDict -upvar] || [dict exists $optDict -update]} {
+                error "Method cannot have both -static and -upvar or -update options"
+            }
+        }
+        if {[dict exists $optDict -update]} {
+            if {![dict exists $optDict -upvar]} {
+                # automatically add -upvar if -update is specified
+                dict set optDict -upvar {}
+            }
+        }
+        set finalArgList {}
+        set finalBody {}
+        if {[dict exists $optDict -upvar]} {
+            lappend finalArgList "thisVar"
+            append finalBody {
+                upvar $thisVar this
+            }
+        } elseif {![dict exists $optDict -static]} {
+            lappend finalArgList "this"
+        }
+        lappend finalArgList {*}$argList
+        set className [uplevel {namespace current}]
+        if {[dict exists $optDict -update]} {
+            set updateFields [dict get $optDict -update]
+            if {[llength $updateFields] == 0} {
+                error "-update option requires at least one field name"
+            }
+            foreach field $updateFields {
+                try {
+                    set fieldIdx [uplevel [list set $field]]
+                } trap {} {} {
+                    error "Field ’$field’ specified in -update option does not exist in class ’$className’"
+                }
+                append finalBody [subst -nocommands {
+                    set $field [lindex \$this $fieldIdx]
+                    lset this $fieldIdx {}
+                }]
+            }
+            append finalBody "try \{"
+        }
+        append finalBody $body
+        if {[dict exists $optDict -update]} {
+            append finalBody "\} finally \{"
+            foreach field $updateFields {
+                set fieldIdx [uplevel [list set $field]]
+                append finalBody [subst -nocommands {
+                    lset this $fieldIdx \$$field
+                }]
+            }
+            append finalBody "\}"
+        }
+        if {!$isPublicEnabled} {
+            set name "my.$name"
+        }
+        if {[dict exists $optDict -override]} {
+            set parentNs [uplevel {set __parentClassNamespace}]
+            if {[info commands "${parentNs}::$name"] eq ""} {
+                error "Method ’$name’ does not override any method in parent class ’$parentNs’"
+            }
+            # If parent’s method is virtual (has base.<name>), auto-promote this override
+            # to a dispatcher so that deep inheritance dispatch works correctly
+            if {[uplevel {info exists __voo_is_virtual_class}] && \
+                [info commands "${parentNs}::base.$name"] ne ""} {
+                dict set optDict -virtual {}
+            }
+        }
+        if {[dict exists $optDict -virtual]} {
+            if {![uplevel {info exists __voo_is_virtual_class}]} {
+                error "Method ’$name’ is declared -virtual but ’[uplevel {namespace current}]’ is not a virtual class"
+            }
+            if {[dict exists $optDict -upvar] || [dict exists $optDict -update] || [dict exists $optDict -static]} {
+                error "Method ’$name’ cannot combine -virtual with -upvar, -update, or -static"
+            }
+            # Register base.<name> with the original body for direct parent calls from subclasses
+            uplevel [list proc "base.$name" $finalArgList $finalBody]
+            # Build dispatch body: route to concrete class implementation at runtime
+            set dispatchBody "set __voo_cls \[lindex \$this 0\]\n"
+            append dispatchBody "if \{\$__voo_cls ne \[namespace current\] && \[info commands \${__voo_cls}::$name\] ne {}\} \{\n"
+            append dispatchBody " return \[\${__voo_cls}::$name \$this"
+            foreach arg $argList {
+                append dispatchBody " \$$arg"
+            }
+            append dispatchBody "\]\n\}\n"
+            append dispatchBody "return \[base.$name \$this"
+            foreach arg $argList {
+                append dispatchBody " \$$arg"
+            }
+            append dispatchBody "\]"
+            set finalBody $dispatchBody
+        }
+        uplevel [list proc $name $finalArgList $finalBody]
+        return
+    }
+
+
+
+
+
+
+
+
+
+# 726
+
+    ##\brief Import one or more methods from parent class into the current (child) class namespace.
+    # \param[in] methods List of method names (or a single method name) to import from parent.
+    # \note Must be called inside a class declared with -extends. Methods are copied at class-definition time.
+    proc importMethods {methods} {
+        set parentNs [uplevel {set __parentClassNamespace}]
+        # Validate caller context and get parent namespace stored by -extends handling
+        if {$parentNs eq ""} {
+            error "importMethods can only be used inside a class declared with -extends"
+        }
+        # Normalize to a list of method names
+        if {[string length [string trim $methods]] == 0} {
+            return
+        }
+        if {[catch {llength $methods}]} {
+            set methodList [list $methods]
+        } else {
+            set methodList $methods
+        }
+        foreach methodName $methodList {
+            set fullMethodName "${parentNs}::$methodName"
+            # Validate parent method exists
+            if {[info commands $fullMethodName] eq ""} {
+                error "Method ’$methodName’ not found in parent class ’$parentNs’"
+            }
+            # Define a copy in the child namespace so unqualified calls resolve to child
+            set argList [info args $fullMethodName]
+            set body [info body $fullMethodName]
+            uplevel [list proc $methodName $argList $body]
+        }
+        return
+    }
+
+    namespace export *    
+}
+# provide the package
+package provide voo $::voo::version
+
diff --git a/src/bootsupport/modules/zipper-0.14.tm b/src/bootsupport/modules/zipper-0.14.tm
index f1e5eeae..5769e1ce 100644
Binary files a/src/bootsupport/modules/zipper-0.14.tm and b/src/bootsupport/modules/zipper-0.14.tm differ
diff --git a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/gitignore.in b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/gitignore.in
index 79773aaa..c9157eed 100644
--- a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/gitignore.in
+++ b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/gitignore.in
@@ -32,6 +32,10 @@
 /logs/
 **/_aside/
 **/_build/
+#G-155 stage workdirs: src/_bake (kit assembly) + per-srcdir _mint (module staging);
+#**/_build/ stays for src/buildsuites/_build (true compile area) and stale checkouts
+**/_mint/
+**/_bake/
 scratch*
 
 #Built documentation
diff --git a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl
index 030847da..ec134c79 100644
--- a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl
+++ b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl
@@ -175,7 +175,7 @@ apply {{} {
 }}
 # Colour-policy gate for raw-SGR emission sites that can run before
 # define_global_ansi / punk::ansi are available (early package-load
-# diagnostics and kit-build warnings). Returns the SGR sequence, or an empty
+# diagnostics and kit-bake warnings). Returns the SGR sequence, or an empty
 # string when colour is disabled. Empty/omitted params give the reset.
 proc ::punkboot::sgr {{sgrparams ""}} {
     if {[info exists ::punk::console::colour_disabled] && $::punk::console::colour_disabled} {
@@ -490,7 +490,7 @@ namespace eval ::punkboot::lib {
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     # G-122 host/target platform split.
     # platform_punk answers "what is THIS tclsh" (the HOST canon). Everything a
-    # build EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
+    # bake EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
     # store holds the runtime, whether artifacts carry .exe, and which process
     # tooling can see/kill a running artifact. The two diverge for the whole
     # cygwin family: an msys2/cygwin-runtime tclsh on windows reports
@@ -522,12 +522,12 @@ namespace eval ::punkboot::lib {
         return [expr {[platform_os $platform] in {msys cygwin}}]
     }
     #Windows-family platforms: native win32 AND the cygwin-family personalities.
-    #They share what matters to a build: executables are .exe files and running
+    #They share what matters to a bake: executables are .exe files and running
     #processes are windows processes (tasklist/taskkill), whatever tcl_platform says.
     proc platform_is_windows_family {platform} {
         return [expr {[platform_os $platform] in {win32 msys cygwin}}]
     }
-    #Default TARGET platform for a host canon. A cygwin-family host builds native
+    #Default TARGET platform for a host canon. A cygwin-family host bakes native
     #windows kits (there is no separate msys kit lineage - third-party msys
     #runtimes are addressed by an explicit per-entry target instead).
     proc platform_target_default {hostplatform} {
@@ -708,7 +708,7 @@ proc ::punkboot::lib::mapvfs_locate {rt_sourcefolder} {
 
 #tomlish::to_dict values are type-tagged (e.g {type STRING value x}, {type ARRAY value {...}});
 #tables are plain nested dicts. Shared by the mapvfs toml reader, the per-.vfs
-#payload declarations (G-115) and any other build-side toml consumption.
+#payload declarations (G-115) and any other bake-side toml consumption.
 proc ::punkboot::lib::toml_untag {tagged} {
     if {[dict get $tagged type] eq "ARRAY"} {
         set plain [list]
@@ -1200,7 +1200,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 # the vfs rootname, kit_type defaulting to 'kit', '-' runtime -> <appname>.kit,
 # TARGET .exe suffix, duplicate appname -> <appname>_<runtime>) so listed names
 # match what a bake produces. Entries whose vfs folder is missing on disk never
-# reach the kit loop - they are appended after the buildable set so 'bakelist'
+# reach the kit loop - they are appended after the bakeable set so 'bakelist'
 # can surface them as broken config. Duplicate-name disambiguation is per TARGET
 # (G-127): same-named kits for different targets coexist under their own output
 # tiers; a same-target duplicate assumes the config keeps appnames unique (as
@@ -1217,7 +1217,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 #   runtime_dir   store tier folder holding the runtime ("" for "-")
 #   target    target platform (e.g win32-x86_64)
 #   store_tier  bin/runtime tier folder name for the target
-#   out_tier  kit OUTPUT tier relative to bin/ and src/_build/ - "" for the
+#   out_tier  kit OUTPUT tier relative to bin/ and src/_bake/ - "" for the
 #             default (host) target's flat locations, "kits/<platform>" for any
 #             other target (G-127)
 #   vfs       vfs folder tail (e.g punk9wintk903.vfs)
@@ -1413,7 +1413,7 @@ proc ::punkboot::lib::mapvfs_match_outputs {kit_outputs names} {
 }
 
 # Local runtime-materialization staleness core (shared by the bake-path
-# BUILD-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
+# BAKE-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
 # toml-revision metadata). Compares a punk-runtime WORKING COPY's beside-toml
 # revision against the highest -r<N> artifact revision present in the same
 # folder. Returns an empty dict when there is nothing to report (pre-family
@@ -1491,23 +1491,23 @@ proc ::punkboot::lib::files_content_identical {patha pathb} {
 }
 
 # Deployed-state classification for a configured kit output (G-121 bakelist):
-# the deployed copy (<projectdir>/bin/<targetkit>) vs the build product
-# (src/_build/<targetkit>).
+# the deployed copy (<projectdir>/bin/<targetkit>) vs the bake product
+# (src/_bake/<targetkit>).
 #   absent  - no deployed copy in the bin folder
-#   nobuild - deployed copy exists but there is no build product to compare against
-#   current - deployed copy is byte-identical to the build product
-#   stale   - deployed copy differs from the build product
+#   nobake  - deployed copy exists but there is no bake product to compare against
+#   current - deployed copy is byte-identical to the bake product
+#   stale   - deployed copy differs from the bake product
 # Size mismatch decides 'stale' cheaply; equal size + equal mtime short-circuits
 # to 'current' (the deploy step is a plain 'file copy'); otherwise a full content
 # compare decides.
-proc ::punkboot::lib::kit_deploy_state {buildfolder deployfolder targetkit} {
-    set built [file join $buildfolder $targetkit]
+proc ::punkboot::lib::kit_deploy_state {bakefolder deployfolder targetkit} {
+    set built [file join $bakefolder $targetkit]
     set deployed [file join $deployfolder $targetkit]
     if {![file isfile $deployed]} {
         return absent
     }
     if {![file isfile $built]} {
-        return nobuild
+        return nobake
     }
     if {[file size $built] != [file size $deployed]} {
         return stale
@@ -1553,10 +1553,10 @@ set this_platform_generic [punkboot::lib::platform_punk] ;#normalized punkshell
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-122 host/target split. $this_platform_generic is the HOST canon and stays the
 #key for everything that describes THIS interpreter (bootsupport/vendorlib
-#platform dirs below, diagnostics). What the build EMITS is keyed by target:
+#platform dirs below, diagnostics). What the bake EMITS is keyed by target:
 #  host_platform    - canon of the driving tclsh (same value, named for clarity)
 #  target_platform  - default target for kit outputs; a cygwin-family host
-#                     (msys2/cygwin runtime on windows) builds win32 kits.
+#                     (msys2/cygwin runtime on windows) bakes win32 kits.
 #                     Per-entry mapvfs.config declarations override it per runtime.
 #  host_windows     - host process/filesystem semantics are windows-like
 #                     (native windows OR cygwin family): drives copy commands,
@@ -1608,8 +1608,8 @@ set sourcesupport_module_paths  [list]
 set sourcesupport_library_paths [list]
 set sourcesupport_paths_exist 0
 #we deliberately don't use [pwd]/modules because commonly the launch dir may be the project dir.
-#The <projectdir>/modules are the very modules we are building - and may be in a broken state, which punkboot then can't fix.
-#The 'building' is generally just assigning a version instead of 999999.0a1 (and some doc string substitution?)
+#The <projectdir>/modules are the very modules we are minting - and may be in a broken state, which punkboot then can't fix.
+#The mint is generally just stamping a version instead of 999999.0a1 (plus modpod packing and doc string substitution)
 #(most?) Modules in src/modules etc should still be runnable directly in certain cases like this where we point to them.
 if {[file tail $startdir] eq "src"} {
     #todo - other src 'module' dirs..
@@ -2578,32 +2578,32 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname -help  or $scriptname --help or $scriptname /? or just $scriptname" \n
     append h "    - This help." \n \n
     append h "  $scriptname bakehouse ?-k? ?-dirty-abort 1|0?" \n
-    append h "    - consumer build from a clean checkout: runs the packages stage (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
+    append h "    - consumer run from a clean checkout: mints the packages (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
     append h "    - refuses uncommitted src by default (-dirty-abort defaults ON: the bakehouse bakes from the committed recipe; pass -dirty-abort 0 to override)" \n
-    append h "    - the optional -k flag will terminate running processes matching the executable being built (if applicable)" \n
+    append h "    - the optional -k flag will terminate running processes matching the executable being baked (if applicable)" \n
     append h "    - does NOT run the promotion gates (bootsupport, vfscommonupdate) - on a clean checkout they are already satisfied by the committed tree" \n \n
     append h "  $scriptname bake ?-k? ?kitname ...?" \n
     append h "    - assemble kit/zipkit executables from the promoted payload (src/vfs) and src/runtime runtimes into <projectdir>/bin" \n
-    append h "    - includes the vfslibs phase; does not rebuild modules/libs and does not run the promotion gates" \n
-    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any build)" \n \n
+    append h "    - includes the vfslibs phase; does not re-mint modules/libs and does not run the promotion gates" \n
+    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any bake)" \n \n
     append h "  $scriptname bakelist ?kitname ...?" \n
     append h "    - list the kit outputs configured in src/runtime/mapvfs.toml: name, kit type, runtime (with presence)," \n
-    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobuild vs the src/_build product)" \n
+    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobake vs the src/_bake product)" \n
     append h "    - kitname arguments filter to the named entries (per-kit detail)" \n \n
     append h "  $scriptname modules"  \n
-    append h "    - build (or copy if build not required) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (stamp real versions, pack modpods; plain copy where no stamping applies) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname libs"  \n
-    append h "    - build (or copy if build not required) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname packages"  \n
-    append h "    - build (or copy if build not required) both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir> (= modules + libs)" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname bootsupport"  \n
     append h "    - update the src/bootsupport modules" \n
     append h "    - bootsupport modules are pulled from locations specified in include_modules.config files within each src/bootsupport subdirectory" \n
     append h "    - project layouts store no bootsupport module snapshots: generated projects get bootsupport injected at generation time by 'dev project.new'" \n
-    append h "    - This should usually be from modules that have been built and tested in <projectdir>/modules <projectdir>/lib etc." \n
+    append h "    - This should usually be from modules that have been minted and tested in <projectdir>/modules <projectdir>/lib etc." \n
     append h "    - bootsupport modules are available to make.tcl" \n \n
     append h "  $scriptname vendorupdate"  \n
     append h "    - update the src/vendormodules based on src/vendormodules/include_modules.config" \n \n
@@ -2617,11 +2617,11 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "    - sha1-verified against the server's per-target sha1sums.txt; materializes package trees under bin/packages/<target>/tcl<N>" \n
     append h "    - canonical origin trusted by default; other servers (incl. PUNKBIN_URL overrides) require -trust-server" \n \n
     append h "  $scriptname vfscommonupdate"  \n
-    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs from compiled src/modules and src/lib etc" \n
+    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs kit payload from the minted <projectdir> module/lib trees" \n
     append h "    - before calling this (followed by '$scriptname bake') - you can test using '<builtexe>(.exe) dev'" \n
     append h "      this will load modules from your <projectdir>/module <projectdir>/lib paths instead of from the kit/zipkit" \n \n
     append h "  $scriptname info" \n
-    append h "    - show the name and base folder of the project to be built" \n \n
+    append h "    - show the name and base folder of the project" \n \n
     append h "  $scriptname check" \n
     append h "    - show module/library paths and any potentially problematic packages for running this script" \n
     append h "  $scriptname shell" \n
@@ -2629,7 +2629,7 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname projectversion" \n
     append h "    - advisory check: verify CHANGELOG.md matches punkproject.toml and warn if src/ has changes since the last project-version bump." \n \n
     append h "  $scriptname workflow" \n
-    append h "    - print an ASCII data-flow overview of the build/release workflow (edit -> packages -> bootsupport -> kits)" \n \n
+    append h "    - print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake) incl. the TERMINOLOGY key" \n \n
     append h "  $scriptname buildsuite list|info|build ?<suitename>? ?driver-args ...?" \n
     append h "    - list the defined buildsuites under src/buildsuites (zig runtime factory), show a suite's configured" \n
     append h "      detail (sources/zig pin/products from its sources.config), or run its driver forwarding the args" \n \n
@@ -2652,33 +2652,61 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "        Use -confirm 0 for unattended runs: the bootsupport minor-staleness gate and the vfscommonupdate REPLACE" \n
     append h "        confirmation proceed without prompting; kits with a source/target kit-type mismatch are skipped." \n
     append h "    -dirty-abort" \n
-    append h "      - abort build/promotion commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
+    append h "      - abort producing commands (mint/promote/bake: bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
     append h "        uncommitted VCS changes. Default is warn-only EXCEPT bakehouse (defaults ON there; -dirty-abort 0 overrides):" \n
-    append h "        artifacts built from dirty src have no committed provenance." \n
+    append h "        artifacts produced from dirty src have no committed provenance." \n
     append h "        Warnings carry a plain PROVENANCE-WARNING: prefix (greppable in redirected output) and are recapped at the end of the run." \n
-    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without building," \n
+    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without minting or baking," \n
     append h "        use '<builtexe> src' or '<builtexe> src shell'." \n \n
     append h "" \n
     append h [punkboot_availability_note]
     return $h
 }
-#Embedded build/release workflow overview - the output of the 'workflow' subcommand.
+#Embedded release-workflow overview - the output of the 'workflow' subcommand.
 #Embedded (rather than a data file) so it travels with make.tcl wherever it runs, including
 #the make.tcl copies seeded into generated projects via the project layouts.
-#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when build data flow changes
+#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when make.tcl data flow changes
 #(subcommand added/removed/repurposed, source or output folder flow changed, new propagation
 #target), this text changes in the same commit. Plain ASCII only, max line width 100.
 proc ::punkboot::workflow_text {} {
     set txt {
-build & release workflow - from module edit to kits + bootsupport (punk project layout)
+mint, promote & bake - the release workflow from module edit to kits + bootsupport (punk layout)
 =============================================================================
 Scope: data flow from editing a module under src/ through to a release-ready
-rebuild (built packages, bootsupport refresh, kit vfs, kit executables).
+refresh (minted packages, bootsupport refresh, kit vfs, kit executables).
 All commands run from the projectroot with a native tclsh, e.g:
     tclsh src/make.tcl <subcommand> -confirm 0            (see [K6])
 
 
-TWO PERSONAS (stage-true subcommand model - one build stage, two promotion
+TERMINOLOGY (stage verbs - one word, one stage)
+----------------------------------------------------------------------------
+  build    compile source to binaries. Lives in the arm's-length factories:
+           'make.tcl buildsuite' (whole Tcl runtimes from external sources,
+           src/buildsuites, workdir src/buildsuites/_build) and 'make.tcl
+           tool build' (vendored zig tools, src/tools). Nothing in
+           mint/promote/bake compiles anything: bakes succeed with no build
+           toolchain installed.
+  mint     stamp real versions onto magic-version sources (999999.0a1.0 ->
+           the <pkg>-buildversion.txt value), pack #modpod-* trees, prune
+           superseded copies and install the results into the projectroot
+           trees (modules*/ lib*/). The modules/libs/packages subcommands
+           are the mint stage; staging area <srcdir>/_mint.
+  promote  propagate minted packages into the two gated consumption trees:
+           src/bootsupport (make.tcl's own boot environment) and
+           src/vfs/_vfscommon.vfs (the committed kit payload) - the
+           bootsupport and vfscommonupdate promotion gates.
+  bake     assemble kit/zipkit executables from promoted payload + runtimes
+           (workdir src/_bake) and deploy them to bin/. Consumer umbrella:
+           bakehouse = mint + bake from the committed recipe.
+  fetch    bring third-party inputs to the tree: libfetch (punkbin lib
+           artifacts), vendorupdate (vendored sources).
+  deploy   the final copy of a baked kit from src/_bake to bin/<kit>.
+Mechanism words keep their scoped meanings: stamp (version fields at mint,
+icons/resources at bake via punkres), install (punkcheck-recorded placement
+at any stage), sync (thin-layout copies), materialize (vfslibs payload
+declarations, libfetch trees).
+
+TWO PERSONAS (stage-true subcommand model - one mint stage, two promotion
 gates, one bake)
 ----------------------------------------------------------------------------
   CONSUMER  (clean checkout, wants baked kits):
@@ -2688,7 +2716,7 @@ gates, one bake)
     default (-dirty-abort defaults ON: the bakehouse bakes from the committed
     recipe; -dirty-abort 0 overrides).
   DEVELOPER (changing payload): pass the gates explicitly - the commit is the
-    publishing act, not a build step. That is the RELEASE SEQUENCE below.
+    publishing act, not a producing step. That is the RELEASE SEQUENCE below.
 
 RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance gates)
 ----------------------------------------------------------------------------
@@ -2698,18 +2726,18 @@ RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance
               punkproject.toml + CHANGELOG.md            project version (if shipped behaviour) [K2]
   (3) test    tclsh src/tests/runtests.tcl ...           runs against src/ trees (if present)
   (4) commit  source changes (git/fossil)                clean tree -> committed provenance [K3]
-  (5) build   tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
-  (6) build   tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
-  (7) build   tclsh src/make.tcl vfscommonupdate -confirm 0
-  (8) build   tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
-  (9) commit  tracked build outputs                      src/bootsupport, thin-layout script/
+  (5) mint    tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
+  (6) promote tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
+  (7) promote tclsh src/make.tcl vfscommonupdate -confirm 0
+  (8) bake    tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
+  (9) commit  tracked output trees                       src/bootsupport, thin-layout script/
                                                          manifest/gitignore.in payload copies
                                                          (src/project_layouts +
                                                          templates modpod payload),
                                                          src/vfs/_vfscommon.vfs
 
 
-DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
+DIAGRAM 1 - DATA FLOW: SOURCE -> MINTED PACKAGES -> PROMOTION TARGETS
 ----------------------------------------------------------------------------
 
    src/modules/foo-999999.0a1.0.tm   [K1]        src/lib/
@@ -2722,7 +2750,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
         v                                           v
    modules/  modules_tcl8/  modules_tcl9/        lib/  lib_tcl8/  lib_tcl9/
    e.g. modules/foo-0.12.4.tm
-   == BUILT PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
+   == MINTED PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
         |
         +--------------------------------------+
         |                                      |
@@ -2735,7 +2763,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
     Project layouts store NO module            |
     snapshots - 'dev project.new'              |  make.tcl bake   (kit-assembly stage;
     injects bootsupport into generated         v   consumer umbrella: bakehouse)
-    projects from the generating          src/_build/<kit>.exe   --deploy-->   bin/<kit>.exe
+    projects from the generating          src/_bake/<kit>.exe   --deploy-->   bin/<kit>.exe
     shell at generation time - G-087)      (see DIAGRAM 2)         [K5]
 
 
@@ -2753,7 +2781,7 @@ DIAGRAM 1b - THIN-LAYOUT SYNC (part of modules/libs/packages/bakehouse runs)
         |  store -> modpod payload sync (punk.project layout only; excludes bin/sdx.kit)
         v
    src/modules/punk/mix/#modpod-templates-*/templates/project_layouts/
-   (packed into the punk::mix::templates module by the modules build, so a bare
+   (packed into the punk::mix::templates module by the modules mint, so a bare
     kit outside any project can list and generate the punk.project layout)
 
 
@@ -2769,10 +2797,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                                       configured kit outputs (presence + deployed state);
                                       'make.tcl bake ?name|@group ...?' bakes only the named
                                       kits (bare bake = all entries except bake_default=false
-                                      ones; unknown names error before any build)
+                                      ones; unknown names error before any bake)
    bin/runtime/<target>/<runtime>     bare Tcl runtime (tclkit / tclsfe / suite build), in the
-                                      store tier of the TARGET platform it builds kits for [K9]
-   src/vfs/_vfscommon.vfs/            common payload (built modules + libs, main boot support)
+                                      store tier of the TARGET platform it bakes kits for [K9]
+   src/vfs/_vfscommon.vfs/            common payload (minted modules + libs, main boot support)
    src/vfs/<kitspecific>.vfs/         per-kit overlay (main.tcl, kit-only modules/config)
    src/vfs/<kitspecific>.vfs.toml     optional per-.vfs payload declaration (G-115): [payload.*]
                                       entries materialized INTO the .vfs folder by the vfslibs
@@ -2789,10 +2817,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
               +-----------+----------+
                           |  copy common, then merge overlay over it
                           v
-              src/_build/<kit>.exe.vfs
+              src/_bake/<kit>.exe.vfs
                           |
                           |  advisory payload/target binary-arch scan of the merged
-                          |  tree (wrong-arch libraries -> recapped BUILD-WARNING) [K11]
+                          |  tree (wrong-arch libraries -> recapped BAKE-WARNING) [K11]
                           |  boot-precondition gate: merged vfs must supply a tcl
                           |  library (tcl_library/, lib/tcl<M>.<m>/, tcl<M>.<m>/) [K10]
                           v
@@ -2811,7 +2839,7 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                           |  mkimg, or (driving tcl without zipfs, e.g 8.6) raw-runtime
                           |  split + punk::zip::mkzip + concatenation - both mount the same
                           v
-              src/_build/<kit>.exe  (+ <kit>.exe.resources.toml)
+              src/_bake/<kit>.exe  (+ <kit>.exe.resources.toml)
                           |
                           |  smoke-require probe (host-runnable kits with declared
                           |  packages): plain 'package require' inside the artifact [K11]
@@ -2857,7 +2885,7 @@ KEY / NOTES
 [K1] Source modules carry the literal magic version 999999.0a1.0 in the filename.
      The real version is the first line of the sibling <modulename>-buildversion.txt;
      bump it per semver (patch=fix, minor=api add, major=breaking) and append a
-     '#<version> - ...' changelog comment line below it. The modules build stamps
+     '#<version> - ...' changelog comment line below it. The mint stamps
      the real version into the output filename and package provide.
      (A project may carry manually-versioned exceptions - see src/modules/AGENTS.md
       if present.)
@@ -2866,10 +2894,11 @@ KEY / NOTES
      entry) is change-driven: bump when the change ships user-visible behaviour.
      Advisory check: tclsh src/make.tcl projectversion
 
-[K3] Every build target root gets a .punkcheck file recording what was installed
-     from where (punkcheck provenance). Building from a tree with uncommitted
-     changes under src/ works but emits PROVENANCE-WARNINGs - commit source first
-     for release builds. Output-tree commits (step 9) come after the builds.
+[K3] Every output target root gets a .punkcheck file recording what was installed
+     from where (punkcheck provenance). Minting/promoting/baking from a tree with
+     uncommitted changes under src/ works but emits PROVENANCE-WARNINGs - commit
+     source first for release runs. Output-tree commits (step 9) come after the
+     producing steps.
 
 [K4] Bootsupport staleness gate: make.tcl compares tracked module versions in
      src/bootsupport against built sources; a stale bootsupport makes other
@@ -2879,10 +2908,10 @@ KEY / NOTES
 
 [K5] The deploy step cannot replace a kit exe that is currently executing. Close
      running kit shells before step 8, or rerun 'make.tcl bake -confirm 0'
-     afterwards - the freshly built kits wait in src/_build. punkcheck records
+     afterwards - the freshly baked kits wait in src/_bake. punkcheck records
      mean the rerun only redoes the failed deploys. When iterating on one kit,
-     'make.tcl bake <kitname>' rebuilds/deploys just that kit; 'make.tcl
-     bakelist' shows each configured kit's deployed state (bin vs src/_build).
+     'make.tcl bake <kitname>' rebakes/deploys just that kit; 'make.tcl
+     bakelist' shows each configured kit's deployed state (bin vs src/_bake).
 
 [K6] All confirmation prompts follow -confirm: unattended/agent runs must pass
      -confirm 0 (non-interactive stdin aborts fast at prompts; piping 'y' is
@@ -2891,13 +2920,13 @@ KEY / NOTES
 [K7] Testing hooks along the way:
        - src/tests/runtests.tcl exercises the src/ trees directly (dev modules).
        - '<builtkit>.exe dev' (or '<builtkit> src') runs a built shell against the
-         project dev modules - useful for testing built packages before they are
+         project dev modules - useful for testing minted packages before they are
          baked into kits via vfscommonupdate + bake.
 
-[K8] What is VCS-tracked where (checkin targets after a build):
+[K8] What is VCS-tracked where (checkin targets after a make.tcl run):
        tracked:   src/** (sources, src/bootsupport, src/project_layouts copies,
                   src/vfs/_vfscommon.vfs), punkproject.toml, CHANGELOG.md
-       untracked: modules*/ lib*/ at projectroot, src/_build/, bin/<kit>.exe,
+       untracked: modules*/ lib*/ at projectroot, src/_bake/, bin/<kit>.exe,
                   bin/kits/<platform>/ (cross-target kit outputs - G-127),
                   src/vfs/*.vfs/_targets/ (per-platform payload staging)
                   (bin/ scripts/tools are tracked; kit executables are not)
@@ -2915,7 +2944,7 @@ KEY / NOTES
      'make.tcl check' prints the derivation; 'make.tcl bakelist' shows per-kit
      targets, with a target= note on rows that are not on the default target.
      OUTPUT locations are target-keyed too (G-127): default-target kits keep the
-     flat src/_build/<kit> + bin/<kit> locations, any other target's kit builds
+     flat src/_bake/<kit> + bin/<kit> locations, any other target's kit bakes
      and deploys under the kits/<platform>/ tier of both (bin/kits/ = outputs,
      beside bin/runtime/ = inputs), so same-named kits for different targets
      coexist instead of overwriting each other; bakelist marks such rows with
@@ -2924,7 +2953,7 @@ KEY / NOTES
 [K10] BOOT-PRECONDITION gate (G-125). A kit whose merged vfs has no tcl library
      cannot initialise at all ('Cannot find a usable init.tcl'), so the bake
      refuses it: the kit is listed under FAILED KITS and NOTHING is written -
-     no src/_build/<kit>, no deploy, and the previously deployed bin/<kit> is
+     no src/_bake/<kit>, no deploy, and the previously deployed bin/<kit> is
      left exactly as it was. This is deliberately not a warning: the deploy step
      deletes the old kit before copying the new one, so warning-and-proceeding
      replaced a working shell with one that could not start. The check is
@@ -2933,18 +2962,18 @@ KEY / NOTES
      executable's own path rather than //zipfs:/app), plus a companion file so a
      package's own init.tcl cannot answer for a tcl library - and runs on the
      MERGED tree, not on whether extraction ran - a .vfs that
-     supplies its own tcl library builds and deploys as normal. Nothing is
+     supplies its own tcl library bakes and deploys as normal. Nothing is
      executed, so cross-target kits are covered too. Usual cause: the runtime's
-     own payload could not be extracted - see the BUILD-WARNING naming what was
+     own payload could not be extracted - see the BAKE-WARNING naming what was
      tried. 'make.tcl check' reports whether the gate is ACTIVE.
 
 [K11] PAYLOAD/TARGET consistency checks (G-133), both ADVISORY - warnings recap at
-     end of run, the kit still builds and deploys. (a) Binary-arch scan at the same
+     end of run, the kit still bakes and deploys. (a) Binary-arch scan at the same
      seam as [K10]: each binary library (*.dll/*.so/*.dylib) in the merged tree is
      classified by header (PE/ELF/Mach-O - structural, nothing executed, so
      cross-target kits are covered) against the kit's target platform; wrong-arch
      libraries outside platform-discriminated subdirs (win32-ix86/, win-x64/ etc -
-     multi-arch payloads are legitimate there) earn recapped BUILD-WARNINGs.
+     multi-arch payloads are legitimate there) earn recapped BAKE-WARNINGs.
      (b) Smoke-require probe: a kit declaring packages (mapvfs.toml smokerequire
      key; legacy config: 5th element) has each one plain-'package require'd INSIDE the freshly built
      artifact via its tclsh subcommand - the only check that sees resolution-order
@@ -2964,7 +2993,7 @@ OUT-OF-BAND SUBSYSTEMS (not part of the packages/bake data flow above)
 
 MAINTENANCE (agents take note)
 ----------------------------------------------------------------------------
-This text is embedded in make.tcl (::punkboot::workflow_text). When the build
+This text is embedded in make.tcl (::punkboot::workflow_text). When the make.tcl
 data flow changes - a make.tcl subcommand added/removed/repurposed, a source or
 output folder added or rerouted, a new propagation target, a changed gate or
 deploy behaviour - update this text in the same change-set and verify with
@@ -3014,7 +3043,7 @@ proc ::punkboot::punkboot_availability_note {} {
             append h "    Call 'make.tcl check' and examine the last table (which includes bootsupport + executable-provided packages)" \n
             append h "    See if there are any items marked missing or broken that aren't marked as '(known optional)'" \n
             append h "    If all are marked (known optional) then it should work." \n
-            append h "    A package marked (known optional) and (RECOMMENDED) may make the build/install processes run a lot faster. (e.g tcllibc)" \n
+            append h "    A package marked (known optional) and (RECOMMENDED) may make the mint/bake and install processes run a lot faster. (e.g tcllibc)" \n
             append h "* $A(HIGHLIGHT)** *** *** ***$A(RST)" \n\n
             #append h "Successfully Loaded packages:" \n
             #append h "    " [join $::punkboot::pkg_loaded "\n    "] \n
@@ -3056,14 +3085,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             #single source for the subcommand one-line summaries: each subcommand definition's
             #@cmd -summary and the top-level subcommand -choicelabels are both built from this.
             variable SUMMARIES {
-                bakehouse       "Consumer build from a clean checkout: packages then bake - refuses uncommitted src by default"
-                packages        "Build .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
-                modules         "Build .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
-                libs            "Build pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
+                bakehouse       "Consumer run from a clean checkout: mint packages then bake - refuses uncommitted src by default"
+                packages        "Mint .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
+                modules         "Mint .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
+                libs            "Mint pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
                 bake            "Assemble kit/zipkit executables from promoted payload (src/vfs) and runtimes into <projectdir>/bin"
                 bakelist        "List the kit outputs configured in src/runtime/mapvfs.toml: type, runtime/vfs presence, deployed state, groups"
                 vfslibs         "Materialize per-.vfs payload declarations (src/vfs/<name>.vfs.toml - G-115) into kit vfs folders; drop-ins preserved"
-                bin             "Install executables from src/bin into <projectdir>/bin, then build kits as for bake"
+                bin             "Install executables from src/bin into <projectdir>/bin, then bake kits as for bake"
                 vendorupdate    "Update src/vendormodules based on src/vendormodules/include_modules.config"
                 libfetch        "Fetch declared punkbin lib-tier library artifacts into bin/packages/<target> (sha1-verified) and materialize the package trees"
                 bootsupport     "Promotion gate: update src/bootsupport modules from built project modules"
@@ -3071,7 +3100,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 info            "Show the name and base folder of the project to be built"
                 check           "Show module/library paths and any potentially problematic packages for running this script"
                 projectversion  "Advisory check: CHANGELOG.md vs punkproject.toml and src/ changes since last version bump"
-                workflow        "Print an ASCII data-flow overview of the build/release workflow (edit -> packages -> gates -> bake)"
+                workflow        "Print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake)"
                 shell           "Run the punk shell using bootsupport libraries"
                 help            "Show usage for make.tcl or one of its subcommands"
                 buildsuite      "List, describe or run the defined buildsuites under src/buildsuites (zig runtime factory)"
@@ -3094,41 +3123,43 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  to run when src/ has uncommitted changes (-dirty-abort defaults ON),
                  pointing at the granular developer flow (packages -> test ->
                  bootsupport/vfscommonupdate -> commit -> bake). Pass -dirty-abort 0
-                 to build anyway with PROVENANCE-WARNINGs.
+                 to proceed anyway with PROVENANCE-WARNINGs.
                  Deliberately does NOT run the promotion gates (bootsupport,
                  vfscommonupdate): payload promotion is a confirm-gated, committed
                  act - on a clean checkout the gates are already satisfied by the
                  committed tree."
                 packages
                 "
-                 Build (or copy if build not required) both .tm and pkgIndex.tcl based
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) both .tm and pkgIndex.tcl based
                  packages from src to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 modules
                 "
-                 Build (or copy if build not required) .tm modules from src/modules,
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) .tm modules from src/modules,
                  src/vendormodules etc to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 libs
                 "
-                 Build (or copy if build not required) pkgIndex.tcl based libraries from
+                 Mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from
                  src/lib, src/vendorlib etc to their corresponding locations under
                  <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 bake
                 "
                  Assemble kit/zipkit executables: scan src/vfs and src/runtime folders,
-                 build each configured kit from the promoted payload
+                 bake each configured kit from the promoted payload
                  (src/vfs/_vfscommon.vfs + custom vfs folders) and its runtime, and
                  install to <projectdir>/bin.
                  With kitname (or @groupname - G-024 groups) arguments, bake and
                  deploy ONLY the named configured kits (see 'make.tcl bakelist'
-                 for the configured names and groups) - other kits' build
+                 for the configured names and groups) - other kits' bake
                  products, bin copies and punkcheck records are left untouched.
-                 An unknown name errors before any build, listing the configured
+                 An unknown name errors before any bake, listing the configured
                  names. Bare 'bake' processes all configured kits except
                  bake_default=false entries (those bake only by name/@group).
                  Includes the vfslibs phase (per-.vfs payload declarations
@@ -3136,7 +3167,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  G-115) so a bake cannot ship stale binary libs; a selective
                  bake narrows that phase to the named kits' vfs folders.
                  Does not rebuild modules/libs and does not run the promotion gates -
-                 built modules reach the kit payload only via 'make.tcl
+                 minted modules reach the kit payload only via 'make.tcl
                  vfscommonupdate' (committed for provenance). Consumer full path from
                  a clean checkout: 'make.tcl bakehouse'."
                 bakelist
@@ -3147,12 +3178,12 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  kit name, kit type (kit|zip|zipcat...), runtime with presence in
                  the runtime store of that kit's TARGET platform
                  (<projectdir>/bin/runtime/<target>), vfs folder, and the
-                 deployed state of <projectdir>/bin/<kit> vs the src/_build build
+                 deployed state of <projectdir>/bin/<kit> vs the src/_bake bake
                  product:
-                   current - deployed copy is identical to the build product
-                   stale   - deployed copy differs from the build product
+                   current - deployed copy is identical to the bake product
+                   stale   - deployed copy differs from the bake product
                    absent  - no deployed copy in <projectdir>/bin
-                   nobuild - deployed copy exists but no build product to compare
+                   nobake  - deployed copy exists but no bake product to compare
                  A trailing notes column flags anomalies (runtime=missing,
                  vfs=missing, rtrev=r<cur><r<max> when the runtime working copy is
                  materialized from an older revision than a -r<N> artifact beside
@@ -3161,14 +3192,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  default - 'make.tcl check' shows that default), G-024 groups
                  (group=<name>), entries excluded from full bakes (default=no)
                  and scheme-expanded outputs (scheme=versioned|dev|release).
-                 Non-default-target kits build and deploy under the
-                 kits/<platform>/ tier of src/_build and bin (G-127) - their rows
+                 Non-default-target kits bake and deploy under the
+                 kits/<platform>/ tier of src/_bake and bin (G-127) - their rows
                  carry out=kits/<platform>/ and the deployed state compares the
                  tiered paths; a kit NAME shared by entries for several targets
                  selects (and lists) every one of them.
                  kitname (or @groupname) arguments filter the report to the named
                  entries (per-kit detail, with resolved store tier, target,
-                 config entry and paths). Reporting only - never builds."
+                 config entry and paths). Reporting only - never bakes."
                 vfslibs
                 "
                  Materialize the per-.vfs payload declarations (G-115): each
@@ -3212,7 +3243,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 bin
                 "
                  Install executables from src/bin to <projectdir>/bin, then check vfs
-                 folders and build kit/zipkit executables as for the bake subcommand."
+                 folders and bake kit/zipkit executables as for the bake subcommand."
                 vendorupdate
                 "
                  Update the src/vendormodules based on src/vendormodules/include_modules.config.
@@ -3245,7 +3276,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  Also reports the colour policy, the host/target platform derivation
                  (this tclsh's platform canon vs the default kit target, its runtime
                  store tier, executable suffix and process tooling), bootsupport
-                 staleness and the src provenance status (what the build/promotion
+                 staleness and the src provenance status (what the producing
                  commands would do)."
                 projectversion
                 "
@@ -3253,13 +3284,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  if src/ has changes since the last project-version bump."
                 workflow
                 "
-                 Print a plain-text (ASCII diagram) overview of the build/release
+                 Print a plain-text (ASCII diagram) overview of the release
                  workflow: the release-ready command sequence and how data flows from
                  editing a module under src/ through built packages to bootsupport,
                  the kit vfs and the kit executables.
                  The text is embedded in make.tcl (::punkboot::workflow_text) so it is
                  available wherever make.tcl runs; its MAINTENANCE key states the
-                 update contract for keeping it in step with build behaviour."
+                 update contract for keeping it in step with make.tcl behaviour."
                 help
                 "
                  Show tabled usage for make.tcl as a whole, or for a single subcommand.
@@ -3280,7 +3311,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 "
                  Surface for the defined buildsuites under src/buildsuites (zig-built
                  runtime factory - an arm's-length subsystem building Tcl runtimes
-                 from external sources, distinct from the project build/bake stages).
+                 from external sources, distinct from the project mint/bake stages).
 
                  Actions:
                    buildsuite list
@@ -3337,7 +3368,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  the LOWEST release satisfying the floor wins (deterministic as
                  newer toolchains appear beside the pinned one; dev builds count
                  only when their base version exceeds the floor). zig is OPTIONAL
-                 for punkshell builds: packages/bake never require this step -
+                 for the punkshell mint/bake pipeline: packages/bake never require this step -
                  without a suitable toolchain, list reports the state and
                  build/test exit nonzero with fetch guidance
                  (bin/punk-getzig.cmd). Build caches (.zig-cache/zig-out) are
@@ -3358,7 +3389,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                       non-interactive resolution:
                         bootsupport minor-version staleness gate -> proceed
                         vfscommonupdate REPLACE confirmation     -> proceed
-                        kit source/target type mismatch          -> skip building that kit
+                        kit source/target type mismatch          -> skip baking that kit
                      Note: Tcl 8.6 lacks the terminal probe (-inputmode) so stdin is assumed
                      interactive there - piped runs under 8.6 should always pass -confirm
                      explicitly."
@@ -3370,13 +3401,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                      provenance. Warnings carry a plain PROVENANCE-WARNING: prefix (greppable
                      in redirected output) and are recapped at the end of the run.
                      Use 'make.tcl check' to see the current provenance status. To evaluate
-                     uncommitted source without building, use '<builtexe> src' or
+                     uncommitted source without minting or baking, use '<builtexe> src' or
                      '<builtexe> src shell'."
             }
             variable OPT_FORCEKILL {
                 -k -type none -default 0 -help\
                     "Terminate running processes matching the executable being built
-                     (if applicable) so the build can install over it."
+                     (if applicable) so the bake can install over it."
             }
             #bakehouse defaults the dirty gate ON:
             #the bakehouse bakes from the committed recipe (G-112 two-persona model).
@@ -3384,10 +3415,10 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 -dirty-abort -type boolean -default 1 -help\
                     "Abort when src/ has uncommitted VCS changes - DEFAULT ON for this
                      subcommand: the bakehouse bakes from the committed recipe. A
-                     consumer build on a clean checkout runs uninterrupted; uncommitted
+                     consumer run on a clean checkout proceeds uninterrupted; uncommitted
                      developer changes get a refusal naming the granular flow
                      (packages -> test -> bootsupport/vfscommonupdate -> commit -> bake).
-                     Pass -dirty-abort 0 to build anyway with PROVENANCE-WARNINGs."
+                     Pass -dirty-abort 0 to proceed anyway with PROVENANCE-WARNINGs."
             }
             #libfetch fragments (G-139): consent is keyed to SERVER TRUST (the G-123
             #posture) - the canonical punkbin origin needs no acknowledgement, any
@@ -3510,7 +3541,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                     @<groupname> for every kit in a configured group (G-024) - see
                     'make.tcl bakelist' for the configured names and groups. With no
                     kitname, all configured kits are processed except entries with
-                    bake_default=false. An unknown name errors before any build."
+                    bake_default=false. An unknown name errors before any bake."
             }
             punk::args::define {
                 @id     -id     "(script)::punkboot::bakelist"
@@ -3729,7 +3760,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             }
             #top-level definition: the subcommand table rendered by 'make.tcl' / 'make.tcl -help'
             variable SUBGROUPS {
-                "build & bake"       {bakehouse packages modules libs bake vfslibs bin}
+                "mint & bake"        {bakehouse packages modules libs bake vfslibs bin}
                 "promotion gates"    {bootsupport vfscommonupdate}
                 "source maintenance" {vendorupdate libfetch}
                 "buildsuites"        {buildsuite}
@@ -3756,7 +3787,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 #sole remaining explicit synopsis override (G-143 retired the per-subcommand
@@ -3805,7 +3836,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot.overview"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 @form -synopsis "make.tcl ?subcommand? ?flags?"
@@ -4212,7 +4243,7 @@ set binfolder    $projectroot/bin
 
 # ----------------------------------------
 # G-121 selective bake: resolve requested kit names against the parsed kit-mapping
-# model before ANY build machinery runs - an unknown name must error without building,
+# model before ANY bake machinery runs - an unknown name must error without baking,
 # and a selected-but-unbuildable kit (missing runtime/vfs) fails fast rather than
 # silently doing nothing (bare 'bake' keeps the historical warn-and-continue
 # behaviour for the full configured set). The kit machinery and the vfslibs phase
@@ -4277,12 +4308,12 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 }
 
 # ----------------------------------------
-# Provenance-warning presentation + dirty-src check for build/promotion commands (goal G-026 direction).
-# Build/promotion commands stamp versions onto src content and propagate it into trees other
+# Provenance-warning presentation + dirty-src check for producing commands (goal G-026 direction).
+# Producing commands (mint/promote/bake) stamp versions onto src content and propagate it into trees other
 # things consume (root modules/, bootsupport snapshots, vfs payloads, kits/zipkits).
 # Artifacts built from uncommitted src have no committed provenance - warn by default,
 # abort if the -dirty-abort flag was given. To evaluate uncommitted source without
-# building, use '<builtexe> src' / '<builtexe> src shell' instead.
+# minting or baking, use '<builtexe> src' / '<builtexe> src shell' instead.
 # Guarded require: a stale or missing punkboot::utils bootsupport snapshot must never
 # brick the make.tcl commands used to repair it - the check degrades to a skip notice
 # (but -dirty-abort still aborts rather than silently skipping the requested strictness).
@@ -4290,7 +4321,7 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 #Emit provenance warnings with a plain column-0 token for automated discovery (grep PROVENANCE-WARNING
 #in redirected output) and ANSI colour for humans. Lines are also accumulated in
 #::punkboot::provenance_warnings_pending unless -norecap is given, so the wrapped ::exit below can
-#recap them at the tail of the output - build progress output is chatty and the original warning
+#recap them at the tail of the output - make.tcl progress output is chatty and the original warning
 #position may scroll out of sight or even out of scrollback.
 set ::punkboot::provenance_warnings_pending [list]
 proc ::punkboot::print_provenance_warnings {warninglines args} {
@@ -4305,22 +4336,22 @@ proc ::punkboot::print_provenance_warnings {warninglines args} {
     }
     flush stderr
 }
-#General build warnings that must stay noticeable despite chatty build output - same
+#General bake warnings that must stay noticeable despite chatty output - same
 #column-0 greppable-token + recap-at-exit treatment as provenance warnings above.
-set ::punkboot::build_warnings_pending [list]
-proc ::punkboot::print_build_warnings {warninglines args} {
+set ::punkboot::bake_warnings_pending [list]
+proc ::punkboot::print_bake_warnings {warninglines args} {
     global A
     if {![array size A]} {punkboot::define_global_ansi}
     foreach w $warninglines {
         regsub {^WARNING: } $w "" w
-        puts stderr "BUILD-WARNING: $A(BAD)$w$A(RST)"
+        puts stderr "BAKE-WARNING: $A(BAD)$w$A(RST)"
         if {"-norecap" ni $args} {
-            lappend ::punkboot::build_warnings_pending $w
+            lappend ::punkboot::bake_warnings_pending $w
         }
     }
     flush stderr
 }
-#Availability probe + scoped dirty-src check, shared by the build/promotion gate below and the
+#Availability probe + scoped dirty-src check, shared by the producing-commands gate below and the
 #'check' command report. Returns {available warninglist}.
 proc ::punkboot::get_src_provenance_warnings {projectroot label} {
     set available [expr {\
@@ -4338,7 +4369,7 @@ proc ::punkboot::get_src_provenance_warnings {projectroot label} {
 #
 #On windows an ordinary 'file copy -force' onto a mapped file is refused: a zipfs mount
 #maps its archive (tclZipfs.c CreateFileMappingW + MapViewOfFile), so a zip-based .tm
-#modpod that any running shell - including this build - has mounted cannot be overwritten
+#modpod that any running shell - including this make.tcl run - has mounted cannot be overwritten
 #in place. Windows reports ERROR_USER_MAPPED_FILE (1224); Tcl's Tcl_WinConvertError maps
 #only Win32 codes 0..267 and sends everything above them to EINVAL, so it surfaces as the
 #uninformative "invalid argument" (same code in 8.6 and 9.x).
@@ -4385,7 +4416,7 @@ proc ::punkboot::mapped_file_hint {errmsg tgtfile} {
     }
     return "'invalid argument' is Tcl's catch-all for any windows error above 267 (Tcl_WinConvertError), not a bad argument.\
         For a file replace the usual cause is ERROR_USER_MAPPED_FILE: '$tgtfile' is memory-mapped by a process that has it mounted -\
-        a zipfs/modpod mount does this, so a running punk shell (or this build) holding that .tm blocks an in-place overwrite.\
+        a zipfs/modpod mount does this, so a running punk shell (or this make.tcl run) holding that .tm blocks an in-place overwrite.\
         Close shells holding it, or rerun - the update now replaces such files by delete-then-place rather than overwrite."
 }
 #Availability probe + boot-precondition check of an assembled kit vfs (G-125), shared by the
@@ -4439,7 +4470,7 @@ proc ::punkboot::get_kit_offsetstyle_report {kitpath} {
 #file exists. The tclsh subcommand is used deliberately: it exits cleanly even on
 #runtimes whose full repl teardown is fragile, and a script argument with drained
 #stdin cannot reach any console-reopen path. ADVISORY: failures become recapped
-#BUILD-WARNINGs naming kit, package and the actual error - the kit still deploys.
+#BAKE-WARNINGs naming kit, package and the actual error - the kit still deploys.
 #Returns 1 when every declared package resolved, else 0.
 proc ::punkboot::kit_smoke_require_probe {kitpath targetkit packages} {
     set probescript [file rootname $kitpath]_smokerequire.tcl
@@ -4459,13 +4490,13 @@ exit 0}
         close $fd
     } errM]} {
         catch {close $fd}
-        ::punkboot::print_build_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
+        ::punkboot::print_bake_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
         return 0
     }
     if {[catch {
         lassign [punk::lib::invoke [list [file nativename $kitpath] tclsh [file nativename $probescript] << ""]] p_stdout p_stderr p_exitcode
     } errM]} {
-        ::punkboot::print_build_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
+        ::punkboot::print_bake_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
         return 0
     }
     set seen [dict create]
@@ -4502,7 +4533,7 @@ exit 0}
         lappend warnings "smoke-require for kit $targetkit: artifact exited with code $p_exitcode via its tclsh subcommand (expected 0)"
     }
     if {[llength $warnings]} {
-        ::punkboot::print_build_warnings $warnings
+        ::punkboot::print_bake_warnings $warnings
     }
     return $allok
 }
@@ -4516,10 +4547,10 @@ if {![llength [info commands ::punkboot::exit_original]]} {
             puts stderr "PROVENANCE-WARNING: recap of warning(s) emitted earlier in this run:"
             ::punkboot::print_provenance_warnings $::punkboot::provenance_warnings_pending -norecap
         }
-        if {[info exists ::punkboot::build_warnings_pending] && [llength $::punkboot::build_warnings_pending]} {
+        if {[info exists ::punkboot::bake_warnings_pending] && [llength $::punkboot::bake_warnings_pending]} {
             puts stderr ""
-            puts stderr "BUILD-WARNING: recap of warning(s) emitted earlier in this run:"
-            ::punkboot::print_build_warnings $::punkboot::build_warnings_pending -norecap
+            puts stderr "BAKE-WARNING: recap of warning(s) emitted earlier in this run:"
+            ::punkboot::print_bake_warnings $::punkboot::bake_warnings_pending -norecap
         }
         ::punkboot::exit_original $returnCode
     }
@@ -4531,7 +4562,7 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
     if {$have_scoped_dirty_check} {
         if {[llength $dirty_warnings]} {
             ::punkboot::print_provenance_warnings $dirty_warnings
-            puts stderr "  To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+            puts stderr "  To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
             if {$dirty_abort} {
                 set ::punkboot::provenance_warnings_pending [list] ;#no recap needed - aborting adjacent to the warning
                 if {$::punkboot::command eq "bakehouse"} {
@@ -4540,9 +4571,9 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
                     puts stderr "    make.tcl packages   -> test ('<builtexe> src', src/tests/runtests.tcl)"
                     puts stderr "    make.tcl bootsupport + make.tcl vfscommonupdate   (promotion gates)"
                     puts stderr "    commit              -> make.tcl bake"
-                    puts stderr "  To build anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
+                    puts stderr "  To proceed anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
                 } else {
-                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to build with a warning)"
+                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to proceed with a warning)"
                 }
                 exit 1
             }
@@ -4734,19 +4765,19 @@ if {$::punkboot::command eq "check"} {
         puts stderr "    cd \[projectroot\]/src && tclsh make.tcl modules && tclsh make.tcl bootsupport"
         puts stderr "=============================================================================="
     }
-    # Dirty-src provenance status - what the build/promotion commands would do
+    # Dirty-src provenance status - what the producing commands would do
     puts stdout $sep
     lassign [::punkboot::get_src_provenance_warnings $projectroot "make.tcl check"] _prov_available _prov_warnings
     if {!$_prov_available} {
         puts stdout "src provenance: check unavailable (punkboot::utils vcs_dirty_warnings with scope support not loadable from bootsupport)"
-        puts stdout "  build/promotion commands will proceed with a NOTE; -dirty-abort would abort as unverifiable."
+        puts stdout "  producing commands (mint/promote/bake) will proceed with a NOTE; -dirty-abort would abort as unverifiable."
     } elseif {![llength $_prov_warnings]} {
         puts stdout "src provenance: OK (no uncommitted fossil/git changes under src/)"
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
     } else {
         ::punkboot::print_provenance_warnings $_prov_warnings -norecap
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
-        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
+        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
     }
     # Kit boot-precondition gate status - whether a bake can refuse an unbootable kit
     puts stdout $sep
@@ -4755,7 +4786,7 @@ if {$::punkboot::command eq "check"} {
     if {$_boot_available} {
         puts stdout "boot-precondition gate (G-125): ACTIVE"
         puts stdout "  bake checks each kit's merged vfs for a tcl library (tcl_library/, lib/tcl<major>.<minor>/ or"
-        puts stdout "  tcl<major>.<minor>/) before building it. A kit with none is reported under FAILED KITS and is"
+        puts stdout "  tcl<major>.<minor>/) before baking it. A kit with none is reported under FAILED KITS and is"
         puts stdout "  neither built nor deployed, so a previously deployed kit is never replaced by an artifact that"
         puts stdout "  cannot initialise."
     } else {
@@ -4770,7 +4801,7 @@ if {$::punkboot::command eq "check"} {
         puts stdout "payload/target arch scan (G-133): ACTIVE (advisory)"
         puts stdout "  bake classifies each merged kit's binary libraries (*.dll/*.so/*.dylib header bytes - structural,"
         puts stdout "  nothing executed, cross-target kits included) against the kit's target platform and emits"
-        puts stdout "  recapped BUILD-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
+        puts stdout "  recapped BAKE-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
         puts stdout "  (canonical <os>-<cpu> names and recognised vendor spellings such as win-x64 are exempt)."
     } else {
         puts stdout "payload/target arch scan (G-133): UNAVAILABLE (punkboot::utils vfs_binary_arch_report not loadable from bootsupport)"
@@ -4783,7 +4814,7 @@ if {$::punkboot::command eq "check"} {
     if {$_off_available} {
         puts stdout "kit offset-style pin (G-134): ACTIVE (advisory)"
         puts stdout "  bake probes each assembled kit image with punk::zip::archive_info and emits a recapped"
-        puts stdout "  BUILD-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
+        puts stdout "  BAKE-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
         puts stdout "  emits archive-relative by construction; the G-128 stamper refuses file-relative by default)."
         puts stdout "  plain/none results (no attached zip - e.g the metakit kit shape) are silence, not warnings."
     } else {
@@ -4804,7 +4835,7 @@ if {$::punkboot::command eq "check"} {
     puts stdout "  (mapvfs.toml smokerequire key; legacy mapvfs.config 5th entry element) have each one plain-'package require'd inside the built"
     puts stdout "  artifact via its tclsh subcommand - the only check that sees resolution-order defects such as"
     puts stdout "  a wrong-arch higher-versioned package shadowing a working copy. Failures are recapped"
-    puts stdout "  BUILD-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
+    puts stdout "  BAKE-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
     if {[llength $_smoke_declared]} {
         puts stdout "  declared: [join $_smoke_declared {; }]"
     } else {
@@ -4995,7 +5026,7 @@ if {$::punkboot::command eq "workflow"} {
 if {$::punkboot::command eq "bakelist"} {
     #G-121: report the kit outputs configured in src/runtime/mapvfs.config, consuming
     #the same parsed mapping model as the bake kit machinery (::punkboot::lib::mapvfs_*).
-    #Reporting only - never builds. Data rows are single-line and column-stable for
+    #Reporting only - never bakes. Data rows are single-line and column-stable for
     #grepping; expected state sits in the columns, anomalies surface in a trailing
     #sparse notes column (key=value tags). Kit name arguments filter the report and
     #add a per-kit detail block (resolved paths/sizes/mtimes).
@@ -5007,7 +5038,7 @@ if {$::punkboot::command eq "bakelist"} {
     set rt_os_arch [punkboot::lib::platform_store_tier $rt_default_target]
     set rtbase   $binfolder/runtime
     set rtfolder $rtbase/$rt_os_arch
-    set buildfolder $sourcefolder/_build
+    set bakefolder $sourcefolder/_bake
     set mapfile [punkboot::lib::mapvfs_locate $sourcefolder/runtime]
     set mapmodel [punkboot::lib::mapvfs_model $sourcefolder/runtime $rtbase $sourcefolder $rt_default_target]
     foreach errline [dict get $mapmodel configerrors] {
@@ -5076,12 +5107,12 @@ if {$::punkboot::command eq "bakelist"} {
         set runtime  [dict get $rec runtime]
         set vfstail  [dict get $rec vfs]
         #G-127: deploy-state roots follow the record's output tier (non-default
-        #targets live under kits/<platform>/ in both bin/ and src/_build/)
+        #targets live under kits/<platform>/ in both bin/ and src/_bake/)
         set out_tier [dict get $rec out_tier]
         if {$out_tier eq ""} {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder $binfolder [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder $binfolder [dict get $rec targetkit]]
         } else {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
         }
         set notes [list]
         if {$runtime ne "-" && ![dict get $rec runtime_present]} {
@@ -5094,7 +5125,7 @@ if {$::punkboot::command eq "bakelist"} {
             #cross-target entry: its runtime, store tier and artifact naming follow
             #its own platform, not this host's default
             lappend notes target=[dict get $rec target]
-            #G-127: and its build/deploy locations sit under the kits/<platform>/ tier
+            #G-127: and its bake/deploy locations sit under the kits/<platform>/ tier
             lappend notes out=$out_tier/
         }
         if {[dict get $rec group] ne ""} {
@@ -5136,7 +5167,7 @@ if {$::punkboot::command eq "bakelist"} {
             append map_display " (deprecated format)"
         }
     }
-    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_build/<kit> (out= rows: under kits/<platform>/)"
+    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_bake/<kit> (out= rows: under kits/<platform>/)"
     set headline ""
     foreach h $headings w $widths {
         append headline [format "%-*s  " $w $h]
@@ -5176,10 +5207,10 @@ if {$::punkboot::command eq "bakelist"} {
             if {[dict get $rec group] ne ""} {
                 puts stdout "    group:         [dict get $rec group][expr {[dict get $rec bake_default] ? "" : "   (bake_default=false - bake by name or @[dict get $rec group])"}]"
             } elseif {![dict get $rec bake_default]} {
-                puts stdout "    bake_default:  false (excluded from full bakes - bake by name to build)"
+                puts stdout "    bake_default:  false (excluded from full bakes - bake it by name)"
             }
             set relkit [expr {[dict get $rec out_tier] eq "" ? [dict get $rec targetkit] : "[dict get $rec out_tier]/[dict get $rec targetkit]"}]
-            puts stdout "    build product: src/_build/$relkit [punkboot::lib::bakelist_file_detail $buildfolder/$relkit]"
+            puts stdout "    bake product:  src/_bake/$relkit [punkboot::lib::bakelist_file_detail $bakefolder/$relkit]"
             puts stdout "    deployed:      bin/$relkit [punkboot::lib::bakelist_file_detail $binfolder/$relkit] state=[lindex $row 4]"
         }
     }
@@ -6114,7 +6145,7 @@ if {$::punkboot::command eq "bootsupport"} {
     #Project layouts store no bootsupport module snapshots - 'dev project.new' injects bootsupport
     #into generated projects from the generating shell at generation time. Layout-carried scripts
     #and bootsupport manifests are kept current by the thin-layout sync step (see DIAGRAM 1b in
-    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse builds.
+    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse runs.
 
     puts stdout " bootsupport done "
     flush stderr
@@ -6434,7 +6465,7 @@ if {$::punkboot::command ni {bakehouse packages modules libs bake vfslibs bin}}
 
 
 
-#external libs and modules first - and any supporting files - no 'building' required
+#external libs and modules first - and any supporting files - no minting required
 
 #install src vendor contents (from version controlled src folder) to base of project (same target folders as our own src/modules etc ie to paths that go on the auto_path and in tcl::tm::list)
 
@@ -6962,7 +6993,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
 
     #store -> modpod payload sync: the punk::mix::templates module ships the thin punk.project layout
     #so module-pathtype layout refs resolve and a bare kit outside any project can generate from it.
-    #The modpod copy is build-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
+    #The modpod copy is sync-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
     #inside zip-based .tm modules). (The unimplemented child-side src/PROJECT_LAYOUTS_* marker was
     #retired by G-087 stage 5 - thin layouts + generation-time injection made it moot.)
     set store_layout   $sourcefolder/project_layouts/vendor/punk/project-0.1
@@ -6978,7 +7009,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
             -installer make.tcl
             -overwrite installedsourcechanged-targets
             -createempty 1
-            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build .git **/.git}
+            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build _mint **/_mint _bake **/_bake .git **/.git}
             -exclude-paths {bin/sdx.kit}
         }]
         puts stdout [punkcheck::summarize_install_resultdict $resultdict]
@@ -7083,20 +7114,29 @@ set installername "make.tcl"
 if {$::punkboot::command ni {bakehouse bake bin}} {
     #command = packages/modules/libs/vfslibs - stops before kit assembly
     puts stdout "vfs folders not checked"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder (promotion gate - commit for provenance)"
-    puts stdout " - use 'make.tcl bake' to build executable kits/zipkits from the vfs folders if you have runtimes installed"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder (promotion gate - commit for provenance)"
+    puts stdout " - use 'make.tcl bake' to bake executable kits/zipkits from the vfs folders if you have runtimes installed"
     puts stdout "   Note that without the vfscommonupdate step, 'make.tcl bake' will include any manual changes in the *custom* vfs folders but"
-    puts stdout "   without the latest built modules."
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   without the latest minted modules."
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
     puts stdout " - consumer full path from a clean checkout: 'make.tcl bakehouse'"
     puts stdout "-done-"
     exit 0
 }
 
 
-set buildfolder [punk::mix::cli::lib::get_build_workdir $sourcefolder]
-if {$buildfolder ne "$sourcefolder/_build"} {
-    puts stderr "$sourcefolder/_build doesn't match the project buildfolder $buildfolder - check project filestructure"
+#G-155: the bake workdir resolver was renamed get_build_workdir -> get_bake_workdir with the
+#src/_build -> src/_bake flip. Fall back to a direct mkdir when driving a stale punk::mix
+#snapshot (old bootsupport, or a generated project mid-update) so the mixed state stays runnable.
+if {[llength [info commands ::punk::mix::cli::lib::get_bake_workdir]]} {
+    set bakefolder [punk::mix::cli::lib::get_bake_workdir $sourcefolder]
+} else {
+    puts stderr "NOTE: punk::mix snapshot predates get_bake_workdir (G-155) - using $sourcefolder/_bake directly. Refresh with 'make.tcl modules' + 'make.tcl bootsupport'."
+    file mkdir $sourcefolder/_bake
+    set bakefolder $sourcefolder/_bake
+}
+if {$bakefolder ne "$sourcefolder/_bake"} {
+    puts stderr "$sourcefolder/_bake doesn't match the project bakefolder $bakefolder - check project filestructure"
     puts stdout " -aborted- "
     exit 2
 }
@@ -7134,7 +7174,7 @@ set rt_sourcefolder $sourcefolder/runtime ;#where our config lives
 #driving tclsh's platform. The copy is the same binary as its source, so it must
 #keep the source's executable convention - an .exe stays an .exe whether a native
 #windows tclsh, an msys/cygwin-runtime tclsh (platform 'unix', .exe files) or a
-#cross-target host is driving the build.
+#cross-target host is driving the bake.
 #Mapping key for a runtime FILE name: the name as mapvfs.config spells it, i.e
 #with a windows .exe suffix removed. Only .exe may be stripped - 'file rootname'
 #would eat the last dotted segment of version-named runtimes such as tclsh9.0.5,
@@ -7200,7 +7240,7 @@ proc ::punkboot::runtime_materialization_warning {rtfolder runtime_fullname} {
         set current_rev [dict get $stale current_rev]
         set maxrev [dict get $stale maxrev]
         set maxname [dict get $stale maxname]
-        ::punkboot::print_build_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
+        ::punkboot::print_bake_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
     }
     return
 }
@@ -7238,7 +7278,7 @@ if {[llength $missing]} {
         #declaration. A missing runtime FILE is environment, not declaration: store
         #tiers are legitimately part-populated (fresh clones; runtimes arrive via the
         #consent-gated fetch tiers), so those entries skip with a recapped
-        #BUILD-WARNING naming the entry (cross-target wording states the tier reason).
+        #BAKE-WARNING naming the entry (cross-target wording states the tier reason).
         #bake_default=false entries are not in the full-bake set; selective bakes
         #fail fast at selection instead.
         set _strict_fatal [list]
@@ -7268,7 +7308,7 @@ if {[llength $missing]} {
             exit 3
         }
         if {[llength $_strict_warn]} {
-            ::punkboot::print_build_warnings $_strict_warn
+            ::punkboot::print_bake_warnings $_strict_warn
         }
         unset -nocomplain _rec _entrylabel _strict_fatal _strict_warn _line
     } else {
@@ -7359,7 +7399,7 @@ dict for {_rtname _rttarget} $runtime_target {
         continue ;#absent cross-target runtime already warned by the parse
     }
     if {[dict exists $rtfolder_of $_file]} {
-        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to build both."
+        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to bake both."
         continue
     }
     lappend runtimes $_file
@@ -7370,14 +7410,14 @@ if {[llength $cross_target_tiers]} {
 }
 unset -nocomplain _rtname _rttarget _tier _dir _file
 if {![llength $runtimes]} {
-    puts stderr "No executable runtimes found in $rtfolder - unable to build any .vfs folders into executables."
+    puts stderr "No executable runtimes found in $rtfolder - unable to bake any .vfs folders into executables."
     puts stderr "Add runtimes to $rtfolder if required"
     if {![file isdirectory $rtfolder]} {
         #same store-tier self-diagnosis as bakelist
         puts stderr "NOTE: that runtime store folder does not exist. Default target '$rt_default_target' derives from THIS tclsh: tcl_platform(os)='$::tcl_platform(os)' tcl_platform(platform)='$::tcl_platform(platform)' -> host canon '$::punkboot::host_platform' -> target '$rt_default_target'."
         puts stderr "  Populate it with 'bin/punk-runtime.cmd' (or by hand), or declare a per-entry target platform in mapvfs.toml for runtimes stored elsewhere."
     }
-    #todo - don't exit - it is valid to use runtime of - to just build a .kit/.zipkit ?
+    #todo - don't exit - it is valid to use runtime of - to just bake a .kit/.zipkit ?
     exit 0
 }
 #G-121 selective bake: restrict processing to the runtimes the selected kits wrap -
@@ -7494,7 +7534,7 @@ dict for {vfstail -} $vfs_runtime_map {
     }
 }
 #G-121 selective bake: only the selected kits' vfs folders get checked/checksummed -
-#other vfs folders' punkcheck build events never fire.
+#other vfs folders' punkcheck bake events never fire.
 if {[llength $::punkboot::bake_selected_kitnames]} {
     set vfs_tails [lmap _vt $vfs_tails {
         if {$_vt ni $::punkboot::bake_selected_vfs} {
@@ -7505,22 +7545,22 @@ if {[llength $::punkboot::bake_selected_kitnames]} {
     unset -nocomplain _vt
 }
 if {![llength $vfs_tails]} {
-    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to build"
+    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to bake"
     puts stdout " -done- "
     exit 0
 }
 
-set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if building from same .vfs with multiple runtime executables
+set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if baking from same .vfs with multiple runtime executables
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we build an exe for a runtime that matches .vfs folder name - REVIEW.
+#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we bake an exe for a runtime that matches .vfs folder name - REVIEW.
 foreach  runtimefile $runtimes {
     #runtimefile e.g tclkit86bi.exe for a win32 target, tclkit86bi for a posix one
 
-    #sdx *may* be pointed to use the runtime we use to build the kit, or the user may manually use this runtime if they don't have tclsh
+    #sdx *may* be pointed to use the runtime we use to bake the kit, or the user may manually use this runtime if they don't have tclsh
     #sdx will complain if the same runtime is used for the shell as is used in the -runtime argument - so we make a copy (REVIEW)
-    #if {![file exists $buildfolder/buildruntime.exe]} {
-    #    file copy $rtfolder/$runtimefile $buildfolder/buildruntime.exe
+    #if {![file exists $bakefolder/buildruntime.exe]} {
+    #    file copy $rtfolder/$runtimefile $bakefolder/buildruntime.exe
     #}
 
     #G-122: each runtime is read from the tier its target platform names, not
@@ -7540,18 +7580,18 @@ foreach  runtimefile $runtimes {
         set useruntimefile $runtimefile
     }
 
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
         -make-step copy_runtime
     }]
     #----------
     set installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-    $installer set_source_target $rt_dir $buildfolder
+    $installer set_source_target $rt_dir $bakefolder
     set event [$installer start_event $config]
-    $event targetset_init INSTALL $buildfolder/build_$runtimefile
+    $event targetset_init INSTALL $bakefolder/build_$runtimefile
     #$event targetset_addsource $rt_dir/$runtimefile
     $event targetset_addsource $rt_dir/$useruntimefile ;#possibly the _BUILDCOPY in the runtime folder (created for when mounted in current executable as a tclkit)
-    $event targetset_addsource $buildfolder/build_$runtimefile ;#self as source for change detection
+    $event targetset_addsource $bakefolder/build_$runtimefile ;#self as source for change detection
     #----------
 
     #set changed_unchanged [punkcheck::recordlist::file_install_record_source_changes [lindex [dict get $file_record body] end]]
@@ -7562,11 +7602,11 @@ foreach  runtimefile $runtimes {
         $event targetset_started
         # -- --- --- --- --- ---
         #This is the full runtime - *possibly* with some sort of vfs attached.
-        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $buildfolder/build_$runtimefile"
+        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $bakefolder/build_$runtimefile"
         if {[catch {
-            file copy -force $rt_dir/$useruntimefile $buildfolder/build_$runtimefile ;#becomes building_runtime
+            file copy -force $rt_dir/$useruntimefile $bakefolder/build_$runtimefile ;#becomes baking_runtime
         } errM]} {
-            puts stderr " >> copy runtime to $buildfolder/build_$runtimefile FAILED"
+            puts stderr " >> copy runtime to $bakefolder/build_$runtimefile FAILED"
             $event targetset_end FAILED
         } else {
             $event targetset_end OK
@@ -7804,7 +7844,7 @@ proc vfs_startup_script_warning {vfsfolder} {
             append detail "; main.tcl fauxlink target '$linktarget' does not exist"
         }
     }
-    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (build proceeding anyway)$detail"
+    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (bake proceeding anyway)$detail"
 }
 #Cat-style zipkit assembly: a raw (vfs-free) runtime followed by a freshly built
 #zip, concatenated. This is the zipfs-less assembly path for BOTH zip-type kits
@@ -7845,7 +7885,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-057 kit icon step. Every built kit gets a <kitname>.resources.toml sidecar
-#recording the build-time icon choice (default src/runtime/punkshell.ico,
+#recording the bake-time icon choice (default src/runtime/punkshell.ico,
 #overridable by a root-level punkshell.ico in the kit's own custom .vfs folder,
 #consulted PRE-merge so the _vfscommon copy never reads as an override), and
 #win32-target kits get that icon embedded as PE RT_ICON/RT_GROUP_ICON resources
@@ -7856,7 +7896,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 #adopted from the first replaced group; idempotent by construction, parity
 #recorded in the G-128 detail file): the vendored punkres portable stamper
 #(G-128, src/tools/punkres, built by 'make.tcl tool build punkres') is
-#selected when bin/punkres(.exe) exists and works from ANY build host;
+#selected when bin/punkres(.exe) exists and works from ANY bake host;
 #otherwise the twapi arm (tcl-sfe sfe-0.2.tm ReplaceIconInStub lineage; Ashok
 #P. Nadkarni) serves windows hosts with nothing built. Ordering is stub-first either way: a per-kit
 #copy of the payload-free raw runtime prefix is stamped BEFORE any payload is
@@ -8195,12 +8235,12 @@ proc ::punkboot::kit_icon_embed_twapi {exepath icopath {group_override {}}} {
 #G-057 single internal entry point. Decides the kit's icon (override: root
 #punkshell.ico in the kit's own custom .vfs folder, pre-merge; else the project
 #default src/runtime/punkshell.ico), writes/refreshes the kit's
-#<kitname>.resources.toml sidecar in the build folder, and - when the target
+#<kitname>.resources.toml sidecar in the bake folder, and - when the target
 #has PE resources and this host can write them - stamps a per-kit copy of the
 #payload-free raw runtime prefix. Returns {wrap_runtime sidecarpath}:
 #wrap_runtime is the runtime prefix the assembly step must consume (the stamped
 #copy when embedding happened, the untouched raw prefix otherwise).
-proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime buildfolder} {
+proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime bakefolder} {
     set repo_root [file dirname $sourcefolder]
     set override_icon $sourcefolder/vfs/$vfstail/punkshell.ico
     if {[file isfile $override_icon]} {
@@ -8253,7 +8293,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     }
     set wrap_runtime $raw_runtime
     if {$status eq ""} {
-        set stamped $buildfolder/iconed_$targetkit
+        set stamped $bakefolder/iconed_$targetkit
         file copy -force $raw_runtime $stamped
         catch {exec chmod +w $stamped}
         if {$punkres_ok} {
@@ -8264,7 +8304,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
             set embed_cmd [list ::punkboot::kit_icon_embed_twapi $stamped $icon_path $icon_group]
         }
         if {[catch $embed_cmd embed_result]} {
-            ::punkboot::print_build_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
+            ::punkboot::print_bake_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
             set status failed
             set reason $embed_result
             catch {file delete $stamped}
@@ -8303,7 +8343,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     lappend lines "embedding = \"$embedding\""
     lappend lines "embedding_status = \"$status\""
     lappend lines "embedding_reason = \"[$esc $reason]\""
-    set sidecar $buildfolder/$targetkit.resources.toml
+    set sidecar $bakefolder/$targetkit.resources.toml
     ::punkboot::kiticon::writefile_ifchanged $sidecar "[join $lines \n]\n"
     return [list $wrap_runtime $sidecar]
 }
@@ -8311,18 +8351,18 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
 
 set startdir [pwd]
 puts stdout "Found [llength $vfs_tails] .vfs folders -   checking each for executables that may need to be built"
-cd [file dirname $buildfolder] 
+cd [file dirname $bakefolder] 
 #root folder mtime is insufficient for change detection. Tree mtime of folders only is a barely  passable mechanism for vfs change detection in some circumstances - e.g if files added/removed but never edited in place
 #a hash of full tree file & dir mtime may be more reasonable - but it remains to be seen if just tar & checksum is any/much slower.
 #Simply rebuilding all the time may be close the speed of detecting change anyway - and almost certainly much faster when there is a change.
-#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle build on reversion to older source.
+#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle re-bake on reversion to older source.
 set exe_names_seen [list]
 set path_cksum_cache [dict create]
 dict set path_cksum_cache {*}[punk::mix::base::lib::get_relativecksum_from_base $basedir $sourcefolder/vfs/_vfscommon.vfs]
 
 #
-# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - build with sdx or zipfs if source .vfs or source runtime exe has changed.
-# we are using punkcheck to install result to buildfolder so we create a .punkcheck file at the target folder to store metadata.
+# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - bake with sdx or zipfs if source .vfs or source runtime exe has changed.
+# we are using punkcheck to install result to bakefolder so we create a .punkcheck file at the target folder to store metadata.
 # punkcheck allows us to not rely purely on timestamps (which may be unreliable)  
 #
 foreach vfstail $vfs_tails {
@@ -8330,11 +8370,11 @@ foreach vfstail $vfs_tails {
     set vfsname [file rootname $vfstail]
     puts stdout "  ------------------------------------"
     puts stdout "  checking vfs $sourcefolder/vfs/$vfstail for configured runtimes"
-    set skipped_vfs_build 0
+    set skipped_vfs_bake 0
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
-        -make-step build_vfs
+        -make-step bake_vfs
     }]
 
 
@@ -8366,7 +8406,7 @@ foreach vfstail $vfs_tails {
         }
     } else {
         #only match this vfs to a correspondingly named runtime if there was no explicit entry for that runtime
-        #review - should this only be done if there are NO explicit entries? how does a user stop builds of unneeded exes that match without renaming files/folders?
+        #review - should this only be done if there are NO explicit entries? how does a user stop bakes of unneeded exes that match without renaming files/folders?
         #but conversely, adding an extra entry shouldn't stop default builds that used to run..
         set matchrt [file rootname [file tail $vfstail]] ;#e.g project.vfs -> project
         if {![dict exists $runtime_vfs_map $matchrt]} {
@@ -8385,7 +8425,7 @@ foreach vfstail $vfs_tails {
         #(e.g _vfscommon.vfs is a merge overlay with no runtime mapping and legitimately has no main.tcl)
         set startup_warning [vfs_startup_script_warning $sourcefolder/vfs/$vfstail]
         if {$startup_warning ne ""} {
-            ::punkboot::print_build_warnings [list $startup_warning]
+            ::punkboot::print_bake_warnings [list $startup_warning]
         }
     }
     #todo - non kit based - zipkit?
@@ -8452,21 +8492,21 @@ foreach vfstail $vfs_tails {
             lassign $targetkit_info targetkit target_kit_type kit_smokerequires kit_attrs
             #G-127: output locations are keyed by the kit's TARGET. Kits for this
             #host's own default target keep the flat locations every launcher, test
-            #and habit expects (src/_build/<kit>, bin/<kit>); any other target's kit
+            #and habit expects (src/_bake/<kit>, bin/<kit>); any other target's kit
             #builds and deploys under a kits/<platform>/ tier so same-named kits for
             #different targets coexist instead of overwriting each other across
             #selective runs. bin/kits/ rather than bin/<platform>/ because
             #bin/runtime/<platform>/ already means build INPUTS.
             if {$rt_target eq $rt_default_target} {
-                set kit_builddir  $buildfolder
+                set kit_bakedir  $bakefolder
                 set kit_deploydir $binfolder
-                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_build/
+                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_bake/
             } else {
-                set kit_builddir  $buildfolder/kits/$rt_target
+                set kit_bakedir  $bakefolder/kits/$rt_target
                 set kit_deploydir $binfolder/kits/$rt_target
                 set kit_relpath   kits/$rt_target/$targetkit
             }
-            file mkdir $kit_builddir
+            file mkdir $kit_bakedir
             #G-024: bake_default=false entries (declared per entry or via their group)
             #are excluded from full bakes - explicit name/@group selection builds them.
             if {![llength $::punkboot::bake_selected_kitnames]
@@ -8493,11 +8533,11 @@ foreach vfstail $vfs_tails {
             set self_exe [file normalize [info nameofexecutable]]
             set self_deploy_target [file normalize $kit_deploydir/$targetkit]
             if {$::punkboot::host_windows} {
-                set is_self_build [string equal -nocase $self_exe $self_deploy_target]
+                set is_self_bake [string equal -nocase $self_exe $self_deploy_target]
             } else {
-                set is_self_build [string equal $self_exe $self_deploy_target]
+                set is_self_bake [string equal $self_exe $self_deploy_target]
             }
-            if {$is_self_build} {
+            if {$is_self_bake} {
                 puts stderr "SKIPPING kit $targetkit - its deployed executable is the one running this build ($self_exe)"
                 puts stderr "  Rerun 'make.tcl $::punkboot::command' under tclsh or a different built kit to rebuild $targetkit."
                 lappend skipped_kits [list kit $targetkit reason "deployed executable is running this build"]
@@ -8505,9 +8545,9 @@ foreach vfstail $vfs_tails {
             }
             # -- ----------
             set vfs_installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-            $vfs_installer set_source_target $sourcefolder $buildfolder
-            set vfs_event [$vfs_installer start_event {-make-step build_vfs}]
-            $vfs_event targetset_init INSTALL $kit_builddir/$targetkit
+            $vfs_installer set_source_target $sourcefolder $bakefolder
+            set vfs_event [$vfs_installer start_event {-make-step bake_vfs}]
+            $vfs_event targetset_init INSTALL $kit_bakedir/$targetkit
             set relvfs [punkcheck::lib::path_relative $basedir $sourcefolder/vfs/$vfstail]
             if {![dict exists $path_cksum_cache $relvfs]} {
                 #e.g ../vfs/punk87.vfs {cksum xxxx cksum_all_opts {-cksum_content 1 ... -cksum_algorithm sha1}}
@@ -8523,11 +8563,11 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_addsource $sourcefolder/runtime/punkshell.ico
             }
             if {$rtname ne "-"} {
-                set building_runtime $buildfolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
-                $vfs_event targetset_addsource $building_runtime
+                set baking_runtime $bakefolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
+                $vfs_event targetset_addsource $baking_runtime
                 set raw_runtime "" ;#building runtime with vfs (zip,kit,cookfs etc stripped)
             } else {
-                set building_runtime "-" ;#REVIEW
+                set baking_runtime "-" ;#REVIEW
                 set raw_runtime "-"
             }
             # -- ----------
@@ -8541,18 +8581,18 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
 
-                if {[file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "deleting existing $buildfolder/$vfsname.new"
-                    file delete $buildfolder/$vfsname.new
+                if {[file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "deleting existing $bakefolder/$vfsname.new"
+                    file delete $bakefolder/$vfsname.new
                 }
 
                 package require fileutil
                 package require fileutil::traverse
                 package require control
 
-                #keep this a simple name - bin/punk script calls into src/_build/exename.vfs/main.tcl
+                #keep this a simple name - bin/punk script calls into src/_bake/exename.vfs/main.tcl
                 #(G-127: non-default-target kits keep the simple name under their kits/<platform>/ tier)
-                set targetvfs $kit_builddir/$targetkit.vfs
+                set targetvfs $kit_bakedir/$targetkit.vfs
                 file delete -force $targetvfs
 
                 set extraction_done 0
@@ -8623,7 +8663,7 @@ foreach vfstail $vfs_tails {
                             #zipfs mkimg replaces the entire zipped vfs in the runtime - so we need the original data to be part of our targetvfs.
                             puts stdout "Attempting to extract zip vfs data from $runtime_fullname"
                             file mkdir $targetvfs
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
 
                             if {[info commands ::tcl::zipfs::mount] ne ""} {
                                 #the driving tcl has zipfs
@@ -8631,13 +8671,13 @@ foreach vfstail $vfs_tails {
 
                                 if {![file exists $rtmountpoint]} {
                                     if {[catch {
-                                        tcl::zipfs::mount $building_runtime  rtmounts/$runtime_fullname
+                                        tcl::zipfs::mount $baking_runtime  rtmounts/$runtime_fullname
                                     } errM]} {
-                                        puts stderr "Failed to mount $building_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
+                                        puts stderr "Failed to mount $baking_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
                                         if {[catch {
-                                        tcl::zipfs::mount rtmounts/$runtime_fullname $building_runtime
+                                        tcl::zipfs::mount rtmounts/$runtime_fullname $baking_runtime
                                         } errM]} {
-                                            puts stderr "ALSO Failed to mount $building_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
+                                            puts stderr "ALSO Failed to mount $baking_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
                                         }
                                     }
                                 }
@@ -8656,7 +8696,7 @@ foreach vfstail $vfs_tails {
                                     if {$baseoffset != 0} {
                                         #tcl was able to determine the compressed-data offset
                                         #either because runtime is a basic catted exe+zip, or Tcl fixed 'zipfs info'
-                                        set fdrt [open $building_runtime r]
+                                        set fdrt [open $baking_runtime r]
                                         chan configure $fdrt -translation binary
                                         set exedata [read $fdrt $baseoffset] ;#may include stored password and ending header // REVIEW - strip it?
                                         close $fdrt
@@ -8665,21 +8705,21 @@ foreach vfstail $vfs_tails {
                                         puts -nonewline $fdraw $exedata
                                         close $fdraw
                                     } else {
-                                        #presumably the supplied building_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
+                                        #presumably the supplied baking_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
                                         #due to zipfs info bug - zipfs now can't tell us the offset of the compressed data.
                                         #we need to use a similarly assumptive method as tclZipfs.c uses to determine the start of the compressed contents
                                         package require punk::zip
                                         #we don't technically need to extract the raw exe for 'zip' - as zipfs mkimg can work on the combined file (ignores zip)
                                         # - but for consistency we want raw_runtime to be emitted in the filesystem.
                                         file delete $raw_runtime
-                                        punk::zip::extract_preamble $building_runtime $raw_runtime
+                                        punk::zip::extract_preamble $baking_runtime $raw_runtime
                                     }
                                 } else {
-                                    #the input building_runtime wasn't mountable as a zip - so presumably a plain executable
+                                    #the input baking_runtime wasn't mountable as a zip - so presumably a plain executable
                                     #runtime executable possibly with kit/cookfs etc attached?
                                     #If not - init.tcl probably won't be found? should we even proceed ??
                                     puts stderr "[punkboot::sgr 31]WARNING the runtime was not mountable as a zip - which means tcl_library was not extracted - the executable may not work with zipfs attached![punkboot::sgr]"
-                                    file copy -force $building_runtime $raw_runtime
+                                    file copy -force $baking_runtime $raw_runtime
                                 }
                             } else {
                                 #The driving tcl we are calling with doesn't have zipfs - can't mount.
@@ -8687,7 +8727,7 @@ foreach vfstail $vfs_tails {
                                 #so this path needs no zipfs, no vfs::zip and no tcllib.
                                 package require punk::zip
                                 puts stdout "tcl shell '[info nameofexecutable]' being used to build doesn't have zipfs - reading the runtime's attached archive with punk::zip"
-                                set extractedzipfolder $buildfolder/extracted_$runtime_fullname
+                                set extractedzipfolder $bakefolder/extracted_$runtime_fullname
                                 file delete $raw_runtime
                                 file delete -force $extractedzipfolder
                                 if {![catch {
@@ -8696,8 +8736,8 @@ foreach vfstail $vfs_tails {
                                     #derived base offset: a runtime whose offsets are file-relative
                                     #splits into a .zip no plain zip reader accepts, and reading the
                                     #whole file sidesteps that intermediate entirely.
-                                    punk::zip::extract_preamble $building_runtime $raw_runtime
-                                    punk::zip::unzip -return none -- $building_runtime $extractedzipfolder
+                                    punk::zip::extract_preamble $baking_runtime $raw_runtime
+                                    punk::zip::unzip -return none -- $baking_runtime $extractedzipfolder
                                 } extracterr]} {
                                      set extraction_done 1
                                      set extract_kit_type $extract_kit_try
@@ -8733,7 +8773,7 @@ foreach vfstail $vfs_tails {
                                 #unlike cookit's //cookit:/  it doesn't show up in file volumes
                                 #set rtmountpoint //cookfstemp:/rtmounts/$runtime_fullname ;#not writable with 'file mkdir' which doesn't seem to handle intermediate nonexistant path
                                 set rtmountpoint //cookfstemp:/$runtime_fullname
-                                cookfs::Mount $building_runtime $rtmountpoint
+                                cookfs::Mount $baking_runtime $rtmountpoint
                                 if {[file exists $rtmountpoint]} {
                                     #copy from mounted runtime's vfs to the filesystem vfs
                                     merge_over $rtmountpoint $targetvfs
@@ -8754,37 +8794,37 @@ foreach vfstail $vfs_tails {
                                 continue ;#to next extraction attempt
 
                             }
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
                             #for a kit, we shouldn't need to extract the existing vfs from the runtime.
                             # - the sdx merge process should be able to merge our .vfs folder with the existing contents.
                             #2025 - in practice this doesn't always seem to be the case? Review - could have been cwd issue?
-                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $building_runtime"
+                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $baking_runtime"
                             set prev_cwd [pwd]
-                            cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
-                            if {[catch {exec {*}$::sdxpath mksplit $building_runtime} mksplitresult]} {
+                            cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                            if {[catch {exec {*}$::sdxpath mksplit $baking_runtime} mksplitresult]} {
                                 #executable doesn't have kit vfs attached
-                                puts stderr "No kit data extracted from $building_runtime"
-                                file copy -force $building_runtime $raw_runtime
+                                puts stderr "No kit data extracted from $baking_runtime"
+                                file copy -force $baking_runtime $raw_runtime
                             } else {
                                 puts stdout "mksplitresult: $mksplitresult"
-                                if {![file exists [file rootname $building_runtime].tail]} {
-                                    error "mksplit didn't produce file at [file rootname $building_runtime].tail"
+                                if {![file exists [file rootname $baking_runtime].tail]} {
+                                    error "mksplit didn't produce file at [file rootname $baking_runtime].tail"
                                 }
-                                file delete -force [file rootname $building_runtime].vfs ;#ensure target for unwrap doesn't exist
-                                #set kit_bare_runtime [file rootname $building_runtime].head
-                                set building_runtime [file rootname $building_runtime].head
-                                exec {*}$::sdxpath unwrap [file rootname $building_runtime].tail ;#extracts to folder named [file rootname $building_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
+                                file delete -force [file rootname $baking_runtime].vfs ;#ensure target for unwrap doesn't exist
+                                #set kit_bare_runtime [file rootname $baking_runtime].head
+                                set baking_runtime [file rootname $baking_runtime].head
+                                exec {*}$::sdxpath unwrap [file rootname $baking_runtime].tail ;#extracts to folder named [file rootname $baking_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
                                 #file rename to existing target dir would copy folder into target dir
                                 if {![file exists $targetvfs]} {
                                     #delay
                                     after 1000
-                                    file rename [file rootname $building_runtime].vfs $targetvfs
+                                    file rename [file rootname $baking_runtime].vfs $targetvfs
                                 } else {
-                                    merge_over [file rootname $building_runtime].vfs $targetvfs
+                                    merge_over [file rootname $baking_runtime].vfs $targetvfs
                                 }
                                 set extraction_done 1
                                 set extract_kit_type $extract_kit_try
-                                file copy -force $building_runtime $raw_runtime
+                                file copy -force $baking_runtime $raw_runtime
                             }
                             cd $prev_cwd
 
@@ -8795,12 +8835,12 @@ foreach vfstail $vfs_tails {
                 set extraction_tried "$target_kit_type[expr {[llength $source_kit_caps] ? " + runtime caps $source_kit_caps" : ""}]"
                 if {!$extraction_done} {
                     #TODO: if not extracted - use a default tcl_library for patchlevel and platform?
-                    #Recapped BUILD-WARNING (not just an inline note): this line would
+                    #Recapped BAKE-WARNING (not just an inline note): this line would
                     #otherwise scroll away behind thousands of merge lines. It is a warning
                     #rather than the failure itself because a .vfs that supplies its own tcl
                     #library needs no extraction - the G-125 gate below decides, on the
                     #merged tree, whether this kit can initialise.
-                    ::punkboot::print_build_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
+                    ::punkboot::print_bake_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
                     file mkdir $targetvfs
                 }
 
@@ -8830,7 +8870,7 @@ foreach vfstail $vfs_tails {
                     puts stderr "--------------------------------------------"
                     #G-030 prompt policy: only an interactive 'y' can force building a mismatched
                     #kit - non-interactive runs (and -confirm 0) skip this kit and continue.
-                    set _build_anyway 0
+                    set _bake_anyway 0
                     if {!$::punkboot::opt_confirm} {
                         puts stderr "skipping kit $targetkit (source/target kit type mismatch; -confirm 0 policy is to skip)"
                     } elseif {![::punkboot::lib::stdin_is_interactive]} {
@@ -8838,10 +8878,10 @@ foreach vfstail $vfs_tails {
                     } else {
                         puts stdout "Continue to try to build $targetkit from $rtname anyway? y|n"
                         if {[string tolower [string trim [gets stdin]]] eq "y"} {
-                            set _build_anyway 1
+                            set _bake_anyway 1
                         }
                     }
-                    if {!$_build_anyway} {
+                    if {!$_bake_anyway} {
                         #skip to next kit
                         continue
                     }
@@ -8873,7 +8913,7 @@ foreach vfstail $vfs_tails {
                         puts stdout "    per-platform payload (G-127): selecting _targets/$rt_target into the merged image for kit $targetkit"
                         merge_over $_pstaging/$rt_target $targetvfs
                     } else {
-                        ::punkboot::print_build_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
+                        ::punkboot::print_bake_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
                     }
                     file delete -force $_pstaging
                 }
@@ -8903,7 +8943,7 @@ foreach vfstail $vfs_tails {
                     if {[llength $archscan_mismatches] > $shown} {
                         lappend archwarnings "payload/target arch mismatch in kit $targetkit (target $rt_target): [expr {[llength $archscan_mismatches] - $shown}] further mismatching binary libraries not listed above ([llength $archscan_mismatches] mismatches total, [dict get $archscan scanned] binary libraries scanned)"
                     }
-                    ::punkboot::print_build_warnings $archwarnings
+                    ::punkboot::print_bake_warnings $archwarnings
                     unset archwarnings archscan_mismatches shown
                 } else {
                     puts stdout "    payload binary-arch scan for kit $targetkit (target $rt_target): OK - [dict get $archscan scanned] binary libraries scanned ([dict get $archscan matched] match target, [dict get $archscan exempt] exempt under platform subdirs, [dict get $archscan unknown] unclassifiable)"
@@ -8944,7 +8984,7 @@ foreach vfstail $vfs_tails {
                 #the assemblers below consume wrap_runtime - the stamped per-kit copy
                 #of the payload-free raw prefix when embedding happened, the untouched
                 #raw prefix otherwise. Runtime store originals are never modified.
-                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_builddir] wrap_runtime kiticon_sidecar
+                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_bakedir] wrap_runtime kiticon_sidecar
 
                 set wrapvfs $targetvfs
                 switch -- $target_kit_type {
@@ -8975,14 +9015,14 @@ foreach vfstail $vfs_tails {
                             }
                             if {[info commands ::tcl::zipfs::mkimg] ne ""} {
                                 #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
-                                puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
-                                tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
+                                puts stderr "calling: tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
+                                tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
                             } else {
                                 #G-122: the driving tcl has no zipfs (8.6) - assemble the same
                                 #kind of image by concatenation. The result mounts on any
                                 #zipfs-capable runtime (archive-start-relative offsets).
                                 puts stderr "WARNING: tcl shell '[info nameofexecutable]' has no zipfs - assembling zip kit $targetkit by concatenation (raw runtime + mkzip)"
-                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                             }
                         } result ]} {
                             set failmsg "zipfs mkimg failed with msg: $result"
@@ -9019,7 +9059,7 @@ foreach vfstail $vfs_tails {
                             }
 
                             #'archive' based zip offsets - editable in 7z,peazip
-                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                         } result ]} {
                             set failmsg "creating zipcat image failed with msg: $result"
                             puts stderr "creating image (zipcat) $targetkit failed" 
@@ -9047,7 +9087,7 @@ foreach vfstail $vfs_tails {
                             continue
                         } else {
                             if {[catch {
-                                #we still have the $building_runtime mounted
+                                #we still have the $baking_runtime mounted
                                 if {[catch {
                                     merge_over $targetvfs $rtmountpoint
                                 } errM]} {
@@ -9063,14 +9103,14 @@ foreach vfstail $vfs_tails {
 
                                 #copy the version that is mounted in this runtime to vfsname.new 
                                 if {[catch {
-                                    file copy -force $building_runtime $buildfolder/$vfsname.new
-                                    catch {exec chmod +w $buildfolder/$vfsname.new}
+                                    file copy -force $baking_runtime $bakefolder/$vfsname.new
+                                    catch {exec chmod +w $bakefolder/$vfsname.new}
                                 } errM]} {
-                                    puts stderr "$target_kit_type 'file copy -force $building_runtime $buildfolder/$vfsname.new' failed\n$errM"
+                                    puts stderr "$target_kit_type 'file copy -force $baking_runtime $bakefolder/$vfsname.new' failed\n$errM"
                                     error $errM
                                 }
                             } result]} {
-                                puts stderr "Writing vfs data and opying cookfs file $building_runtime to $buildfolder/$vfsname.new failed\n $result"
+                                puts stderr "Writing vfs data and opying cookfs file $baking_runtime to $bakefolder/$vfsname.new failed\n $result"
                                 lappend failed_kits [list kit $targetkit reason copy_failed]
                                 $vfs_event targetset_end FAILED
                                 $vfs_event destroy
@@ -9088,21 +9128,21 @@ foreach vfstail $vfs_tails {
                     kit {
                         set verbose ""
                         #set verbose "-verbose"
-                        #assert: building_runtime has been replaced with $kit_bare_runtime
+                        #assert: baking_runtime has been replaced with $kit_bare_runtime
 
                         set prev_cwd [pwd]
-                        cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                        cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
                         if {[catch {
                             if {$rtname ne "-"} {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
                             } else {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose
                             }
                         } result]} {
                             if {$rtname ne "-"} {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
                             } else {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
                             }
                             puts stderr "$::sdxpath wrap $targetkit failed" 
                             lappend failed_kits [list kit $targetkit reason $sdxmsg]
@@ -9122,9 +9162,9 @@ foreach vfstail $vfs_tails {
                 }
 
 
-                if {![file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "|err> make.tcl build didn't seem to produce output at $buildfolder/$vfsname.new"
-                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $buildfolder/$vfsname.new"]
+                if {![file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "|err> make.tcl build didn't seem to produce output at $bakefolder/$vfsname.new"
+                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $bakefolder/$vfsname.new"]
                     $vfs_event targetset_end FAILED
                     $vfs_event destroy
                     $vfs_installer destroy
@@ -9244,13 +9284,13 @@ foreach vfstail $vfs_tails {
                     }
                 }
 
-                if {[file exists $kit_builddir/$targetkit]} {
-                    puts stderr "deleting existing $kit_builddir/$targetkit"
+                if {[file exists $kit_bakedir/$targetkit]} {
+                    puts stderr "deleting existing $kit_bakedir/$targetkit"
                     if {[catch {
-                        file delete $kit_builddir/$targetkit
+                        file delete $kit_bakedir/$targetkit
                     } msg]} {
-                        puts stderr "Failed to delete $kit_builddir/$targetkit"
-                        lappend failed_kits [list kit $targetkit reason "could not delete buildfolder kit at $kit_builddir/$targetkit"]
+                        puts stderr "Failed to delete $kit_bakedir/$targetkit"
+                        lappend failed_kits [list kit $targetkit reason "could not delete bakefolder kit at $kit_bakedir/$targetkit"]
                         $vfs_event targetset_end FAILED
                         $vfs_event destroy
                         $vfs_installer destroy
@@ -9260,23 +9300,23 @@ foreach vfstail $vfs_tails {
 
                 #WINDOWS filesystem 'tunnelling' (file replacement within 15secs) could cause targetkit to copy ctime & shortname metadata from previous file!
                 #This is probably harmless - but worth being aware of.
-                file rename $buildfolder/$vfsname.new $kit_builddir/$targetkit
+                file rename $bakefolder/$vfsname.new $kit_bakedir/$targetkit
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
                 #G-134 post-assembly offset-style pin: the pipeline emits
                 #ARCHIVE-relative zip payloads by construction - this probe makes
                 #that a checked contract. Advisory per the G-133 posture: a
-                #file-relative image earns a recapped BUILD-WARNING (the G-128
+                #file-relative image earns a recapped BAKE-WARNING (the G-128
                 #stamper would refuse it by default) and the kit still builds and
                 #deploys; plain/none (no attached zip - the metakit kit shape) and
                 #unreadable results are silence. One EOCD scan + CD walk per
                 #REBUILT kit only.
-                lassign [::punkboot::get_kit_offsetstyle_report $kit_builddir/$targetkit] offprobe_available offprobe
+                lassign [::punkboot::get_kit_offsetstyle_report $kit_bakedir/$targetkit] offprobe_available offprobe
                 if {!$offprobe_available} {
                     puts stderr "NOTE: kit offset-style pin unavailable (punkboot::utils kit_offsetstyle_report not loadable from bootsupport) - continuing without it"
                 } elseif {[dict get $offprobe offsetstyle] eq "file"} {
-                    ::punkboot::print_build_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
+                    ::punkboot::print_bake_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
                 }
 
                 #G-133 post-build smoke-require probe. Only an actual 'package require'
@@ -9292,12 +9332,12 @@ foreach vfstail $vfs_tails {
                         puts stdout "    smoke-require skipped for kit $targetkit: cross-target ($rt_target) - the artifact is not executable on this $::punkboot::host_platform host"
                     } else {
                         puts stdout "    smoke-require probe for kit $targetkit (packages: $kit_smokerequires) - executing freshly built artifact via its tclsh subcommand"
-                        ::punkboot::kit_smoke_require_probe $kit_builddir/$targetkit $targetkit $kit_smokerequires
+                        ::punkboot::kit_smoke_require_probe $kit_bakedir/$targetkit $targetkit $kit_smokerequires
                     }
                 }
 
             } else {
-                set skipped_vfs_build 1
+                set skipped_vfs_bake 1
                 puts stderr "."
                 puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
                 lappend skipped_kits [list kit $targetkit reason "no change detected"]
@@ -9317,14 +9357,14 @@ foreach vfstail $vfs_tails {
 
             # -- ----------
             set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-            $bin_installer set_source_target $buildfolder $deployment_folder
+            $bin_installer set_source_target $bakefolder $deployment_folder
             set bin_event [$bin_installer start_event {-make-step final_kit_install}]
             $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #todo - move final deployment step outside of the bake vfs loop? (final deployment can fail and then isn't rerun even though _bake and deployed versions differ, unless .vfs modified again)
             #set last_completion [$bin_event targetset_last_complete]
 
             $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
-            $bin_event targetset_addsource $kit_builddir/$targetkit
+            $bin_event targetset_addsource $kit_bakedir/$targetkit
             $bin_event targetset_started
             # -- ----------
 
@@ -9347,14 +9387,14 @@ foreach vfstail $vfs_tails {
                 }
 
                 puts stdout "copying.."
-                puts stdout "$kit_builddir/$targetkit"
+                puts stdout "$kit_bakedir/$targetkit"
                 puts stdout "to:"
                 puts stdout "$deployment_folder/$targetkit"
                 after 300
-                file copy $kit_builddir/$targetkit $deployment_folder/$targetkit
+                file copy $kit_bakedir/$targetkit $deployment_folder/$targetkit
                 #G-057: the kit resource sidecar ships with the kit
-                if {[file isfile $kit_builddir/$targetkit.resources.toml]} {
-                    file copy -force $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
+                if {[file isfile $kit_bakedir/$targetkit.resources.toml]} {
+                    file copy -force $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
                 }
                 lappend installed_kits $kit_relpath
                 # -- ----------
@@ -9367,7 +9407,7 @@ foreach vfstail $vfs_tails {
                 #G-057: keep the deployed resource sidecar current even when the kit
                 #itself is unchanged (the record can be newer than the kit rebuild -
                 #e.g the sidecar feature arriving, or a host-capability change)
-                if {[::punkboot::kiticon::copy_ifchanged $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
+                if {[::punkboot::kiticon::copy_ifchanged $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
                     puts stdout "    kit icon (G-057): refreshed deployed sidecar $deployment_folder/$targetkit.resources.toml"
                 }
                 lappend skipped_kit_installs [list kit $targetkit reason "no change detected"]
@@ -9397,10 +9437,10 @@ set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llen
 if {$had_kits} {
     puts stdout "   module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)"
     puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
     puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables"
-    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest built modules"
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules"
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
 } else {
     puts stdout "   module builds processed"
     puts stdout ""
diff --git a/src/project_layouts/vendor/punk/basic/gitignore.in b/src/project_layouts/vendor/punk/basic/gitignore.in
index 79773aaa..c9157eed 100644
--- a/src/project_layouts/vendor/punk/basic/gitignore.in
+++ b/src/project_layouts/vendor/punk/basic/gitignore.in
@@ -32,6 +32,10 @@
 /logs/
 **/_aside/
 **/_build/
+#G-155 stage workdirs: src/_bake (kit assembly) + per-srcdir _mint (module staging);
+#**/_build/ stays for src/buildsuites/_build (true compile area) and stale checkouts
+**/_mint/
+**/_bake/
 scratch*
 
 #Built documentation
diff --git a/src/project_layouts/vendor/punk/basic/src/make.tcl b/src/project_layouts/vendor/punk/basic/src/make.tcl
index 030847da..ec134c79 100644
--- a/src/project_layouts/vendor/punk/basic/src/make.tcl
+++ b/src/project_layouts/vendor/punk/basic/src/make.tcl
@@ -175,7 +175,7 @@ apply {{} {
 }}
 # Colour-policy gate for raw-SGR emission sites that can run before
 # define_global_ansi / punk::ansi are available (early package-load
-# diagnostics and kit-build warnings). Returns the SGR sequence, or an empty
+# diagnostics and kit-bake warnings). Returns the SGR sequence, or an empty
 # string when colour is disabled. Empty/omitted params give the reset.
 proc ::punkboot::sgr {{sgrparams ""}} {
     if {[info exists ::punk::console::colour_disabled] && $::punk::console::colour_disabled} {
@@ -490,7 +490,7 @@ namespace eval ::punkboot::lib {
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     # G-122 host/target platform split.
     # platform_punk answers "what is THIS tclsh" (the HOST canon). Everything a
-    # build EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
+    # bake EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
     # store holds the runtime, whether artifacts carry .exe, and which process
     # tooling can see/kill a running artifact. The two diverge for the whole
     # cygwin family: an msys2/cygwin-runtime tclsh on windows reports
@@ -522,12 +522,12 @@ namespace eval ::punkboot::lib {
         return [expr {[platform_os $platform] in {msys cygwin}}]
     }
     #Windows-family platforms: native win32 AND the cygwin-family personalities.
-    #They share what matters to a build: executables are .exe files and running
+    #They share what matters to a bake: executables are .exe files and running
     #processes are windows processes (tasklist/taskkill), whatever tcl_platform says.
     proc platform_is_windows_family {platform} {
         return [expr {[platform_os $platform] in {win32 msys cygwin}}]
     }
-    #Default TARGET platform for a host canon. A cygwin-family host builds native
+    #Default TARGET platform for a host canon. A cygwin-family host bakes native
     #windows kits (there is no separate msys kit lineage - third-party msys
     #runtimes are addressed by an explicit per-entry target instead).
     proc platform_target_default {hostplatform} {
@@ -708,7 +708,7 @@ proc ::punkboot::lib::mapvfs_locate {rt_sourcefolder} {
 
 #tomlish::to_dict values are type-tagged (e.g {type STRING value x}, {type ARRAY value {...}});
 #tables are plain nested dicts. Shared by the mapvfs toml reader, the per-.vfs
-#payload declarations (G-115) and any other build-side toml consumption.
+#payload declarations (G-115) and any other bake-side toml consumption.
 proc ::punkboot::lib::toml_untag {tagged} {
     if {[dict get $tagged type] eq "ARRAY"} {
         set plain [list]
@@ -1200,7 +1200,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 # the vfs rootname, kit_type defaulting to 'kit', '-' runtime -> <appname>.kit,
 # TARGET .exe suffix, duplicate appname -> <appname>_<runtime>) so listed names
 # match what a bake produces. Entries whose vfs folder is missing on disk never
-# reach the kit loop - they are appended after the buildable set so 'bakelist'
+# reach the kit loop - they are appended after the bakeable set so 'bakelist'
 # can surface them as broken config. Duplicate-name disambiguation is per TARGET
 # (G-127): same-named kits for different targets coexist under their own output
 # tiers; a same-target duplicate assumes the config keeps appnames unique (as
@@ -1217,7 +1217,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 #   runtime_dir   store tier folder holding the runtime ("" for "-")
 #   target    target platform (e.g win32-x86_64)
 #   store_tier  bin/runtime tier folder name for the target
-#   out_tier  kit OUTPUT tier relative to bin/ and src/_build/ - "" for the
+#   out_tier  kit OUTPUT tier relative to bin/ and src/_bake/ - "" for the
 #             default (host) target's flat locations, "kits/<platform>" for any
 #             other target (G-127)
 #   vfs       vfs folder tail (e.g punk9wintk903.vfs)
@@ -1413,7 +1413,7 @@ proc ::punkboot::lib::mapvfs_match_outputs {kit_outputs names} {
 }
 
 # Local runtime-materialization staleness core (shared by the bake-path
-# BUILD-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
+# BAKE-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
 # toml-revision metadata). Compares a punk-runtime WORKING COPY's beside-toml
 # revision against the highest -r<N> artifact revision present in the same
 # folder. Returns an empty dict when there is nothing to report (pre-family
@@ -1491,23 +1491,23 @@ proc ::punkboot::lib::files_content_identical {patha pathb} {
 }
 
 # Deployed-state classification for a configured kit output (G-121 bakelist):
-# the deployed copy (<projectdir>/bin/<targetkit>) vs the build product
-# (src/_build/<targetkit>).
+# the deployed copy (<projectdir>/bin/<targetkit>) vs the bake product
+# (src/_bake/<targetkit>).
 #   absent  - no deployed copy in the bin folder
-#   nobuild - deployed copy exists but there is no build product to compare against
-#   current - deployed copy is byte-identical to the build product
-#   stale   - deployed copy differs from the build product
+#   nobake  - deployed copy exists but there is no bake product to compare against
+#   current - deployed copy is byte-identical to the bake product
+#   stale   - deployed copy differs from the bake product
 # Size mismatch decides 'stale' cheaply; equal size + equal mtime short-circuits
 # to 'current' (the deploy step is a plain 'file copy'); otherwise a full content
 # compare decides.
-proc ::punkboot::lib::kit_deploy_state {buildfolder deployfolder targetkit} {
-    set built [file join $buildfolder $targetkit]
+proc ::punkboot::lib::kit_deploy_state {bakefolder deployfolder targetkit} {
+    set built [file join $bakefolder $targetkit]
     set deployed [file join $deployfolder $targetkit]
     if {![file isfile $deployed]} {
         return absent
     }
     if {![file isfile $built]} {
-        return nobuild
+        return nobake
     }
     if {[file size $built] != [file size $deployed]} {
         return stale
@@ -1553,10 +1553,10 @@ set this_platform_generic [punkboot::lib::platform_punk] ;#normalized punkshell
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-122 host/target split. $this_platform_generic is the HOST canon and stays the
 #key for everything that describes THIS interpreter (bootsupport/vendorlib
-#platform dirs below, diagnostics). What the build EMITS is keyed by target:
+#platform dirs below, diagnostics). What the bake EMITS is keyed by target:
 #  host_platform    - canon of the driving tclsh (same value, named for clarity)
 #  target_platform  - default target for kit outputs; a cygwin-family host
-#                     (msys2/cygwin runtime on windows) builds win32 kits.
+#                     (msys2/cygwin runtime on windows) bakes win32 kits.
 #                     Per-entry mapvfs.config declarations override it per runtime.
 #  host_windows     - host process/filesystem semantics are windows-like
 #                     (native windows OR cygwin family): drives copy commands,
@@ -1608,8 +1608,8 @@ set sourcesupport_module_paths  [list]
 set sourcesupport_library_paths [list]
 set sourcesupport_paths_exist 0
 #we deliberately don't use [pwd]/modules because commonly the launch dir may be the project dir.
-#The <projectdir>/modules are the very modules we are building - and may be in a broken state, which punkboot then can't fix.
-#The 'building' is generally just assigning a version instead of 999999.0a1 (and some doc string substitution?)
+#The <projectdir>/modules are the very modules we are minting - and may be in a broken state, which punkboot then can't fix.
+#The mint is generally just stamping a version instead of 999999.0a1 (plus modpod packing and doc string substitution)
 #(most?) Modules in src/modules etc should still be runnable directly in certain cases like this where we point to them.
 if {[file tail $startdir] eq "src"} {
     #todo - other src 'module' dirs..
@@ -2578,32 +2578,32 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname -help  or $scriptname --help or $scriptname /? or just $scriptname" \n
     append h "    - This help." \n \n
     append h "  $scriptname bakehouse ?-k? ?-dirty-abort 1|0?" \n
-    append h "    - consumer build from a clean checkout: runs the packages stage (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
+    append h "    - consumer run from a clean checkout: mints the packages (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
     append h "    - refuses uncommitted src by default (-dirty-abort defaults ON: the bakehouse bakes from the committed recipe; pass -dirty-abort 0 to override)" \n
-    append h "    - the optional -k flag will terminate running processes matching the executable being built (if applicable)" \n
+    append h "    - the optional -k flag will terminate running processes matching the executable being baked (if applicable)" \n
     append h "    - does NOT run the promotion gates (bootsupport, vfscommonupdate) - on a clean checkout they are already satisfied by the committed tree" \n \n
     append h "  $scriptname bake ?-k? ?kitname ...?" \n
     append h "    - assemble kit/zipkit executables from the promoted payload (src/vfs) and src/runtime runtimes into <projectdir>/bin" \n
-    append h "    - includes the vfslibs phase; does not rebuild modules/libs and does not run the promotion gates" \n
-    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any build)" \n \n
+    append h "    - includes the vfslibs phase; does not re-mint modules/libs and does not run the promotion gates" \n
+    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any bake)" \n \n
     append h "  $scriptname bakelist ?kitname ...?" \n
     append h "    - list the kit outputs configured in src/runtime/mapvfs.toml: name, kit type, runtime (with presence)," \n
-    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobuild vs the src/_build product)" \n
+    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobake vs the src/_bake product)" \n
     append h "    - kitname arguments filter to the named entries (per-kit detail)" \n \n
     append h "  $scriptname modules"  \n
-    append h "    - build (or copy if build not required) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (stamp real versions, pack modpods; plain copy where no stamping applies) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname libs"  \n
-    append h "    - build (or copy if build not required) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname packages"  \n
-    append h "    - build (or copy if build not required) both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir> (= modules + libs)" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname bootsupport"  \n
     append h "    - update the src/bootsupport modules" \n
     append h "    - bootsupport modules are pulled from locations specified in include_modules.config files within each src/bootsupport subdirectory" \n
     append h "    - project layouts store no bootsupport module snapshots: generated projects get bootsupport injected at generation time by 'dev project.new'" \n
-    append h "    - This should usually be from modules that have been built and tested in <projectdir>/modules <projectdir>/lib etc." \n
+    append h "    - This should usually be from modules that have been minted and tested in <projectdir>/modules <projectdir>/lib etc." \n
     append h "    - bootsupport modules are available to make.tcl" \n \n
     append h "  $scriptname vendorupdate"  \n
     append h "    - update the src/vendormodules based on src/vendormodules/include_modules.config" \n \n
@@ -2617,11 +2617,11 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "    - sha1-verified against the server's per-target sha1sums.txt; materializes package trees under bin/packages/<target>/tcl<N>" \n
     append h "    - canonical origin trusted by default; other servers (incl. PUNKBIN_URL overrides) require -trust-server" \n \n
     append h "  $scriptname vfscommonupdate"  \n
-    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs from compiled src/modules and src/lib etc" \n
+    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs kit payload from the minted <projectdir> module/lib trees" \n
     append h "    - before calling this (followed by '$scriptname bake') - you can test using '<builtexe>(.exe) dev'" \n
     append h "      this will load modules from your <projectdir>/module <projectdir>/lib paths instead of from the kit/zipkit" \n \n
     append h "  $scriptname info" \n
-    append h "    - show the name and base folder of the project to be built" \n \n
+    append h "    - show the name and base folder of the project" \n \n
     append h "  $scriptname check" \n
     append h "    - show module/library paths and any potentially problematic packages for running this script" \n
     append h "  $scriptname shell" \n
@@ -2629,7 +2629,7 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname projectversion" \n
     append h "    - advisory check: verify CHANGELOG.md matches punkproject.toml and warn if src/ has changes since the last project-version bump." \n \n
     append h "  $scriptname workflow" \n
-    append h "    - print an ASCII data-flow overview of the build/release workflow (edit -> packages -> bootsupport -> kits)" \n \n
+    append h "    - print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake) incl. the TERMINOLOGY key" \n \n
     append h "  $scriptname buildsuite list|info|build ?<suitename>? ?driver-args ...?" \n
     append h "    - list the defined buildsuites under src/buildsuites (zig runtime factory), show a suite's configured" \n
     append h "      detail (sources/zig pin/products from its sources.config), or run its driver forwarding the args" \n \n
@@ -2652,33 +2652,61 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "        Use -confirm 0 for unattended runs: the bootsupport minor-staleness gate and the vfscommonupdate REPLACE" \n
     append h "        confirmation proceed without prompting; kits with a source/target kit-type mismatch are skipped." \n
     append h "    -dirty-abort" \n
-    append h "      - abort build/promotion commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
+    append h "      - abort producing commands (mint/promote/bake: bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
     append h "        uncommitted VCS changes. Default is warn-only EXCEPT bakehouse (defaults ON there; -dirty-abort 0 overrides):" \n
-    append h "        artifacts built from dirty src have no committed provenance." \n
+    append h "        artifacts produced from dirty src have no committed provenance." \n
     append h "        Warnings carry a plain PROVENANCE-WARNING: prefix (greppable in redirected output) and are recapped at the end of the run." \n
-    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without building," \n
+    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without minting or baking," \n
     append h "        use '<builtexe> src' or '<builtexe> src shell'." \n \n
     append h "" \n
     append h [punkboot_availability_note]
     return $h
 }
-#Embedded build/release workflow overview - the output of the 'workflow' subcommand.
+#Embedded release-workflow overview - the output of the 'workflow' subcommand.
 #Embedded (rather than a data file) so it travels with make.tcl wherever it runs, including
 #the make.tcl copies seeded into generated projects via the project layouts.
-#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when build data flow changes
+#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when make.tcl data flow changes
 #(subcommand added/removed/repurposed, source or output folder flow changed, new propagation
 #target), this text changes in the same commit. Plain ASCII only, max line width 100.
 proc ::punkboot::workflow_text {} {
     set txt {
-build & release workflow - from module edit to kits + bootsupport (punk project layout)
+mint, promote & bake - the release workflow from module edit to kits + bootsupport (punk layout)
 =============================================================================
 Scope: data flow from editing a module under src/ through to a release-ready
-rebuild (built packages, bootsupport refresh, kit vfs, kit executables).
+refresh (minted packages, bootsupport refresh, kit vfs, kit executables).
 All commands run from the projectroot with a native tclsh, e.g:
     tclsh src/make.tcl <subcommand> -confirm 0            (see [K6])
 
 
-TWO PERSONAS (stage-true subcommand model - one build stage, two promotion
+TERMINOLOGY (stage verbs - one word, one stage)
+----------------------------------------------------------------------------
+  build    compile source to binaries. Lives in the arm's-length factories:
+           'make.tcl buildsuite' (whole Tcl runtimes from external sources,
+           src/buildsuites, workdir src/buildsuites/_build) and 'make.tcl
+           tool build' (vendored zig tools, src/tools). Nothing in
+           mint/promote/bake compiles anything: bakes succeed with no build
+           toolchain installed.
+  mint     stamp real versions onto magic-version sources (999999.0a1.0 ->
+           the <pkg>-buildversion.txt value), pack #modpod-* trees, prune
+           superseded copies and install the results into the projectroot
+           trees (modules*/ lib*/). The modules/libs/packages subcommands
+           are the mint stage; staging area <srcdir>/_mint.
+  promote  propagate minted packages into the two gated consumption trees:
+           src/bootsupport (make.tcl's own boot environment) and
+           src/vfs/_vfscommon.vfs (the committed kit payload) - the
+           bootsupport and vfscommonupdate promotion gates.
+  bake     assemble kit/zipkit executables from promoted payload + runtimes
+           (workdir src/_bake) and deploy them to bin/. Consumer umbrella:
+           bakehouse = mint + bake from the committed recipe.
+  fetch    bring third-party inputs to the tree: libfetch (punkbin lib
+           artifacts), vendorupdate (vendored sources).
+  deploy   the final copy of a baked kit from src/_bake to bin/<kit>.
+Mechanism words keep their scoped meanings: stamp (version fields at mint,
+icons/resources at bake via punkres), install (punkcheck-recorded placement
+at any stage), sync (thin-layout copies), materialize (vfslibs payload
+declarations, libfetch trees).
+
+TWO PERSONAS (stage-true subcommand model - one mint stage, two promotion
 gates, one bake)
 ----------------------------------------------------------------------------
   CONSUMER  (clean checkout, wants baked kits):
@@ -2688,7 +2716,7 @@ gates, one bake)
     default (-dirty-abort defaults ON: the bakehouse bakes from the committed
     recipe; -dirty-abort 0 overrides).
   DEVELOPER (changing payload): pass the gates explicitly - the commit is the
-    publishing act, not a build step. That is the RELEASE SEQUENCE below.
+    publishing act, not a producing step. That is the RELEASE SEQUENCE below.
 
 RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance gates)
 ----------------------------------------------------------------------------
@@ -2698,18 +2726,18 @@ RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance
               punkproject.toml + CHANGELOG.md            project version (if shipped behaviour) [K2]
   (3) test    tclsh src/tests/runtests.tcl ...           runs against src/ trees (if present)
   (4) commit  source changes (git/fossil)                clean tree -> committed provenance [K3]
-  (5) build   tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
-  (6) build   tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
-  (7) build   tclsh src/make.tcl vfscommonupdate -confirm 0
-  (8) build   tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
-  (9) commit  tracked build outputs                      src/bootsupport, thin-layout script/
+  (5) mint    tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
+  (6) promote tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
+  (7) promote tclsh src/make.tcl vfscommonupdate -confirm 0
+  (8) bake    tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
+  (9) commit  tracked output trees                       src/bootsupport, thin-layout script/
                                                          manifest/gitignore.in payload copies
                                                          (src/project_layouts +
                                                          templates modpod payload),
                                                          src/vfs/_vfscommon.vfs
 
 
-DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
+DIAGRAM 1 - DATA FLOW: SOURCE -> MINTED PACKAGES -> PROMOTION TARGETS
 ----------------------------------------------------------------------------
 
    src/modules/foo-999999.0a1.0.tm   [K1]        src/lib/
@@ -2722,7 +2750,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
         v                                           v
    modules/  modules_tcl8/  modules_tcl9/        lib/  lib_tcl8/  lib_tcl9/
    e.g. modules/foo-0.12.4.tm
-   == BUILT PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
+   == MINTED PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
         |
         +--------------------------------------+
         |                                      |
@@ -2735,7 +2763,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
     Project layouts store NO module            |
     snapshots - 'dev project.new'              |  make.tcl bake   (kit-assembly stage;
     injects bootsupport into generated         v   consumer umbrella: bakehouse)
-    projects from the generating          src/_build/<kit>.exe   --deploy-->   bin/<kit>.exe
+    projects from the generating          src/_bake/<kit>.exe   --deploy-->   bin/<kit>.exe
     shell at generation time - G-087)      (see DIAGRAM 2)         [K5]
 
 
@@ -2753,7 +2781,7 @@ DIAGRAM 1b - THIN-LAYOUT SYNC (part of modules/libs/packages/bakehouse runs)
         |  store -> modpod payload sync (punk.project layout only; excludes bin/sdx.kit)
         v
    src/modules/punk/mix/#modpod-templates-*/templates/project_layouts/
-   (packed into the punk::mix::templates module by the modules build, so a bare
+   (packed into the punk::mix::templates module by the modules mint, so a bare
     kit outside any project can list and generate the punk.project layout)
 
 
@@ -2769,10 +2797,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                                       configured kit outputs (presence + deployed state);
                                       'make.tcl bake ?name|@group ...?' bakes only the named
                                       kits (bare bake = all entries except bake_default=false
-                                      ones; unknown names error before any build)
+                                      ones; unknown names error before any bake)
    bin/runtime/<target>/<runtime>     bare Tcl runtime (tclkit / tclsfe / suite build), in the
-                                      store tier of the TARGET platform it builds kits for [K9]
-   src/vfs/_vfscommon.vfs/            common payload (built modules + libs, main boot support)
+                                      store tier of the TARGET platform it bakes kits for [K9]
+   src/vfs/_vfscommon.vfs/            common payload (minted modules + libs, main boot support)
    src/vfs/<kitspecific>.vfs/         per-kit overlay (main.tcl, kit-only modules/config)
    src/vfs/<kitspecific>.vfs.toml     optional per-.vfs payload declaration (G-115): [payload.*]
                                       entries materialized INTO the .vfs folder by the vfslibs
@@ -2789,10 +2817,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
               +-----------+----------+
                           |  copy common, then merge overlay over it
                           v
-              src/_build/<kit>.exe.vfs
+              src/_bake/<kit>.exe.vfs
                           |
                           |  advisory payload/target binary-arch scan of the merged
-                          |  tree (wrong-arch libraries -> recapped BUILD-WARNING) [K11]
+                          |  tree (wrong-arch libraries -> recapped BAKE-WARNING) [K11]
                           |  boot-precondition gate: merged vfs must supply a tcl
                           |  library (tcl_library/, lib/tcl<M>.<m>/, tcl<M>.<m>/) [K10]
                           v
@@ -2811,7 +2839,7 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                           |  mkimg, or (driving tcl without zipfs, e.g 8.6) raw-runtime
                           |  split + punk::zip::mkzip + concatenation - both mount the same
                           v
-              src/_build/<kit>.exe  (+ <kit>.exe.resources.toml)
+              src/_bake/<kit>.exe  (+ <kit>.exe.resources.toml)
                           |
                           |  smoke-require probe (host-runnable kits with declared
                           |  packages): plain 'package require' inside the artifact [K11]
@@ -2857,7 +2885,7 @@ KEY / NOTES
 [K1] Source modules carry the literal magic version 999999.0a1.0 in the filename.
      The real version is the first line of the sibling <modulename>-buildversion.txt;
      bump it per semver (patch=fix, minor=api add, major=breaking) and append a
-     '#<version> - ...' changelog comment line below it. The modules build stamps
+     '#<version> - ...' changelog comment line below it. The mint stamps
      the real version into the output filename and package provide.
      (A project may carry manually-versioned exceptions - see src/modules/AGENTS.md
       if present.)
@@ -2866,10 +2894,11 @@ KEY / NOTES
      entry) is change-driven: bump when the change ships user-visible behaviour.
      Advisory check: tclsh src/make.tcl projectversion
 
-[K3] Every build target root gets a .punkcheck file recording what was installed
-     from where (punkcheck provenance). Building from a tree with uncommitted
-     changes under src/ works but emits PROVENANCE-WARNINGs - commit source first
-     for release builds. Output-tree commits (step 9) come after the builds.
+[K3] Every output target root gets a .punkcheck file recording what was installed
+     from where (punkcheck provenance). Minting/promoting/baking from a tree with
+     uncommitted changes under src/ works but emits PROVENANCE-WARNINGs - commit
+     source first for release runs. Output-tree commits (step 9) come after the
+     producing steps.
 
 [K4] Bootsupport staleness gate: make.tcl compares tracked module versions in
      src/bootsupport against built sources; a stale bootsupport makes other
@@ -2879,10 +2908,10 @@ KEY / NOTES
 
 [K5] The deploy step cannot replace a kit exe that is currently executing. Close
      running kit shells before step 8, or rerun 'make.tcl bake -confirm 0'
-     afterwards - the freshly built kits wait in src/_build. punkcheck records
+     afterwards - the freshly baked kits wait in src/_bake. punkcheck records
      mean the rerun only redoes the failed deploys. When iterating on one kit,
-     'make.tcl bake <kitname>' rebuilds/deploys just that kit; 'make.tcl
-     bakelist' shows each configured kit's deployed state (bin vs src/_build).
+     'make.tcl bake <kitname>' rebakes/deploys just that kit; 'make.tcl
+     bakelist' shows each configured kit's deployed state (bin vs src/_bake).
 
 [K6] All confirmation prompts follow -confirm: unattended/agent runs must pass
      -confirm 0 (non-interactive stdin aborts fast at prompts; piping 'y' is
@@ -2891,13 +2920,13 @@ KEY / NOTES
 [K7] Testing hooks along the way:
        - src/tests/runtests.tcl exercises the src/ trees directly (dev modules).
        - '<builtkit>.exe dev' (or '<builtkit> src') runs a built shell against the
-         project dev modules - useful for testing built packages before they are
+         project dev modules - useful for testing minted packages before they are
          baked into kits via vfscommonupdate + bake.
 
-[K8] What is VCS-tracked where (checkin targets after a build):
+[K8] What is VCS-tracked where (checkin targets after a make.tcl run):
        tracked:   src/** (sources, src/bootsupport, src/project_layouts copies,
                   src/vfs/_vfscommon.vfs), punkproject.toml, CHANGELOG.md
-       untracked: modules*/ lib*/ at projectroot, src/_build/, bin/<kit>.exe,
+       untracked: modules*/ lib*/ at projectroot, src/_bake/, bin/<kit>.exe,
                   bin/kits/<platform>/ (cross-target kit outputs - G-127),
                   src/vfs/*.vfs/_targets/ (per-platform payload staging)
                   (bin/ scripts/tools are tracked; kit executables are not)
@@ -2915,7 +2944,7 @@ KEY / NOTES
      'make.tcl check' prints the derivation; 'make.tcl bakelist' shows per-kit
      targets, with a target= note on rows that are not on the default target.
      OUTPUT locations are target-keyed too (G-127): default-target kits keep the
-     flat src/_build/<kit> + bin/<kit> locations, any other target's kit builds
+     flat src/_bake/<kit> + bin/<kit> locations, any other target's kit bakes
      and deploys under the kits/<platform>/ tier of both (bin/kits/ = outputs,
      beside bin/runtime/ = inputs), so same-named kits for different targets
      coexist instead of overwriting each other; bakelist marks such rows with
@@ -2924,7 +2953,7 @@ KEY / NOTES
 [K10] BOOT-PRECONDITION gate (G-125). A kit whose merged vfs has no tcl library
      cannot initialise at all ('Cannot find a usable init.tcl'), so the bake
      refuses it: the kit is listed under FAILED KITS and NOTHING is written -
-     no src/_build/<kit>, no deploy, and the previously deployed bin/<kit> is
+     no src/_bake/<kit>, no deploy, and the previously deployed bin/<kit> is
      left exactly as it was. This is deliberately not a warning: the deploy step
      deletes the old kit before copying the new one, so warning-and-proceeding
      replaced a working shell with one that could not start. The check is
@@ -2933,18 +2962,18 @@ KEY / NOTES
      executable's own path rather than //zipfs:/app), plus a companion file so a
      package's own init.tcl cannot answer for a tcl library - and runs on the
      MERGED tree, not on whether extraction ran - a .vfs that
-     supplies its own tcl library builds and deploys as normal. Nothing is
+     supplies its own tcl library bakes and deploys as normal. Nothing is
      executed, so cross-target kits are covered too. Usual cause: the runtime's
-     own payload could not be extracted - see the BUILD-WARNING naming what was
+     own payload could not be extracted - see the BAKE-WARNING naming what was
      tried. 'make.tcl check' reports whether the gate is ACTIVE.
 
 [K11] PAYLOAD/TARGET consistency checks (G-133), both ADVISORY - warnings recap at
-     end of run, the kit still builds and deploys. (a) Binary-arch scan at the same
+     end of run, the kit still bakes and deploys. (a) Binary-arch scan at the same
      seam as [K10]: each binary library (*.dll/*.so/*.dylib) in the merged tree is
      classified by header (PE/ELF/Mach-O - structural, nothing executed, so
      cross-target kits are covered) against the kit's target platform; wrong-arch
      libraries outside platform-discriminated subdirs (win32-ix86/, win-x64/ etc -
-     multi-arch payloads are legitimate there) earn recapped BUILD-WARNINGs.
+     multi-arch payloads are legitimate there) earn recapped BAKE-WARNINGs.
      (b) Smoke-require probe: a kit declaring packages (mapvfs.toml smokerequire
      key; legacy config: 5th element) has each one plain-'package require'd INSIDE the freshly built
      artifact via its tclsh subcommand - the only check that sees resolution-order
@@ -2964,7 +2993,7 @@ OUT-OF-BAND SUBSYSTEMS (not part of the packages/bake data flow above)
 
 MAINTENANCE (agents take note)
 ----------------------------------------------------------------------------
-This text is embedded in make.tcl (::punkboot::workflow_text). When the build
+This text is embedded in make.tcl (::punkboot::workflow_text). When the make.tcl
 data flow changes - a make.tcl subcommand added/removed/repurposed, a source or
 output folder added or rerouted, a new propagation target, a changed gate or
 deploy behaviour - update this text in the same change-set and verify with
@@ -3014,7 +3043,7 @@ proc ::punkboot::punkboot_availability_note {} {
             append h "    Call 'make.tcl check' and examine the last table (which includes bootsupport + executable-provided packages)" \n
             append h "    See if there are any items marked missing or broken that aren't marked as '(known optional)'" \n
             append h "    If all are marked (known optional) then it should work." \n
-            append h "    A package marked (known optional) and (RECOMMENDED) may make the build/install processes run a lot faster. (e.g tcllibc)" \n
+            append h "    A package marked (known optional) and (RECOMMENDED) may make the mint/bake and install processes run a lot faster. (e.g tcllibc)" \n
             append h "* $A(HIGHLIGHT)** *** *** ***$A(RST)" \n\n
             #append h "Successfully Loaded packages:" \n
             #append h "    " [join $::punkboot::pkg_loaded "\n    "] \n
@@ -3056,14 +3085,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             #single source for the subcommand one-line summaries: each subcommand definition's
             #@cmd -summary and the top-level subcommand -choicelabels are both built from this.
             variable SUMMARIES {
-                bakehouse       "Consumer build from a clean checkout: packages then bake - refuses uncommitted src by default"
-                packages        "Build .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
-                modules         "Build .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
-                libs            "Build pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
+                bakehouse       "Consumer run from a clean checkout: mint packages then bake - refuses uncommitted src by default"
+                packages        "Mint .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
+                modules         "Mint .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
+                libs            "Mint pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
                 bake            "Assemble kit/zipkit executables from promoted payload (src/vfs) and runtimes into <projectdir>/bin"
                 bakelist        "List the kit outputs configured in src/runtime/mapvfs.toml: type, runtime/vfs presence, deployed state, groups"
                 vfslibs         "Materialize per-.vfs payload declarations (src/vfs/<name>.vfs.toml - G-115) into kit vfs folders; drop-ins preserved"
-                bin             "Install executables from src/bin into <projectdir>/bin, then build kits as for bake"
+                bin             "Install executables from src/bin into <projectdir>/bin, then bake kits as for bake"
                 vendorupdate    "Update src/vendormodules based on src/vendormodules/include_modules.config"
                 libfetch        "Fetch declared punkbin lib-tier library artifacts into bin/packages/<target> (sha1-verified) and materialize the package trees"
                 bootsupport     "Promotion gate: update src/bootsupport modules from built project modules"
@@ -3071,7 +3100,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 info            "Show the name and base folder of the project to be built"
                 check           "Show module/library paths and any potentially problematic packages for running this script"
                 projectversion  "Advisory check: CHANGELOG.md vs punkproject.toml and src/ changes since last version bump"
-                workflow        "Print an ASCII data-flow overview of the build/release workflow (edit -> packages -> gates -> bake)"
+                workflow        "Print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake)"
                 shell           "Run the punk shell using bootsupport libraries"
                 help            "Show usage for make.tcl or one of its subcommands"
                 buildsuite      "List, describe or run the defined buildsuites under src/buildsuites (zig runtime factory)"
@@ -3094,41 +3123,43 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  to run when src/ has uncommitted changes (-dirty-abort defaults ON),
                  pointing at the granular developer flow (packages -> test ->
                  bootsupport/vfscommonupdate -> commit -> bake). Pass -dirty-abort 0
-                 to build anyway with PROVENANCE-WARNINGs.
+                 to proceed anyway with PROVENANCE-WARNINGs.
                  Deliberately does NOT run the promotion gates (bootsupport,
                  vfscommonupdate): payload promotion is a confirm-gated, committed
                  act - on a clean checkout the gates are already satisfied by the
                  committed tree."
                 packages
                 "
-                 Build (or copy if build not required) both .tm and pkgIndex.tcl based
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) both .tm and pkgIndex.tcl based
                  packages from src to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 modules
                 "
-                 Build (or copy if build not required) .tm modules from src/modules,
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) .tm modules from src/modules,
                  src/vendormodules etc to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 libs
                 "
-                 Build (or copy if build not required) pkgIndex.tcl based libraries from
+                 Mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from
                  src/lib, src/vendorlib etc to their corresponding locations under
                  <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 bake
                 "
                  Assemble kit/zipkit executables: scan src/vfs and src/runtime folders,
-                 build each configured kit from the promoted payload
+                 bake each configured kit from the promoted payload
                  (src/vfs/_vfscommon.vfs + custom vfs folders) and its runtime, and
                  install to <projectdir>/bin.
                  With kitname (or @groupname - G-024 groups) arguments, bake and
                  deploy ONLY the named configured kits (see 'make.tcl bakelist'
-                 for the configured names and groups) - other kits' build
+                 for the configured names and groups) - other kits' bake
                  products, bin copies and punkcheck records are left untouched.
-                 An unknown name errors before any build, listing the configured
+                 An unknown name errors before any bake, listing the configured
                  names. Bare 'bake' processes all configured kits except
                  bake_default=false entries (those bake only by name/@group).
                  Includes the vfslibs phase (per-.vfs payload declarations
@@ -3136,7 +3167,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  G-115) so a bake cannot ship stale binary libs; a selective
                  bake narrows that phase to the named kits' vfs folders.
                  Does not rebuild modules/libs and does not run the promotion gates -
-                 built modules reach the kit payload only via 'make.tcl
+                 minted modules reach the kit payload only via 'make.tcl
                  vfscommonupdate' (committed for provenance). Consumer full path from
                  a clean checkout: 'make.tcl bakehouse'."
                 bakelist
@@ -3147,12 +3178,12 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  kit name, kit type (kit|zip|zipcat...), runtime with presence in
                  the runtime store of that kit's TARGET platform
                  (<projectdir>/bin/runtime/<target>), vfs folder, and the
-                 deployed state of <projectdir>/bin/<kit> vs the src/_build build
+                 deployed state of <projectdir>/bin/<kit> vs the src/_bake bake
                  product:
-                   current - deployed copy is identical to the build product
-                   stale   - deployed copy differs from the build product
+                   current - deployed copy is identical to the bake product
+                   stale   - deployed copy differs from the bake product
                    absent  - no deployed copy in <projectdir>/bin
-                   nobuild - deployed copy exists but no build product to compare
+                   nobake  - deployed copy exists but no bake product to compare
                  A trailing notes column flags anomalies (runtime=missing,
                  vfs=missing, rtrev=r<cur><r<max> when the runtime working copy is
                  materialized from an older revision than a -r<N> artifact beside
@@ -3161,14 +3192,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  default - 'make.tcl check' shows that default), G-024 groups
                  (group=<name>), entries excluded from full bakes (default=no)
                  and scheme-expanded outputs (scheme=versioned|dev|release).
-                 Non-default-target kits build and deploy under the
-                 kits/<platform>/ tier of src/_build and bin (G-127) - their rows
+                 Non-default-target kits bake and deploy under the
+                 kits/<platform>/ tier of src/_bake and bin (G-127) - their rows
                  carry out=kits/<platform>/ and the deployed state compares the
                  tiered paths; a kit NAME shared by entries for several targets
                  selects (and lists) every one of them.
                  kitname (or @groupname) arguments filter the report to the named
                  entries (per-kit detail, with resolved store tier, target,
-                 config entry and paths). Reporting only - never builds."
+                 config entry and paths). Reporting only - never bakes."
                 vfslibs
                 "
                  Materialize the per-.vfs payload declarations (G-115): each
@@ -3212,7 +3243,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 bin
                 "
                  Install executables from src/bin to <projectdir>/bin, then check vfs
-                 folders and build kit/zipkit executables as for the bake subcommand."
+                 folders and bake kit/zipkit executables as for the bake subcommand."
                 vendorupdate
                 "
                  Update the src/vendormodules based on src/vendormodules/include_modules.config.
@@ -3245,7 +3276,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  Also reports the colour policy, the host/target platform derivation
                  (this tclsh's platform canon vs the default kit target, its runtime
                  store tier, executable suffix and process tooling), bootsupport
-                 staleness and the src provenance status (what the build/promotion
+                 staleness and the src provenance status (what the producing
                  commands would do)."
                 projectversion
                 "
@@ -3253,13 +3284,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  if src/ has changes since the last project-version bump."
                 workflow
                 "
-                 Print a plain-text (ASCII diagram) overview of the build/release
+                 Print a plain-text (ASCII diagram) overview of the release
                  workflow: the release-ready command sequence and how data flows from
                  editing a module under src/ through built packages to bootsupport,
                  the kit vfs and the kit executables.
                  The text is embedded in make.tcl (::punkboot::workflow_text) so it is
                  available wherever make.tcl runs; its MAINTENANCE key states the
-                 update contract for keeping it in step with build behaviour."
+                 update contract for keeping it in step with make.tcl behaviour."
                 help
                 "
                  Show tabled usage for make.tcl as a whole, or for a single subcommand.
@@ -3280,7 +3311,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 "
                  Surface for the defined buildsuites under src/buildsuites (zig-built
                  runtime factory - an arm's-length subsystem building Tcl runtimes
-                 from external sources, distinct from the project build/bake stages).
+                 from external sources, distinct from the project mint/bake stages).
 
                  Actions:
                    buildsuite list
@@ -3337,7 +3368,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  the LOWEST release satisfying the floor wins (deterministic as
                  newer toolchains appear beside the pinned one; dev builds count
                  only when their base version exceeds the floor). zig is OPTIONAL
-                 for punkshell builds: packages/bake never require this step -
+                 for the punkshell mint/bake pipeline: packages/bake never require this step -
                  without a suitable toolchain, list reports the state and
                  build/test exit nonzero with fetch guidance
                  (bin/punk-getzig.cmd). Build caches (.zig-cache/zig-out) are
@@ -3358,7 +3389,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                       non-interactive resolution:
                         bootsupport minor-version staleness gate -> proceed
                         vfscommonupdate REPLACE confirmation     -> proceed
-                        kit source/target type mismatch          -> skip building that kit
+                        kit source/target type mismatch          -> skip baking that kit
                      Note: Tcl 8.6 lacks the terminal probe (-inputmode) so stdin is assumed
                      interactive there - piped runs under 8.6 should always pass -confirm
                      explicitly."
@@ -3370,13 +3401,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                      provenance. Warnings carry a plain PROVENANCE-WARNING: prefix (greppable
                      in redirected output) and are recapped at the end of the run.
                      Use 'make.tcl check' to see the current provenance status. To evaluate
-                     uncommitted source without building, use '<builtexe> src' or
+                     uncommitted source without minting or baking, use '<builtexe> src' or
                      '<builtexe> src shell'."
             }
             variable OPT_FORCEKILL {
                 -k -type none -default 0 -help\
                     "Terminate running processes matching the executable being built
-                     (if applicable) so the build can install over it."
+                     (if applicable) so the bake can install over it."
             }
             #bakehouse defaults the dirty gate ON:
             #the bakehouse bakes from the committed recipe (G-112 two-persona model).
@@ -3384,10 +3415,10 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 -dirty-abort -type boolean -default 1 -help\
                     "Abort when src/ has uncommitted VCS changes - DEFAULT ON for this
                      subcommand: the bakehouse bakes from the committed recipe. A
-                     consumer build on a clean checkout runs uninterrupted; uncommitted
+                     consumer run on a clean checkout proceeds uninterrupted; uncommitted
                      developer changes get a refusal naming the granular flow
                      (packages -> test -> bootsupport/vfscommonupdate -> commit -> bake).
-                     Pass -dirty-abort 0 to build anyway with PROVENANCE-WARNINGs."
+                     Pass -dirty-abort 0 to proceed anyway with PROVENANCE-WARNINGs."
             }
             #libfetch fragments (G-139): consent is keyed to SERVER TRUST (the G-123
             #posture) - the canonical punkbin origin needs no acknowledgement, any
@@ -3510,7 +3541,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                     @<groupname> for every kit in a configured group (G-024) - see
                     'make.tcl bakelist' for the configured names and groups. With no
                     kitname, all configured kits are processed except entries with
-                    bake_default=false. An unknown name errors before any build."
+                    bake_default=false. An unknown name errors before any bake."
             }
             punk::args::define {
                 @id     -id     "(script)::punkboot::bakelist"
@@ -3729,7 +3760,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             }
             #top-level definition: the subcommand table rendered by 'make.tcl' / 'make.tcl -help'
             variable SUBGROUPS {
-                "build & bake"       {bakehouse packages modules libs bake vfslibs bin}
+                "mint & bake"        {bakehouse packages modules libs bake vfslibs bin}
                 "promotion gates"    {bootsupport vfscommonupdate}
                 "source maintenance" {vendorupdate libfetch}
                 "buildsuites"        {buildsuite}
@@ -3756,7 +3787,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 #sole remaining explicit synopsis override (G-143 retired the per-subcommand
@@ -3805,7 +3836,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot.overview"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 @form -synopsis "make.tcl ?subcommand? ?flags?"
@@ -4212,7 +4243,7 @@ set binfolder    $projectroot/bin
 
 # ----------------------------------------
 # G-121 selective bake: resolve requested kit names against the parsed kit-mapping
-# model before ANY build machinery runs - an unknown name must error without building,
+# model before ANY bake machinery runs - an unknown name must error without baking,
 # and a selected-but-unbuildable kit (missing runtime/vfs) fails fast rather than
 # silently doing nothing (bare 'bake' keeps the historical warn-and-continue
 # behaviour for the full configured set). The kit machinery and the vfslibs phase
@@ -4277,12 +4308,12 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 }
 
 # ----------------------------------------
-# Provenance-warning presentation + dirty-src check for build/promotion commands (goal G-026 direction).
-# Build/promotion commands stamp versions onto src content and propagate it into trees other
+# Provenance-warning presentation + dirty-src check for producing commands (goal G-026 direction).
+# Producing commands (mint/promote/bake) stamp versions onto src content and propagate it into trees other
 # things consume (root modules/, bootsupport snapshots, vfs payloads, kits/zipkits).
 # Artifacts built from uncommitted src have no committed provenance - warn by default,
 # abort if the -dirty-abort flag was given. To evaluate uncommitted source without
-# building, use '<builtexe> src' / '<builtexe> src shell' instead.
+# minting or baking, use '<builtexe> src' / '<builtexe> src shell' instead.
 # Guarded require: a stale or missing punkboot::utils bootsupport snapshot must never
 # brick the make.tcl commands used to repair it - the check degrades to a skip notice
 # (but -dirty-abort still aborts rather than silently skipping the requested strictness).
@@ -4290,7 +4321,7 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 #Emit provenance warnings with a plain column-0 token for automated discovery (grep PROVENANCE-WARNING
 #in redirected output) and ANSI colour for humans. Lines are also accumulated in
 #::punkboot::provenance_warnings_pending unless -norecap is given, so the wrapped ::exit below can
-#recap them at the tail of the output - build progress output is chatty and the original warning
+#recap them at the tail of the output - make.tcl progress output is chatty and the original warning
 #position may scroll out of sight or even out of scrollback.
 set ::punkboot::provenance_warnings_pending [list]
 proc ::punkboot::print_provenance_warnings {warninglines args} {
@@ -4305,22 +4336,22 @@ proc ::punkboot::print_provenance_warnings {warninglines args} {
     }
     flush stderr
 }
-#General build warnings that must stay noticeable despite chatty build output - same
+#General bake warnings that must stay noticeable despite chatty output - same
 #column-0 greppable-token + recap-at-exit treatment as provenance warnings above.
-set ::punkboot::build_warnings_pending [list]
-proc ::punkboot::print_build_warnings {warninglines args} {
+set ::punkboot::bake_warnings_pending [list]
+proc ::punkboot::print_bake_warnings {warninglines args} {
     global A
     if {![array size A]} {punkboot::define_global_ansi}
     foreach w $warninglines {
         regsub {^WARNING: } $w "" w
-        puts stderr "BUILD-WARNING: $A(BAD)$w$A(RST)"
+        puts stderr "BAKE-WARNING: $A(BAD)$w$A(RST)"
         if {"-norecap" ni $args} {
-            lappend ::punkboot::build_warnings_pending $w
+            lappend ::punkboot::bake_warnings_pending $w
         }
     }
     flush stderr
 }
-#Availability probe + scoped dirty-src check, shared by the build/promotion gate below and the
+#Availability probe + scoped dirty-src check, shared by the producing-commands gate below and the
 #'check' command report. Returns {available warninglist}.
 proc ::punkboot::get_src_provenance_warnings {projectroot label} {
     set available [expr {\
@@ -4338,7 +4369,7 @@ proc ::punkboot::get_src_provenance_warnings {projectroot label} {
 #
 #On windows an ordinary 'file copy -force' onto a mapped file is refused: a zipfs mount
 #maps its archive (tclZipfs.c CreateFileMappingW + MapViewOfFile), so a zip-based .tm
-#modpod that any running shell - including this build - has mounted cannot be overwritten
+#modpod that any running shell - including this make.tcl run - has mounted cannot be overwritten
 #in place. Windows reports ERROR_USER_MAPPED_FILE (1224); Tcl's Tcl_WinConvertError maps
 #only Win32 codes 0..267 and sends everything above them to EINVAL, so it surfaces as the
 #uninformative "invalid argument" (same code in 8.6 and 9.x).
@@ -4385,7 +4416,7 @@ proc ::punkboot::mapped_file_hint {errmsg tgtfile} {
     }
     return "'invalid argument' is Tcl's catch-all for any windows error above 267 (Tcl_WinConvertError), not a bad argument.\
         For a file replace the usual cause is ERROR_USER_MAPPED_FILE: '$tgtfile' is memory-mapped by a process that has it mounted -\
-        a zipfs/modpod mount does this, so a running punk shell (or this build) holding that .tm blocks an in-place overwrite.\
+        a zipfs/modpod mount does this, so a running punk shell (or this make.tcl run) holding that .tm blocks an in-place overwrite.\
         Close shells holding it, or rerun - the update now replaces such files by delete-then-place rather than overwrite."
 }
 #Availability probe + boot-precondition check of an assembled kit vfs (G-125), shared by the
@@ -4439,7 +4470,7 @@ proc ::punkboot::get_kit_offsetstyle_report {kitpath} {
 #file exists. The tclsh subcommand is used deliberately: it exits cleanly even on
 #runtimes whose full repl teardown is fragile, and a script argument with drained
 #stdin cannot reach any console-reopen path. ADVISORY: failures become recapped
-#BUILD-WARNINGs naming kit, package and the actual error - the kit still deploys.
+#BAKE-WARNINGs naming kit, package and the actual error - the kit still deploys.
 #Returns 1 when every declared package resolved, else 0.
 proc ::punkboot::kit_smoke_require_probe {kitpath targetkit packages} {
     set probescript [file rootname $kitpath]_smokerequire.tcl
@@ -4459,13 +4490,13 @@ exit 0}
         close $fd
     } errM]} {
         catch {close $fd}
-        ::punkboot::print_build_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
+        ::punkboot::print_bake_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
         return 0
     }
     if {[catch {
         lassign [punk::lib::invoke [list [file nativename $kitpath] tclsh [file nativename $probescript] << ""]] p_stdout p_stderr p_exitcode
     } errM]} {
-        ::punkboot::print_build_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
+        ::punkboot::print_bake_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
         return 0
     }
     set seen [dict create]
@@ -4502,7 +4533,7 @@ exit 0}
         lappend warnings "smoke-require for kit $targetkit: artifact exited with code $p_exitcode via its tclsh subcommand (expected 0)"
     }
     if {[llength $warnings]} {
-        ::punkboot::print_build_warnings $warnings
+        ::punkboot::print_bake_warnings $warnings
     }
     return $allok
 }
@@ -4516,10 +4547,10 @@ if {![llength [info commands ::punkboot::exit_original]]} {
             puts stderr "PROVENANCE-WARNING: recap of warning(s) emitted earlier in this run:"
             ::punkboot::print_provenance_warnings $::punkboot::provenance_warnings_pending -norecap
         }
-        if {[info exists ::punkboot::build_warnings_pending] && [llength $::punkboot::build_warnings_pending]} {
+        if {[info exists ::punkboot::bake_warnings_pending] && [llength $::punkboot::bake_warnings_pending]} {
             puts stderr ""
-            puts stderr "BUILD-WARNING: recap of warning(s) emitted earlier in this run:"
-            ::punkboot::print_build_warnings $::punkboot::build_warnings_pending -norecap
+            puts stderr "BAKE-WARNING: recap of warning(s) emitted earlier in this run:"
+            ::punkboot::print_bake_warnings $::punkboot::bake_warnings_pending -norecap
         }
         ::punkboot::exit_original $returnCode
     }
@@ -4531,7 +4562,7 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
     if {$have_scoped_dirty_check} {
         if {[llength $dirty_warnings]} {
             ::punkboot::print_provenance_warnings $dirty_warnings
-            puts stderr "  To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+            puts stderr "  To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
             if {$dirty_abort} {
                 set ::punkboot::provenance_warnings_pending [list] ;#no recap needed - aborting adjacent to the warning
                 if {$::punkboot::command eq "bakehouse"} {
@@ -4540,9 +4571,9 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
                     puts stderr "    make.tcl packages   -> test ('<builtexe> src', src/tests/runtests.tcl)"
                     puts stderr "    make.tcl bootsupport + make.tcl vfscommonupdate   (promotion gates)"
                     puts stderr "    commit              -> make.tcl bake"
-                    puts stderr "  To build anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
+                    puts stderr "  To proceed anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
                 } else {
-                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to build with a warning)"
+                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to proceed with a warning)"
                 }
                 exit 1
             }
@@ -4734,19 +4765,19 @@ if {$::punkboot::command eq "check"} {
         puts stderr "    cd \[projectroot\]/src && tclsh make.tcl modules && tclsh make.tcl bootsupport"
         puts stderr "=============================================================================="
     }
-    # Dirty-src provenance status - what the build/promotion commands would do
+    # Dirty-src provenance status - what the producing commands would do
     puts stdout $sep
     lassign [::punkboot::get_src_provenance_warnings $projectroot "make.tcl check"] _prov_available _prov_warnings
     if {!$_prov_available} {
         puts stdout "src provenance: check unavailable (punkboot::utils vcs_dirty_warnings with scope support not loadable from bootsupport)"
-        puts stdout "  build/promotion commands will proceed with a NOTE; -dirty-abort would abort as unverifiable."
+        puts stdout "  producing commands (mint/promote/bake) will proceed with a NOTE; -dirty-abort would abort as unverifiable."
     } elseif {![llength $_prov_warnings]} {
         puts stdout "src provenance: OK (no uncommitted fossil/git changes under src/)"
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
     } else {
         ::punkboot::print_provenance_warnings $_prov_warnings -norecap
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
-        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
+        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
     }
     # Kit boot-precondition gate status - whether a bake can refuse an unbootable kit
     puts stdout $sep
@@ -4755,7 +4786,7 @@ if {$::punkboot::command eq "check"} {
     if {$_boot_available} {
         puts stdout "boot-precondition gate (G-125): ACTIVE"
         puts stdout "  bake checks each kit's merged vfs for a tcl library (tcl_library/, lib/tcl<major>.<minor>/ or"
-        puts stdout "  tcl<major>.<minor>/) before building it. A kit with none is reported under FAILED KITS and is"
+        puts stdout "  tcl<major>.<minor>/) before baking it. A kit with none is reported under FAILED KITS and is"
         puts stdout "  neither built nor deployed, so a previously deployed kit is never replaced by an artifact that"
         puts stdout "  cannot initialise."
     } else {
@@ -4770,7 +4801,7 @@ if {$::punkboot::command eq "check"} {
         puts stdout "payload/target arch scan (G-133): ACTIVE (advisory)"
         puts stdout "  bake classifies each merged kit's binary libraries (*.dll/*.so/*.dylib header bytes - structural,"
         puts stdout "  nothing executed, cross-target kits included) against the kit's target platform and emits"
-        puts stdout "  recapped BUILD-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
+        puts stdout "  recapped BAKE-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
         puts stdout "  (canonical <os>-<cpu> names and recognised vendor spellings such as win-x64 are exempt)."
     } else {
         puts stdout "payload/target arch scan (G-133): UNAVAILABLE (punkboot::utils vfs_binary_arch_report not loadable from bootsupport)"
@@ -4783,7 +4814,7 @@ if {$::punkboot::command eq "check"} {
     if {$_off_available} {
         puts stdout "kit offset-style pin (G-134): ACTIVE (advisory)"
         puts stdout "  bake probes each assembled kit image with punk::zip::archive_info and emits a recapped"
-        puts stdout "  BUILD-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
+        puts stdout "  BAKE-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
         puts stdout "  emits archive-relative by construction; the G-128 stamper refuses file-relative by default)."
         puts stdout "  plain/none results (no attached zip - e.g the metakit kit shape) are silence, not warnings."
     } else {
@@ -4804,7 +4835,7 @@ if {$::punkboot::command eq "check"} {
     puts stdout "  (mapvfs.toml smokerequire key; legacy mapvfs.config 5th entry element) have each one plain-'package require'd inside the built"
     puts stdout "  artifact via its tclsh subcommand - the only check that sees resolution-order defects such as"
     puts stdout "  a wrong-arch higher-versioned package shadowing a working copy. Failures are recapped"
-    puts stdout "  BUILD-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
+    puts stdout "  BAKE-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
     if {[llength $_smoke_declared]} {
         puts stdout "  declared: [join $_smoke_declared {; }]"
     } else {
@@ -4995,7 +5026,7 @@ if {$::punkboot::command eq "workflow"} {
 if {$::punkboot::command eq "bakelist"} {
     #G-121: report the kit outputs configured in src/runtime/mapvfs.config, consuming
     #the same parsed mapping model as the bake kit machinery (::punkboot::lib::mapvfs_*).
-    #Reporting only - never builds. Data rows are single-line and column-stable for
+    #Reporting only - never bakes. Data rows are single-line and column-stable for
     #grepping; expected state sits in the columns, anomalies surface in a trailing
     #sparse notes column (key=value tags). Kit name arguments filter the report and
     #add a per-kit detail block (resolved paths/sizes/mtimes).
@@ -5007,7 +5038,7 @@ if {$::punkboot::command eq "bakelist"} {
     set rt_os_arch [punkboot::lib::platform_store_tier $rt_default_target]
     set rtbase   $binfolder/runtime
     set rtfolder $rtbase/$rt_os_arch
-    set buildfolder $sourcefolder/_build
+    set bakefolder $sourcefolder/_bake
     set mapfile [punkboot::lib::mapvfs_locate $sourcefolder/runtime]
     set mapmodel [punkboot::lib::mapvfs_model $sourcefolder/runtime $rtbase $sourcefolder $rt_default_target]
     foreach errline [dict get $mapmodel configerrors] {
@@ -5076,12 +5107,12 @@ if {$::punkboot::command eq "bakelist"} {
         set runtime  [dict get $rec runtime]
         set vfstail  [dict get $rec vfs]
         #G-127: deploy-state roots follow the record's output tier (non-default
-        #targets live under kits/<platform>/ in both bin/ and src/_build/)
+        #targets live under kits/<platform>/ in both bin/ and src/_bake/)
         set out_tier [dict get $rec out_tier]
         if {$out_tier eq ""} {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder $binfolder [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder $binfolder [dict get $rec targetkit]]
         } else {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
         }
         set notes [list]
         if {$runtime ne "-" && ![dict get $rec runtime_present]} {
@@ -5094,7 +5125,7 @@ if {$::punkboot::command eq "bakelist"} {
             #cross-target entry: its runtime, store tier and artifact naming follow
             #its own platform, not this host's default
             lappend notes target=[dict get $rec target]
-            #G-127: and its build/deploy locations sit under the kits/<platform>/ tier
+            #G-127: and its bake/deploy locations sit under the kits/<platform>/ tier
             lappend notes out=$out_tier/
         }
         if {[dict get $rec group] ne ""} {
@@ -5136,7 +5167,7 @@ if {$::punkboot::command eq "bakelist"} {
             append map_display " (deprecated format)"
         }
     }
-    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_build/<kit> (out= rows: under kits/<platform>/)"
+    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_bake/<kit> (out= rows: under kits/<platform>/)"
     set headline ""
     foreach h $headings w $widths {
         append headline [format "%-*s  " $w $h]
@@ -5176,10 +5207,10 @@ if {$::punkboot::command eq "bakelist"} {
             if {[dict get $rec group] ne ""} {
                 puts stdout "    group:         [dict get $rec group][expr {[dict get $rec bake_default] ? "" : "   (bake_default=false - bake by name or @[dict get $rec group])"}]"
             } elseif {![dict get $rec bake_default]} {
-                puts stdout "    bake_default:  false (excluded from full bakes - bake by name to build)"
+                puts stdout "    bake_default:  false (excluded from full bakes - bake it by name)"
             }
             set relkit [expr {[dict get $rec out_tier] eq "" ? [dict get $rec targetkit] : "[dict get $rec out_tier]/[dict get $rec targetkit]"}]
-            puts stdout "    build product: src/_build/$relkit [punkboot::lib::bakelist_file_detail $buildfolder/$relkit]"
+            puts stdout "    bake product:  src/_bake/$relkit [punkboot::lib::bakelist_file_detail $bakefolder/$relkit]"
             puts stdout "    deployed:      bin/$relkit [punkboot::lib::bakelist_file_detail $binfolder/$relkit] state=[lindex $row 4]"
         }
     }
@@ -6114,7 +6145,7 @@ if {$::punkboot::command eq "bootsupport"} {
     #Project layouts store no bootsupport module snapshots - 'dev project.new' injects bootsupport
     #into generated projects from the generating shell at generation time. Layout-carried scripts
     #and bootsupport manifests are kept current by the thin-layout sync step (see DIAGRAM 1b in
-    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse builds.
+    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse runs.
 
     puts stdout " bootsupport done "
     flush stderr
@@ -6434,7 +6465,7 @@ if {$::punkboot::command ni {bakehouse packages modules libs bake vfslibs bin}}
 
 
 
-#external libs and modules first - and any supporting files - no 'building' required
+#external libs and modules first - and any supporting files - no minting required
 
 #install src vendor contents (from version controlled src folder) to base of project (same target folders as our own src/modules etc ie to paths that go on the auto_path and in tcl::tm::list)
 
@@ -6962,7 +6993,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
 
     #store -> modpod payload sync: the punk::mix::templates module ships the thin punk.project layout
     #so module-pathtype layout refs resolve and a bare kit outside any project can generate from it.
-    #The modpod copy is build-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
+    #The modpod copy is sync-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
     #inside zip-based .tm modules). (The unimplemented child-side src/PROJECT_LAYOUTS_* marker was
     #retired by G-087 stage 5 - thin layouts + generation-time injection made it moot.)
     set store_layout   $sourcefolder/project_layouts/vendor/punk/project-0.1
@@ -6978,7 +7009,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
             -installer make.tcl
             -overwrite installedsourcechanged-targets
             -createempty 1
-            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build .git **/.git}
+            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build _mint **/_mint _bake **/_bake .git **/.git}
             -exclude-paths {bin/sdx.kit}
         }]
         puts stdout [punkcheck::summarize_install_resultdict $resultdict]
@@ -7083,20 +7114,29 @@ set installername "make.tcl"
 if {$::punkboot::command ni {bakehouse bake bin}} {
     #command = packages/modules/libs/vfslibs - stops before kit assembly
     puts stdout "vfs folders not checked"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder (promotion gate - commit for provenance)"
-    puts stdout " - use 'make.tcl bake' to build executable kits/zipkits from the vfs folders if you have runtimes installed"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder (promotion gate - commit for provenance)"
+    puts stdout " - use 'make.tcl bake' to bake executable kits/zipkits from the vfs folders if you have runtimes installed"
     puts stdout "   Note that without the vfscommonupdate step, 'make.tcl bake' will include any manual changes in the *custom* vfs folders but"
-    puts stdout "   without the latest built modules."
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   without the latest minted modules."
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
     puts stdout " - consumer full path from a clean checkout: 'make.tcl bakehouse'"
     puts stdout "-done-"
     exit 0
 }
 
 
-set buildfolder [punk::mix::cli::lib::get_build_workdir $sourcefolder]
-if {$buildfolder ne "$sourcefolder/_build"} {
-    puts stderr "$sourcefolder/_build doesn't match the project buildfolder $buildfolder - check project filestructure"
+#G-155: the bake workdir resolver was renamed get_build_workdir -> get_bake_workdir with the
+#src/_build -> src/_bake flip. Fall back to a direct mkdir when driving a stale punk::mix
+#snapshot (old bootsupport, or a generated project mid-update) so the mixed state stays runnable.
+if {[llength [info commands ::punk::mix::cli::lib::get_bake_workdir]]} {
+    set bakefolder [punk::mix::cli::lib::get_bake_workdir $sourcefolder]
+} else {
+    puts stderr "NOTE: punk::mix snapshot predates get_bake_workdir (G-155) - using $sourcefolder/_bake directly. Refresh with 'make.tcl modules' + 'make.tcl bootsupport'."
+    file mkdir $sourcefolder/_bake
+    set bakefolder $sourcefolder/_bake
+}
+if {$bakefolder ne "$sourcefolder/_bake"} {
+    puts stderr "$sourcefolder/_bake doesn't match the project bakefolder $bakefolder - check project filestructure"
     puts stdout " -aborted- "
     exit 2
 }
@@ -7134,7 +7174,7 @@ set rt_sourcefolder $sourcefolder/runtime ;#where our config lives
 #driving tclsh's platform. The copy is the same binary as its source, so it must
 #keep the source's executable convention - an .exe stays an .exe whether a native
 #windows tclsh, an msys/cygwin-runtime tclsh (platform 'unix', .exe files) or a
-#cross-target host is driving the build.
+#cross-target host is driving the bake.
 #Mapping key for a runtime FILE name: the name as mapvfs.config spells it, i.e
 #with a windows .exe suffix removed. Only .exe may be stripped - 'file rootname'
 #would eat the last dotted segment of version-named runtimes such as tclsh9.0.5,
@@ -7200,7 +7240,7 @@ proc ::punkboot::runtime_materialization_warning {rtfolder runtime_fullname} {
         set current_rev [dict get $stale current_rev]
         set maxrev [dict get $stale maxrev]
         set maxname [dict get $stale maxname]
-        ::punkboot::print_build_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
+        ::punkboot::print_bake_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
     }
     return
 }
@@ -7238,7 +7278,7 @@ if {[llength $missing]} {
         #declaration. A missing runtime FILE is environment, not declaration: store
         #tiers are legitimately part-populated (fresh clones; runtimes arrive via the
         #consent-gated fetch tiers), so those entries skip with a recapped
-        #BUILD-WARNING naming the entry (cross-target wording states the tier reason).
+        #BAKE-WARNING naming the entry (cross-target wording states the tier reason).
         #bake_default=false entries are not in the full-bake set; selective bakes
         #fail fast at selection instead.
         set _strict_fatal [list]
@@ -7268,7 +7308,7 @@ if {[llength $missing]} {
             exit 3
         }
         if {[llength $_strict_warn]} {
-            ::punkboot::print_build_warnings $_strict_warn
+            ::punkboot::print_bake_warnings $_strict_warn
         }
         unset -nocomplain _rec _entrylabel _strict_fatal _strict_warn _line
     } else {
@@ -7359,7 +7399,7 @@ dict for {_rtname _rttarget} $runtime_target {
         continue ;#absent cross-target runtime already warned by the parse
     }
     if {[dict exists $rtfolder_of $_file]} {
-        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to build both."
+        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to bake both."
         continue
     }
     lappend runtimes $_file
@@ -7370,14 +7410,14 @@ if {[llength $cross_target_tiers]} {
 }
 unset -nocomplain _rtname _rttarget _tier _dir _file
 if {![llength $runtimes]} {
-    puts stderr "No executable runtimes found in $rtfolder - unable to build any .vfs folders into executables."
+    puts stderr "No executable runtimes found in $rtfolder - unable to bake any .vfs folders into executables."
     puts stderr "Add runtimes to $rtfolder if required"
     if {![file isdirectory $rtfolder]} {
         #same store-tier self-diagnosis as bakelist
         puts stderr "NOTE: that runtime store folder does not exist. Default target '$rt_default_target' derives from THIS tclsh: tcl_platform(os)='$::tcl_platform(os)' tcl_platform(platform)='$::tcl_platform(platform)' -> host canon '$::punkboot::host_platform' -> target '$rt_default_target'."
         puts stderr "  Populate it with 'bin/punk-runtime.cmd' (or by hand), or declare a per-entry target platform in mapvfs.toml for runtimes stored elsewhere."
     }
-    #todo - don't exit - it is valid to use runtime of - to just build a .kit/.zipkit ?
+    #todo - don't exit - it is valid to use runtime of - to just bake a .kit/.zipkit ?
     exit 0
 }
 #G-121 selective bake: restrict processing to the runtimes the selected kits wrap -
@@ -7494,7 +7534,7 @@ dict for {vfstail -} $vfs_runtime_map {
     }
 }
 #G-121 selective bake: only the selected kits' vfs folders get checked/checksummed -
-#other vfs folders' punkcheck build events never fire.
+#other vfs folders' punkcheck bake events never fire.
 if {[llength $::punkboot::bake_selected_kitnames]} {
     set vfs_tails [lmap _vt $vfs_tails {
         if {$_vt ni $::punkboot::bake_selected_vfs} {
@@ -7505,22 +7545,22 @@ if {[llength $::punkboot::bake_selected_kitnames]} {
     unset -nocomplain _vt
 }
 if {![llength $vfs_tails]} {
-    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to build"
+    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to bake"
     puts stdout " -done- "
     exit 0
 }
 
-set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if building from same .vfs with multiple runtime executables
+set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if baking from same .vfs with multiple runtime executables
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we build an exe for a runtime that matches .vfs folder name - REVIEW.
+#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we bake an exe for a runtime that matches .vfs folder name - REVIEW.
 foreach  runtimefile $runtimes {
     #runtimefile e.g tclkit86bi.exe for a win32 target, tclkit86bi for a posix one
 
-    #sdx *may* be pointed to use the runtime we use to build the kit, or the user may manually use this runtime if they don't have tclsh
+    #sdx *may* be pointed to use the runtime we use to bake the kit, or the user may manually use this runtime if they don't have tclsh
     #sdx will complain if the same runtime is used for the shell as is used in the -runtime argument - so we make a copy (REVIEW)
-    #if {![file exists $buildfolder/buildruntime.exe]} {
-    #    file copy $rtfolder/$runtimefile $buildfolder/buildruntime.exe
+    #if {![file exists $bakefolder/buildruntime.exe]} {
+    #    file copy $rtfolder/$runtimefile $bakefolder/buildruntime.exe
     #}
 
     #G-122: each runtime is read from the tier its target platform names, not
@@ -7540,18 +7580,18 @@ foreach  runtimefile $runtimes {
         set useruntimefile $runtimefile
     }
 
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
         -make-step copy_runtime
     }]
     #----------
     set installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-    $installer set_source_target $rt_dir $buildfolder
+    $installer set_source_target $rt_dir $bakefolder
     set event [$installer start_event $config]
-    $event targetset_init INSTALL $buildfolder/build_$runtimefile
+    $event targetset_init INSTALL $bakefolder/build_$runtimefile
     #$event targetset_addsource $rt_dir/$runtimefile
     $event targetset_addsource $rt_dir/$useruntimefile ;#possibly the _BUILDCOPY in the runtime folder (created for when mounted in current executable as a tclkit)
-    $event targetset_addsource $buildfolder/build_$runtimefile ;#self as source for change detection
+    $event targetset_addsource $bakefolder/build_$runtimefile ;#self as source for change detection
     #----------
 
     #set changed_unchanged [punkcheck::recordlist::file_install_record_source_changes [lindex [dict get $file_record body] end]]
@@ -7562,11 +7602,11 @@ foreach  runtimefile $runtimes {
         $event targetset_started
         # -- --- --- --- --- ---
         #This is the full runtime - *possibly* with some sort of vfs attached.
-        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $buildfolder/build_$runtimefile"
+        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $bakefolder/build_$runtimefile"
         if {[catch {
-            file copy -force $rt_dir/$useruntimefile $buildfolder/build_$runtimefile ;#becomes building_runtime
+            file copy -force $rt_dir/$useruntimefile $bakefolder/build_$runtimefile ;#becomes baking_runtime
         } errM]} {
-            puts stderr " >> copy runtime to $buildfolder/build_$runtimefile FAILED"
+            puts stderr " >> copy runtime to $bakefolder/build_$runtimefile FAILED"
             $event targetset_end FAILED
         } else {
             $event targetset_end OK
@@ -7804,7 +7844,7 @@ proc vfs_startup_script_warning {vfsfolder} {
             append detail "; main.tcl fauxlink target '$linktarget' does not exist"
         }
     }
-    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (build proceeding anyway)$detail"
+    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (bake proceeding anyway)$detail"
 }
 #Cat-style zipkit assembly: a raw (vfs-free) runtime followed by a freshly built
 #zip, concatenated. This is the zipfs-less assembly path for BOTH zip-type kits
@@ -7845,7 +7885,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-057 kit icon step. Every built kit gets a <kitname>.resources.toml sidecar
-#recording the build-time icon choice (default src/runtime/punkshell.ico,
+#recording the bake-time icon choice (default src/runtime/punkshell.ico,
 #overridable by a root-level punkshell.ico in the kit's own custom .vfs folder,
 #consulted PRE-merge so the _vfscommon copy never reads as an override), and
 #win32-target kits get that icon embedded as PE RT_ICON/RT_GROUP_ICON resources
@@ -7856,7 +7896,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 #adopted from the first replaced group; idempotent by construction, parity
 #recorded in the G-128 detail file): the vendored punkres portable stamper
 #(G-128, src/tools/punkres, built by 'make.tcl tool build punkres') is
-#selected when bin/punkres(.exe) exists and works from ANY build host;
+#selected when bin/punkres(.exe) exists and works from ANY bake host;
 #otherwise the twapi arm (tcl-sfe sfe-0.2.tm ReplaceIconInStub lineage; Ashok
 #P. Nadkarni) serves windows hosts with nothing built. Ordering is stub-first either way: a per-kit
 #copy of the payload-free raw runtime prefix is stamped BEFORE any payload is
@@ -8195,12 +8235,12 @@ proc ::punkboot::kit_icon_embed_twapi {exepath icopath {group_override {}}} {
 #G-057 single internal entry point. Decides the kit's icon (override: root
 #punkshell.ico in the kit's own custom .vfs folder, pre-merge; else the project
 #default src/runtime/punkshell.ico), writes/refreshes the kit's
-#<kitname>.resources.toml sidecar in the build folder, and - when the target
+#<kitname>.resources.toml sidecar in the bake folder, and - when the target
 #has PE resources and this host can write them - stamps a per-kit copy of the
 #payload-free raw runtime prefix. Returns {wrap_runtime sidecarpath}:
 #wrap_runtime is the runtime prefix the assembly step must consume (the stamped
 #copy when embedding happened, the untouched raw prefix otherwise).
-proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime buildfolder} {
+proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime bakefolder} {
     set repo_root [file dirname $sourcefolder]
     set override_icon $sourcefolder/vfs/$vfstail/punkshell.ico
     if {[file isfile $override_icon]} {
@@ -8253,7 +8293,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     }
     set wrap_runtime $raw_runtime
     if {$status eq ""} {
-        set stamped $buildfolder/iconed_$targetkit
+        set stamped $bakefolder/iconed_$targetkit
         file copy -force $raw_runtime $stamped
         catch {exec chmod +w $stamped}
         if {$punkres_ok} {
@@ -8264,7 +8304,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
             set embed_cmd [list ::punkboot::kit_icon_embed_twapi $stamped $icon_path $icon_group]
         }
         if {[catch $embed_cmd embed_result]} {
-            ::punkboot::print_build_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
+            ::punkboot::print_bake_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
             set status failed
             set reason $embed_result
             catch {file delete $stamped}
@@ -8303,7 +8343,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     lappend lines "embedding = \"$embedding\""
     lappend lines "embedding_status = \"$status\""
     lappend lines "embedding_reason = \"[$esc $reason]\""
-    set sidecar $buildfolder/$targetkit.resources.toml
+    set sidecar $bakefolder/$targetkit.resources.toml
     ::punkboot::kiticon::writefile_ifchanged $sidecar "[join $lines \n]\n"
     return [list $wrap_runtime $sidecar]
 }
@@ -8311,18 +8351,18 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
 
 set startdir [pwd]
 puts stdout "Found [llength $vfs_tails] .vfs folders -   checking each for executables that may need to be built"
-cd [file dirname $buildfolder] 
+cd [file dirname $bakefolder] 
 #root folder mtime is insufficient for change detection. Tree mtime of folders only is a barely  passable mechanism for vfs change detection in some circumstances - e.g if files added/removed but never edited in place
 #a hash of full tree file & dir mtime may be more reasonable - but it remains to be seen if just tar & checksum is any/much slower.
 #Simply rebuilding all the time may be close the speed of detecting change anyway - and almost certainly much faster when there is a change.
-#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle build on reversion to older source.
+#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle re-bake on reversion to older source.
 set exe_names_seen [list]
 set path_cksum_cache [dict create]
 dict set path_cksum_cache {*}[punk::mix::base::lib::get_relativecksum_from_base $basedir $sourcefolder/vfs/_vfscommon.vfs]
 
 #
-# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - build with sdx or zipfs if source .vfs or source runtime exe has changed.
-# we are using punkcheck to install result to buildfolder so we create a .punkcheck file at the target folder to store metadata.
+# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - bake with sdx or zipfs if source .vfs or source runtime exe has changed.
+# we are using punkcheck to install result to bakefolder so we create a .punkcheck file at the target folder to store metadata.
 # punkcheck allows us to not rely purely on timestamps (which may be unreliable)  
 #
 foreach vfstail $vfs_tails {
@@ -8330,11 +8370,11 @@ foreach vfstail $vfs_tails {
     set vfsname [file rootname $vfstail]
     puts stdout "  ------------------------------------"
     puts stdout "  checking vfs $sourcefolder/vfs/$vfstail for configured runtimes"
-    set skipped_vfs_build 0
+    set skipped_vfs_bake 0
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
-        -make-step build_vfs
+        -make-step bake_vfs
     }]
 
 
@@ -8366,7 +8406,7 @@ foreach vfstail $vfs_tails {
         }
     } else {
         #only match this vfs to a correspondingly named runtime if there was no explicit entry for that runtime
-        #review - should this only be done if there are NO explicit entries? how does a user stop builds of unneeded exes that match without renaming files/folders?
+        #review - should this only be done if there are NO explicit entries? how does a user stop bakes of unneeded exes that match without renaming files/folders?
         #but conversely, adding an extra entry shouldn't stop default builds that used to run..
         set matchrt [file rootname [file tail $vfstail]] ;#e.g project.vfs -> project
         if {![dict exists $runtime_vfs_map $matchrt]} {
@@ -8385,7 +8425,7 @@ foreach vfstail $vfs_tails {
         #(e.g _vfscommon.vfs is a merge overlay with no runtime mapping and legitimately has no main.tcl)
         set startup_warning [vfs_startup_script_warning $sourcefolder/vfs/$vfstail]
         if {$startup_warning ne ""} {
-            ::punkboot::print_build_warnings [list $startup_warning]
+            ::punkboot::print_bake_warnings [list $startup_warning]
         }
     }
     #todo - non kit based - zipkit?
@@ -8452,21 +8492,21 @@ foreach vfstail $vfs_tails {
             lassign $targetkit_info targetkit target_kit_type kit_smokerequires kit_attrs
             #G-127: output locations are keyed by the kit's TARGET. Kits for this
             #host's own default target keep the flat locations every launcher, test
-            #and habit expects (src/_build/<kit>, bin/<kit>); any other target's kit
+            #and habit expects (src/_bake/<kit>, bin/<kit>); any other target's kit
             #builds and deploys under a kits/<platform>/ tier so same-named kits for
             #different targets coexist instead of overwriting each other across
             #selective runs. bin/kits/ rather than bin/<platform>/ because
             #bin/runtime/<platform>/ already means build INPUTS.
             if {$rt_target eq $rt_default_target} {
-                set kit_builddir  $buildfolder
+                set kit_bakedir  $bakefolder
                 set kit_deploydir $binfolder
-                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_build/
+                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_bake/
             } else {
-                set kit_builddir  $buildfolder/kits/$rt_target
+                set kit_bakedir  $bakefolder/kits/$rt_target
                 set kit_deploydir $binfolder/kits/$rt_target
                 set kit_relpath   kits/$rt_target/$targetkit
             }
-            file mkdir $kit_builddir
+            file mkdir $kit_bakedir
             #G-024: bake_default=false entries (declared per entry or via their group)
             #are excluded from full bakes - explicit name/@group selection builds them.
             if {![llength $::punkboot::bake_selected_kitnames]
@@ -8493,11 +8533,11 @@ foreach vfstail $vfs_tails {
             set self_exe [file normalize [info nameofexecutable]]
             set self_deploy_target [file normalize $kit_deploydir/$targetkit]
             if {$::punkboot::host_windows} {
-                set is_self_build [string equal -nocase $self_exe $self_deploy_target]
+                set is_self_bake [string equal -nocase $self_exe $self_deploy_target]
             } else {
-                set is_self_build [string equal $self_exe $self_deploy_target]
+                set is_self_bake [string equal $self_exe $self_deploy_target]
             }
-            if {$is_self_build} {
+            if {$is_self_bake} {
                 puts stderr "SKIPPING kit $targetkit - its deployed executable is the one running this build ($self_exe)"
                 puts stderr "  Rerun 'make.tcl $::punkboot::command' under tclsh or a different built kit to rebuild $targetkit."
                 lappend skipped_kits [list kit $targetkit reason "deployed executable is running this build"]
@@ -8505,9 +8545,9 @@ foreach vfstail $vfs_tails {
             }
             # -- ----------
             set vfs_installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-            $vfs_installer set_source_target $sourcefolder $buildfolder
-            set vfs_event [$vfs_installer start_event {-make-step build_vfs}]
-            $vfs_event targetset_init INSTALL $kit_builddir/$targetkit
+            $vfs_installer set_source_target $sourcefolder $bakefolder
+            set vfs_event [$vfs_installer start_event {-make-step bake_vfs}]
+            $vfs_event targetset_init INSTALL $kit_bakedir/$targetkit
             set relvfs [punkcheck::lib::path_relative $basedir $sourcefolder/vfs/$vfstail]
             if {![dict exists $path_cksum_cache $relvfs]} {
                 #e.g ../vfs/punk87.vfs {cksum xxxx cksum_all_opts {-cksum_content 1 ... -cksum_algorithm sha1}}
@@ -8523,11 +8563,11 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_addsource $sourcefolder/runtime/punkshell.ico
             }
             if {$rtname ne "-"} {
-                set building_runtime $buildfolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
-                $vfs_event targetset_addsource $building_runtime
+                set baking_runtime $bakefolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
+                $vfs_event targetset_addsource $baking_runtime
                 set raw_runtime "" ;#building runtime with vfs (zip,kit,cookfs etc stripped)
             } else {
-                set building_runtime "-" ;#REVIEW
+                set baking_runtime "-" ;#REVIEW
                 set raw_runtime "-"
             }
             # -- ----------
@@ -8541,18 +8581,18 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
 
-                if {[file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "deleting existing $buildfolder/$vfsname.new"
-                    file delete $buildfolder/$vfsname.new
+                if {[file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "deleting existing $bakefolder/$vfsname.new"
+                    file delete $bakefolder/$vfsname.new
                 }
 
                 package require fileutil
                 package require fileutil::traverse
                 package require control
 
-                #keep this a simple name - bin/punk script calls into src/_build/exename.vfs/main.tcl
+                #keep this a simple name - bin/punk script calls into src/_bake/exename.vfs/main.tcl
                 #(G-127: non-default-target kits keep the simple name under their kits/<platform>/ tier)
-                set targetvfs $kit_builddir/$targetkit.vfs
+                set targetvfs $kit_bakedir/$targetkit.vfs
                 file delete -force $targetvfs
 
                 set extraction_done 0
@@ -8623,7 +8663,7 @@ foreach vfstail $vfs_tails {
                             #zipfs mkimg replaces the entire zipped vfs in the runtime - so we need the original data to be part of our targetvfs.
                             puts stdout "Attempting to extract zip vfs data from $runtime_fullname"
                             file mkdir $targetvfs
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
 
                             if {[info commands ::tcl::zipfs::mount] ne ""} {
                                 #the driving tcl has zipfs
@@ -8631,13 +8671,13 @@ foreach vfstail $vfs_tails {
 
                                 if {![file exists $rtmountpoint]} {
                                     if {[catch {
-                                        tcl::zipfs::mount $building_runtime  rtmounts/$runtime_fullname
+                                        tcl::zipfs::mount $baking_runtime  rtmounts/$runtime_fullname
                                     } errM]} {
-                                        puts stderr "Failed to mount $building_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
+                                        puts stderr "Failed to mount $baking_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
                                         if {[catch {
-                                        tcl::zipfs::mount rtmounts/$runtime_fullname $building_runtime
+                                        tcl::zipfs::mount rtmounts/$runtime_fullname $baking_runtime
                                         } errM]} {
-                                            puts stderr "ALSO Failed to mount $building_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
+                                            puts stderr "ALSO Failed to mount $baking_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
                                         }
                                     }
                                 }
@@ -8656,7 +8696,7 @@ foreach vfstail $vfs_tails {
                                     if {$baseoffset != 0} {
                                         #tcl was able to determine the compressed-data offset
                                         #either because runtime is a basic catted exe+zip, or Tcl fixed 'zipfs info'
-                                        set fdrt [open $building_runtime r]
+                                        set fdrt [open $baking_runtime r]
                                         chan configure $fdrt -translation binary
                                         set exedata [read $fdrt $baseoffset] ;#may include stored password and ending header // REVIEW - strip it?
                                         close $fdrt
@@ -8665,21 +8705,21 @@ foreach vfstail $vfs_tails {
                                         puts -nonewline $fdraw $exedata
                                         close $fdraw
                                     } else {
-                                        #presumably the supplied building_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
+                                        #presumably the supplied baking_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
                                         #due to zipfs info bug - zipfs now can't tell us the offset of the compressed data.
                                         #we need to use a similarly assumptive method as tclZipfs.c uses to determine the start of the compressed contents
                                         package require punk::zip
                                         #we don't technically need to extract the raw exe for 'zip' - as zipfs mkimg can work on the combined file (ignores zip)
                                         # - but for consistency we want raw_runtime to be emitted in the filesystem.
                                         file delete $raw_runtime
-                                        punk::zip::extract_preamble $building_runtime $raw_runtime
+                                        punk::zip::extract_preamble $baking_runtime $raw_runtime
                                     }
                                 } else {
-                                    #the input building_runtime wasn't mountable as a zip - so presumably a plain executable
+                                    #the input baking_runtime wasn't mountable as a zip - so presumably a plain executable
                                     #runtime executable possibly with kit/cookfs etc attached?
                                     #If not - init.tcl probably won't be found? should we even proceed ??
                                     puts stderr "[punkboot::sgr 31]WARNING the runtime was not mountable as a zip - which means tcl_library was not extracted - the executable may not work with zipfs attached![punkboot::sgr]"
-                                    file copy -force $building_runtime $raw_runtime
+                                    file copy -force $baking_runtime $raw_runtime
                                 }
                             } else {
                                 #The driving tcl we are calling with doesn't have zipfs - can't mount.
@@ -8687,7 +8727,7 @@ foreach vfstail $vfs_tails {
                                 #so this path needs no zipfs, no vfs::zip and no tcllib.
                                 package require punk::zip
                                 puts stdout "tcl shell '[info nameofexecutable]' being used to build doesn't have zipfs - reading the runtime's attached archive with punk::zip"
-                                set extractedzipfolder $buildfolder/extracted_$runtime_fullname
+                                set extractedzipfolder $bakefolder/extracted_$runtime_fullname
                                 file delete $raw_runtime
                                 file delete -force $extractedzipfolder
                                 if {![catch {
@@ -8696,8 +8736,8 @@ foreach vfstail $vfs_tails {
                                     #derived base offset: a runtime whose offsets are file-relative
                                     #splits into a .zip no plain zip reader accepts, and reading the
                                     #whole file sidesteps that intermediate entirely.
-                                    punk::zip::extract_preamble $building_runtime $raw_runtime
-                                    punk::zip::unzip -return none -- $building_runtime $extractedzipfolder
+                                    punk::zip::extract_preamble $baking_runtime $raw_runtime
+                                    punk::zip::unzip -return none -- $baking_runtime $extractedzipfolder
                                 } extracterr]} {
                                      set extraction_done 1
                                      set extract_kit_type $extract_kit_try
@@ -8733,7 +8773,7 @@ foreach vfstail $vfs_tails {
                                 #unlike cookit's //cookit:/  it doesn't show up in file volumes
                                 #set rtmountpoint //cookfstemp:/rtmounts/$runtime_fullname ;#not writable with 'file mkdir' which doesn't seem to handle intermediate nonexistant path
                                 set rtmountpoint //cookfstemp:/$runtime_fullname
-                                cookfs::Mount $building_runtime $rtmountpoint
+                                cookfs::Mount $baking_runtime $rtmountpoint
                                 if {[file exists $rtmountpoint]} {
                                     #copy from mounted runtime's vfs to the filesystem vfs
                                     merge_over $rtmountpoint $targetvfs
@@ -8754,37 +8794,37 @@ foreach vfstail $vfs_tails {
                                 continue ;#to next extraction attempt
 
                             }
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
                             #for a kit, we shouldn't need to extract the existing vfs from the runtime.
                             # - the sdx merge process should be able to merge our .vfs folder with the existing contents.
                             #2025 - in practice this doesn't always seem to be the case? Review - could have been cwd issue?
-                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $building_runtime"
+                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $baking_runtime"
                             set prev_cwd [pwd]
-                            cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
-                            if {[catch {exec {*}$::sdxpath mksplit $building_runtime} mksplitresult]} {
+                            cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                            if {[catch {exec {*}$::sdxpath mksplit $baking_runtime} mksplitresult]} {
                                 #executable doesn't have kit vfs attached
-                                puts stderr "No kit data extracted from $building_runtime"
-                                file copy -force $building_runtime $raw_runtime
+                                puts stderr "No kit data extracted from $baking_runtime"
+                                file copy -force $baking_runtime $raw_runtime
                             } else {
                                 puts stdout "mksplitresult: $mksplitresult"
-                                if {![file exists [file rootname $building_runtime].tail]} {
-                                    error "mksplit didn't produce file at [file rootname $building_runtime].tail"
+                                if {![file exists [file rootname $baking_runtime].tail]} {
+                                    error "mksplit didn't produce file at [file rootname $baking_runtime].tail"
                                 }
-                                file delete -force [file rootname $building_runtime].vfs ;#ensure target for unwrap doesn't exist
-                                #set kit_bare_runtime [file rootname $building_runtime].head
-                                set building_runtime [file rootname $building_runtime].head
-                                exec {*}$::sdxpath unwrap [file rootname $building_runtime].tail ;#extracts to folder named [file rootname $building_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
+                                file delete -force [file rootname $baking_runtime].vfs ;#ensure target for unwrap doesn't exist
+                                #set kit_bare_runtime [file rootname $baking_runtime].head
+                                set baking_runtime [file rootname $baking_runtime].head
+                                exec {*}$::sdxpath unwrap [file rootname $baking_runtime].tail ;#extracts to folder named [file rootname $baking_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
                                 #file rename to existing target dir would copy folder into target dir
                                 if {![file exists $targetvfs]} {
                                     #delay
                                     after 1000
-                                    file rename [file rootname $building_runtime].vfs $targetvfs
+                                    file rename [file rootname $baking_runtime].vfs $targetvfs
                                 } else {
-                                    merge_over [file rootname $building_runtime].vfs $targetvfs
+                                    merge_over [file rootname $baking_runtime].vfs $targetvfs
                                 }
                                 set extraction_done 1
                                 set extract_kit_type $extract_kit_try
-                                file copy -force $building_runtime $raw_runtime
+                                file copy -force $baking_runtime $raw_runtime
                             }
                             cd $prev_cwd
 
@@ -8795,12 +8835,12 @@ foreach vfstail $vfs_tails {
                 set extraction_tried "$target_kit_type[expr {[llength $source_kit_caps] ? " + runtime caps $source_kit_caps" : ""}]"
                 if {!$extraction_done} {
                     #TODO: if not extracted - use a default tcl_library for patchlevel and platform?
-                    #Recapped BUILD-WARNING (not just an inline note): this line would
+                    #Recapped BAKE-WARNING (not just an inline note): this line would
                     #otherwise scroll away behind thousands of merge lines. It is a warning
                     #rather than the failure itself because a .vfs that supplies its own tcl
                     #library needs no extraction - the G-125 gate below decides, on the
                     #merged tree, whether this kit can initialise.
-                    ::punkboot::print_build_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
+                    ::punkboot::print_bake_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
                     file mkdir $targetvfs
                 }
 
@@ -8830,7 +8870,7 @@ foreach vfstail $vfs_tails {
                     puts stderr "--------------------------------------------"
                     #G-030 prompt policy: only an interactive 'y' can force building a mismatched
                     #kit - non-interactive runs (and -confirm 0) skip this kit and continue.
-                    set _build_anyway 0
+                    set _bake_anyway 0
                     if {!$::punkboot::opt_confirm} {
                         puts stderr "skipping kit $targetkit (source/target kit type mismatch; -confirm 0 policy is to skip)"
                     } elseif {![::punkboot::lib::stdin_is_interactive]} {
@@ -8838,10 +8878,10 @@ foreach vfstail $vfs_tails {
                     } else {
                         puts stdout "Continue to try to build $targetkit from $rtname anyway? y|n"
                         if {[string tolower [string trim [gets stdin]]] eq "y"} {
-                            set _build_anyway 1
+                            set _bake_anyway 1
                         }
                     }
-                    if {!$_build_anyway} {
+                    if {!$_bake_anyway} {
                         #skip to next kit
                         continue
                     }
@@ -8873,7 +8913,7 @@ foreach vfstail $vfs_tails {
                         puts stdout "    per-platform payload (G-127): selecting _targets/$rt_target into the merged image for kit $targetkit"
                         merge_over $_pstaging/$rt_target $targetvfs
                     } else {
-                        ::punkboot::print_build_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
+                        ::punkboot::print_bake_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
                     }
                     file delete -force $_pstaging
                 }
@@ -8903,7 +8943,7 @@ foreach vfstail $vfs_tails {
                     if {[llength $archscan_mismatches] > $shown} {
                         lappend archwarnings "payload/target arch mismatch in kit $targetkit (target $rt_target): [expr {[llength $archscan_mismatches] - $shown}] further mismatching binary libraries not listed above ([llength $archscan_mismatches] mismatches total, [dict get $archscan scanned] binary libraries scanned)"
                     }
-                    ::punkboot::print_build_warnings $archwarnings
+                    ::punkboot::print_bake_warnings $archwarnings
                     unset archwarnings archscan_mismatches shown
                 } else {
                     puts stdout "    payload binary-arch scan for kit $targetkit (target $rt_target): OK - [dict get $archscan scanned] binary libraries scanned ([dict get $archscan matched] match target, [dict get $archscan exempt] exempt under platform subdirs, [dict get $archscan unknown] unclassifiable)"
@@ -8944,7 +8984,7 @@ foreach vfstail $vfs_tails {
                 #the assemblers below consume wrap_runtime - the stamped per-kit copy
                 #of the payload-free raw prefix when embedding happened, the untouched
                 #raw prefix otherwise. Runtime store originals are never modified.
-                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_builddir] wrap_runtime kiticon_sidecar
+                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_bakedir] wrap_runtime kiticon_sidecar
 
                 set wrapvfs $targetvfs
                 switch -- $target_kit_type {
@@ -8975,14 +9015,14 @@ foreach vfstail $vfs_tails {
                             }
                             if {[info commands ::tcl::zipfs::mkimg] ne ""} {
                                 #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
-                                puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
-                                tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
+                                puts stderr "calling: tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
+                                tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
                             } else {
                                 #G-122: the driving tcl has no zipfs (8.6) - assemble the same
                                 #kind of image by concatenation. The result mounts on any
                                 #zipfs-capable runtime (archive-start-relative offsets).
                                 puts stderr "WARNING: tcl shell '[info nameofexecutable]' has no zipfs - assembling zip kit $targetkit by concatenation (raw runtime + mkzip)"
-                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                             }
                         } result ]} {
                             set failmsg "zipfs mkimg failed with msg: $result"
@@ -9019,7 +9059,7 @@ foreach vfstail $vfs_tails {
                             }
 
                             #'archive' based zip offsets - editable in 7z,peazip
-                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                         } result ]} {
                             set failmsg "creating zipcat image failed with msg: $result"
                             puts stderr "creating image (zipcat) $targetkit failed" 
@@ -9047,7 +9087,7 @@ foreach vfstail $vfs_tails {
                             continue
                         } else {
                             if {[catch {
-                                #we still have the $building_runtime mounted
+                                #we still have the $baking_runtime mounted
                                 if {[catch {
                                     merge_over $targetvfs $rtmountpoint
                                 } errM]} {
@@ -9063,14 +9103,14 @@ foreach vfstail $vfs_tails {
 
                                 #copy the version that is mounted in this runtime to vfsname.new 
                                 if {[catch {
-                                    file copy -force $building_runtime $buildfolder/$vfsname.new
-                                    catch {exec chmod +w $buildfolder/$vfsname.new}
+                                    file copy -force $baking_runtime $bakefolder/$vfsname.new
+                                    catch {exec chmod +w $bakefolder/$vfsname.new}
                                 } errM]} {
-                                    puts stderr "$target_kit_type 'file copy -force $building_runtime $buildfolder/$vfsname.new' failed\n$errM"
+                                    puts stderr "$target_kit_type 'file copy -force $baking_runtime $bakefolder/$vfsname.new' failed\n$errM"
                                     error $errM
                                 }
                             } result]} {
-                                puts stderr "Writing vfs data and opying cookfs file $building_runtime to $buildfolder/$vfsname.new failed\n $result"
+                                puts stderr "Writing vfs data and opying cookfs file $baking_runtime to $bakefolder/$vfsname.new failed\n $result"
                                 lappend failed_kits [list kit $targetkit reason copy_failed]
                                 $vfs_event targetset_end FAILED
                                 $vfs_event destroy
@@ -9088,21 +9128,21 @@ foreach vfstail $vfs_tails {
                     kit {
                         set verbose ""
                         #set verbose "-verbose"
-                        #assert: building_runtime has been replaced with $kit_bare_runtime
+                        #assert: baking_runtime has been replaced with $kit_bare_runtime
 
                         set prev_cwd [pwd]
-                        cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                        cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
                         if {[catch {
                             if {$rtname ne "-"} {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
                             } else {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose
                             }
                         } result]} {
                             if {$rtname ne "-"} {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
                             } else {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
                             }
                             puts stderr "$::sdxpath wrap $targetkit failed" 
                             lappend failed_kits [list kit $targetkit reason $sdxmsg]
@@ -9122,9 +9162,9 @@ foreach vfstail $vfs_tails {
                 }
 
 
-                if {![file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "|err> make.tcl build didn't seem to produce output at $buildfolder/$vfsname.new"
-                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $buildfolder/$vfsname.new"]
+                if {![file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "|err> make.tcl build didn't seem to produce output at $bakefolder/$vfsname.new"
+                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $bakefolder/$vfsname.new"]
                     $vfs_event targetset_end FAILED
                     $vfs_event destroy
                     $vfs_installer destroy
@@ -9244,13 +9284,13 @@ foreach vfstail $vfs_tails {
                     }
                 }
 
-                if {[file exists $kit_builddir/$targetkit]} {
-                    puts stderr "deleting existing $kit_builddir/$targetkit"
+                if {[file exists $kit_bakedir/$targetkit]} {
+                    puts stderr "deleting existing $kit_bakedir/$targetkit"
                     if {[catch {
-                        file delete $kit_builddir/$targetkit
+                        file delete $kit_bakedir/$targetkit
                     } msg]} {
-                        puts stderr "Failed to delete $kit_builddir/$targetkit"
-                        lappend failed_kits [list kit $targetkit reason "could not delete buildfolder kit at $kit_builddir/$targetkit"]
+                        puts stderr "Failed to delete $kit_bakedir/$targetkit"
+                        lappend failed_kits [list kit $targetkit reason "could not delete bakefolder kit at $kit_bakedir/$targetkit"]
                         $vfs_event targetset_end FAILED
                         $vfs_event destroy
                         $vfs_installer destroy
@@ -9260,23 +9300,23 @@ foreach vfstail $vfs_tails {
 
                 #WINDOWS filesystem 'tunnelling' (file replacement within 15secs) could cause targetkit to copy ctime & shortname metadata from previous file!
                 #This is probably harmless - but worth being aware of.
-                file rename $buildfolder/$vfsname.new $kit_builddir/$targetkit
+                file rename $bakefolder/$vfsname.new $kit_bakedir/$targetkit
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
                 #G-134 post-assembly offset-style pin: the pipeline emits
                 #ARCHIVE-relative zip payloads by construction - this probe makes
                 #that a checked contract. Advisory per the G-133 posture: a
-                #file-relative image earns a recapped BUILD-WARNING (the G-128
+                #file-relative image earns a recapped BAKE-WARNING (the G-128
                 #stamper would refuse it by default) and the kit still builds and
                 #deploys; plain/none (no attached zip - the metakit kit shape) and
                 #unreadable results are silence. One EOCD scan + CD walk per
                 #REBUILT kit only.
-                lassign [::punkboot::get_kit_offsetstyle_report $kit_builddir/$targetkit] offprobe_available offprobe
+                lassign [::punkboot::get_kit_offsetstyle_report $kit_bakedir/$targetkit] offprobe_available offprobe
                 if {!$offprobe_available} {
                     puts stderr "NOTE: kit offset-style pin unavailable (punkboot::utils kit_offsetstyle_report not loadable from bootsupport) - continuing without it"
                 } elseif {[dict get $offprobe offsetstyle] eq "file"} {
-                    ::punkboot::print_build_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
+                    ::punkboot::print_bake_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
                 }
 
                 #G-133 post-build smoke-require probe. Only an actual 'package require'
@@ -9292,12 +9332,12 @@ foreach vfstail $vfs_tails {
                         puts stdout "    smoke-require skipped for kit $targetkit: cross-target ($rt_target) - the artifact is not executable on this $::punkboot::host_platform host"
                     } else {
                         puts stdout "    smoke-require probe for kit $targetkit (packages: $kit_smokerequires) - executing freshly built artifact via its tclsh subcommand"
-                        ::punkboot::kit_smoke_require_probe $kit_builddir/$targetkit $targetkit $kit_smokerequires
+                        ::punkboot::kit_smoke_require_probe $kit_bakedir/$targetkit $targetkit $kit_smokerequires
                     }
                 }
 
             } else {
-                set skipped_vfs_build 1
+                set skipped_vfs_bake 1
                 puts stderr "."
                 puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
                 lappend skipped_kits [list kit $targetkit reason "no change detected"]
@@ -9317,14 +9357,14 @@ foreach vfstail $vfs_tails {
 
             # -- ----------
             set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-            $bin_installer set_source_target $buildfolder $deployment_folder
+            $bin_installer set_source_target $bakefolder $deployment_folder
             set bin_event [$bin_installer start_event {-make-step final_kit_install}]
             $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #todo - move final deployment step outside of the bake vfs loop? (final deployment can fail and then isn't rerun even though _bake and deployed versions differ, unless .vfs modified again)
             #set last_completion [$bin_event targetset_last_complete]
 
             $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
-            $bin_event targetset_addsource $kit_builddir/$targetkit
+            $bin_event targetset_addsource $kit_bakedir/$targetkit
             $bin_event targetset_started
             # -- ----------
 
@@ -9347,14 +9387,14 @@ foreach vfstail $vfs_tails {
                 }
 
                 puts stdout "copying.."
-                puts stdout "$kit_builddir/$targetkit"
+                puts stdout "$kit_bakedir/$targetkit"
                 puts stdout "to:"
                 puts stdout "$deployment_folder/$targetkit"
                 after 300
-                file copy $kit_builddir/$targetkit $deployment_folder/$targetkit
+                file copy $kit_bakedir/$targetkit $deployment_folder/$targetkit
                 #G-057: the kit resource sidecar ships with the kit
-                if {[file isfile $kit_builddir/$targetkit.resources.toml]} {
-                    file copy -force $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
+                if {[file isfile $kit_bakedir/$targetkit.resources.toml]} {
+                    file copy -force $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
                 }
                 lappend installed_kits $kit_relpath
                 # -- ----------
@@ -9367,7 +9407,7 @@ foreach vfstail $vfs_tails {
                 #G-057: keep the deployed resource sidecar current even when the kit
                 #itself is unchanged (the record can be newer than the kit rebuild -
                 #e.g the sidecar feature arriving, or a host-capability change)
-                if {[::punkboot::kiticon::copy_ifchanged $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
+                if {[::punkboot::kiticon::copy_ifchanged $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
                     puts stdout "    kit icon (G-057): refreshed deployed sidecar $deployment_folder/$targetkit.resources.toml"
                 }
                 lappend skipped_kit_installs [list kit $targetkit reason "no change detected"]
@@ -9397,10 +9437,10 @@ set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llen
 if {$had_kits} {
     puts stdout "   module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)"
     puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
     puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables"
-    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest built modules"
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules"
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
 } else {
     puts stdout "   module builds processed"
     puts stdout ""
diff --git a/src/project_layouts/vendor/punk/minimal/gitignore.in b/src/project_layouts/vendor/punk/minimal/gitignore.in
index 79773aaa..c9157eed 100644
--- a/src/project_layouts/vendor/punk/minimal/gitignore.in
+++ b/src/project_layouts/vendor/punk/minimal/gitignore.in
@@ -32,6 +32,10 @@
 /logs/
 **/_aside/
 **/_build/
+#G-155 stage workdirs: src/_bake (kit assembly) + per-srcdir _mint (module staging);
+#**/_build/ stays for src/buildsuites/_build (true compile area) and stale checkouts
+**/_mint/
+**/_bake/
 scratch*
 
 #Built documentation
diff --git a/src/project_layouts/vendor/punk/project-0.1/gitignore.in b/src/project_layouts/vendor/punk/project-0.1/gitignore.in
index 79773aaa..c9157eed 100644
--- a/src/project_layouts/vendor/punk/project-0.1/gitignore.in
+++ b/src/project_layouts/vendor/punk/project-0.1/gitignore.in
@@ -32,6 +32,10 @@
 /logs/
 **/_aside/
 **/_build/
+#G-155 stage workdirs: src/_bake (kit assembly) + per-srcdir _mint (module staging);
+#**/_build/ stays for src/buildsuites/_build (true compile area) and stale checkouts
+**/_mint/
+**/_bake/
 scratch*
 
 #Built documentation
diff --git a/src/project_layouts/vendor/punk/project-0.1/src/make.tcl b/src/project_layouts/vendor/punk/project-0.1/src/make.tcl
index 030847da..ec134c79 100644
--- a/src/project_layouts/vendor/punk/project-0.1/src/make.tcl
+++ b/src/project_layouts/vendor/punk/project-0.1/src/make.tcl
@@ -175,7 +175,7 @@ apply {{} {
 }}
 # Colour-policy gate for raw-SGR emission sites that can run before
 # define_global_ansi / punk::ansi are available (early package-load
-# diagnostics and kit-build warnings). Returns the SGR sequence, or an empty
+# diagnostics and kit-bake warnings). Returns the SGR sequence, or an empty
 # string when colour is disabled. Empty/omitted params give the reset.
 proc ::punkboot::sgr {{sgrparams ""}} {
     if {[info exists ::punk::console::colour_disabled] && $::punk::console::colour_disabled} {
@@ -490,7 +490,7 @@ namespace eval ::punkboot::lib {
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
     # G-122 host/target platform split.
     # platform_punk answers "what is THIS tclsh" (the HOST canon). Everything a
-    # build EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
+    # bake EMITS is a separate question keyed by TARGET: which bin/runtime/<tier>
     # store holds the runtime, whether artifacts carry .exe, and which process
     # tooling can see/kill a running artifact. The two diverge for the whole
     # cygwin family: an msys2/cygwin-runtime tclsh on windows reports
@@ -522,12 +522,12 @@ namespace eval ::punkboot::lib {
         return [expr {[platform_os $platform] in {msys cygwin}}]
     }
     #Windows-family platforms: native win32 AND the cygwin-family personalities.
-    #They share what matters to a build: executables are .exe files and running
+    #They share what matters to a bake: executables are .exe files and running
     #processes are windows processes (tasklist/taskkill), whatever tcl_platform says.
     proc platform_is_windows_family {platform} {
         return [expr {[platform_os $platform] in {win32 msys cygwin}}]
     }
-    #Default TARGET platform for a host canon. A cygwin-family host builds native
+    #Default TARGET platform for a host canon. A cygwin-family host bakes native
     #windows kits (there is no separate msys kit lineage - third-party msys
     #runtimes are addressed by an explicit per-entry target instead).
     proc platform_target_default {hostplatform} {
@@ -708,7 +708,7 @@ proc ::punkboot::lib::mapvfs_locate {rt_sourcefolder} {
 
 #tomlish::to_dict values are type-tagged (e.g {type STRING value x}, {type ARRAY value {...}});
 #tables are plain nested dicts. Shared by the mapvfs toml reader, the per-.vfs
-#payload declarations (G-115) and any other build-side toml consumption.
+#payload declarations (G-115) and any other bake-side toml consumption.
 proc ::punkboot::lib::toml_untag {tagged} {
     if {[dict get $tagged type] eq "ARRAY"} {
         set plain [list]
@@ -1200,7 +1200,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 # the vfs rootname, kit_type defaulting to 'kit', '-' runtime -> <appname>.kit,
 # TARGET .exe suffix, duplicate appname -> <appname>_<runtime>) so listed names
 # match what a bake produces. Entries whose vfs folder is missing on disk never
-# reach the kit loop - they are appended after the buildable set so 'bakelist'
+# reach the kit loop - they are appended after the bakeable set so 'bakelist'
 # can surface them as broken config. Duplicate-name disambiguation is per TARGET
 # (G-127): same-named kits for different targets coexist under their own output
 # tiers; a same-target duplicate assumes the config keeps appnames unique (as
@@ -1217,7 +1217,7 @@ proc ::punkboot::lib::mapvfs_parse_config {mapfile rtbase sourcefolder default_t
 #   runtime_dir   store tier folder holding the runtime ("" for "-")
 #   target    target platform (e.g win32-x86_64)
 #   store_tier  bin/runtime tier folder name for the target
-#   out_tier  kit OUTPUT tier relative to bin/ and src/_build/ - "" for the
+#   out_tier  kit OUTPUT tier relative to bin/ and src/_bake/ - "" for the
 #             default (host) target's flat locations, "kits/<platform>" for any
 #             other target (G-127)
 #   vfs       vfs folder tail (e.g punk9wintk903.vfs)
@@ -1413,7 +1413,7 @@ proc ::punkboot::lib::mapvfs_match_outputs {kit_outputs names} {
 }
 
 # Local runtime-materialization staleness core (shared by the bake-path
-# BUILD-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
+# BAKE-WARNING and the bakelist report - the G-121 reuse of the G-103/G-117
 # toml-revision metadata). Compares a punk-runtime WORKING COPY's beside-toml
 # revision against the highest -r<N> artifact revision present in the same
 # folder. Returns an empty dict when there is nothing to report (pre-family
@@ -1491,23 +1491,23 @@ proc ::punkboot::lib::files_content_identical {patha pathb} {
 }
 
 # Deployed-state classification for a configured kit output (G-121 bakelist):
-# the deployed copy (<projectdir>/bin/<targetkit>) vs the build product
-# (src/_build/<targetkit>).
+# the deployed copy (<projectdir>/bin/<targetkit>) vs the bake product
+# (src/_bake/<targetkit>).
 #   absent  - no deployed copy in the bin folder
-#   nobuild - deployed copy exists but there is no build product to compare against
-#   current - deployed copy is byte-identical to the build product
-#   stale   - deployed copy differs from the build product
+#   nobake  - deployed copy exists but there is no bake product to compare against
+#   current - deployed copy is byte-identical to the bake product
+#   stale   - deployed copy differs from the bake product
 # Size mismatch decides 'stale' cheaply; equal size + equal mtime short-circuits
 # to 'current' (the deploy step is a plain 'file copy'); otherwise a full content
 # compare decides.
-proc ::punkboot::lib::kit_deploy_state {buildfolder deployfolder targetkit} {
-    set built [file join $buildfolder $targetkit]
+proc ::punkboot::lib::kit_deploy_state {bakefolder deployfolder targetkit} {
+    set built [file join $bakefolder $targetkit]
     set deployed [file join $deployfolder $targetkit]
     if {![file isfile $deployed]} {
         return absent
     }
     if {![file isfile $built]} {
-        return nobuild
+        return nobake
     }
     if {[file size $built] != [file size $deployed]} {
         return stale
@@ -1553,10 +1553,10 @@ set this_platform_generic [punkboot::lib::platform_punk] ;#normalized punkshell
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-122 host/target split. $this_platform_generic is the HOST canon and stays the
 #key for everything that describes THIS interpreter (bootsupport/vendorlib
-#platform dirs below, diagnostics). What the build EMITS is keyed by target:
+#platform dirs below, diagnostics). What the bake EMITS is keyed by target:
 #  host_platform    - canon of the driving tclsh (same value, named for clarity)
 #  target_platform  - default target for kit outputs; a cygwin-family host
-#                     (msys2/cygwin runtime on windows) builds win32 kits.
+#                     (msys2/cygwin runtime on windows) bakes win32 kits.
 #                     Per-entry mapvfs.config declarations override it per runtime.
 #  host_windows     - host process/filesystem semantics are windows-like
 #                     (native windows OR cygwin family): drives copy commands,
@@ -1608,8 +1608,8 @@ set sourcesupport_module_paths  [list]
 set sourcesupport_library_paths [list]
 set sourcesupport_paths_exist 0
 #we deliberately don't use [pwd]/modules because commonly the launch dir may be the project dir.
-#The <projectdir>/modules are the very modules we are building - and may be in a broken state, which punkboot then can't fix.
-#The 'building' is generally just assigning a version instead of 999999.0a1 (and some doc string substitution?)
+#The <projectdir>/modules are the very modules we are minting - and may be in a broken state, which punkboot then can't fix.
+#The mint is generally just stamping a version instead of 999999.0a1 (plus modpod packing and doc string substitution)
 #(most?) Modules in src/modules etc should still be runnable directly in certain cases like this where we point to them.
 if {[file tail $startdir] eq "src"} {
     #todo - other src 'module' dirs..
@@ -2578,32 +2578,32 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname -help  or $scriptname --help or $scriptname /? or just $scriptname" \n
     append h "    - This help." \n \n
     append h "  $scriptname bakehouse ?-k? ?-dirty-abort 1|0?" \n
-    append h "    - consumer build from a clean checkout: runs the packages stage (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
+    append h "    - consumer run from a clean checkout: mints the packages (modules + libs) then bakes kit/zipkit executables to <projectdir>/bin" \n
     append h "    - refuses uncommitted src by default (-dirty-abort defaults ON: the bakehouse bakes from the committed recipe; pass -dirty-abort 0 to override)" \n
-    append h "    - the optional -k flag will terminate running processes matching the executable being built (if applicable)" \n
+    append h "    - the optional -k flag will terminate running processes matching the executable being baked (if applicable)" \n
     append h "    - does NOT run the promotion gates (bootsupport, vfscommonupdate) - on a clean checkout they are already satisfied by the committed tree" \n \n
     append h "  $scriptname bake ?-k? ?kitname ...?" \n
     append h "    - assemble kit/zipkit executables from the promoted payload (src/vfs) and src/runtime runtimes into <projectdir>/bin" \n
-    append h "    - includes the vfslibs phase; does not rebuild modules/libs and does not run the promotion gates" \n
-    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any build)" \n \n
+    append h "    - includes the vfslibs phase; does not re-mint modules/libs and does not run the promotion gates" \n
+    append h "    - with kitname arguments, bakes and deploys only the named configured kits (unknown names error before any bake)" \n \n
     append h "  $scriptname bakelist ?kitname ...?" \n
     append h "    - list the kit outputs configured in src/runtime/mapvfs.toml: name, kit type, runtime (with presence)," \n
-    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobuild vs the src/_build product)" \n
+    append h "      vfs folder and deployed state (bin copy absent/current/stale/nobake vs the src/_bake product)" \n
     append h "    - kitname arguments filter to the named entries (per-kit detail)" \n \n
     append h "  $scriptname modules"  \n
-    append h "    - build (or copy if build not required) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (stamp real versions, pack modpods; plain copy where no stamping applies) .tm modules from src/modules src/vendormodules etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname libs"  \n
-    append h "    - build (or copy if build not required) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from src/lib src/vendorlib etc to their corresponding locations under <projectdir>" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname packages"  \n
-    append h "    - build (or copy if build not required) both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir>" \n
-    append h "      This does not scan src/runtime and src/vfs folders to build kit/zipkit/cookfs executables" \n \n
+    append h "    - mint both .tm and pkgIndex.tcl based packages from src to their corresponding locations under <projectdir> (= modules + libs)" \n
+    append h "      This does not scan src/runtime and src/vfs folders to bake kit/zipkit/cookfs executables" \n \n
     append h "  $scriptname bootsupport"  \n
     append h "    - update the src/bootsupport modules" \n
     append h "    - bootsupport modules are pulled from locations specified in include_modules.config files within each src/bootsupport subdirectory" \n
     append h "    - project layouts store no bootsupport module snapshots: generated projects get bootsupport injected at generation time by 'dev project.new'" \n
-    append h "    - This should usually be from modules that have been built and tested in <projectdir>/modules <projectdir>/lib etc." \n
+    append h "    - This should usually be from modules that have been minted and tested in <projectdir>/modules <projectdir>/lib etc." \n
     append h "    - bootsupport modules are available to make.tcl" \n \n
     append h "  $scriptname vendorupdate"  \n
     append h "    - update the src/vendormodules based on src/vendormodules/include_modules.config" \n \n
@@ -2617,11 +2617,11 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "    - sha1-verified against the server's per-target sha1sums.txt; materializes package trees under bin/packages/<target>/tcl<N>" \n
     append h "    - canonical origin trusted by default; other servers (incl. PUNKBIN_URL overrides) require -trust-server" \n \n
     append h "  $scriptname vfscommonupdate"  \n
-    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs from compiled src/modules and src/lib etc" \n
+    append h "    - promotion gate: update the src/vfs/_vfscommon.vfs kit payload from the minted <projectdir> module/lib trees" \n
     append h "    - before calling this (followed by '$scriptname bake') - you can test using '<builtexe>(.exe) dev'" \n
     append h "      this will load modules from your <projectdir>/module <projectdir>/lib paths instead of from the kit/zipkit" \n \n
     append h "  $scriptname info" \n
-    append h "    - show the name and base folder of the project to be built" \n \n
+    append h "    - show the name and base folder of the project" \n \n
     append h "  $scriptname check" \n
     append h "    - show module/library paths and any potentially problematic packages for running this script" \n
     append h "  $scriptname shell" \n
@@ -2629,7 +2629,7 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "  $scriptname projectversion" \n
     append h "    - advisory check: verify CHANGELOG.md matches punkproject.toml and warn if src/ has changes since the last project-version bump." \n \n
     append h "  $scriptname workflow" \n
-    append h "    - print an ASCII data-flow overview of the build/release workflow (edit -> packages -> bootsupport -> kits)" \n \n
+    append h "    - print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake) incl. the TERMINOLOGY key" \n \n
     append h "  $scriptname buildsuite list|info|build ?<suitename>? ?driver-args ...?" \n
     append h "    - list the defined buildsuites under src/buildsuites (zig runtime factory), show a suite's configured" \n
     append h "      detail (sources/zig pin/products from its sources.config), or run its driver forwarding the args" \n \n
@@ -2652,33 +2652,61 @@ proc ::punkboot::punkboot_gethelp {args} {
     append h "        Use -confirm 0 for unattended runs: the bootsupport minor-staleness gate and the vfscommonupdate REPLACE" \n
     append h "        confirmation proceed without prompting; kits with a source/target kit-type mismatch are skipped." \n
     append h "    -dirty-abort" \n
-    append h "      - abort build/promotion commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
+    append h "      - abort producing commands (mint/promote/bake: bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) when src/ has" \n
     append h "        uncommitted VCS changes. Default is warn-only EXCEPT bakehouse (defaults ON there; -dirty-abort 0 overrides):" \n
-    append h "        artifacts built from dirty src have no committed provenance." \n
+    append h "        artifacts produced from dirty src have no committed provenance." \n
     append h "        Warnings carry a plain PROVENANCE-WARNING: prefix (greppable in redirected output) and are recapped at the end of the run." \n
-    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without building," \n
+    append h "        Use '$scriptname check' to see the current provenance status. To evaluate uncommitted source without minting or baking," \n
     append h "        use '<builtexe> src' or '<builtexe> src shell'." \n \n
     append h "" \n
     append h [punkboot_availability_note]
     return $h
 }
-#Embedded build/release workflow overview - the output of the 'workflow' subcommand.
+#Embedded release-workflow overview - the output of the 'workflow' subcommand.
 #Embedded (rather than a data file) so it travels with make.tcl wherever it runs, including
 #the make.tcl copies seeded into generated projects via the project layouts.
-#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when build data flow changes
+#Contract for updates (see also src/AGENTS.md 'Work Guidance'): when make.tcl data flow changes
 #(subcommand added/removed/repurposed, source or output folder flow changed, new propagation
 #target), this text changes in the same commit. Plain ASCII only, max line width 100.
 proc ::punkboot::workflow_text {} {
     set txt {
-build & release workflow - from module edit to kits + bootsupport (punk project layout)
+mint, promote & bake - the release workflow from module edit to kits + bootsupport (punk layout)
 =============================================================================
 Scope: data flow from editing a module under src/ through to a release-ready
-rebuild (built packages, bootsupport refresh, kit vfs, kit executables).
+refresh (minted packages, bootsupport refresh, kit vfs, kit executables).
 All commands run from the projectroot with a native tclsh, e.g:
     tclsh src/make.tcl <subcommand> -confirm 0            (see [K6])
 
 
-TWO PERSONAS (stage-true subcommand model - one build stage, two promotion
+TERMINOLOGY (stage verbs - one word, one stage)
+----------------------------------------------------------------------------
+  build    compile source to binaries. Lives in the arm's-length factories:
+           'make.tcl buildsuite' (whole Tcl runtimes from external sources,
+           src/buildsuites, workdir src/buildsuites/_build) and 'make.tcl
+           tool build' (vendored zig tools, src/tools). Nothing in
+           mint/promote/bake compiles anything: bakes succeed with no build
+           toolchain installed.
+  mint     stamp real versions onto magic-version sources (999999.0a1.0 ->
+           the <pkg>-buildversion.txt value), pack #modpod-* trees, prune
+           superseded copies and install the results into the projectroot
+           trees (modules*/ lib*/). The modules/libs/packages subcommands
+           are the mint stage; staging area <srcdir>/_mint.
+  promote  propagate minted packages into the two gated consumption trees:
+           src/bootsupport (make.tcl's own boot environment) and
+           src/vfs/_vfscommon.vfs (the committed kit payload) - the
+           bootsupport and vfscommonupdate promotion gates.
+  bake     assemble kit/zipkit executables from promoted payload + runtimes
+           (workdir src/_bake) and deploy them to bin/. Consumer umbrella:
+           bakehouse = mint + bake from the committed recipe.
+  fetch    bring third-party inputs to the tree: libfetch (punkbin lib
+           artifacts), vendorupdate (vendored sources).
+  deploy   the final copy of a baked kit from src/_bake to bin/<kit>.
+Mechanism words keep their scoped meanings: stamp (version fields at mint,
+icons/resources at bake via punkres), install (punkcheck-recorded placement
+at any stage), sync (thin-layout copies), materialize (vfslibs payload
+declarations, libfetch trees).
+
+TWO PERSONAS (stage-true subcommand model - one mint stage, two promotion
 gates, one bake)
 ----------------------------------------------------------------------------
   CONSUMER  (clean checkout, wants baked kits):
@@ -2688,7 +2716,7 @@ gates, one bake)
     default (-dirty-abort defaults ON: the bakehouse bakes from the committed
     recipe; -dirty-abort 0 overrides).
   DEVELOPER (changing payload): pass the gates explicitly - the commit is the
-    publishing act, not a build step. That is the RELEASE SEQUENCE below.
+    publishing act, not a producing step. That is the RELEASE SEQUENCE below.
 
 RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance gates)
 ----------------------------------------------------------------------------
@@ -2698,18 +2726,18 @@ RELEASE SEQUENCE (the developer order that satisfies the staleness + provenance
               punkproject.toml + CHANGELOG.md            project version (if shipped behaviour) [K2]
   (3) test    tclsh src/tests/runtests.tcl ...           runs against src/ trees (if present)
   (4) commit  source changes (git/fossil)                clean tree -> committed provenance [K3]
-  (5) build   tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
-  (6) build   tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
-  (7) build   tclsh src/make.tcl vfscommonupdate -confirm 0
-  (8) build   tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
-  (9) commit  tracked build outputs                      src/bootsupport, thin-layout script/
+  (5) mint    tclsh src/make.tcl modules -confirm 0      (or 'packages' = modules + libs)
+  (6) promote tclsh src/make.tcl bootsupport -confirm 0  run twice: 2nd pass must copy 0 files [K4]
+  (7) promote tclsh src/make.tcl vfscommonupdate -confirm 0
+  (8) bake    tclsh src/make.tcl bake -confirm 0         kits; close running kit shells first [K5]
+  (9) commit  tracked output trees                       src/bootsupport, thin-layout script/
                                                          manifest/gitignore.in payload copies
                                                          (src/project_layouts +
                                                          templates modpod payload),
                                                          src/vfs/_vfscommon.vfs
 
 
-DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
+DIAGRAM 1 - DATA FLOW: SOURCE -> MINTED PACKAGES -> PROMOTION TARGETS
 ----------------------------------------------------------------------------
 
    src/modules/foo-999999.0a1.0.tm   [K1]        src/lib/
@@ -2722,7 +2750,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
         v                                           v
    modules/  modules_tcl8/  modules_tcl9/        lib/  lib_tcl8/  lib_tcl9/
    e.g. modules/foo-0.12.4.tm
-   == BUILT PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
+   == MINTED PACKAGES (projectroot output trees, punkcheck-recorded [K3]) ==
         |
         +--------------------------------------+
         |                                      |
@@ -2735,7 +2763,7 @@ DIAGRAM 1 - DATA FLOW: SOURCE -> BUILT PACKAGES -> PROPAGATION TARGETS
     Project layouts store NO module            |
     snapshots - 'dev project.new'              |  make.tcl bake   (kit-assembly stage;
     injects bootsupport into generated         v   consumer umbrella: bakehouse)
-    projects from the generating          src/_build/<kit>.exe   --deploy-->   bin/<kit>.exe
+    projects from the generating          src/_bake/<kit>.exe   --deploy-->   bin/<kit>.exe
     shell at generation time - G-087)      (see DIAGRAM 2)         [K5]
 
 
@@ -2753,7 +2781,7 @@ DIAGRAM 1b - THIN-LAYOUT SYNC (part of modules/libs/packages/bakehouse runs)
         |  store -> modpod payload sync (punk.project layout only; excludes bin/sdx.kit)
         v
    src/modules/punk/mix/#modpod-templates-*/templates/project_layouts/
-   (packed into the punk::mix::templates module by the modules build, so a bare
+   (packed into the punk::mix::templates module by the modules mint, so a bare
     kit outside any project can list and generate the punk.project layout)
 
 
@@ -2769,10 +2797,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                                       configured kit outputs (presence + deployed state);
                                       'make.tcl bake ?name|@group ...?' bakes only the named
                                       kits (bare bake = all entries except bake_default=false
-                                      ones; unknown names error before any build)
+                                      ones; unknown names error before any bake)
    bin/runtime/<target>/<runtime>     bare Tcl runtime (tclkit / tclsfe / suite build), in the
-                                      store tier of the TARGET platform it builds kits for [K9]
-   src/vfs/_vfscommon.vfs/            common payload (built modules + libs, main boot support)
+                                      store tier of the TARGET platform it bakes kits for [K9]
+   src/vfs/_vfscommon.vfs/            common payload (minted modules + libs, main boot support)
    src/vfs/<kitspecific>.vfs/         per-kit overlay (main.tcl, kit-only modules/config)
    src/vfs/<kitspecific>.vfs.toml     optional per-.vfs payload declaration (G-115): [payload.*]
                                       entries materialized INTO the .vfs folder by the vfslibs
@@ -2789,10 +2817,10 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
               +-----------+----------+
                           |  copy common, then merge overlay over it
                           v
-              src/_build/<kit>.exe.vfs
+              src/_bake/<kit>.exe.vfs
                           |
                           |  advisory payload/target binary-arch scan of the merged
-                          |  tree (wrong-arch libraries -> recapped BUILD-WARNING) [K11]
+                          |  tree (wrong-arch libraries -> recapped BAKE-WARNING) [K11]
                           |  boot-precondition gate: merged vfs must supply a tcl
                           |  library (tcl_library/, lib/tcl<M>.<m>/, tcl<M>.<m>/) [K10]
                           v
@@ -2811,7 +2839,7 @@ DIAGRAM 2 - KIT ASSEMBLY DETAIL (the 'make.tcl bake' stage; incl. vfslibs phase)
                           |  mkimg, or (driving tcl without zipfs, e.g 8.6) raw-runtime
                           |  split + punk::zip::mkzip + concatenation - both mount the same
                           v
-              src/_build/<kit>.exe  (+ <kit>.exe.resources.toml)
+              src/_bake/<kit>.exe  (+ <kit>.exe.resources.toml)
                           |
                           |  smoke-require probe (host-runnable kits with declared
                           |  packages): plain 'package require' inside the artifact [K11]
@@ -2857,7 +2885,7 @@ KEY / NOTES
 [K1] Source modules carry the literal magic version 999999.0a1.0 in the filename.
      The real version is the first line of the sibling <modulename>-buildversion.txt;
      bump it per semver (patch=fix, minor=api add, major=breaking) and append a
-     '#<version> - ...' changelog comment line below it. The modules build stamps
+     '#<version> - ...' changelog comment line below it. The mint stamps
      the real version into the output filename and package provide.
      (A project may carry manually-versioned exceptions - see src/modules/AGENTS.md
       if present.)
@@ -2866,10 +2894,11 @@ KEY / NOTES
      entry) is change-driven: bump when the change ships user-visible behaviour.
      Advisory check: tclsh src/make.tcl projectversion
 
-[K3] Every build target root gets a .punkcheck file recording what was installed
-     from where (punkcheck provenance). Building from a tree with uncommitted
-     changes under src/ works but emits PROVENANCE-WARNINGs - commit source first
-     for release builds. Output-tree commits (step 9) come after the builds.
+[K3] Every output target root gets a .punkcheck file recording what was installed
+     from where (punkcheck provenance). Minting/promoting/baking from a tree with
+     uncommitted changes under src/ works but emits PROVENANCE-WARNINGs - commit
+     source first for release runs. Output-tree commits (step 9) come after the
+     producing steps.
 
 [K4] Bootsupport staleness gate: make.tcl compares tracked module versions in
      src/bootsupport against built sources; a stale bootsupport makes other
@@ -2879,10 +2908,10 @@ KEY / NOTES
 
 [K5] The deploy step cannot replace a kit exe that is currently executing. Close
      running kit shells before step 8, or rerun 'make.tcl bake -confirm 0'
-     afterwards - the freshly built kits wait in src/_build. punkcheck records
+     afterwards - the freshly baked kits wait in src/_bake. punkcheck records
      mean the rerun only redoes the failed deploys. When iterating on one kit,
-     'make.tcl bake <kitname>' rebuilds/deploys just that kit; 'make.tcl
-     bakelist' shows each configured kit's deployed state (bin vs src/_build).
+     'make.tcl bake <kitname>' rebakes/deploys just that kit; 'make.tcl
+     bakelist' shows each configured kit's deployed state (bin vs src/_bake).
 
 [K6] All confirmation prompts follow -confirm: unattended/agent runs must pass
      -confirm 0 (non-interactive stdin aborts fast at prompts; piping 'y' is
@@ -2891,13 +2920,13 @@ KEY / NOTES
 [K7] Testing hooks along the way:
        - src/tests/runtests.tcl exercises the src/ trees directly (dev modules).
        - '<builtkit>.exe dev' (or '<builtkit> src') runs a built shell against the
-         project dev modules - useful for testing built packages before they are
+         project dev modules - useful for testing minted packages before they are
          baked into kits via vfscommonupdate + bake.
 
-[K8] What is VCS-tracked where (checkin targets after a build):
+[K8] What is VCS-tracked where (checkin targets after a make.tcl run):
        tracked:   src/** (sources, src/bootsupport, src/project_layouts copies,
                   src/vfs/_vfscommon.vfs), punkproject.toml, CHANGELOG.md
-       untracked: modules*/ lib*/ at projectroot, src/_build/, bin/<kit>.exe,
+       untracked: modules*/ lib*/ at projectroot, src/_bake/, bin/<kit>.exe,
                   bin/kits/<platform>/ (cross-target kit outputs - G-127),
                   src/vfs/*.vfs/_targets/ (per-platform payload staging)
                   (bin/ scripts/tools are tracked; kit executables are not)
@@ -2915,7 +2944,7 @@ KEY / NOTES
      'make.tcl check' prints the derivation; 'make.tcl bakelist' shows per-kit
      targets, with a target= note on rows that are not on the default target.
      OUTPUT locations are target-keyed too (G-127): default-target kits keep the
-     flat src/_build/<kit> + bin/<kit> locations, any other target's kit builds
+     flat src/_bake/<kit> + bin/<kit> locations, any other target's kit bakes
      and deploys under the kits/<platform>/ tier of both (bin/kits/ = outputs,
      beside bin/runtime/ = inputs), so same-named kits for different targets
      coexist instead of overwriting each other; bakelist marks such rows with
@@ -2924,7 +2953,7 @@ KEY / NOTES
 [K10] BOOT-PRECONDITION gate (G-125). A kit whose merged vfs has no tcl library
      cannot initialise at all ('Cannot find a usable init.tcl'), so the bake
      refuses it: the kit is listed under FAILED KITS and NOTHING is written -
-     no src/_build/<kit>, no deploy, and the previously deployed bin/<kit> is
+     no src/_bake/<kit>, no deploy, and the previously deployed bin/<kit> is
      left exactly as it was. This is deliberately not a warning: the deploy step
      deletes the old kit before copying the new one, so warning-and-proceeding
      replaced a working shell with one that could not start. The check is
@@ -2933,18 +2962,18 @@ KEY / NOTES
      executable's own path rather than //zipfs:/app), plus a companion file so a
      package's own init.tcl cannot answer for a tcl library - and runs on the
      MERGED tree, not on whether extraction ran - a .vfs that
-     supplies its own tcl library builds and deploys as normal. Nothing is
+     supplies its own tcl library bakes and deploys as normal. Nothing is
      executed, so cross-target kits are covered too. Usual cause: the runtime's
-     own payload could not be extracted - see the BUILD-WARNING naming what was
+     own payload could not be extracted - see the BAKE-WARNING naming what was
      tried. 'make.tcl check' reports whether the gate is ACTIVE.
 
 [K11] PAYLOAD/TARGET consistency checks (G-133), both ADVISORY - warnings recap at
-     end of run, the kit still builds and deploys. (a) Binary-arch scan at the same
+     end of run, the kit still bakes and deploys. (a) Binary-arch scan at the same
      seam as [K10]: each binary library (*.dll/*.so/*.dylib) in the merged tree is
      classified by header (PE/ELF/Mach-O - structural, nothing executed, so
      cross-target kits are covered) against the kit's target platform; wrong-arch
      libraries outside platform-discriminated subdirs (win32-ix86/, win-x64/ etc -
-     multi-arch payloads are legitimate there) earn recapped BUILD-WARNINGs.
+     multi-arch payloads are legitimate there) earn recapped BAKE-WARNINGs.
      (b) Smoke-require probe: a kit declaring packages (mapvfs.toml smokerequire
      key; legacy config: 5th element) has each one plain-'package require'd INSIDE the freshly built
      artifact via its tclsh subcommand - the only check that sees resolution-order
@@ -2964,7 +2993,7 @@ OUT-OF-BAND SUBSYSTEMS (not part of the packages/bake data flow above)
 
 MAINTENANCE (agents take note)
 ----------------------------------------------------------------------------
-This text is embedded in make.tcl (::punkboot::workflow_text). When the build
+This text is embedded in make.tcl (::punkboot::workflow_text). When the make.tcl
 data flow changes - a make.tcl subcommand added/removed/repurposed, a source or
 output folder added or rerouted, a new propagation target, a changed gate or
 deploy behaviour - update this text in the same change-set and verify with
@@ -3014,7 +3043,7 @@ proc ::punkboot::punkboot_availability_note {} {
             append h "    Call 'make.tcl check' and examine the last table (which includes bootsupport + executable-provided packages)" \n
             append h "    See if there are any items marked missing or broken that aren't marked as '(known optional)'" \n
             append h "    If all are marked (known optional) then it should work." \n
-            append h "    A package marked (known optional) and (RECOMMENDED) may make the build/install processes run a lot faster. (e.g tcllibc)" \n
+            append h "    A package marked (known optional) and (RECOMMENDED) may make the mint/bake and install processes run a lot faster. (e.g tcllibc)" \n
             append h "* $A(HIGHLIGHT)** *** *** ***$A(RST)" \n\n
             #append h "Successfully Loaded packages:" \n
             #append h "    " [join $::punkboot::pkg_loaded "\n    "] \n
@@ -3056,14 +3085,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             #single source for the subcommand one-line summaries: each subcommand definition's
             #@cmd -summary and the top-level subcommand -choicelabels are both built from this.
             variable SUMMARIES {
-                bakehouse       "Consumer build from a clean checkout: packages then bake - refuses uncommitted src by default"
-                packages        "Build .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
-                modules         "Build .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
-                libs            "Build pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
+                bakehouse       "Consumer run from a clean checkout: mint packages then bake - refuses uncommitted src by default"
+                packages        "Mint .tm modules and pkgIndex.tcl libraries from src into <projectdir> (no kit executables)"
+                modules         "Mint .tm modules from src/modules, src/vendormodules etc into <projectdir>/modules etc"
+                libs            "Mint pkgIndex.tcl libraries from src/lib, src/vendorlib etc into <projectdir>/lib etc"
                 bake            "Assemble kit/zipkit executables from promoted payload (src/vfs) and runtimes into <projectdir>/bin"
                 bakelist        "List the kit outputs configured in src/runtime/mapvfs.toml: type, runtime/vfs presence, deployed state, groups"
                 vfslibs         "Materialize per-.vfs payload declarations (src/vfs/<name>.vfs.toml - G-115) into kit vfs folders; drop-ins preserved"
-                bin             "Install executables from src/bin into <projectdir>/bin, then build kits as for bake"
+                bin             "Install executables from src/bin into <projectdir>/bin, then bake kits as for bake"
                 vendorupdate    "Update src/vendormodules based on src/vendormodules/include_modules.config"
                 libfetch        "Fetch declared punkbin lib-tier library artifacts into bin/packages/<target> (sha1-verified) and materialize the package trees"
                 bootsupport     "Promotion gate: update src/bootsupport modules from built project modules"
@@ -3071,7 +3100,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 info            "Show the name and base folder of the project to be built"
                 check           "Show module/library paths and any potentially problematic packages for running this script"
                 projectversion  "Advisory check: CHANGELOG.md vs punkproject.toml and src/ changes since last version bump"
-                workflow        "Print an ASCII data-flow overview of the build/release workflow (edit -> packages -> gates -> bake)"
+                workflow        "Print an ASCII data-flow overview of the release workflow (edit -> mint -> promote -> bake)"
                 shell           "Run the punk shell using bootsupport libraries"
                 help            "Show usage for make.tcl or one of its subcommands"
                 buildsuite      "List, describe or run the defined buildsuites under src/buildsuites (zig runtime factory)"
@@ -3094,41 +3123,43 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  to run when src/ has uncommitted changes (-dirty-abort defaults ON),
                  pointing at the granular developer flow (packages -> test ->
                  bootsupport/vfscommonupdate -> commit -> bake). Pass -dirty-abort 0
-                 to build anyway with PROVENANCE-WARNINGs.
+                 to proceed anyway with PROVENANCE-WARNINGs.
                  Deliberately does NOT run the promotion gates (bootsupport,
                  vfscommonupdate): payload promotion is a confirm-gated, committed
                  act - on a clean checkout the gates are already satisfied by the
                  committed tree."
                 packages
                 "
-                 Build (or copy if build not required) both .tm and pkgIndex.tcl based
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) both .tm and pkgIndex.tcl based
                  packages from src to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 modules
                 "
-                 Build (or copy if build not required) .tm modules from src/modules,
+                 Mint (stamp real versions, pack modpods; plain copy where no
+                 stamping applies) .tm modules from src/modules,
                  src/vendormodules etc to their corresponding locations under <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 libs
                 "
-                 Build (or copy if build not required) pkgIndex.tcl based libraries from
+                 Mint (or plain copy where no stamping applies) pkgIndex.tcl based libraries from
                  src/lib, src/vendorlib etc to their corresponding locations under
                  <projectdir>.
-                 This does not scan src/runtime and src/vfs folders to build kit/zipkit
+                 This does not scan src/runtime and src/vfs folders to bake kit/zipkit
                  executables."
                 bake
                 "
                  Assemble kit/zipkit executables: scan src/vfs and src/runtime folders,
-                 build each configured kit from the promoted payload
+                 bake each configured kit from the promoted payload
                  (src/vfs/_vfscommon.vfs + custom vfs folders) and its runtime, and
                  install to <projectdir>/bin.
                  With kitname (or @groupname - G-024 groups) arguments, bake and
                  deploy ONLY the named configured kits (see 'make.tcl bakelist'
-                 for the configured names and groups) - other kits' build
+                 for the configured names and groups) - other kits' bake
                  products, bin copies and punkcheck records are left untouched.
-                 An unknown name errors before any build, listing the configured
+                 An unknown name errors before any bake, listing the configured
                  names. Bare 'bake' processes all configured kits except
                  bake_default=false entries (those bake only by name/@group).
                  Includes the vfslibs phase (per-.vfs payload declarations
@@ -3136,7 +3167,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  G-115) so a bake cannot ship stale binary libs; a selective
                  bake narrows that phase to the named kits' vfs folders.
                  Does not rebuild modules/libs and does not run the promotion gates -
-                 built modules reach the kit payload only via 'make.tcl
+                 minted modules reach the kit payload only via 'make.tcl
                  vfscommonupdate' (committed for provenance). Consumer full path from
                  a clean checkout: 'make.tcl bakehouse'."
                 bakelist
@@ -3147,12 +3178,12 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  kit name, kit type (kit|zip|zipcat...), runtime with presence in
                  the runtime store of that kit's TARGET platform
                  (<projectdir>/bin/runtime/<target>), vfs folder, and the
-                 deployed state of <projectdir>/bin/<kit> vs the src/_build build
+                 deployed state of <projectdir>/bin/<kit> vs the src/_bake bake
                  product:
-                   current - deployed copy is identical to the build product
-                   stale   - deployed copy differs from the build product
+                   current - deployed copy is identical to the bake product
+                   stale   - deployed copy differs from the bake product
                    absent  - no deployed copy in <projectdir>/bin
-                   nobuild - deployed copy exists but no build product to compare
+                   nobake  - deployed copy exists but no bake product to compare
                  A trailing notes column flags anomalies (runtime=missing,
                  vfs=missing, rtrev=r<cur><r<max> when the runtime working copy is
                  materialized from an older revision than a -r<N> artifact beside
@@ -3161,14 +3192,14 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  default - 'make.tcl check' shows that default), G-024 groups
                  (group=<name>), entries excluded from full bakes (default=no)
                  and scheme-expanded outputs (scheme=versioned|dev|release).
-                 Non-default-target kits build and deploy under the
-                 kits/<platform>/ tier of src/_build and bin (G-127) - their rows
+                 Non-default-target kits bake and deploy under the
+                 kits/<platform>/ tier of src/_bake and bin (G-127) - their rows
                  carry out=kits/<platform>/ and the deployed state compares the
                  tiered paths; a kit NAME shared by entries for several targets
                  selects (and lists) every one of them.
                  kitname (or @groupname) arguments filter the report to the named
                  entries (per-kit detail, with resolved store tier, target,
-                 config entry and paths). Reporting only - never builds."
+                 config entry and paths). Reporting only - never bakes."
                 vfslibs
                 "
                  Materialize the per-.vfs payload declarations (G-115): each
@@ -3212,7 +3243,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 bin
                 "
                  Install executables from src/bin to <projectdir>/bin, then check vfs
-                 folders and build kit/zipkit executables as for the bake subcommand."
+                 folders and bake kit/zipkit executables as for the bake subcommand."
                 vendorupdate
                 "
                  Update the src/vendormodules based on src/vendormodules/include_modules.config.
@@ -3245,7 +3276,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  Also reports the colour policy, the host/target platform derivation
                  (this tclsh's platform canon vs the default kit target, its runtime
                  store tier, executable suffix and process tooling), bootsupport
-                 staleness and the src provenance status (what the build/promotion
+                 staleness and the src provenance status (what the producing
                  commands would do)."
                 projectversion
                 "
@@ -3253,13 +3284,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  if src/ has changes since the last project-version bump."
                 workflow
                 "
-                 Print a plain-text (ASCII diagram) overview of the build/release
+                 Print a plain-text (ASCII diagram) overview of the release
                  workflow: the release-ready command sequence and how data flows from
                  editing a module under src/ through built packages to bootsupport,
                  the kit vfs and the kit executables.
                  The text is embedded in make.tcl (::punkboot::workflow_text) so it is
                  available wherever make.tcl runs; its MAINTENANCE key states the
-                 update contract for keeping it in step with build behaviour."
+                 update contract for keeping it in step with make.tcl behaviour."
                 help
                 "
                  Show tabled usage for make.tcl as a whole, or for a single subcommand.
@@ -3280,7 +3311,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 "
                  Surface for the defined buildsuites under src/buildsuites (zig-built
                  runtime factory - an arm's-length subsystem building Tcl runtimes
-                 from external sources, distinct from the project build/bake stages).
+                 from external sources, distinct from the project mint/bake stages).
 
                  Actions:
                    buildsuite list
@@ -3337,7 +3368,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                  the LOWEST release satisfying the floor wins (deterministic as
                  newer toolchains appear beside the pinned one; dev builds count
                  only when their base version exceeds the floor). zig is OPTIONAL
-                 for punkshell builds: packages/bake never require this step -
+                 for the punkshell mint/bake pipeline: packages/bake never require this step -
                  without a suitable toolchain, list reports the state and
                  build/test exit nonzero with fetch guidance
                  (bin/punk-getzig.cmd). Build caches (.zig-cache/zig-out) are
@@ -3358,7 +3389,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                       non-interactive resolution:
                         bootsupport minor-version staleness gate -> proceed
                         vfscommonupdate REPLACE confirmation     -> proceed
-                        kit source/target type mismatch          -> skip building that kit
+                        kit source/target type mismatch          -> skip baking that kit
                      Note: Tcl 8.6 lacks the terminal probe (-inputmode) so stdin is assumed
                      interactive there - piped runs under 8.6 should always pass -confirm
                      explicitly."
@@ -3370,13 +3401,13 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                      provenance. Warnings carry a plain PROVENANCE-WARNING: prefix (greppable
                      in redirected output) and are recapped at the end of the run.
                      Use 'make.tcl check' to see the current provenance status. To evaluate
-                     uncommitted source without building, use '<builtexe> src' or
+                     uncommitted source without minting or baking, use '<builtexe> src' or
                      '<builtexe> src shell'."
             }
             variable OPT_FORCEKILL {
                 -k -type none -default 0 -help\
                     "Terminate running processes matching the executable being built
-                     (if applicable) so the build can install over it."
+                     (if applicable) so the bake can install over it."
             }
             #bakehouse defaults the dirty gate ON:
             #the bakehouse bakes from the committed recipe (G-112 two-persona model).
@@ -3384,10 +3415,10 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                 -dirty-abort -type boolean -default 1 -help\
                     "Abort when src/ has uncommitted VCS changes - DEFAULT ON for this
                      subcommand: the bakehouse bakes from the committed recipe. A
-                     consumer build on a clean checkout runs uninterrupted; uncommitted
+                     consumer run on a clean checkout proceeds uninterrupted; uncommitted
                      developer changes get a refusal naming the granular flow
                      (packages -> test -> bootsupport/vfscommonupdate -> commit -> bake).
-                     Pass -dirty-abort 0 to build anyway with PROVENANCE-WARNINGs."
+                     Pass -dirty-abort 0 to proceed anyway with PROVENANCE-WARNINGs."
             }
             #libfetch fragments (G-139): consent is keyed to SERVER TRUST (the G-123
             #posture) - the canonical punkbin origin needs no acknowledgement, any
@@ -3510,7 +3541,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
                     @<groupname> for every kit in a configured group (G-024) - see
                     'make.tcl bakelist' for the configured names and groups. With no
                     kitname, all configured kits are processed except entries with
-                    bake_default=false. An unknown name errors before any build."
+                    bake_default=false. An unknown name errors before any bake."
             }
             punk::args::define {
                 @id     -id     "(script)::punkboot::bakelist"
@@ -3729,7 +3760,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             }
             #top-level definition: the subcommand table rendered by 'make.tcl' / 'make.tcl -help'
             variable SUBGROUPS {
-                "build & bake"       {bakehouse packages modules libs bake vfslibs bin}
+                "mint & bake"        {bakehouse packages modules libs bake vfslibs bin}
                 "promotion gates"    {bootsupport vfscommonupdate}
                 "source maintenance" {vendorupdate libfetch}
                 "buildsuites"        {buildsuite}
@@ -3756,7 +3787,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 #sole remaining explicit synopsis override (G-143 retired the per-subcommand
@@ -3805,7 +3836,7 @@ if {[info exists ::env(PUNKBOOT_PLAIN)] && [string is true -strict $::env(PUNKBO
             punk::args::define {
                 @id     -id     "(script)::punkboot.overview"
                 @cmd    -name   "make.tcl"                              -&
-                    -summary "punkshell project build tool (punk boot)" -&
+                    -summary "punkshell project make tool (punk boot)" -&
                     -help                                               -&
                     {${$TOPLEVEL_HELP}}
                 @form -synopsis "make.tcl ?subcommand? ?flags?"
@@ -4212,7 +4243,7 @@ set binfolder    $projectroot/bin
 
 # ----------------------------------------
 # G-121 selective bake: resolve requested kit names against the parsed kit-mapping
-# model before ANY build machinery runs - an unknown name must error without building,
+# model before ANY bake machinery runs - an unknown name must error without baking,
 # and a selected-but-unbuildable kit (missing runtime/vfs) fails fast rather than
 # silently doing nothing (bare 'bake' keeps the historical warn-and-continue
 # behaviour for the full configured set). The kit machinery and the vfslibs phase
@@ -4277,12 +4308,12 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 }
 
 # ----------------------------------------
-# Provenance-warning presentation + dirty-src check for build/promotion commands (goal G-026 direction).
-# Build/promotion commands stamp versions onto src content and propagate it into trees other
+# Provenance-warning presentation + dirty-src check for producing commands (goal G-026 direction).
+# Producing commands (mint/promote/bake) stamp versions onto src content and propagate it into trees other
 # things consume (root modules/, bootsupport snapshots, vfs payloads, kits/zipkits).
 # Artifacts built from uncommitted src have no committed provenance - warn by default,
 # abort if the -dirty-abort flag was given. To evaluate uncommitted source without
-# building, use '<builtexe> src' / '<builtexe> src shell' instead.
+# minting or baking, use '<builtexe> src' / '<builtexe> src shell' instead.
 # Guarded require: a stale or missing punkboot::utils bootsupport snapshot must never
 # brick the make.tcl commands used to repair it - the check degrades to a skip notice
 # (but -dirty-abort still aborts rather than silently skipping the requested strictness).
@@ -4290,7 +4321,7 @@ if {$::punkboot::command eq "bake" && [llength $::punkboot::opt_kitnames]} {
 #Emit provenance warnings with a plain column-0 token for automated discovery (grep PROVENANCE-WARNING
 #in redirected output) and ANSI colour for humans. Lines are also accumulated in
 #::punkboot::provenance_warnings_pending unless -norecap is given, so the wrapped ::exit below can
-#recap them at the tail of the output - build progress output is chatty and the original warning
+#recap them at the tail of the output - make.tcl progress output is chatty and the original warning
 #position may scroll out of sight or even out of scrollback.
 set ::punkboot::provenance_warnings_pending [list]
 proc ::punkboot::print_provenance_warnings {warninglines args} {
@@ -4305,22 +4336,22 @@ proc ::punkboot::print_provenance_warnings {warninglines args} {
     }
     flush stderr
 }
-#General build warnings that must stay noticeable despite chatty build output - same
+#General bake warnings that must stay noticeable despite chatty output - same
 #column-0 greppable-token + recap-at-exit treatment as provenance warnings above.
-set ::punkboot::build_warnings_pending [list]
-proc ::punkboot::print_build_warnings {warninglines args} {
+set ::punkboot::bake_warnings_pending [list]
+proc ::punkboot::print_bake_warnings {warninglines args} {
     global A
     if {![array size A]} {punkboot::define_global_ansi}
     foreach w $warninglines {
         regsub {^WARNING: } $w "" w
-        puts stderr "BUILD-WARNING: $A(BAD)$w$A(RST)"
+        puts stderr "BAKE-WARNING: $A(BAD)$w$A(RST)"
         if {"-norecap" ni $args} {
-            lappend ::punkboot::build_warnings_pending $w
+            lappend ::punkboot::bake_warnings_pending $w
         }
     }
     flush stderr
 }
-#Availability probe + scoped dirty-src check, shared by the build/promotion gate below and the
+#Availability probe + scoped dirty-src check, shared by the producing-commands gate below and the
 #'check' command report. Returns {available warninglist}.
 proc ::punkboot::get_src_provenance_warnings {projectroot label} {
     set available [expr {\
@@ -4338,7 +4369,7 @@ proc ::punkboot::get_src_provenance_warnings {projectroot label} {
 #
 #On windows an ordinary 'file copy -force' onto a mapped file is refused: a zipfs mount
 #maps its archive (tclZipfs.c CreateFileMappingW + MapViewOfFile), so a zip-based .tm
-#modpod that any running shell - including this build - has mounted cannot be overwritten
+#modpod that any running shell - including this make.tcl run - has mounted cannot be overwritten
 #in place. Windows reports ERROR_USER_MAPPED_FILE (1224); Tcl's Tcl_WinConvertError maps
 #only Win32 codes 0..267 and sends everything above them to EINVAL, so it surfaces as the
 #uninformative "invalid argument" (same code in 8.6 and 9.x).
@@ -4385,7 +4416,7 @@ proc ::punkboot::mapped_file_hint {errmsg tgtfile} {
     }
     return "'invalid argument' is Tcl's catch-all for any windows error above 267 (Tcl_WinConvertError), not a bad argument.\
         For a file replace the usual cause is ERROR_USER_MAPPED_FILE: '$tgtfile' is memory-mapped by a process that has it mounted -\
-        a zipfs/modpod mount does this, so a running punk shell (or this build) holding that .tm blocks an in-place overwrite.\
+        a zipfs/modpod mount does this, so a running punk shell (or this make.tcl run) holding that .tm blocks an in-place overwrite.\
         Close shells holding it, or rerun - the update now replaces such files by delete-then-place rather than overwrite."
 }
 #Availability probe + boot-precondition check of an assembled kit vfs (G-125), shared by the
@@ -4439,7 +4470,7 @@ proc ::punkboot::get_kit_offsetstyle_report {kitpath} {
 #file exists. The tclsh subcommand is used deliberately: it exits cleanly even on
 #runtimes whose full repl teardown is fragile, and a script argument with drained
 #stdin cannot reach any console-reopen path. ADVISORY: failures become recapped
-#BUILD-WARNINGs naming kit, package and the actual error - the kit still deploys.
+#BAKE-WARNINGs naming kit, package and the actual error - the kit still deploys.
 #Returns 1 when every declared package resolved, else 0.
 proc ::punkboot::kit_smoke_require_probe {kitpath targetkit packages} {
     set probescript [file rootname $kitpath]_smokerequire.tcl
@@ -4459,13 +4490,13 @@ exit 0}
         close $fd
     } errM]} {
         catch {close $fd}
-        ::punkboot::print_build_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
+        ::punkboot::print_bake_warnings [list "smoke-require for kit $targetkit could not write its probe script ($probescript): $errM"]
         return 0
     }
     if {[catch {
         lassign [punk::lib::invoke [list [file nativename $kitpath] tclsh [file nativename $probescript] << ""]] p_stdout p_stderr p_exitcode
     } errM]} {
-        ::punkboot::print_build_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
+        ::punkboot::print_bake_warnings [list "smoke-require FAILED for kit $targetkit: could not execute freshly built artifact via its tclsh subcommand ($errM)"]
         return 0
     }
     set seen [dict create]
@@ -4502,7 +4533,7 @@ exit 0}
         lappend warnings "smoke-require for kit $targetkit: artifact exited with code $p_exitcode via its tclsh subcommand (expected 0)"
     }
     if {[llength $warnings]} {
-        ::punkboot::print_build_warnings $warnings
+        ::punkboot::print_bake_warnings $warnings
     }
     return $allok
 }
@@ -4516,10 +4547,10 @@ if {![llength [info commands ::punkboot::exit_original]]} {
             puts stderr "PROVENANCE-WARNING: recap of warning(s) emitted earlier in this run:"
             ::punkboot::print_provenance_warnings $::punkboot::provenance_warnings_pending -norecap
         }
-        if {[info exists ::punkboot::build_warnings_pending] && [llength $::punkboot::build_warnings_pending]} {
+        if {[info exists ::punkboot::bake_warnings_pending] && [llength $::punkboot::bake_warnings_pending]} {
             puts stderr ""
-            puts stderr "BUILD-WARNING: recap of warning(s) emitted earlier in this run:"
-            ::punkboot::print_build_warnings $::punkboot::build_warnings_pending -norecap
+            puts stderr "BAKE-WARNING: recap of warning(s) emitted earlier in this run:"
+            ::punkboot::print_bake_warnings $::punkboot::bake_warnings_pending -norecap
         }
         ::punkboot::exit_original $returnCode
     }
@@ -4531,7 +4562,7 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
     if {$have_scoped_dirty_check} {
         if {[llength $dirty_warnings]} {
             ::punkboot::print_provenance_warnings $dirty_warnings
-            puts stderr "  To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+            puts stderr "  To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
             if {$dirty_abort} {
                 set ::punkboot::provenance_warnings_pending [list] ;#no recap needed - aborting adjacent to the warning
                 if {$::punkboot::command eq "bakehouse"} {
@@ -4540,9 +4571,9 @@ if {$::punkboot::command in {bakehouse packages modules libs bake vfslibs bin bo
                     puts stderr "    make.tcl packages   -> test ('<builtexe> src', src/tests/runtests.tcl)"
                     puts stderr "    make.tcl bootsupport + make.tcl vfscommonupdate   (promotion gates)"
                     puts stderr "    commit              -> make.tcl bake"
-                    puts stderr "  To build anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
+                    puts stderr "  To proceed anyway without committed provenance: make.tcl bakehouse -dirty-abort 0"
                 } else {
-                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to build with a warning)"
+                    puts stderr "-aborted- (-dirty-abort given and src has uncommitted changes - commit first, or rerun without -dirty-abort to proceed with a warning)"
                 }
                 exit 1
             }
@@ -4734,19 +4765,19 @@ if {$::punkboot::command eq "check"} {
         puts stderr "    cd \[projectroot\]/src && tclsh make.tcl modules && tclsh make.tcl bootsupport"
         puts stderr "=============================================================================="
     }
-    # Dirty-src provenance status - what the build/promotion commands would do
+    # Dirty-src provenance status - what the producing commands would do
     puts stdout $sep
     lassign [::punkboot::get_src_provenance_warnings $projectroot "make.tcl check"] _prov_available _prov_warnings
     if {!$_prov_available} {
         puts stdout "src provenance: check unavailable (punkboot::utils vcs_dirty_warnings with scope support not loadable from bootsupport)"
-        puts stdout "  build/promotion commands will proceed with a NOTE; -dirty-abort would abort as unverifiable."
+        puts stdout "  producing commands (mint/promote/bake) will proceed with a NOTE; -dirty-abort would abort as unverifiable."
     } elseif {![llength $_prov_warnings]} {
         puts stdout "src provenance: OK (no uncommitted fossil/git changes under src/)"
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will proceed without provenance warnings."
     } else {
         ::punkboot::print_provenance_warnings $_prov_warnings -norecap
-        puts stdout "  build/promotion commands (project packages modules libs vfs vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
-        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without building, use '<builtexe> src' or '<builtexe> src shell'."
+        puts stdout "  producing commands (bakehouse packages modules libs bake vfslibs bin bootsupport vfscommonupdate) will WARN as above and proceed."
+        puts stdout "  With -dirty-abort they would abort. To evaluate uncommitted source without minting or baking, use '<builtexe> src' or '<builtexe> src shell'."
     }
     # Kit boot-precondition gate status - whether a bake can refuse an unbootable kit
     puts stdout $sep
@@ -4755,7 +4786,7 @@ if {$::punkboot::command eq "check"} {
     if {$_boot_available} {
         puts stdout "boot-precondition gate (G-125): ACTIVE"
         puts stdout "  bake checks each kit's merged vfs for a tcl library (tcl_library/, lib/tcl<major>.<minor>/ or"
-        puts stdout "  tcl<major>.<minor>/) before building it. A kit with none is reported under FAILED KITS and is"
+        puts stdout "  tcl<major>.<minor>/) before baking it. A kit with none is reported under FAILED KITS and is"
         puts stdout "  neither built nor deployed, so a previously deployed kit is never replaced by an artifact that"
         puts stdout "  cannot initialise."
     } else {
@@ -4770,7 +4801,7 @@ if {$::punkboot::command eq "check"} {
         puts stdout "payload/target arch scan (G-133): ACTIVE (advisory)"
         puts stdout "  bake classifies each merged kit's binary libraries (*.dll/*.so/*.dylib header bytes - structural,"
         puts stdout "  nothing executed, cross-target kits included) against the kit's target platform and emits"
-        puts stdout "  recapped BUILD-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
+        puts stdout "  recapped BAKE-WARNINGs for wrong-arch libraries outside platform-discriminated subdirs"
         puts stdout "  (canonical <os>-<cpu> names and recognised vendor spellings such as win-x64 are exempt)."
     } else {
         puts stdout "payload/target arch scan (G-133): UNAVAILABLE (punkboot::utils vfs_binary_arch_report not loadable from bootsupport)"
@@ -4783,7 +4814,7 @@ if {$::punkboot::command eq "check"} {
     if {$_off_available} {
         puts stdout "kit offset-style pin (G-134): ACTIVE (advisory)"
         puts stdout "  bake probes each assembled kit image with punk::zip::archive_info and emits a recapped"
-        puts stdout "  BUILD-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
+        puts stdout "  BAKE-WARNING when an attached zip payload records FILE-relative offsets (the pipeline"
         puts stdout "  emits archive-relative by construction; the G-128 stamper refuses file-relative by default)."
         puts stdout "  plain/none results (no attached zip - e.g the metakit kit shape) are silence, not warnings."
     } else {
@@ -4804,7 +4835,7 @@ if {$::punkboot::command eq "check"} {
     puts stdout "  (mapvfs.toml smokerequire key; legacy mapvfs.config 5th entry element) have each one plain-'package require'd inside the built"
     puts stdout "  artifact via its tclsh subcommand - the only check that sees resolution-order defects such as"
     puts stdout "  a wrong-arch higher-versioned package shadowing a working copy. Failures are recapped"
-    puts stdout "  BUILD-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
+    puts stdout "  BAKE-WARNINGs; cross-target kits skip with a stated reason; undeclared kits run nothing new."
     if {[llength $_smoke_declared]} {
         puts stdout "  declared: [join $_smoke_declared {; }]"
     } else {
@@ -4995,7 +5026,7 @@ if {$::punkboot::command eq "workflow"} {
 if {$::punkboot::command eq "bakelist"} {
     #G-121: report the kit outputs configured in src/runtime/mapvfs.config, consuming
     #the same parsed mapping model as the bake kit machinery (::punkboot::lib::mapvfs_*).
-    #Reporting only - never builds. Data rows are single-line and column-stable for
+    #Reporting only - never bakes. Data rows are single-line and column-stable for
     #grepping; expected state sits in the columns, anomalies surface in a trailing
     #sparse notes column (key=value tags). Kit name arguments filter the report and
     #add a per-kit detail block (resolved paths/sizes/mtimes).
@@ -5007,7 +5038,7 @@ if {$::punkboot::command eq "bakelist"} {
     set rt_os_arch [punkboot::lib::platform_store_tier $rt_default_target]
     set rtbase   $binfolder/runtime
     set rtfolder $rtbase/$rt_os_arch
-    set buildfolder $sourcefolder/_build
+    set bakefolder $sourcefolder/_bake
     set mapfile [punkboot::lib::mapvfs_locate $sourcefolder/runtime]
     set mapmodel [punkboot::lib::mapvfs_model $sourcefolder/runtime $rtbase $sourcefolder $rt_default_target]
     foreach errline [dict get $mapmodel configerrors] {
@@ -5076,12 +5107,12 @@ if {$::punkboot::command eq "bakelist"} {
         set runtime  [dict get $rec runtime]
         set vfstail  [dict get $rec vfs]
         #G-127: deploy-state roots follow the record's output tier (non-default
-        #targets live under kits/<platform>/ in both bin/ and src/_build/)
+        #targets live under kits/<platform>/ in both bin/ and src/_bake/)
         set out_tier [dict get $rec out_tier]
         if {$out_tier eq ""} {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder $binfolder [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder $binfolder [dict get $rec targetkit]]
         } else {
-            set deployed [punkboot::lib::kit_deploy_state $buildfolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
+            set deployed [punkboot::lib::kit_deploy_state $bakefolder/$out_tier $binfolder/$out_tier [dict get $rec targetkit]]
         }
         set notes [list]
         if {$runtime ne "-" && ![dict get $rec runtime_present]} {
@@ -5094,7 +5125,7 @@ if {$::punkboot::command eq "bakelist"} {
             #cross-target entry: its runtime, store tier and artifact naming follow
             #its own platform, not this host's default
             lappend notes target=[dict get $rec target]
-            #G-127: and its build/deploy locations sit under the kits/<platform>/ tier
+            #G-127: and its bake/deploy locations sit under the kits/<platform>/ tier
             lappend notes out=$out_tier/
         }
         if {[dict get $rec group] ne ""} {
@@ -5136,7 +5167,7 @@ if {$::punkboot::command eq "bakelist"} {
             append map_display " (deprecated format)"
         }
     }
-    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_build/<kit> (out= rows: under kits/<platform>/)"
+    puts stdout "# mapvfs: $map_display   runtimes: bin/runtime/$rt_os_arch$rt_store_note   deployed: bin/<kit> vs src/_bake/<kit> (out= rows: under kits/<platform>/)"
     set headline ""
     foreach h $headings w $widths {
         append headline [format "%-*s  " $w $h]
@@ -5176,10 +5207,10 @@ if {$::punkboot::command eq "bakelist"} {
             if {[dict get $rec group] ne ""} {
                 puts stdout "    group:         [dict get $rec group][expr {[dict get $rec bake_default] ? "" : "   (bake_default=false - bake by name or @[dict get $rec group])"}]"
             } elseif {![dict get $rec bake_default]} {
-                puts stdout "    bake_default:  false (excluded from full bakes - bake by name to build)"
+                puts stdout "    bake_default:  false (excluded from full bakes - bake it by name)"
             }
             set relkit [expr {[dict get $rec out_tier] eq "" ? [dict get $rec targetkit] : "[dict get $rec out_tier]/[dict get $rec targetkit]"}]
-            puts stdout "    build product: src/_build/$relkit [punkboot::lib::bakelist_file_detail $buildfolder/$relkit]"
+            puts stdout "    bake product:  src/_bake/$relkit [punkboot::lib::bakelist_file_detail $bakefolder/$relkit]"
             puts stdout "    deployed:      bin/$relkit [punkboot::lib::bakelist_file_detail $binfolder/$relkit] state=[lindex $row 4]"
         }
     }
@@ -6114,7 +6145,7 @@ if {$::punkboot::command eq "bootsupport"} {
     #Project layouts store no bootsupport module snapshots - 'dev project.new' injects bootsupport
     #into generated projects from the generating shell at generation time. Layout-carried scripts
     #and bootsupport manifests are kept current by the thin-layout sync step (see DIAGRAM 1b in
-    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse builds.
+    #::punkboot::workflow_text), which runs during modules/libs/packages/bakehouse runs.
 
     puts stdout " bootsupport done "
     flush stderr
@@ -6434,7 +6465,7 @@ if {$::punkboot::command ni {bakehouse packages modules libs bake vfslibs bin}}
 
 
 
-#external libs and modules first - and any supporting files - no 'building' required
+#external libs and modules first - and any supporting files - no minting required
 
 #install src vendor contents (from version controlled src folder) to base of project (same target folders as our own src/modules etc ie to paths that go on the auto_path and in tcl::tm::list)
 
@@ -6962,7 +6993,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
 
     #store -> modpod payload sync: the punk::mix::templates module ships the thin punk.project layout
     #so module-pathtype layout refs resolve and a bare kit outside any project can generate from it.
-    #The modpod copy is build-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
+    #The modpod copy is sync-managed - do not hand-edit it. Excludes: bin/sdx.kit (no new binaries
     #inside zip-based .tm modules). (The unimplemented child-side src/PROJECT_LAYOUTS_* marker was
     #retired by G-087 stage 5 - thin layouts + generation-time injection made it moot.)
     set store_layout   $sourcefolder/project_layouts/vendor/punk/project-0.1
@@ -6978,7 +7009,7 @@ if {$::punkboot::command in {bakehouse packages modules libs}} {
             -installer make.tcl
             -overwrite installedsourcechanged-targets
             -createempty 1
-            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build .git **/.git}
+            -exclude-paths-core {#* **/#* _aside **/_aside _build **/_build _mint **/_mint _bake **/_bake .git **/.git}
             -exclude-paths {bin/sdx.kit}
         }]
         puts stdout [punkcheck::summarize_install_resultdict $resultdict]
@@ -7083,20 +7114,29 @@ set installername "make.tcl"
 if {$::punkboot::command ni {bakehouse bake bin}} {
     #command = packages/modules/libs/vfslibs - stops before kit assembly
     puts stdout "vfs folders not checked"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder (promotion gate - commit for provenance)"
-    puts stdout " - use 'make.tcl bake' to build executable kits/zipkits from the vfs folders if you have runtimes installed"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder (promotion gate - commit for provenance)"
+    puts stdout " - use 'make.tcl bake' to bake executable kits/zipkits from the vfs folders if you have runtimes installed"
     puts stdout "   Note that without the vfscommonupdate step, 'make.tcl bake' will include any manual changes in the *custom* vfs folders but"
-    puts stdout "   without the latest built modules."
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   without the latest minted modules."
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
     puts stdout " - consumer full path from a clean checkout: 'make.tcl bakehouse'"
     puts stdout "-done-"
     exit 0
 }
 
 
-set buildfolder [punk::mix::cli::lib::get_build_workdir $sourcefolder]
-if {$buildfolder ne "$sourcefolder/_build"} {
-    puts stderr "$sourcefolder/_build doesn't match the project buildfolder $buildfolder - check project filestructure"
+#G-155: the bake workdir resolver was renamed get_build_workdir -> get_bake_workdir with the
+#src/_build -> src/_bake flip. Fall back to a direct mkdir when driving a stale punk::mix
+#snapshot (old bootsupport, or a generated project mid-update) so the mixed state stays runnable.
+if {[llength [info commands ::punk::mix::cli::lib::get_bake_workdir]]} {
+    set bakefolder [punk::mix::cli::lib::get_bake_workdir $sourcefolder]
+} else {
+    puts stderr "NOTE: punk::mix snapshot predates get_bake_workdir (G-155) - using $sourcefolder/_bake directly. Refresh with 'make.tcl modules' + 'make.tcl bootsupport'."
+    file mkdir $sourcefolder/_bake
+    set bakefolder $sourcefolder/_bake
+}
+if {$bakefolder ne "$sourcefolder/_bake"} {
+    puts stderr "$sourcefolder/_bake doesn't match the project bakefolder $bakefolder - check project filestructure"
     puts stdout " -aborted- "
     exit 2
 }
@@ -7134,7 +7174,7 @@ set rt_sourcefolder $sourcefolder/runtime ;#where our config lives
 #driving tclsh's platform. The copy is the same binary as its source, so it must
 #keep the source's executable convention - an .exe stays an .exe whether a native
 #windows tclsh, an msys/cygwin-runtime tclsh (platform 'unix', .exe files) or a
-#cross-target host is driving the build.
+#cross-target host is driving the bake.
 #Mapping key for a runtime FILE name: the name as mapvfs.config spells it, i.e
 #with a windows .exe suffix removed. Only .exe may be stripped - 'file rootname'
 #would eat the last dotted segment of version-named runtimes such as tclsh9.0.5,
@@ -7200,7 +7240,7 @@ proc ::punkboot::runtime_materialization_warning {rtfolder runtime_fullname} {
         set current_rev [dict get $stale current_rev]
         set maxrev [dict get $stale maxrev]
         set maxname [dict get $stale maxname]
-        ::punkboot::print_build_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
+        ::punkboot::print_bake_warnings [list "runtime $runtime_fullname working copy is materialized from revision r$current_rev but $maxname (r$maxrev) is present beside it - kits wrapping this runtime get r$current_rev. To bake with r$maxrev: bin/punk-runtime.cmd use $maxname   then re-run the bake"]
     }
     return
 }
@@ -7238,7 +7278,7 @@ if {[llength $missing]} {
         #declaration. A missing runtime FILE is environment, not declaration: store
         #tiers are legitimately part-populated (fresh clones; runtimes arrive via the
         #consent-gated fetch tiers), so those entries skip with a recapped
-        #BUILD-WARNING naming the entry (cross-target wording states the tier reason).
+        #BAKE-WARNING naming the entry (cross-target wording states the tier reason).
         #bake_default=false entries are not in the full-bake set; selective bakes
         #fail fast at selection instead.
         set _strict_fatal [list]
@@ -7268,7 +7308,7 @@ if {[llength $missing]} {
             exit 3
         }
         if {[llength $_strict_warn]} {
-            ::punkboot::print_build_warnings $_strict_warn
+            ::punkboot::print_bake_warnings $_strict_warn
         }
         unset -nocomplain _rec _entrylabel _strict_fatal _strict_warn _line
     } else {
@@ -7359,7 +7399,7 @@ dict for {_rtname _rttarget} $runtime_target {
         continue ;#absent cross-target runtime already warned by the parse
     }
     if {[dict exists $rtfolder_of $_file]} {
-        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to build both."
+        puts stderr "WARNING: runtime file $_file is present in more than one store tier ([dict get $rtfolder_of $_file] and $_dir) - using the first found. Rename one of them to bake both."
         continue
     }
     lappend runtimes $_file
@@ -7370,14 +7410,14 @@ if {[llength $cross_target_tiers]} {
 }
 unset -nocomplain _rtname _rttarget _tier _dir _file
 if {![llength $runtimes]} {
-    puts stderr "No executable runtimes found in $rtfolder - unable to build any .vfs folders into executables."
+    puts stderr "No executable runtimes found in $rtfolder - unable to bake any .vfs folders into executables."
     puts stderr "Add runtimes to $rtfolder if required"
     if {![file isdirectory $rtfolder]} {
         #same store-tier self-diagnosis as bakelist
         puts stderr "NOTE: that runtime store folder does not exist. Default target '$rt_default_target' derives from THIS tclsh: tcl_platform(os)='$::tcl_platform(os)' tcl_platform(platform)='$::tcl_platform(platform)' -> host canon '$::punkboot::host_platform' -> target '$rt_default_target'."
         puts stderr "  Populate it with 'bin/punk-runtime.cmd' (or by hand), or declare a per-entry target platform in mapvfs.toml for runtimes stored elsewhere."
     }
-    #todo - don't exit - it is valid to use runtime of - to just build a .kit/.zipkit ?
+    #todo - don't exit - it is valid to use runtime of - to just bake a .kit/.zipkit ?
     exit 0
 }
 #G-121 selective bake: restrict processing to the runtimes the selected kits wrap -
@@ -7494,7 +7534,7 @@ dict for {vfstail -} $vfs_runtime_map {
     }
 }
 #G-121 selective bake: only the selected kits' vfs folders get checked/checksummed -
-#other vfs folders' punkcheck build events never fire.
+#other vfs folders' punkcheck bake events never fire.
 if {[llength $::punkboot::bake_selected_kitnames]} {
     set vfs_tails [lmap _vt $vfs_tails {
         if {$_vt ni $::punkboot::bake_selected_vfs} {
@@ -7505,22 +7545,22 @@ if {[llength $::punkboot::bake_selected_kitnames]} {
     unset -nocomplain _vt
 }
 if {![llength $vfs_tails]} {
-    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to build"
+    puts stdout "No .vfs folders found at '$sourcefolder/vfs' - no kits to bake"
     puts stdout " -done- "
     exit 0
 }
 
-set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if building from same .vfs with multiple runtime executables
+set vfs_folder_changes [dict create] ;#cache whether each .vfs folder has changes so we don't re-run tests if baking from same .vfs with multiple runtime executables
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we build an exe for a runtime that matches .vfs folder name - REVIEW.
+#make build copy for all runtimes - not just those in the map - because even without a mapvfs.config file entry we bake an exe for a runtime that matches .vfs folder name - REVIEW.
 foreach  runtimefile $runtimes {
     #runtimefile e.g tclkit86bi.exe for a win32 target, tclkit86bi for a posix one
 
-    #sdx *may* be pointed to use the runtime we use to build the kit, or the user may manually use this runtime if they don't have tclsh
+    #sdx *may* be pointed to use the runtime we use to bake the kit, or the user may manually use this runtime if they don't have tclsh
     #sdx will complain if the same runtime is used for the shell as is used in the -runtime argument - so we make a copy (REVIEW)
-    #if {![file exists $buildfolder/buildruntime.exe]} {
-    #    file copy $rtfolder/$runtimefile $buildfolder/buildruntime.exe
+    #if {![file exists $bakefolder/buildruntime.exe]} {
+    #    file copy $rtfolder/$runtimefile $bakefolder/buildruntime.exe
     #}
 
     #G-122: each runtime is read from the tier its target platform names, not
@@ -7540,18 +7580,18 @@ foreach  runtimefile $runtimes {
         set useruntimefile $runtimefile
     }
 
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
         -make-step copy_runtime
     }]
     #----------
     set installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-    $installer set_source_target $rt_dir $buildfolder
+    $installer set_source_target $rt_dir $bakefolder
     set event [$installer start_event $config]
-    $event targetset_init INSTALL $buildfolder/build_$runtimefile
+    $event targetset_init INSTALL $bakefolder/build_$runtimefile
     #$event targetset_addsource $rt_dir/$runtimefile
     $event targetset_addsource $rt_dir/$useruntimefile ;#possibly the _BUILDCOPY in the runtime folder (created for when mounted in current executable as a tclkit)
-    $event targetset_addsource $buildfolder/build_$runtimefile ;#self as source for change detection
+    $event targetset_addsource $bakefolder/build_$runtimefile ;#self as source for change detection
     #----------
 
     #set changed_unchanged [punkcheck::recordlist::file_install_record_source_changes [lindex [dict get $file_record body] end]]
@@ -7562,11 +7602,11 @@ foreach  runtimefile $runtimes {
         $event targetset_started
         # -- --- --- --- --- ---
         #This is the full runtime - *possibly* with some sort of vfs attached.
-        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $buildfolder/build_$runtimefile"
+        puts stdout "Copying runtime (as is) from $rt_dir/$useruntimefile to $bakefolder/build_$runtimefile"
         if {[catch {
-            file copy -force $rt_dir/$useruntimefile $buildfolder/build_$runtimefile ;#becomes building_runtime
+            file copy -force $rt_dir/$useruntimefile $bakefolder/build_$runtimefile ;#becomes baking_runtime
         } errM]} {
-            puts stderr " >> copy runtime to $buildfolder/build_$runtimefile FAILED"
+            puts stderr " >> copy runtime to $bakefolder/build_$runtimefile FAILED"
             $event targetset_end FAILED
         } else {
             $event targetset_end OK
@@ -7804,7 +7844,7 @@ proc vfs_startup_script_warning {vfsfolder} {
             append detail "; main.tcl fauxlink target '$linktarget' does not exist"
         }
     }
-    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (build proceeding anyway)$detail"
+    return "vfs folder $vfsfolder has NO STARTUP SCRIPT: no root main.tcl and no root fauxlink resolving to main.tcl with an existing .tcl target - kits built from it will have no boot script (bake proceeding anyway)$detail"
 }
 #Cat-style zipkit assembly: a raw (vfs-free) runtime followed by a freshly built
 #zip, concatenated. This is the zipfs-less assembly path for BOTH zip-type kits
@@ -7845,7 +7885,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 
 # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 #G-057 kit icon step. Every built kit gets a <kitname>.resources.toml sidecar
-#recording the build-time icon choice (default src/runtime/punkshell.ico,
+#recording the bake-time icon choice (default src/runtime/punkshell.ico,
 #overridable by a root-level punkshell.ico in the kit's own custom .vfs folder,
 #consulted PRE-merge so the _vfscommon copy never reads as an override), and
 #win32-target kits get that icon embedded as PE RT_ICON/RT_GROUP_ICON resources
@@ -7856,7 +7896,7 @@ proc ::punkboot::assemble_zipcat_image {raw_runtime wrapvfs outfile zipfile} {
 #adopted from the first replaced group; idempotent by construction, parity
 #recorded in the G-128 detail file): the vendored punkres portable stamper
 #(G-128, src/tools/punkres, built by 'make.tcl tool build punkres') is
-#selected when bin/punkres(.exe) exists and works from ANY build host;
+#selected when bin/punkres(.exe) exists and works from ANY bake host;
 #otherwise the twapi arm (tcl-sfe sfe-0.2.tm ReplaceIconInStub lineage; Ashok
 #P. Nadkarni) serves windows hosts with nothing built. Ordering is stub-first either way: a per-kit
 #copy of the payload-free raw runtime prefix is stamped BEFORE any payload is
@@ -8195,12 +8235,12 @@ proc ::punkboot::kit_icon_embed_twapi {exepath icopath {group_override {}}} {
 #G-057 single internal entry point. Decides the kit's icon (override: root
 #punkshell.ico in the kit's own custom .vfs folder, pre-merge; else the project
 #default src/runtime/punkshell.ico), writes/refreshes the kit's
-#<kitname>.resources.toml sidecar in the build folder, and - when the target
+#<kitname>.resources.toml sidecar in the bake folder, and - when the target
 #has PE resources and this host can write them - stamps a per-kit copy of the
 #payload-free raw runtime prefix. Returns {wrap_runtime sidecarpath}:
 #wrap_runtime is the runtime prefix the assembly step must consume (the stamped
 #copy when embedding happened, the untouched raw prefix otherwise).
-proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime buildfolder} {
+proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefolder vfstail raw_runtime bakefolder} {
     set repo_root [file dirname $sourcefolder]
     set override_icon $sourcefolder/vfs/$vfstail/punkshell.ico
     if {[file isfile $override_icon]} {
@@ -8253,7 +8293,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     }
     set wrap_runtime $raw_runtime
     if {$status eq ""} {
-        set stamped $buildfolder/iconed_$targetkit
+        set stamped $bakefolder/iconed_$targetkit
         file copy -force $raw_runtime $stamped
         catch {exec chmod +w $stamped}
         if {$punkres_ok} {
@@ -8264,7 +8304,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
             set embed_cmd [list ::punkboot::kit_icon_embed_twapi $stamped $icon_path $icon_group]
         }
         if {[catch $embed_cmd embed_result]} {
-            ::punkboot::print_build_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
+            ::punkboot::print_bake_warnings [list "kit icon embedding FAILED for $targetkit ($icon_origin icon $icon_path via $embedding): $embed_result - kit keeps its runtime's own icon"]
             set status failed
             set reason $embed_result
             catch {file delete $stamped}
@@ -8303,7 +8343,7 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
     lappend lines "embedding = \"$embedding\""
     lappend lines "embedding_status = \"$status\""
     lappend lines "embedding_reason = \"[$esc $reason]\""
-    set sidecar $buildfolder/$targetkit.resources.toml
+    set sidecar $bakefolder/$targetkit.resources.toml
     ::punkboot::kiticon::writefile_ifchanged $sidecar "[join $lines \n]\n"
     return [list $wrap_runtime $sidecar]
 }
@@ -8311,18 +8351,18 @@ proc ::punkboot::kit_icon_process {targetkit rt_target rtname kit_type sourcefol
 
 set startdir [pwd]
 puts stdout "Found [llength $vfs_tails] .vfs folders -   checking each for executables that may need to be built"
-cd [file dirname $buildfolder] 
+cd [file dirname $bakefolder] 
 #root folder mtime is insufficient for change detection. Tree mtime of folders only is a barely  passable mechanism for vfs change detection in some circumstances - e.g if files added/removed but never edited in place
 #a hash of full tree file & dir mtime may be more reasonable - but it remains to be seen if just tar & checksum is any/much slower.
 #Simply rebuilding all the time may be close the speed of detecting change anyway - and almost certainly much faster when there is a change.
-#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle build on reversion to older source.
+#Using first mtime encountered that is later than target is another option - but likely to be highly variable in speed. Last file in the tree could happen to be the latest, and this mechanism doesn't handle re-bake on reversion to older source.
 set exe_names_seen [list]
 set path_cksum_cache [dict create]
 dict set path_cksum_cache {*}[punk::mix::base::lib::get_relativecksum_from_base $basedir $sourcefolder/vfs/_vfscommon.vfs]
 
 #
-# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - build with sdx or zipfs if source .vfs or source runtime exe has changed.
-# we are using punkcheck to install result to buildfolder so we create a .punkcheck file at the target folder to store metadata.
+# loop over vfs_tails and for each one, loop over configured (or matching)  runtimes - bake with sdx or zipfs if source .vfs or source runtime exe has changed.
+# we are using punkcheck to install result to bakefolder so we create a .punkcheck file at the target folder to store metadata.
 # punkcheck allows us to not rely purely on timestamps (which may be unreliable)  
 #
 foreach vfstail $vfs_tails {
@@ -8330,11 +8370,11 @@ foreach vfstail $vfs_tails {
     set vfsname [file rootname $vfstail]
     puts stdout "  ------------------------------------"
     puts stdout "  checking vfs $sourcefolder/vfs/$vfstail for configured runtimes"
-    set skipped_vfs_build 0
+    set skipped_vfs_bake 0
     # -- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-    set basedir $buildfolder
+    set basedir $bakefolder
     set config [dict create {*}{
-        -make-step build_vfs
+        -make-step bake_vfs
     }]
 
 
@@ -8366,7 +8406,7 @@ foreach vfstail $vfs_tails {
         }
     } else {
         #only match this vfs to a correspondingly named runtime if there was no explicit entry for that runtime
-        #review - should this only be done if there are NO explicit entries? how does a user stop builds of unneeded exes that match without renaming files/folders?
+        #review - should this only be done if there are NO explicit entries? how does a user stop bakes of unneeded exes that match without renaming files/folders?
         #but conversely, adding an extra entry shouldn't stop default builds that used to run..
         set matchrt [file rootname [file tail $vfstail]] ;#e.g project.vfs -> project
         if {![dict exists $runtime_vfs_map $matchrt]} {
@@ -8385,7 +8425,7 @@ foreach vfstail $vfs_tails {
         #(e.g _vfscommon.vfs is a merge overlay with no runtime mapping and legitimately has no main.tcl)
         set startup_warning [vfs_startup_script_warning $sourcefolder/vfs/$vfstail]
         if {$startup_warning ne ""} {
-            ::punkboot::print_build_warnings [list $startup_warning]
+            ::punkboot::print_bake_warnings [list $startup_warning]
         }
     }
     #todo - non kit based - zipkit?
@@ -8452,21 +8492,21 @@ foreach vfstail $vfs_tails {
             lassign $targetkit_info targetkit target_kit_type kit_smokerequires kit_attrs
             #G-127: output locations are keyed by the kit's TARGET. Kits for this
             #host's own default target keep the flat locations every launcher, test
-            #and habit expects (src/_build/<kit>, bin/<kit>); any other target's kit
+            #and habit expects (src/_bake/<kit>, bin/<kit>); any other target's kit
             #builds and deploys under a kits/<platform>/ tier so same-named kits for
             #different targets coexist instead of overwriting each other across
             #selective runs. bin/kits/ rather than bin/<platform>/ because
             #bin/runtime/<platform>/ already means build INPUTS.
             if {$rt_target eq $rt_default_target} {
-                set kit_builddir  $buildfolder
+                set kit_bakedir  $bakefolder
                 set kit_deploydir $binfolder
-                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_build/
+                set kit_relpath   $targetkit ;#kit path relative to bin/ and src/_bake/
             } else {
-                set kit_builddir  $buildfolder/kits/$rt_target
+                set kit_bakedir  $bakefolder/kits/$rt_target
                 set kit_deploydir $binfolder/kits/$rt_target
                 set kit_relpath   kits/$rt_target/$targetkit
             }
-            file mkdir $kit_builddir
+            file mkdir $kit_bakedir
             #G-024: bake_default=false entries (declared per entry or via their group)
             #are excluded from full bakes - explicit name/@group selection builds them.
             if {![llength $::punkboot::bake_selected_kitnames]
@@ -8493,11 +8533,11 @@ foreach vfstail $vfs_tails {
             set self_exe [file normalize [info nameofexecutable]]
             set self_deploy_target [file normalize $kit_deploydir/$targetkit]
             if {$::punkboot::host_windows} {
-                set is_self_build [string equal -nocase $self_exe $self_deploy_target]
+                set is_self_bake [string equal -nocase $self_exe $self_deploy_target]
             } else {
-                set is_self_build [string equal $self_exe $self_deploy_target]
+                set is_self_bake [string equal $self_exe $self_deploy_target]
             }
-            if {$is_self_build} {
+            if {$is_self_bake} {
                 puts stderr "SKIPPING kit $targetkit - its deployed executable is the one running this build ($self_exe)"
                 puts stderr "  Rerun 'make.tcl $::punkboot::command' under tclsh or a different built kit to rebuild $targetkit."
                 lappend skipped_kits [list kit $targetkit reason "deployed executable is running this build"]
@@ -8505,9 +8545,9 @@ foreach vfstail $vfs_tails {
             }
             # -- ----------
             set vfs_installer [punkcheck::installtrack new $installername $basedir/.punkcheck]
-            $vfs_installer set_source_target $sourcefolder $buildfolder
-            set vfs_event [$vfs_installer start_event {-make-step build_vfs}]
-            $vfs_event targetset_init INSTALL $kit_builddir/$targetkit
+            $vfs_installer set_source_target $sourcefolder $bakefolder
+            set vfs_event [$vfs_installer start_event {-make-step bake_vfs}]
+            $vfs_event targetset_init INSTALL $kit_bakedir/$targetkit
             set relvfs [punkcheck::lib::path_relative $basedir $sourcefolder/vfs/$vfstail]
             if {![dict exists $path_cksum_cache $relvfs]} {
                 #e.g ../vfs/punk87.vfs {cksum xxxx cksum_all_opts {-cksum_content 1 ... -cksum_algorithm sha1}}
@@ -8523,11 +8563,11 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_addsource $sourcefolder/runtime/punkshell.ico
             }
             if {$rtname ne "-"} {
-                set building_runtime $buildfolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
-                $vfs_event targetset_addsource $building_runtime
+                set baking_runtime $bakefolder/build_$runtime_fullname ;#working copy of runtime executable - (possibly with kit/zipfs/cookfs etc attached!)
+                $vfs_event targetset_addsource $baking_runtime
                 set raw_runtime "" ;#building runtime with vfs (zip,kit,cookfs etc stripped)
             } else {
-                set building_runtime "-" ;#REVIEW
+                set baking_runtime "-" ;#REVIEW
                 set raw_runtime "-"
             }
             # -- ----------
@@ -8541,18 +8581,18 @@ foreach vfstail $vfs_tails {
                 $vfs_event targetset_started
                 # -- --- --- --- --- ---
 
-                if {[file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "deleting existing $buildfolder/$vfsname.new"
-                    file delete $buildfolder/$vfsname.new
+                if {[file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "deleting existing $bakefolder/$vfsname.new"
+                    file delete $bakefolder/$vfsname.new
                 }
 
                 package require fileutil
                 package require fileutil::traverse
                 package require control
 
-                #keep this a simple name - bin/punk script calls into src/_build/exename.vfs/main.tcl
+                #keep this a simple name - bin/punk script calls into src/_bake/exename.vfs/main.tcl
                 #(G-127: non-default-target kits keep the simple name under their kits/<platform>/ tier)
-                set targetvfs $kit_builddir/$targetkit.vfs
+                set targetvfs $kit_bakedir/$targetkit.vfs
                 file delete -force $targetvfs
 
                 set extraction_done 0
@@ -8623,7 +8663,7 @@ foreach vfstail $vfs_tails {
                             #zipfs mkimg replaces the entire zipped vfs in the runtime - so we need the original data to be part of our targetvfs.
                             puts stdout "Attempting to extract zip vfs data from $runtime_fullname"
                             file mkdir $targetvfs
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
 
                             if {[info commands ::tcl::zipfs::mount] ne ""} {
                                 #the driving tcl has zipfs
@@ -8631,13 +8671,13 @@ foreach vfstail $vfs_tails {
 
                                 if {![file exists $rtmountpoint]} {
                                     if {[catch {
-                                        tcl::zipfs::mount $building_runtime  rtmounts/$runtime_fullname
+                                        tcl::zipfs::mount $baking_runtime  rtmounts/$runtime_fullname
                                     } errM]} {
-                                        puts stderr "Failed to mount $building_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
+                                        puts stderr "Failed to mount $baking_runtime using standard api. Err:$errM\n trying reverse args on tcl::zipfs::mount..."
                                         if {[catch {
-                                        tcl::zipfs::mount rtmounts/$runtime_fullname $building_runtime
+                                        tcl::zipfs::mount rtmounts/$runtime_fullname $baking_runtime
                                         } errM]} {
-                                            puts stderr "ALSO Failed to mount $building_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
+                                            puts stderr "ALSO Failed to mount $baking_runtime using reverse args to api. Err:$errM - no mountable zipfs on runtime?"
                                         }
                                     }
                                 }
@@ -8656,7 +8696,7 @@ foreach vfstail $vfs_tails {
                                     if {$baseoffset != 0} {
                                         #tcl was able to determine the compressed-data offset
                                         #either because runtime is a basic catted exe+zip, or Tcl fixed 'zipfs info'
-                                        set fdrt [open $building_runtime r]
+                                        set fdrt [open $baking_runtime r]
                                         chan configure $fdrt -translation binary
                                         set exedata [read $fdrt $baseoffset] ;#may include stored password and ending header // REVIEW - strip it?
                                         close $fdrt
@@ -8665,21 +8705,21 @@ foreach vfstail $vfs_tails {
                                         puts -nonewline $fdraw $exedata
                                         close $fdraw
                                     } else {
-                                        #presumably the supplied building_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
+                                        #presumably the supplied baking_runtime has had its offsets adjusted so that it all appears within offsets off the zip. (file relative offsets)
                                         #due to zipfs info bug - zipfs now can't tell us the offset of the compressed data.
                                         #we need to use a similarly assumptive method as tclZipfs.c uses to determine the start of the compressed contents
                                         package require punk::zip
                                         #we don't technically need to extract the raw exe for 'zip' - as zipfs mkimg can work on the combined file (ignores zip)
                                         # - but for consistency we want raw_runtime to be emitted in the filesystem.
                                         file delete $raw_runtime
-                                        punk::zip::extract_preamble $building_runtime $raw_runtime
+                                        punk::zip::extract_preamble $baking_runtime $raw_runtime
                                     }
                                 } else {
-                                    #the input building_runtime wasn't mountable as a zip - so presumably a plain executable
+                                    #the input baking_runtime wasn't mountable as a zip - so presumably a plain executable
                                     #runtime executable possibly with kit/cookfs etc attached?
                                     #If not - init.tcl probably won't be found? should we even proceed ??
                                     puts stderr "[punkboot::sgr 31]WARNING the runtime was not mountable as a zip - which means tcl_library was not extracted - the executable may not work with zipfs attached![punkboot::sgr]"
-                                    file copy -force $building_runtime $raw_runtime
+                                    file copy -force $baking_runtime $raw_runtime
                                 }
                             } else {
                                 #The driving tcl we are calling with doesn't have zipfs - can't mount.
@@ -8687,7 +8727,7 @@ foreach vfstail $vfs_tails {
                                 #so this path needs no zipfs, no vfs::zip and no tcllib.
                                 package require punk::zip
                                 puts stdout "tcl shell '[info nameofexecutable]' being used to build doesn't have zipfs - reading the runtime's attached archive with punk::zip"
-                                set extractedzipfolder $buildfolder/extracted_$runtime_fullname
+                                set extractedzipfolder $bakefolder/extracted_$runtime_fullname
                                 file delete $raw_runtime
                                 file delete -force $extractedzipfolder
                                 if {![catch {
@@ -8696,8 +8736,8 @@ foreach vfstail $vfs_tails {
                                     #derived base offset: a runtime whose offsets are file-relative
                                     #splits into a .zip no plain zip reader accepts, and reading the
                                     #whole file sidesteps that intermediate entirely.
-                                    punk::zip::extract_preamble $building_runtime $raw_runtime
-                                    punk::zip::unzip -return none -- $building_runtime $extractedzipfolder
+                                    punk::zip::extract_preamble $baking_runtime $raw_runtime
+                                    punk::zip::unzip -return none -- $baking_runtime $extractedzipfolder
                                 } extracterr]} {
                                      set extraction_done 1
                                      set extract_kit_type $extract_kit_try
@@ -8733,7 +8773,7 @@ foreach vfstail $vfs_tails {
                                 #unlike cookit's //cookit:/  it doesn't show up in file volumes
                                 #set rtmountpoint //cookfstemp:/rtmounts/$runtime_fullname ;#not writable with 'file mkdir' which doesn't seem to handle intermediate nonexistant path
                                 set rtmountpoint //cookfstemp:/$runtime_fullname
-                                cookfs::Mount $building_runtime $rtmountpoint
+                                cookfs::Mount $baking_runtime $rtmountpoint
                                 if {[file exists $rtmountpoint]} {
                                     #copy from mounted runtime's vfs to the filesystem vfs
                                     merge_over $rtmountpoint $targetvfs
@@ -8754,37 +8794,37 @@ foreach vfstail $vfs_tails {
                                 continue ;#to next extraction attempt
 
                             }
-                            set raw_runtime $buildfolder/raw_$runtime_fullname
+                            set raw_runtime $bakefolder/raw_$runtime_fullname
                             #for a kit, we shouldn't need to extract the existing vfs from the runtime.
                             # - the sdx merge process should be able to merge our .vfs folder with the existing contents.
                             #2025 - in practice this doesn't always seem to be the case? Review - could have been cwd issue?
-                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $building_runtime"
+                            puts stdout "Attempting to split kitfile using: $::sdxpath mksplit $baking_runtime"
                             set prev_cwd [pwd]
-                            cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
-                            if {[catch {exec {*}$::sdxpath mksplit $building_runtime} mksplitresult]} {
+                            cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                            if {[catch {exec {*}$::sdxpath mksplit $baking_runtime} mksplitresult]} {
                                 #executable doesn't have kit vfs attached
-                                puts stderr "No kit data extracted from $building_runtime"
-                                file copy -force $building_runtime $raw_runtime
+                                puts stderr "No kit data extracted from $baking_runtime"
+                                file copy -force $baking_runtime $raw_runtime
                             } else {
                                 puts stdout "mksplitresult: $mksplitresult"
-                                if {![file exists [file rootname $building_runtime].tail]} {
-                                    error "mksplit didn't produce file at [file rootname $building_runtime].tail"
+                                if {![file exists [file rootname $baking_runtime].tail]} {
+                                    error "mksplit didn't produce file at [file rootname $baking_runtime].tail"
                                 }
-                                file delete -force [file rootname $building_runtime].vfs ;#ensure target for unwrap doesn't exist
-                                #set kit_bare_runtime [file rootname $building_runtime].head
-                                set building_runtime [file rootname $building_runtime].head
-                                exec {*}$::sdxpath unwrap [file rootname $building_runtime].tail ;#extracts to folder named [file rootname $building_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
+                                file delete -force [file rootname $baking_runtime].vfs ;#ensure target for unwrap doesn't exist
+                                #set kit_bare_runtime [file rootname $baking_runtime].head
+                                set baking_runtime [file rootname $baking_runtime].head
+                                exec {*}$::sdxpath unwrap [file rootname $baking_runtime].tail ;#extracts to folder named [file rootname $baking_runtime].vfs e.g build_tclkit9.0.2-win64-dyn.vfs
                                 #file rename to existing target dir would copy folder into target dir
                                 if {![file exists $targetvfs]} {
                                     #delay
                                     after 1000
-                                    file rename [file rootname $building_runtime].vfs $targetvfs
+                                    file rename [file rootname $baking_runtime].vfs $targetvfs
                                 } else {
-                                    merge_over [file rootname $building_runtime].vfs $targetvfs
+                                    merge_over [file rootname $baking_runtime].vfs $targetvfs
                                 }
                                 set extraction_done 1
                                 set extract_kit_type $extract_kit_try
-                                file copy -force $building_runtime $raw_runtime
+                                file copy -force $baking_runtime $raw_runtime
                             }
                             cd $prev_cwd
 
@@ -8795,12 +8835,12 @@ foreach vfstail $vfs_tails {
                 set extraction_tried "$target_kit_type[expr {[llength $source_kit_caps] ? " + runtime caps $source_kit_caps" : ""}]"
                 if {!$extraction_done} {
                     #TODO: if not extracted - use a default tcl_library for patchlevel and platform?
-                    #Recapped BUILD-WARNING (not just an inline note): this line would
+                    #Recapped BAKE-WARNING (not just an inline note): this line would
                     #otherwise scroll away behind thousands of merge lines. It is a warning
                     #rather than the failure itself because a .vfs that supplies its own tcl
                     #library needs no extraction - the G-125 gate below decides, on the
                     #merged tree, whether this kit can initialise.
-                    ::punkboot::print_build_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
+                    ::punkboot::print_bake_warnings [list "No extraction done from runtime $runtime_fullname (tried: $extraction_tried) - kit $targetkit gets no tcl library from the runtime, so it will FAIL the boot-precondition gate unless src/vfs/$vfstail supplies one"]
                     file mkdir $targetvfs
                 }
 
@@ -8830,7 +8870,7 @@ foreach vfstail $vfs_tails {
                     puts stderr "--------------------------------------------"
                     #G-030 prompt policy: only an interactive 'y' can force building a mismatched
                     #kit - non-interactive runs (and -confirm 0) skip this kit and continue.
-                    set _build_anyway 0
+                    set _bake_anyway 0
                     if {!$::punkboot::opt_confirm} {
                         puts stderr "skipping kit $targetkit (source/target kit type mismatch; -confirm 0 policy is to skip)"
                     } elseif {![::punkboot::lib::stdin_is_interactive]} {
@@ -8838,10 +8878,10 @@ foreach vfstail $vfs_tails {
                     } else {
                         puts stdout "Continue to try to build $targetkit from $rtname anyway? y|n"
                         if {[string tolower [string trim [gets stdin]]] eq "y"} {
-                            set _build_anyway 1
+                            set _bake_anyway 1
                         }
                     }
-                    if {!$_build_anyway} {
+                    if {!$_bake_anyway} {
                         #skip to next kit
                         continue
                     }
@@ -8873,7 +8913,7 @@ foreach vfstail $vfs_tails {
                         puts stdout "    per-platform payload (G-127): selecting _targets/$rt_target into the merged image for kit $targetkit"
                         merge_over $_pstaging/$rt_target $targetvfs
                     } else {
-                        ::punkboot::print_build_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
+                        ::punkboot::print_bake_warnings [list "per-platform payload (G-127): kit $targetkit (target $rt_target) - the merged vfs has a _targets/ staging tree but no _targets/$rt_target subtree, so this kit gets NO per-platform payload (check the %platform% declarations in src/vfs/$vfstail.toml against the kit's mapvfs target)"]
                     }
                     file delete -force $_pstaging
                 }
@@ -8903,7 +8943,7 @@ foreach vfstail $vfs_tails {
                     if {[llength $archscan_mismatches] > $shown} {
                         lappend archwarnings "payload/target arch mismatch in kit $targetkit (target $rt_target): [expr {[llength $archscan_mismatches] - $shown}] further mismatching binary libraries not listed above ([llength $archscan_mismatches] mismatches total, [dict get $archscan scanned] binary libraries scanned)"
                     }
-                    ::punkboot::print_build_warnings $archwarnings
+                    ::punkboot::print_bake_warnings $archwarnings
                     unset archwarnings archscan_mismatches shown
                 } else {
                     puts stdout "    payload binary-arch scan for kit $targetkit (target $rt_target): OK - [dict get $archscan scanned] binary libraries scanned ([dict get $archscan matched] match target, [dict get $archscan exempt] exempt under platform subdirs, [dict get $archscan unknown] unclassifiable)"
@@ -8944,7 +8984,7 @@ foreach vfstail $vfs_tails {
                 #the assemblers below consume wrap_runtime - the stamped per-kit copy
                 #of the payload-free raw prefix when embedding happened, the untouched
                 #raw prefix otherwise. Runtime store originals are never modified.
-                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_builddir] wrap_runtime kiticon_sidecar
+                lassign [::punkboot::kit_icon_process $targetkit $rt_target $rtname $target_kit_type $sourcefolder $vfstail $raw_runtime $kit_bakedir] wrap_runtime kiticon_sidecar
 
                 set wrapvfs $targetvfs
                 switch -- $target_kit_type {
@@ -8975,14 +9015,14 @@ foreach vfstail $vfs_tails {
                             }
                             if {[info commands ::tcl::zipfs::mkimg] ne ""} {
                                 #note - as at 2024-08 - there is some discussion about the interface to mkimg - it is considered unstable (may change to -option value syntax)
-                                puts stderr "calling: tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
-                                tcl::zipfs::mkimg $buildfolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
+                                puts stderr "calling: tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs \"\" $wrap_runtime"
+                                tcl::zipfs::mkimg $bakefolder/$vfsname.new $wrapvfs $wrapvfs "" $wrap_runtime
                             } else {
                                 #G-122: the driving tcl has no zipfs (8.6) - assemble the same
                                 #kind of image by concatenation. The result mounts on any
                                 #zipfs-capable runtime (archive-start-relative offsets).
                                 puts stderr "WARNING: tcl shell '[info nameofexecutable]' has no zipfs - assembling zip kit $targetkit by concatenation (raw runtime + mkzip)"
-                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                                ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                             }
                         } result ]} {
                             set failmsg "zipfs mkimg failed with msg: $result"
@@ -9019,7 +9059,7 @@ foreach vfstail $vfs_tails {
                             }
 
                             #'archive' based zip offsets - editable in 7z,peazip
-                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $buildfolder/$vfsname.new $buildfolder/$vfsname.zip
+                            ::punkboot::assemble_zipcat_image $wrap_runtime $wrapvfs $bakefolder/$vfsname.new $bakefolder/$vfsname.zip
                         } result ]} {
                             set failmsg "creating zipcat image failed with msg: $result"
                             puts stderr "creating image (zipcat) $targetkit failed" 
@@ -9047,7 +9087,7 @@ foreach vfstail $vfs_tails {
                             continue
                         } else {
                             if {[catch {
-                                #we still have the $building_runtime mounted
+                                #we still have the $baking_runtime mounted
                                 if {[catch {
                                     merge_over $targetvfs $rtmountpoint
                                 } errM]} {
@@ -9063,14 +9103,14 @@ foreach vfstail $vfs_tails {
 
                                 #copy the version that is mounted in this runtime to vfsname.new 
                                 if {[catch {
-                                    file copy -force $building_runtime $buildfolder/$vfsname.new
-                                    catch {exec chmod +w $buildfolder/$vfsname.new}
+                                    file copy -force $baking_runtime $bakefolder/$vfsname.new
+                                    catch {exec chmod +w $bakefolder/$vfsname.new}
                                 } errM]} {
-                                    puts stderr "$target_kit_type 'file copy -force $building_runtime $buildfolder/$vfsname.new' failed\n$errM"
+                                    puts stderr "$target_kit_type 'file copy -force $baking_runtime $bakefolder/$vfsname.new' failed\n$errM"
                                     error $errM
                                 }
                             } result]} {
-                                puts stderr "Writing vfs data and opying cookfs file $building_runtime to $buildfolder/$vfsname.new failed\n $result"
+                                puts stderr "Writing vfs data and opying cookfs file $baking_runtime to $bakefolder/$vfsname.new failed\n $result"
                                 lappend failed_kits [list kit $targetkit reason copy_failed]
                                 $vfs_event targetset_end FAILED
                                 $vfs_event destroy
@@ -9088,21 +9128,21 @@ foreach vfstail $vfs_tails {
                     kit {
                         set verbose ""
                         #set verbose "-verbose"
-                        #assert: building_runtime has been replaced with $kit_bare_runtime
+                        #assert: baking_runtime has been replaced with $kit_bare_runtime
 
                         set prev_cwd [pwd]
-                        cd [file dirname $building_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
+                        cd [file dirname $baking_runtime] ;#make sure SDX is called with the same working dir as the files we're working on.
                         if {[catch {
                             if {$rtname ne "-"} {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose
                             } else {
-                                exec {*}$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose
+                                exec {*}$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose
                             }
                         } result]} {
                             if {$rtname ne "-"} {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs -runtime $wrap_runtime {*}$verbose failed with msg: $result"
                             } else {
-                                set sdxmsg "$::sdxpath wrap $buildfolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
+                                set sdxmsg "$::sdxpath wrap $bakefolder/$vfsname.new -vfs $wrapvfs {*}$verbose failed with msg: $result"
                             }
                             puts stderr "$::sdxpath wrap $targetkit failed" 
                             lappend failed_kits [list kit $targetkit reason $sdxmsg]
@@ -9122,9 +9162,9 @@ foreach vfstail $vfs_tails {
                 }
 
 
-                if {![file exists $buildfolder/$vfsname.new]} {
-                    puts stderr "|err> make.tcl build didn't seem to produce output at $buildfolder/$vfsname.new"
-                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $buildfolder/$vfsname.new"]
+                if {![file exists $bakefolder/$vfsname.new]} {
+                    puts stderr "|err> make.tcl build didn't seem to produce output at $bakefolder/$vfsname.new"
+                    lappend failed_kits [list kit $targetkit reason "build failed to produce output at $bakefolder/$vfsname.new"]
                     $vfs_event targetset_end FAILED
                     $vfs_event destroy
                     $vfs_installer destroy
@@ -9244,13 +9284,13 @@ foreach vfstail $vfs_tails {
                     }
                 }
 
-                if {[file exists $kit_builddir/$targetkit]} {
-                    puts stderr "deleting existing $kit_builddir/$targetkit"
+                if {[file exists $kit_bakedir/$targetkit]} {
+                    puts stderr "deleting existing $kit_bakedir/$targetkit"
                     if {[catch {
-                        file delete $kit_builddir/$targetkit
+                        file delete $kit_bakedir/$targetkit
                     } msg]} {
-                        puts stderr "Failed to delete $kit_builddir/$targetkit"
-                        lappend failed_kits [list kit $targetkit reason "could not delete buildfolder kit at $kit_builddir/$targetkit"]
+                        puts stderr "Failed to delete $kit_bakedir/$targetkit"
+                        lappend failed_kits [list kit $targetkit reason "could not delete bakefolder kit at $kit_bakedir/$targetkit"]
                         $vfs_event targetset_end FAILED
                         $vfs_event destroy
                         $vfs_installer destroy
@@ -9260,23 +9300,23 @@ foreach vfstail $vfs_tails {
 
                 #WINDOWS filesystem 'tunnelling' (file replacement within 15secs) could cause targetkit to copy ctime & shortname metadata from previous file!
                 #This is probably harmless - but worth being aware of.
-                file rename $buildfolder/$vfsname.new $kit_builddir/$targetkit
+                file rename $bakefolder/$vfsname.new $kit_bakedir/$targetkit
                 # -- --- --- --- --- ---
                 $vfs_event targetset_end OK
 
                 #G-134 post-assembly offset-style pin: the pipeline emits
                 #ARCHIVE-relative zip payloads by construction - this probe makes
                 #that a checked contract. Advisory per the G-133 posture: a
-                #file-relative image earns a recapped BUILD-WARNING (the G-128
+                #file-relative image earns a recapped BAKE-WARNING (the G-128
                 #stamper would refuse it by default) and the kit still builds and
                 #deploys; plain/none (no attached zip - the metakit kit shape) and
                 #unreadable results are silence. One EOCD scan + CD walk per
                 #REBUILT kit only.
-                lassign [::punkboot::get_kit_offsetstyle_report $kit_builddir/$targetkit] offprobe_available offprobe
+                lassign [::punkboot::get_kit_offsetstyle_report $kit_bakedir/$targetkit] offprobe_available offprobe
                 if {!$offprobe_available} {
                     puts stderr "NOTE: kit offset-style pin unavailable (punkboot::utils kit_offsetstyle_report not loadable from bootsupport) - continuing without it"
                 } elseif {[dict get $offprobe offsetstyle] eq "file"} {
-                    ::punkboot::print_build_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
+                    ::punkboot::print_bake_warnings [list "kit $targetkit assembled with a FILE-relative zip payload (G-134 pin: the pipeline emits archive-relative by construction; the G-128 stamper refuses file-relative by default) - investigate this kit's assembly path"]
                 }
 
                 #G-133 post-build smoke-require probe. Only an actual 'package require'
@@ -9292,12 +9332,12 @@ foreach vfstail $vfs_tails {
                         puts stdout "    smoke-require skipped for kit $targetkit: cross-target ($rt_target) - the artifact is not executable on this $::punkboot::host_platform host"
                     } else {
                         puts stdout "    smoke-require probe for kit $targetkit (packages: $kit_smokerequires) - executing freshly built artifact via its tclsh subcommand"
-                        ::punkboot::kit_smoke_require_probe $kit_builddir/$targetkit $targetkit $kit_smokerequires
+                        ::punkboot::kit_smoke_require_probe $kit_bakedir/$targetkit $targetkit $kit_smokerequires
                     }
                 }
 
             } else {
-                set skipped_vfs_build 1
+                set skipped_vfs_bake 1
                 puts stderr "."
                 puts stdout "Skipping build for vfs $vfstail with runtime $rtname - no change detected"
                 lappend skipped_kits [list kit $targetkit reason "no change detected"]
@@ -9317,14 +9357,14 @@ foreach vfstail $vfs_tails {
 
             # -- ----------
             set bin_installer [punkcheck::installtrack new "make.tcl" $deployment_folder/.punkcheck]
-            $bin_installer set_source_target $buildfolder $deployment_folder
+            $bin_installer set_source_target $bakefolder $deployment_folder
             set bin_event [$bin_installer start_event {-make-step final_kit_install}]
             $bin_event targetset_init INSTALL $deployment_folder/$targetkit
-            #todo - move final deployment step outside of the build vfs loop? (final deployment can fail and then isn't rerun even though _build and deployed versions differ, unless .vfs modified again)
+            #todo - move final deployment step outside of the bake vfs loop? (final deployment can fail and then isn't rerun even though _bake and deployed versions differ, unless .vfs modified again)
             #set last_completion [$bin_event targetset_last_complete]
 
             $bin_event targetset_addsource $deployment_folder/$targetkit ;#add target as a source of metadata for change detection
-            $bin_event targetset_addsource $kit_builddir/$targetkit
+            $bin_event targetset_addsource $kit_bakedir/$targetkit
             $bin_event targetset_started
             # -- ----------
 
@@ -9347,14 +9387,14 @@ foreach vfstail $vfs_tails {
                 }
 
                 puts stdout "copying.."
-                puts stdout "$kit_builddir/$targetkit"
+                puts stdout "$kit_bakedir/$targetkit"
                 puts stdout "to:"
                 puts stdout "$deployment_folder/$targetkit"
                 after 300
-                file copy $kit_builddir/$targetkit $deployment_folder/$targetkit
+                file copy $kit_bakedir/$targetkit $deployment_folder/$targetkit
                 #G-057: the kit resource sidecar ships with the kit
-                if {[file isfile $kit_builddir/$targetkit.resources.toml]} {
-                    file copy -force $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
+                if {[file isfile $kit_bakedir/$targetkit.resources.toml]} {
+                    file copy -force $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml
                 }
                 lappend installed_kits $kit_relpath
                 # -- ----------
@@ -9367,7 +9407,7 @@ foreach vfstail $vfs_tails {
                 #G-057: keep the deployed resource sidecar current even when the kit
                 #itself is unchanged (the record can be newer than the kit rebuild -
                 #e.g the sidecar feature arriving, or a host-capability change)
-                if {[::punkboot::kiticon::copy_ifchanged $kit_builddir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
+                if {[::punkboot::kiticon::copy_ifchanged $kit_bakedir/$targetkit.resources.toml $deployment_folder/$targetkit.resources.toml] eq "copied"} {
                     puts stdout "    kit icon (G-057): refreshed deployed sidecar $deployment_folder/$targetkit.resources.toml"
                 }
                 lappend skipped_kit_installs [list kit $targetkit reason "no change detected"]
@@ -9397,10 +9437,10 @@ set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llen
 if {$had_kits} {
     puts stdout "   module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)"
     puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits"
-    puts stdout " - use 'make.tcl vfscommonupdate' to promote built modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
+    puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder <projectdir>/src/vfs/_vfscommon.vfs (promotion gate)"
     puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables"
-    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest built modules"
-    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of built modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
+    puts stdout "   that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules"
+    puts stdout "   calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'"
 } else {
     puts stdout "   module builds processed"
     puts stdout ""
diff --git a/src/project_layouts/vendor/punk/sample-0.1/gitignore.in b/src/project_layouts/vendor/punk/sample-0.1/gitignore.in
index 79773aaa..c9157eed 100644
--- a/src/project_layouts/vendor/punk/sample-0.1/gitignore.in
+++ b/src/project_layouts/vendor/punk/sample-0.1/gitignore.in
@@ -32,6 +32,10 @@
 /logs/
 **/_aside/
 **/_build/
+#G-155 stage workdirs: src/_bake (kit assembly) + per-srcdir _mint (module staging);
+#**/_build/ stays for src/buildsuites/_build (true compile area) and stale checkouts
+**/_mint/
+**/_bake/
 scratch*
 
 #Built documentation