factor: more renaming.

LC_ALL=C find . -type f -name '*.factor' -exec sed -i '' 's/SINGLETON:/singleton:/g' {} +

apps/99-bottles/99-bottles.factor

@@ -24,4 +24,4 @@ in: 99-bottles
 : 99-bottles ( -- )
     99 1 [a,b] [ verse ] each last-verse ;
 
-MAIN: 99-bottles
+main: 99-bottles

apps/key-logger/key-logger.factor

@@ -17,7 +17,7 @@ CONSTANT: path "resource:key-log.txt"
         [ 8 >be write ] bi@ flush
     ] with-file-appender ;
 
-SYMBOL: key-logger
+symbol: key-logger
 
 : start-key-logger ( -- )
     key-logger get-global [
@@ -32,4 +32,4 @@ SYMBOL: key-logger
     f key-logger set-global
     close-game-input ;
 
-MAIN: start-key-logger
+main: start-key-logger

benchmarks/benchmark/3d-matrix-scalar/3d-matrix-scalar.factor

@@ -20,4 +20,4 @@ in: benchmark.3d-matrix-scalar
     ] times
     result . ;
 
-MAIN: 3d-matrix-scalar-benchmark
+main: 3d-matrix-scalar-benchmark

benchmarks/benchmark/3d-matrix-vector/3d-matrix-vector.factor

@@ -24,4 +24,4 @@ TYPED:: mv-matrix ( pitch: float yaw: float location: float-4 -- matrix: matrix4
     ] times
     result . ;
 
-MAIN: 3d-matrix-vector-benchmark
+main: 3d-matrix-vector-benchmark

benchmarks/benchmark/ant/ant.factor

@@ -54,4 +54,4 @@ C: <point> point
         ] when
     ] until total 148848 assert= ;
 
-MAIN: ant-benchmark
+main: ant-benchmark

benchmarks/benchmark/backtrack/backtrack.factor

@@ -50,4 +50,4 @@ CONSTANT: words { 24-from-1 24-from-2 24-from-3 24-from-4 }
     words [ "memoize" word-prop assoc-size ] map
     { 1588 5137 4995 10000 } assert= ;
 
-MAIN: backtrack-benchmark
+main: backtrack-benchmark

benchmarks/benchmark/base64/base64.factor

@@ -8,4 +8,4 @@ in: benchmark.base64
     20 [ >base64 base64> ] times
     drop ;
 
-MAIN: base64-benchmark
+main: base64-benchmark

benchmarks/benchmark/benchmark-tests.factor

@@ -4,7 +4,7 @@ in: benchmark.tests
 : dummy-benchmark ( -- )
     ;
 
-MAIN: dummy-benchmark
+main: dummy-benchmark
 
 { "benchmark.tests" } [
     { "benchmark.tests" } [ run-timing-benchmark ] run-benchmarks

benchmarks/benchmark/benchmark.factor

@@ -59,4 +59,4 @@ PRIVATE>
 : timing-benchmarks ( -- )
     run-timing-benchmarks [ timings. ] [ benchmark-errors. ] bi* ;
 
-MAIN: timing-benchmarks
+main: timing-benchmarks

benchmarks/benchmark/beust1/beust1.factor

@@ -9,4 +9,4 @@ in: benchmark.beust1
 : beust1-benchmark ( -- )
     2000000 count-numbers 229050 assert= ;
 
-MAIN: beust1-benchmark
+main: beust1-benchmark

benchmarks/benchmark/beust2/beust2.factor

@@ -35,4 +35,4 @@ in: benchmark.beust2
     5000000000 [ i 1 + i! ] count-numbers
     i 7063290 assert= ;
 
-MAIN: beust2-benchmark
+main: beust2-benchmark

benchmarks/benchmark/binary-search/binary-search.factor

@@ -13,4 +13,4 @@ primes-under-million drop
     1 1000000 [a,b] [ primes-under-million sorted-member? ] map
     length 1000000 assert= ;
 
-MAIN: binary-search-benchmark
+main: binary-search-benchmark

benchmarks/benchmark/binary-trees/binary-trees.factor

@@ -56,4 +56,4 @@ CONSTANT: min-depth 4
 : binary-trees-benchmark ( -- )
     16 binary-trees ;
 
-MAIN: binary-trees-benchmark
+main: binary-trees-benchmark

benchmarks/benchmark/bloom-filters/bloom-filters.factor

@@ -14,4 +14,4 @@ in: benchmark.bloom-filters
 : bloom-filters-benchmark ( -- )
     0.01 2000 <bloom-filter> insert-data test-hit test-miss drop ;
 
-MAIN: bloom-filters-benchmark
+main: bloom-filters-benchmark

benchmarks/benchmark/bootstrap1/bootstrap1.factor

@@ -1,4 +1,4 @@
 USING: bootstrap.image ;
 in: benchmark.bootstrap1
 
-MAIN: make-images
+main: make-images

benchmarks/benchmark/busy-loop/busy-loop.factor

@@ -12,4 +12,4 @@ in: benchmark.busy-loop
 : busy-loop-benchmark ( -- )
     1337 [ busy-loop ] [ assert= ] bi ;
 
-MAIN: busy-loop-benchmark
+main: busy-loop-benchmark

benchmarks/benchmark/chameneos-redux/chameneos-redux.factor

@@ -103,4 +103,4 @@ TUPLE: meeting-place count mailbox ;
         { blue red yellow red yellow blue red yellow red blue } chameneos-redux
     ] bi ;
 
-MAIN: chameneos-redux-benchmark
+main: chameneos-redux-benchmark

benchmarks/benchmark/combinatorics/combinatorics.factor

@@ -27,4 +27,4 @@ in: benchmark.combinatorics
 : combinatorics-benchmark ( -- )
     15 bench-combinations 8 bench-permutations ;
 
-MAIN: combinatorics-benchmark
+main: combinatorics-benchmark

benchmarks/benchmark/completion/completion.factor

@@ -12,4 +12,4 @@ in: benchmark.completion
     ] replicate concat [ name-completions ] keep
     [ length ] bi@ assert= ;
 
-MAIN: completion-benchmark
+main: completion-benchmark

benchmarks/benchmark/continuations/continuations.factor

@@ -4,4 +4,4 @@ in: benchmark.continuations
 : continuations-benchmark ( -- )
     1,000,000 [ drop [ continue ] callcc0 ] each-integer ;
 
-MAIN: continuations-benchmark
+main: continuations-benchmark

benchmarks/benchmark/crc32/crc32.factor

@@ -7,4 +7,4 @@ in: benchmark.crc32
         crc32 checksum-file drop
     ] times ;
 
-MAIN: crc32-benchmark
+main: crc32-benchmark

benchmarks/benchmark/csv/csv.factor

@@ -7,4 +7,4 @@ in: benchmark.csv
     1,000 200 iota [ number>string ] map <array>
     [ csv>string string>csv ] keep assert= ;
 
-MAIN: csv-benchmark
+main: csv-benchmark

benchmarks/benchmark/dawes/dawes.factor

@@ -13,4 +13,4 @@ in: benchmark.dawes
 : dawes-benchmark ( -- )
     200 make-int-array '[ _ count-ones ] replicate drop ;
 
-MAIN: dawes-benchmark
+main: dawes-benchmark

benchmarks/benchmark/dispatch1/dispatch1.factor

@@ -74,4 +74,4 @@ M: x30 g ;
     1000000 a-bunch-of-objects
     [ [ g drop ] each ] curry times ;
 
-MAIN: dispatch1-benchmark
+main: dispatch1-benchmark

benchmarks/benchmark/dispatch2/dispatch2.factor

@@ -29,4 +29,4 @@ in: benchmark.dispatch2
     1000000 sequences
     [ [ first don't-flush-me ] each ] curry times ;
 
-MAIN: dispatch2-benchmark
+main: dispatch2-benchmark

benchmarks/benchmark/dispatch3/dispatch3.factor

@@ -47,4 +47,4 @@ M: object g drop "object" ;
 : dispatch3-benchmark ( -- )
     2000000 objects [ [ g drop ] each ] curry times ;
 
-MAIN: dispatch3-benchmark
+main: dispatch3-benchmark

benchmarks/benchmark/dispatch4/dispatch4.factor

@@ -33,4 +33,4 @@ in: benchmark.dispatch4
         ] each-integer
     ] times ;
 
-MAIN: dispatch4-benchmark
+main: dispatch4-benchmark

benchmarks/benchmark/dispatch5/dispatch5.factor

@@ -1,7 +1,7 @@
 USING: classes classes.tuple kernel sequences vocabs math ;
 in: benchmark.dispatch5
 
-MIXIN: g
+mixin: g
 
 TUPLE: x1 ;
 INSTANCE: x1 g
@@ -74,4 +74,4 @@ INSTANCE: x30 g
     1000000 a-bunch-of-objects
     [ f [ g? or ] reduce drop ] curry times ;
 
-MAIN: dispatch5-benchmark
+main: dispatch5-benchmark

benchmarks/benchmark/dispatch6/dispatch6.factor

@@ -33,4 +33,4 @@ in: benchmark.dispatch6
         ] each-integer
     ] times ;
 
-MAIN: dispatch6-benchmark
+main: dispatch6-benchmark

benchmarks/benchmark/dlists/dlists.factor

@@ -9,4 +9,4 @@ in: benchmark.dlists
         [ dup 1 - * 2 / ] bi assert=
     ] each ;
 
-MAIN: dlists-benchmark
+main: dlists-benchmark

benchmarks/benchmark/e-decimals/e-decimals.factor

@@ -14,4 +14,4 @@ in: benchmark.e-decimals
 : e-decimals-benchmark ( -- )
     5 [ 800 calculate-e-decimals drop ] times ;
 
-MAIN: e-decimals-benchmark
+main: e-decimals-benchmark

benchmarks/benchmark/e-ratios/e-ratios.factor

@@ -9,4 +9,4 @@ in: benchmark.e-ratios
 : e-ratios-benchmark ( -- )
     5 [ 300 calculate-e-ratios drop ] times ;
 
-MAIN: e-ratios-benchmark
+main: e-ratios-benchmark

benchmarks/benchmark/empty-loop-0/empty-loop-0.factor

@@ -7,4 +7,4 @@ in: benchmark.empty-loop-0
 : empty-loop-0-benchmark ( -- )
     50000000 empty-loop-0 ;
 
-MAIN: empty-loop-0-benchmark
+main: empty-loop-0-benchmark

benchmarks/benchmark/empty-loop-1/empty-loop-1.factor

@@ -7,4 +7,4 @@ in: benchmark.empty-loop-1
 : empty-loop-1-benchmark ( -- )
     50000000 empty-loop-1 ;
 
-MAIN: empty-loop-1-benchmark
+main: empty-loop-1-benchmark

benchmarks/benchmark/empty-loop-2/empty-loop-2.factor

@@ -7,4 +7,4 @@ in: benchmark.empty-loop-2
 : empty-loop-2-benchmark ( -- )
     50000000 empty-loop-2 ;
 
-MAIN: empty-loop-2-benchmark
+main: empty-loop-2-benchmark

benchmarks/benchmark/euler150/euler150.factor

@@ -4,4 +4,4 @@ USING: kernel project-euler.150 ;
 : euler150-benchmark ( -- )
     euler150 -271248680 assert= ;
 
-MAIN: euler150-benchmark
+main: euler150-benchmark

benchmarks/benchmark/fannkuch/fannkuch.factor

@@ -16,7 +16,7 @@ in: benchmark.fannkuch
     ] count ; inline
 
 : write-permutation ( perm -- )
-    [ CHAR: 0 + write1 ] each nl ; inline
+    [ char: 0 + write1 ] each nl ; inline
 
 : fannkuch-step ( counter max-flips perm -- counter max-flips )
     pick 30 < [ [ 1 + ] [ ] [ dup write-permutation ] tri* ] when
@@ -32,4 +32,4 @@ in: benchmark.fannkuch
 : fannkuch-benchmark ( -- )
     9 fannkuch ;
 
-MAIN: fannkuch-benchmark
+main: fannkuch-benchmark

benchmarks/benchmark/fasta/fasta.factor

@@ -19,30 +19,30 @@ CONSTANT: ALU "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACC
 
 CONSTANT: IUB
     {
-        { CHAR: a 0.27 }
+        { char: a 0.27 }
-        { CHAR: c 0.12 }
+        { char: c 0.12 }
-        { CHAR: g 0.12 }
+        { char: g 0.12 }
-        { CHAR: t 0.27 }
+        { char: t 0.27 }
 
-        { CHAR: B 0.02 }
+        { char: B 0.02 }
-        { CHAR: D 0.02 }
+        { char: D 0.02 }
-        { CHAR: H 0.02 }
+        { char: H 0.02 }
-        { CHAR: K 0.02 }
+        { char: K 0.02 }
-        { CHAR: M 0.02 }
+        { char: M 0.02 }
-        { CHAR: N 0.02 }
+        { char: N 0.02 }
-        { CHAR: R 0.02 }
+        { char: R 0.02 }
-        { CHAR: S 0.02 }
+        { char: S 0.02 }
-        { CHAR: V 0.02 }
+        { char: V 0.02 }
-        { CHAR: W 0.02 }
+        { char: W 0.02 }
-        { CHAR: Y 0.02 }
+        { char: Y 0.02 }
     }
 
 CONSTANT: homo-sapiens
     {
-        { CHAR: a 0.3029549426680 }
+        { char: a 0.3029549426680 }
-        { CHAR: c 0.1979883004921 }
+        { char: c 0.1979883004921 }
-        { CHAR: g 0.1975473066391 }
+        { char: g 0.1975473066391 }
-        { CHAR: t 0.3015094502008 }
+        { char: t 0.3015094502008 }
     }
 
 TYPED: make-cumulative ( freq -- chars: byte-array floats: double-array )
@@ -104,4 +104,4 @@ TYPED:: make-repeat-fasta ( k: fixnum len: fixnum alu: string -- k': fixnum )
 
 : fasta-benchmark ( -- ) 2500000 reverse-complement-in fasta ;
 
-MAIN: fasta-benchmark
+main: fasta-benchmark

benchmarks/benchmark/fib1/fib1.factor

@@ -11,4 +11,4 @@ in: benchmark.fib1
 
 : fib1-benchmark ( -- ) 34 fast-fixnum-fib 9227465 assert= ;
 
-MAIN: fib1-benchmark
+main: fib1-benchmark

benchmarks/benchmark/fib2/fib2.factor

@@ -10,4 +10,4 @@ in: benchmark.fib2
 
 : fib2-benchmark ( -- ) 34 fixnum-fib 9227465 assert= ;
 
-MAIN: fib2-benchmark
+main: fib2-benchmark

benchmarks/benchmark/fib3/fib3.factor

@@ -6,4 +6,4 @@ in: benchmark.fib3
 
 : fib3-benchmark ( -- ) 34 fib 9227465 assert= ;
 
-MAIN: fib3-benchmark
+main: fib3-benchmark

benchmarks/benchmark/fib4/fib4.factor

@@ -19,4 +19,4 @@ C: <box> box
 
 : fib4-benchmark ( -- ) T{ box f 34 } tuple-fib i>> 9227465 assert= ;
 
-MAIN: fib4-benchmark
+main: fib4-benchmark

benchmarks/benchmark/fib5/fib5.factor

@@ -1,7 +1,7 @@
 USING: math kernel debugger namespaces ;
 in: benchmark.fib5
 
-SYMBOL: n
+symbol: n
 : namespace-fib ( m -- n )
     [
         n set
@@ -16,4 +16,4 @@ SYMBOL: n
 
 : fib5-benchmark ( -- ) 30 namespace-fib 1346269 assert= ;
 
-MAIN: fib5-benchmark
+main: fib5-benchmark

benchmarks/benchmark/fib6/fib6.factor

@@ -11,4 +11,4 @@ in: benchmark.fib6
 
 : fib6-benchmark ( -- ) 32 fib drop ;
 
-MAIN: fib6-benchmark
+main: fib6-benchmark

benchmarks/benchmark/fib7/fib7.factor

@@ -3,7 +3,7 @@ in: benchmark.fib7
 
 :: matrix-fib ( m -- n )
     m 0 >= [ m throw ] unless
-    m 2 >base [ CHAR: 1 = ] { } map-as :> bits
+    m 2 >base [ char: 1 = ] { } map-as :> bits
     1 :> a! 0 :> b! 1 :> c!
     bits [
         [
@@ -20,4 +20,4 @@ in: benchmark.fib7
         100,000 matrix-fib log2 69423 assert=
     ] times ;
 
-MAIN: fib7-benchmark
+main: fib7-benchmark

benchmarks/benchmark/fib8/fib8.factor

@@ -19,4 +19,4 @@ MEMO: (faster-fib) ( m -- n )
         100,000 faster-fib log2 69423 assert=
     ] times ;
 
-MAIN: fib8-benchmark
+main: fib8-benchmark

benchmarks/benchmark/find-pi/find-pi.factor

@@ -13,4 +13,4 @@ in: benchmark.find-pi
 : find-pi-benchmark ( -- )
     0.0005 find-pi-to drop 4001 assert= ;
 
-MAIN: find-pi-benchmark
+main: find-pi-benchmark

benchmarks/benchmark/flip/flip.factor

@@ -10,4 +10,4 @@ CONSTANT: my-array { { 1 2 3 } { 4 5 6 } { 7 8 9 } }
     1,000,000 [ my-generic flip drop ] times
     1,000,000 [ my-array flip drop ] times ;
 
-MAIN: flip-benchmark
+main: flip-benchmark

benchmarks/benchmark/gc0/gc0.factor

@@ -7,4 +7,4 @@ in: benchmark.gc0
 
 : gc0-benchmark ( -- ) f 60000000 [ allocate nip ] times drop ;
 
-MAIN: gc0-benchmark
+main: gc0-benchmark

benchmarks/benchmark/gc1/gc1.factor

@@ -5,4 +5,4 @@ in: benchmark.gc1
 
 : gc1-benchmark ( -- ) 600000 iota [ >bignum 1 + ] map drop ;
 
-MAIN: gc1-benchmark
+main: gc1-benchmark

benchmarks/benchmark/gc2/gc2.factor

@@ -4,7 +4,7 @@ USING: arrays byte-arrays kernel namespaces sequences math memory ;
 in: benchmark.gc2
 
 ! Runs slowly if clean cards are not unmarked.
-SYMBOL: oldies
+symbol: oldies
 
 : make-old-objects ( -- )
     1000000 [ 1 f <array> ] replicate oldies set gc
@@ -21,4 +21,4 @@ SYMBOL: oldies
         50000 [ age ] times
     ] with-scope ;
 
-MAIN: gc2-benchmark
+main: gc2-benchmark

benchmarks/benchmark/gc3/gc3.factor

@@ -8,4 +8,4 @@ in: benchmark.gc3
     1000000 <hashtable>
     '[ [ number>string ] keep _ set-at ] each ;
 
-MAIN: gc3-benchmark
+main: gc3-benchmark

benchmarks/benchmark/hash-sets/hash-sets.factor

@@ -27,4 +27,4 @@ CONSTANT: test-sets $[
 : hash-sets-benchmark ( -- )
     test-sets bench-sets ;
 
-MAIN: hash-sets-benchmark
+main: hash-sets-benchmark

benchmarks/benchmark/hashtables/hashtables.factor

@@ -71,4 +71,4 @@ M: collision hashcode* value>> hashcode* 15 bitand ;
     ] times
     drop ;
 
-MAIN: hashtables-benchmark
+main: hashtables-benchmark

benchmarks/benchmark/heaps/heaps.factor

@@ -16,4 +16,4 @@ in: benchmark.heaps
 : heaps-benchmark ( -- )
     100 [ heap-test ] times ;
 
-MAIN: heaps-benchmark
+main: heaps-benchmark

benchmarks/benchmark/interval-sets/interval-sets.factor

@@ -11,4 +11,4 @@ in: benchmark.interval-sets
     2 <groups> <interval-set>
     3,000,000 swap '[ random-32 _ in? drop ] times ;
 
-MAIN: interval-sets-benchmark
+main: interval-sets-benchmark

benchmarks/benchmark/iteration/iteration.factor

@@ -18,4 +18,4 @@ kernel ;
     sbuf-iter
     reverse-iter ;
 
-MAIN: iteration-benchmark
+main: iteration-benchmark

benchmarks/benchmark/javascript/javascript.factor

@@ -7,4 +7,4 @@ in: benchmark.javascript
     "vocab:benchmark/javascript/jquery-1.3.2.min.js"
     utf8 file-contents parse-javascript drop ;
 
-MAIN: javascript-benchmark
+main: javascript-benchmark

benchmarks/benchmark/json/json.factor

@@ -8,4 +8,4 @@ in: benchmark.json
     200 iota [ [ number>string ] keep ] H{ } map>assoc
     1,000 [ >json json> ] times drop ;
 
-MAIN: json-benchmark
+main: json-benchmark

benchmarks/benchmark/knucleotide/knucleotide.factor

@@ -15,7 +15,7 @@ CONSTANT: knucleotide-in "vocab:benchmark/knucleotide/knucleotide-input.txt"
 : read-input ( -- input )
     discard-lines
     ">" read-until drop
-    CHAR: \n swap remove >upper ;
+    char: \n swap remove >upper ;
 
 : handle-table ( inputs n -- )
     clump
@@ -42,4 +42,4 @@ CONSTANT: knucleotide-in "vocab:benchmark/knucleotide/knucleotide-input.txt"
     ascii [ read-input ] with-file-reader
     process-input ;
 
-MAIN: knucleotide-benchmark
+main: knucleotide-benchmark

benchmarks/benchmark/lcs/lcs.factor

@@ -5,4 +5,4 @@ in: benchmark.lcs
     f 50,000 [ drop "sitting" "kitten" levenshtein ] times 3 assert=
     f 50,000 [ drop "faxbcd" "abdef" lcs ] times "abd" assert= ;
 
-MAIN: lcs-benchmark
+main: lcs-benchmark

benchmarks/benchmark/lexer/lexer.factor

@@ -10,4 +10,4 @@ in: benchmark.lexer
         <lexer> [ parse-token ] curry loop
     ] curry times ;
 
-MAIN: lexer-benchmark
+main: lexer-benchmark

benchmarks/benchmark/linked-assocs/linked-assocs.factor

@@ -16,4 +16,4 @@ in: benchmark.linked-assocs
 : linked-assocs-benchmark ( -- )
     100 [ (linked-assocs-benchmark) ] times ;
 
-MAIN: linked-assocs-benchmark
+main: linked-assocs-benchmark

benchmarks/benchmark/make/make.factor

@@ -6,7 +6,7 @@ USING: kernel make math sequences ;
 in: benchmark.make
 
 : make-strings ( n -- seq )
-    [ [ CHAR: a , ] times ] "" make ;
+    [ [ char: a , ] times ] "" make ;
 
 : make-arrays ( n -- seq )
     [ iota % ] { } make ;
@@ -20,4 +20,4 @@ in: benchmark.make
         3drop
     ] each ;
 
-MAIN: make-benchmark
+main: make-benchmark

benchmarks/benchmark/mandel/mandel.factor

@@ -34,4 +34,4 @@ in: benchmark.mandel
 : mandel-benchmark ( -- )
     "mandel.ppm" temp-file binary [ ppm-header render ] with-file-writer ;
 
-MAIN: mandel-benchmark
+main: mandel-benchmark

benchmarks/benchmark/matrix-exponential-scalar/matrix-exponential-scalar.factor

@@ -21,4 +21,4 @@ in: benchmark.matrix-exponential-scalar
     ] times
     result . ;
 
-MAIN: matrix-exponential-scalar-benchmark
+main: matrix-exponential-scalar-benchmark

benchmarks/benchmark/matrix-exponential-simd/matrix-exponential-simd.factor

@@ -15,4 +15,4 @@ TYPED:: e^m4 ( m: matrix4 iterations: fixnum -- e^m: matrix4 )
     ] times
     result . ;
 
-MAIN: matrix-exponential-simd-benchmark
+main: matrix-exponential-simd-benchmark

benchmarks/benchmark/md5/md5.factor

@@ -4,4 +4,4 @@ in: benchmark.md5
 : md5-benchmark ( -- )
     2000000 iota >byte-array md5 checksum-bytes drop ;
 
-MAIN: md5-benchmark
+main: md5-benchmark

benchmarks/benchmark/memoize/memoize.factor

@@ -16,4 +16,4 @@ MEMO: mem4 ( n n n n -- n ) + + + ;
         ] each
     ] times ;
 
-MAIN: memoize-benchmark
+main: memoize-benchmark

benchmarks/benchmark/msgpack/msgpack.factor

@@ -12,4 +12,4 @@ in: benchmark.msgpack
     500,000 "hello" <repetition> pack-sum-lengths 2,500,000 assert=
     500,000 pi <repetition> pack-sum 0x1.7f7ec53a9f04ap20 assert= ;
 
-MAIN: msgpack-benchmark
+main: msgpack-benchmark

benchmarks/benchmark/mt/mt.factor

@@ -8,4 +8,4 @@ in: benchmark.mt
 
 : mt-benchmark ( -- ) 10000000 mt-bench ;
 
-MAIN: mt-benchmark
+main: mt-benchmark

benchmarks/benchmark/namespaces/namespaces.factor

@@ -5,9 +5,9 @@ USING: kernel math namespaces ;
 
 in: benchmark.namespaces
 
-SYMBOL: foo
+symbol: foo
-SYMBOL: bar
+symbol: bar
-SYMBOL: baz
+symbol: baz
 
 : namespaces-benchmark ( -- )
     200 [
@@ -26,4 +26,4 @@ SYMBOL: baz
         ] with-variable
     ] times ;
 
-MAIN: namespaces-benchmark
+main: namespaces-benchmark

benchmarks/benchmark/nbody-simd/nbody-simd.factor

@@ -100,4 +100,4 @@ SPECIALIZED-ARRAY: body
 
 : nbody-simd-benchmark ( -- ) 1000000 nbody ;
 
-MAIN: nbody-simd-benchmark
+main: nbody-simd-benchmark

benchmarks/benchmark/nbody/nbody.factor

@@ -104,4 +104,4 @@ HINTS: nbody fixnum ;
 
 : nbody-benchmark ( -- ) 1000000 nbody ;
 
-MAIN: nbody-benchmark
+main: nbody-benchmark

benchmarks/benchmark/nested-empty-loop-1/nested-empty-loop-1.factor

@@ -26,4 +26,4 @@ HINTS: nested-empty-loop fixnum ;
 
 : nested-empty-loop-1-benchmark ( -- ) 7 nested-empty-loop ;
 
-MAIN: nested-empty-loop-1-benchmark
+main: nested-empty-loop-1-benchmark

benchmarks/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor

@@ -28,4 +28,4 @@ HINTS: nested-empty-loop fixnum ;
 
 : nested-empty-loop-2-benchmark ( -- ) 7 nested-empty-loop ;
 
-MAIN: nested-empty-loop-2-benchmark
+main: nested-empty-loop-2-benchmark

benchmarks/benchmark/nsieve-bits/nsieve-bits.factor

@@ -34,4 +34,4 @@ in: benchmark.nsieve-bits
 
 : nsieve-bits-benchmark ( -- ) 11 nsieve-bits-main ;
 
-MAIN: nsieve-bits-benchmark
+main: nsieve-bits-benchmark

benchmarks/benchmark/nsieve-bytes/nsieve-bytes.factor

@@ -32,4 +32,4 @@ byte-arrays make io ;
 
 : nsieve-bytes-benchmark ( -- ) 9 nsieve-main ;
 
-MAIN: nsieve-bytes-benchmark
+main: nsieve-bytes-benchmark

benchmarks/benchmark/nsieve/nsieve.factor

@@ -33,4 +33,4 @@ in: benchmark.nsieve
 
 : nsieve-benchmark ( -- ) 9 nsieve-main ;
 
-MAIN: nsieve-benchmark
+main: nsieve-benchmark

benchmarks/benchmark/parse-bignum/parse-bignum.factor

@@ -6,4 +6,4 @@ in: benchmark.parse-bignum
         2^ [ number>string string>number ] [ assert= ] bi
     ] each ;
 
-MAIN: parse-bignum-benchmark
+main: parse-bignum-benchmark

benchmarks/benchmark/parse-fixnum/parse-fixnum.factor

@@ -6,4 +6,4 @@ in: benchmark.parse-fixnum
         [ number>string string>number ] [ assert= ] bi
     ] each ;
 
-MAIN: parse-fixnum-benchmark
+main: parse-fixnum-benchmark

benchmarks/benchmark/parse-float/parse-float.factor

@@ -9,4 +9,4 @@ CONSTANT: test-floats $[ 100,000 random-units ]
         [ number>string string>number ] [ 1e-10 ~ t assert= ] bi
     ] each ;
 
-MAIN: parse-float-benchmark
+main: parse-float-benchmark

benchmarks/benchmark/parse-ratio/parse-ratio.factor

@@ -12,4 +12,4 @@ CONSTANT: test-ratios $[
         [ number>string string>number ] [ assert= ] bi
     ] each ;
 
-MAIN: parse-ratio-benchmark
+main: parse-ratio-benchmark

benchmarks/benchmark/partial-sums/partial-sums.factor

@@ -41,4 +41,4 @@ HINTS: partial-sums fixnum ;
 : partial-sums-benchmark ( -- )
     2500000 partial-sums simple-table. ;
 
-MAIN: partial-sums-benchmark
+main: partial-sums-benchmark

benchmarks/benchmark/pidigits/pidigits.factor

@@ -56,4 +56,4 @@ in: benchmark.pidigits
 : pidigits-benchmark ( -- )
     2000 pidigits ;
 
-MAIN: pidigits-benchmark
+main: pidigits-benchmark

benchmarks/benchmark/random/random.factor

@@ -6,4 +6,4 @@ in: benchmark.random
         200 random random-unit random-32 3drop
     ] times ;
 
-MAIN: random-benchmark
+main: random-benchmark

benchmarks/benchmark/randomize/randomize.factor

@@ -6,4 +6,4 @@ CONSTANT: data $[ 10,000,000 iota >array ]
 : randomize-benchmark ( -- )
     data randomize drop ;
 
-MAIN: randomize-benchmark
+main: randomize-benchmark

benchmarks/benchmark/raytracer-simd/raytracer-simd.factor

@@ -111,7 +111,7 @@ CONSTANT: initial-hit T{ hit f double-4{ 0.0 0.0 0.0 0.0 } 1/0. }
 : create-center ( c r d -- c2 )
     [ 3.0 12.0 sqrt / * ] dip n*v v+ ; inline no-compile
 
-DEFER: create
+defer: create
 
 : create-step ( level c r d -- scene )
     over [ create-center ] dip 2.0 / [ 1 - ] 2dip create ;
@@ -170,4 +170,4 @@ CONSTANT: create-offsets
 : raytracer-simd-benchmark ( -- )
     run-raytracer-simd "raytracer.pnm" temp-file binary set-file-contents ;
 
-MAIN: raytracer-simd-benchmark
+main: raytracer-simd-benchmark

benchmarks/benchmark/raytracer/raytracer.factor

@@ -120,7 +120,7 @@ CONSTANT: initial-hit T{ hit f double-array{ 0.0 0.0 0.0 } 1/0. }
 : create-center ( c r d -- c2 )
     [ 3.0 12.0 sqrt / * ] dip n*v v+ ; inline
 
-DEFER: create
+defer: create
 
 : create-step ( level c r d -- scene )
     over [ create-center ] dip 2.0 / [ 1 - ] 2dip create ;
@@ -184,4 +184,4 @@ DEFER: create
 : raytracer-benchmark ( -- )
     run-raytracer "raytracer.pnm" temp-file binary set-file-contents ;
 
-MAIN: raytracer-benchmark
+main: raytracer-benchmark

benchmarks/benchmark/recursive/recursive.factor

@@ -35,4 +35,4 @@ HINTS: recursive fixnum ;
 
 : recursive-benchmark ( -- ) 10 recursive ;
 
-MAIN: recursive-benchmark
+main: recursive-benchmark

benchmarks/benchmark/regex-dna/regex-dna.factor

@@ -41,8 +41,8 @@ in: benchmark.regex-dna
         { R/ Y/ "(c|t)" }
     } [ re-replace ] assoc-each ;
 
-SYMBOL: ilen
+symbol: ilen
-SYMBOL: clen
+symbol: clen
 
 : regex-dna ( file -- )
     ascii file-contents dup length ilen set
@@ -57,4 +57,4 @@ SYMBOL: clen
 : regex-dna-benchmark ( -- )
     knucleotide-in regex-dna ;
 
-MAIN: regex-dna-benchmark
+main: regex-dna-benchmark

benchmarks/benchmark/regexp/regexp.factor

@@ -7,10 +7,10 @@ in: benchmark.regexp
 : regexp-benchmark ( -- )
     200
     20,000 iota [ number>string ] map
-    200 iota [ 1 + CHAR: a <string> ] map
+    200 iota [ 1 + char: a <string> ] map
     '[
         _ R/ \d+/ [ matches? ] curry all? t assert=
         _ R/ [a]+/ [ matches? ] curry all? t assert=
     ] times ;
 
-MAIN: regexp-benchmark
+main: regexp-benchmark

benchmarks/benchmark/reverse-complement/reverse-complement.factor

@@ -40,4 +40,4 @@ HINTS: do-line vector string ;
     reverse-complement-out
     reverse-complement ;
 
-MAIN: reverse-complement-benchmark
+main: reverse-complement-benchmark

benchmarks/benchmark/ring/ring.factor

@@ -2,7 +2,7 @@ USING: threads concurrency.messaging kernel
 tools.time math sequences ;
 in: benchmark.ring
 
-SYMBOL: done
+symbol: done
 
 : tunnel ( process -- process )
     receive 2dup swap send done eq? [ tunnel ] unless ;
@@ -24,4 +24,4 @@ SYMBOL: done
 : ring-benchmark ( -- )
     1000 1000 ring-bench ;
 
-MAIN: ring-benchmark
+main: ring-benchmark

benchmarks/benchmark/sfmt/sfmt.factor

@@ -8,4 +8,4 @@ in: benchmark.sfmt
 
 : sfmt-benchmark ( -- ) 10000000 sfmt-bench ;
 
-MAIN: sfmt-benchmark
+main: sfmt-benchmark

benchmarks/benchmark/sha1/sha1.factor

@@ -4,4 +4,4 @@ in: benchmark.sha1
 : sha1-benchmark ( -- )
     2000000 iota >byte-array sha1 checksum-bytes drop ;
 
-MAIN: sha1-benchmark
+main: sha1-benchmark

benchmarks/benchmark/sieve/sieve.factor

@@ -19,4 +19,4 @@ in: benchmark.sieve
 : sieve-benchmark ( -- )
     100,000,000 sieve 5,761,455 assert= ;
 
-MAIN: sieve-benchmark
+main: sieve-benchmark

benchmarks/benchmark/simd-1/simd-1.factor

@@ -25,4 +25,4 @@ in: benchmark.simd-1
 : simd-1-benchmark ( -- )
     10 [ 500000 simd-benchmark ] times ;
 
-MAIN: simd-1-benchmark
+main: simd-1-benchmark

benchmarks/benchmark/sockets/sockets.factor

@@ -6,10 +6,10 @@ prettyprint concurrency.count-downs concurrency.promises
 namespaces arrays continuations destructors ;
 in: benchmark.sockets
 
-SYMBOL: counter
+symbol: counter
-SYMBOL: server-promise
+symbol: server-promise
-SYMBOL: server
+symbol: server
-SYMBOL: port
+symbol: port
 
 CONSTANT: number-of-requests 1000
 
@@ -19,7 +19,7 @@ CONSTANT: number-of-requests 1000
 : server-loop ( server -- )
     dup accept drop [
         [
-            read1 CHAR: x = [
+            read1 char: x = [
                 server get dispose
             ] [
                 number-of-requests
@@ -35,16 +35,16 @@ CONSTANT: number-of-requests 1000
 : simple-client ( -- )
     [
         server-addr ascii [
-            CHAR: b write1 flush
+            char: b write1 flush
             number-of-requests
-            [ CHAR: a dup write1 flush read1 assert= ] times
+            [ char: a dup write1 flush read1 assert= ] times
         ] with-client
     ] try
     counter get count-down ;
 
 : stop-server ( -- )
     server-addr ascii [
-        CHAR: x write1
+        char: x write1
     ] with-client ;
 
 : clients ( n -- )
@@ -69,4 +69,4 @@ CONSTANT: number-of-requests 1000
     40 clients
     100 clients ;
 
-MAIN: sockets-benchmark
+main: sockets-benchmark

benchmarks/benchmark/sort/sort.factor

@@ -8,4 +8,4 @@ CONSTANT: alist-to-sort $[ 1,000 iota dup zip ]
     10 [ numbers-to-sort natural-sort drop ] times
     5,000 [ alist-to-sort sort-keys drop ] times ;
 
-MAIN: sort-benchmark
+main: sort-benchmark