diff --git a/benchmarks/benchmark/regex-dna/regex-dna-tests.factor b/benchmarks/benchmark/regex-dna/regex-dna-tests.factor
index e0ae048c88..54f2510e0e 100644
--- a/benchmarks/benchmark/regex-dna/regex-dna-tests.factor
+++ b/benchmarks/benchmark/regex-dna/regex-dna-tests.factor
@@ -3,8 +3,8 @@ io.streams.string kernel tools.test splitting ;
 IN: benchmark.regex-dna.tests
 
 { t } [
-    "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt"
+    "vocab:benchmark/regex-dna/regex-dna-test-in.txt"
     [ regex-dna ] with-string-writer
-    "resource:extra/benchmark/regex-dna/regex-dna-test-out.txt"
+    "vocab:benchmark/regex-dna/regex-dna-test-out.txt"
     ascii file-contents =
 ] unit-test
diff --git a/core-locals.factor b/core-locals.factor
deleted file mode 100644
index 0f53ad98d8..0000000000
--- a/core-locals.factor
+++ /dev/null
@@ -1,177 +0,0 @@
-auto-use
-IN: syntax
-USE: delegate.private
-
-COMPILE< FORGET: \ MACRO: COMPILE>
-COMPILE< FORGET: \ MACRO:: COMPILE>
-COMPILE< FORGET: \ MEMO: COMPILE>
-COMPILE< FORGET: \ MEMO:: COMPILE>
-COMPILE< FORGET: \ M:: COMPILE>
-COMPILE< FORGET: \ IDENTITY-MEMO: COMPILE>
-COMPILE< FORGET: \ IDENTITY-MEMO:: COMPILE>
-COMPILE< FORGET: \ TYPED: COMPILE>
-COMPILE< FORGET: \ TYPED:: COMPILE>
-
-COMPILE< FORGET: \ '[ COMPILE>
-COMPILE< FORGET: \ :: COMPILE>
-COMPILE< FORGET: \ :> COMPILE>
-COMPILE< FORGET: _ COMPILE>
-COMPILE< FORGET: @ COMPILE>
-COMPILE< FORGET: \ |[ COMPILE>
-COMPILE< FORGET: \ let[ COMPILE>
-COMPILE< FORGET: \ IH{ COMPILE>
-COMPILE< FORGET: \ PROTOCOL: COMPILE>
-COMPILE< FORGET: \ CONSULT: COMPILE>
-COMPILE< FORGET: \ BROADCAST: COMPILE>
-COMPILE< FORGET: \ SLOT-PROTOCOL: COMPILE>
-COMPILE< FORGET: \ HINTS: COMPILE>
-
-
-
-SYNTAX: :: (::) define-declared ;
-SYNTAX: M:: (M::) define ;
-SYNTAX: MEMO: (:) define-memoized ;
-SYNTAX: MEMO:: (::) define-memoized ;
-SYNTAX: MACRO: (:) define-macro ;
-SYNTAX: MACRO:: (::) define-macro ;
-
-SYNTAX: IDENTITY-MEMO: (:) define-identity-memoized ;
-SYNTAX: IDENTITY-MEMO:: (::) define-identity-memoized ;
-
-SYNTAX: TYPED: (:) define-typed ;
-SYNTAX: TYPED:: (::) define-typed ;
-
-SYNTAX: :>
-    in-lambda? get [ :>-outside-lambda-error ] unless
-    scan-token parse-def suffix! ;
-
-SYNTAX: |[ parse-lambda append! ;
-
-SYNTAX: let[ parse-let append! ;
-
-SYNTAX: MEMO[ parse-quotation dup infer memoize-quot suffix! ;
-
-SYNTAX: '[ parse-quotation fry append! ;
-: _ ( -- * ) "Only valid inside a fry" throw ;
-: @ ( -- * ) "Only valid inside a fry" throw ;
-PREDICATE: fry-specifier < word { _ @ } member-eq? ;
-
-SYNTAX: IH{ \ } [ >identity-hashtable ] parse-literal ;
-
-
-SYNTAX: PROTOCOL:
-    scan-new-word parse-definition define-protocol ;
-    
-SYNTAX: CONSULT:
-    scan-word scan-word parse-definition <consultation>
-    [ save-location ] [ define-consult ] bi ;
-
-SYNTAX: BROADCAST:
-    scan-word scan-word parse-definition <broadcast>
-    [ save-location ] [ define-consult ] bi ;
-
-
-SYNTAX: SLOT-PROTOCOL:
-    scan-new-word ";"
-    [ [ reader-word ] [ writer-word ] bi 2array ]
-    map-tokens concat define-protocol ;
-    
-    
-SYNTAX: HINTS:
-    scan-object dup wrapper? [ wrapped>> ] when
-    [ changed-definition ]
-    [ subwords [ changed-definition ] each ]
-    [ parse-definition { } like set-specializer ] tri ;
-    
-    
-
-
- H{ } clone root-cache set-global
- 
- use: io.directories.search
- "/Users/erg/factor/core/locals" t recursive-directory-files
-[ "/Users/erg/factor/core/" ?head drop ] map
-[ "." swap subseq? ] reject
-[ H{ { char: / char: . } } substitute ] map
-[ vocab-exists? ] filter
-[ reload ] each
-
-
- use: io.directories.search
- use: ui.tools.listener
- "/Users/erg/factor/core/stack-checker" t recursive-directory-files
-[ "/Users/erg/factor/core/" ?head drop ] map
-[ "." swap subseq? ] reject
-[ H{ { char: / char: . } } substitute ] map
-[ vocab-exists? ] filter
-[ reload ] each
-
-
-
-"fry" reload
-"bootstrap.image" reload
-
-
-! load somewhere!
-{
-    { [ os windows? ] [ "alien.libraries.windows" ] }
-    { [ os unix? ] [ "alien.libraries.unix" ] }
-} cond require
-
-
-! bug in locals with current approach...
-"compiler.cfg.parallel-copy" reload
-
-
-MD5 (boot.unix-x86.64.image) = 9fa82ffeeb8eebf763327205a78c4597
-
-
-
- "/Users/erg/factor/core/" t recursive-directory-files
-[ "/Users/erg/factor/core/" ?head drop ] map
-[ "." swap subseq? ] reject
-[ H{ { char: / char: . } } substitute ] map
-[ vocab-exists? ] filter
-
-
-
-string-lines
-[ " " split1 nip ] map
-[ "resource:core/" ?head drop ] map
-[ H{ { char: / char: . } } substitute ] map
-[ "." split but-last but-last  "." join ] map
-
-2dup diff
-
-
-    "compiler"
-    "command-line.debugger"
-    "command-line.startup"
-    "delegate.protocols"
-    "locals.definitions"
-    "memoize.syntax"
-    "typed.debugger"
-    "typed.namespaces"
-    "hashtables.identity.mirrors"
-    "vocabs.loader.test.a"
-    "vocabs.loader.test.b"
-    "vocabs.loader.test.c"
-    "vocabs.loader.test.d"
-    "vocabs.loader.test.e"
-    "vocabs.loader.test.f"
-    "vocabs.loader.test.g"
-    "vocabs.loader.test.h"
-    "vocabs.loader.test.i"
-    "vocabs.loader.test.j"
-    "vocabs.loader.test.k"
-    "vocabs.loader.test.l"
-    "vocabs.loader.test.m"
-    "vocabs.loader.test.n"
-    "vocabs.loader.test.o"
-    "vocabs.loader.test.p"
-    
-
-disable-optimizer
-enable-optimizer
-    
-IN: scratchpad 1 1 - restarts [ nth f ] change-global  "peg.ebnf" reload continue-restart
diff --git a/core/modern/out/out.factor b/core/modern/out/out.factor
index b056ff36c3..4aab623c9d 100644
--- a/core/modern/out/out.factor
+++ b/core/modern/out/out.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays combinators combinators.short-circuit
 combinators.smart continuations fry io io.encodings.utf8
 io.files io.streams.string kernel modern modern.paths
-modern.slices multiline namespaces prettyprint sequences
+modern.slices namespaces prettyprint sequences
 sequences.extras sets splitting splitting.monotonic strings
 unicode ;
 IN: modern.out
@@ -213,18 +213,6 @@ M: compound-sequence-literal write-literal
 : rewrite-paths ( seq quot -- ) '[ _ rewrite-path ] each ; inline
 
 
-/*
-! These work except they use pegs/ebnf, grep for [[ ]]
-	modified:   basis/db/sqlite/errors/errors.factor
-	modified:   basis/formatting/formatting.factor
-	modified:   basis/globs/globs.factor
-	modified:   extra/alien/fortran/fortran.factor
-	modified:   extra/cpu/8080/emulator/emulator.factor
-	modified:   extra/peg/expr/expr.factor
-	modified:   extra/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor
-	modified:   extra/shell/parser/parser.factor
-*/
-
 : paren-word>tick-word ( string -- string' )
     dup [ "(" ?head drop ")" ?tail drop "'" append ] [ ] if ;
 
@@ -246,5 +234,3 @@ M: compound-sequence-literal write-literal
 
 : transform-source ( quot -- )
     all-paths swap rewrite-paths ; inline
-
-! : transform-core ( quot -- ) lexable-core-paths swap rewrite-paths ; inline
diff --git a/demos/project-euler/001/001.factor b/demos/project-euler/001/001.factor
index 3195847ae3..621e1f554b 100644
--- a/demos/project-euler/001/001.factor
+++ b/demos/project-euler/001/001.factor
@@ -66,4 +66,4 @@ PRIVATE>
 ! [ euler001d ] 100 ave-time
 ! 0 ms ave run time - 0.08 SD (100 trials)
 
-solution: euler001
+SOLUTION: euler001
diff --git a/demos/project-euler/002/002.factor b/demos/project-euler/002/002.factor
index d5e7776fd2..04fd2a77e2 100644
--- a/demos/project-euler/002/002.factor
+++ b/demos/project-euler/002/002.factor
@@ -77,4 +77,4 @@ PRIVATE>
 ! [ euler002b ] 100 ave-time
 ! 0 ms ave run time - 0.0 SD (100 trials)
 
-solution: euler002b
+SOLUTION: euler002b
diff --git a/demos/project-euler/003/003.factor b/demos/project-euler/003/003.factor
index 48fc9e1a18..36dc862de6 100644
--- a/demos/project-euler/003/003.factor
+++ b/demos/project-euler/003/003.factor
@@ -22,4 +22,4 @@ IN: project-euler.003
 ! [ euler003 ] 100 ave-time
 ! 1 ms ave run time - 0.49 SD (100 trials)
 
-solution: euler003
+SOLUTION: euler003
diff --git a/demos/project-euler/004/004.factor b/demos/project-euler/004/004.factor
index b5b677257d..e84e4dd942 100644
--- a/demos/project-euler/004/004.factor
+++ b/demos/project-euler/004/004.factor
@@ -34,4 +34,4 @@ PRIVATE>
 ! [ euler004 ] 100 ave-time
 ! 1164 ms ave run time - 39.35 SD (100 trials)
 
-solution: euler004
+SOLUTION: euler004
diff --git a/demos/project-euler/005/005.factor b/demos/project-euler/005/005.factor
index 09324e8003..8512bc97fa 100644
--- a/demos/project-euler/005/005.factor
+++ b/demos/project-euler/005/005.factor
@@ -23,4 +23,4 @@ IN: project-euler.005
 ! [ euler005 ] 100 ave-time
 ! 0 ms ave run time - 0.14 SD (100 trials)
 
-solution: euler005
+SOLUTION: euler005
diff --git a/demos/project-euler/006/006.factor b/demos/project-euler/006/006.factor
index e31c8c104b..7ff68b9339 100644
--- a/demos/project-euler/006/006.factor
+++ b/demos/project-euler/006/006.factor
@@ -40,4 +40,4 @@ PRIVATE>
 ! [ euler006 ] 100 ave-time
 ! 0 ms ave run time - 0.24 SD (100 trials)
 
-solution: euler006
+SOLUTION: euler006
diff --git a/demos/project-euler/007/007.factor b/demos/project-euler/007/007.factor
index 16563f34a7..1827d0fa06 100644
--- a/demos/project-euler/007/007.factor
+++ b/demos/project-euler/007/007.factor
@@ -23,4 +23,4 @@ IN: project-euler.007
 ! [ euler007 ] 100 ave-time
 ! 5 ms ave run time - 1.13 SD (100 trials)
 
-solution: euler007
+SOLUTION: euler007
diff --git a/demos/project-euler/008/008.factor b/demos/project-euler/008/008.factor
index b80cb6f295..93569c5acb 100644
--- a/demos/project-euler/008/008.factor
+++ b/demos/project-euler/008/008.factor
@@ -69,4 +69,4 @@ PRIVATE>
 ! [ euler008 ] 100 ave-time
 ! 2 ms ave run time - 0.79 SD (100 trials)
 
-solution: euler008
+SOLUTION: euler008
diff --git a/demos/project-euler/009/009.factor b/demos/project-euler/009/009.factor
index d37dc45d7f..8517119806 100644
--- a/demos/project-euler/009/009.factor
+++ b/demos/project-euler/009/009.factor
@@ -50,4 +50,4 @@ PRIVATE>
 ! [ euler009 ] 100 ave-time
 ! 1 ms ave run time - 0.73 SD (100 trials)
 
-solution: euler009
+SOLUTION: euler009
diff --git a/demos/project-euler/010/010.factor b/demos/project-euler/010/010.factor
index 6e792cdc21..648699e1db 100644
--- a/demos/project-euler/010/010.factor
+++ b/demos/project-euler/010/010.factor
@@ -22,4 +22,4 @@ IN: project-euler.010
 ! [ euler010 ] 100 ave-time
 ! 15 ms ave run time - 0.41 SD (100 trials)
 
-solution: euler010
+SOLUTION: euler010
diff --git a/demos/project-euler/011/011.factor b/demos/project-euler/011/011.factor
index cf794d1ca9..a2a773211d 100644
--- a/demos/project-euler/011/011.factor
+++ b/demos/project-euler/011/011.factor
@@ -101,4 +101,4 @@ PRIVATE>
 ! [ euler011 ] 100 ave-time
 ! 3 ms ave run time - 0.77 SD (100 trials)
 
-solution: euler011
+SOLUTION: euler011
diff --git a/demos/project-euler/012/012.factor b/demos/project-euler/012/012.factor
index 56d98da9b4..223404b9d6 100644
--- a/demos/project-euler/012/012.factor
+++ b/demos/project-euler/012/012.factor
@@ -39,4 +39,4 @@ IN: project-euler.012
 ! [ euler012 ] 10 ave-time
 ! 6573 ms ave run time - 346.27 SD (10 trials)
 
-solution: euler012
+SOLUTION: euler012
diff --git a/demos/project-euler/013/013.factor b/demos/project-euler/013/013.factor
index 16403ba58c..97689c533f 100644
--- a/demos/project-euler/013/013.factor
+++ b/demos/project-euler/013/013.factor
@@ -230,4 +230,4 @@ PRIVATE>
 ! [ euler013 ] 100 ave-time
 ! 0 ms ave run time - 0.31 SD (100 trials)
 
-solution: euler013
+SOLUTION: euler013
diff --git a/demos/project-euler/014/014.factor b/demos/project-euler/014/014.factor
index f0cad13886..74756602a7 100644
--- a/demos/project-euler/014/014.factor
+++ b/demos/project-euler/014/014.factor
@@ -70,4 +70,4 @@ PRIVATE>
 
 ! TODO: try using memoization
 
-solution: euler014a
+SOLUTION: euler014a
diff --git a/demos/project-euler/015/015.factor b/demos/project-euler/015/015.factor
index 6e031a842d..16b412d7c2 100644
--- a/demos/project-euler/015/015.factor
+++ b/demos/project-euler/015/015.factor
@@ -30,4 +30,4 @@ PRIVATE>
 ! [ euler015 ] 100 ave-time
 ! 0 ms ave run time - 0.2 SD (100 trials)
 
-solution: euler015
+SOLUTION: euler015
diff --git a/demos/project-euler/016/016.factor b/demos/project-euler/016/016.factor
index df9761ceac..b81619b980 100644
--- a/demos/project-euler/016/016.factor
+++ b/demos/project-euler/016/016.factor
@@ -22,4 +22,4 @@ IN: project-euler.016
 ! [ euler016 ] 100 ave-time
 ! 0 ms ave run time - 0.67 SD (100 trials)
 
-solution: euler016
+SOLUTION: euler016
diff --git a/demos/project-euler/017/017.factor b/demos/project-euler/017/017.factor
index 32ab59ab12..827e478da0 100644
--- a/demos/project-euler/017/017.factor
+++ b/demos/project-euler/017/017.factor
@@ -29,4 +29,4 @@ IN: project-euler.017
 ! [ euler017 ] 100 ave-time
 ! 15 ms ave run time - 1.71 SD (100 trials)
 
-solution: euler017
+SOLUTION: euler017
diff --git a/demos/project-euler/018/018.factor b/demos/project-euler/018/018.factor
index f5f1fa418d..fcfd8b1669 100644
--- a/demos/project-euler/018/018.factor
+++ b/demos/project-euler/018/018.factor
@@ -90,4 +90,4 @@ PRIVATE>
 ! [ euler018a ] 100 ave-time
 ! 0 ms ave run time - 0.39 SD (100 trials)
 
-solution: euler018a
+SOLUTION: euler018a
diff --git a/demos/project-euler/019/019.factor b/demos/project-euler/019/019.factor
index 3d5941d1da..3c8e02806b 100644
--- a/demos/project-euler/019/019.factor
+++ b/demos/project-euler/019/019.factor
@@ -63,4 +63,4 @@ PRIVATE>
 ! [ euler019a ] 100 ave-time
 ! 17 ms ave run time - 2.13 SD (100 trials)
 
-solution: euler019
+SOLUTION: euler019
diff --git a/demos/project-euler/020/020.factor b/demos/project-euler/020/020.factor
index 2a6508b64c..85aeebb5ad 100644
--- a/demos/project-euler/020/020.factor
+++ b/demos/project-euler/020/020.factor
@@ -22,4 +22,4 @@ IN: project-euler.020
 ! [ euler020 ] 100 ave-time
 ! 0 ms ave run time - 0.55 (100 trials)
 
-solution: euler020
+SOLUTION: euler020
diff --git a/demos/project-euler/021/021.factor b/demos/project-euler/021/021.factor
index d9f5d5849d..165d463a46 100644
--- a/demos/project-euler/021/021.factor
+++ b/demos/project-euler/021/021.factor
@@ -35,4 +35,4 @@ IN: project-euler.021
 ! [ euler021 ] 100 ave-time
 ! 335 ms ave run time - 18.63 SD (100 trials)
 
-solution: euler021
+SOLUTION: euler021
diff --git a/demos/project-euler/022/022.factor b/demos/project-euler/022/022.factor
index 3f8bb5650a..fae88bc594 100644
--- a/demos/project-euler/022/022.factor
+++ b/demos/project-euler/022/022.factor
@@ -42,4 +42,4 @@ PRIVATE>
 ! [ euler022 ] 100 ave-time
 ! 74 ms ave run time - 5.13 SD (100 trials)
 
-solution: euler022
+SOLUTION: euler022
diff --git a/demos/project-euler/023/023.factor b/demos/project-euler/023/023.factor
index def2a3619d..bb4d98b0bd 100644
--- a/demos/project-euler/023/023.factor
+++ b/demos/project-euler/023/023.factor
@@ -55,4 +55,4 @@ PRIVATE>
 ! [ euler023 ] time
 ! 2.15542 seconds
 
-solution: euler023
+SOLUTION: euler023
diff --git a/demos/project-euler/024/024.factor b/demos/project-euler/024/024.factor
index b499cef7db..d95dc741eb 100644
--- a/demos/project-euler/024/024.factor
+++ b/demos/project-euler/024/024.factor
@@ -29,4 +29,4 @@ IN: project-euler.024
 ! [ euler024 ] 100 ave-time
 ! 0 ms ave run time - 0.27 SD (100 trials)
 
-solution: euler024
+SOLUTION: euler024
diff --git a/demos/project-euler/025/025.factor b/demos/project-euler/025/025.factor
index 69c435b928..adac4ee046 100644
--- a/demos/project-euler/025/025.factor
+++ b/demos/project-euler/025/025.factor
@@ -78,4 +78,4 @@ PRIVATE>
 ! [ euler025a ] 100 ave-time
 ! 0 ms ave run time - 0.17 SD (100 trials)
 
-solution: euler025a
+SOLUTION: euler025a
diff --git a/demos/project-euler/026/026.factor b/demos/project-euler/026/026.factor
index 6ecd5a1f36..ba63a6d031 100644
--- a/demos/project-euler/026/026.factor
+++ b/demos/project-euler/026/026.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler026 ] 100 ave-time
 ! 290 ms ave run time - 19.2 SD (100 trials)
 
-solution: euler026
+SOLUTION: euler026
diff --git a/demos/project-euler/027/027.factor b/demos/project-euler/027/027.factor
index cbed79b3a9..25467b5253 100644
--- a/demos/project-euler/027/027.factor
+++ b/demos/project-euler/027/027.factor
@@ -72,4 +72,4 @@ PRIVATE>
 
 ! TODO: generalize max-consecutive/max-product (from #26) into a new word
 
-solution: euler027
+SOLUTION: euler027
diff --git a/demos/project-euler/028/028.factor b/demos/project-euler/028/028.factor
index 4f24a19f86..f18ee19517 100644
--- a/demos/project-euler/028/028.factor
+++ b/demos/project-euler/028/028.factor
@@ -43,4 +43,4 @@ PRIVATE>
 ! [ euler028 ] 100 ave-time
 ! 0 ms ave run time - 0.39 SD (100 trials)
 
-solution: euler028
+SOLUTION: euler028
diff --git a/demos/project-euler/029/029.factor b/demos/project-euler/029/029.factor
index 6ac603ed26..944d345938 100644
--- a/demos/project-euler/029/029.factor
+++ b/demos/project-euler/029/029.factor
@@ -34,4 +34,4 @@ IN: project-euler.029
 ! [ euler029 ] 100 ave-time
 ! 704 ms ave run time - 28.07 SD (100 trials)
 
-solution: euler029
+SOLUTION: euler029
diff --git a/demos/project-euler/030/030.factor b/demos/project-euler/030/030.factor
index 2f455dc4f1..aec0f90af7 100644
--- a/demos/project-euler/030/030.factor
+++ b/demos/project-euler/030/030.factor
@@ -43,4 +43,4 @@ PRIVATE>
 ! [ euler030 ] 100 ave-time
 ! 1700 ms ave run time - 64.84 SD (100 trials)
 
-solution: euler030
+SOLUTION: euler030
diff --git a/demos/project-euler/031/031.factor b/demos/project-euler/031/031.factor
index cc37ecaed3..527be41655 100644
--- a/demos/project-euler/031/031.factor
+++ b/demos/project-euler/031/031.factor
@@ -60,4 +60,4 @@ PRIVATE>
 
 ! TODO: generalize to eliminate duplication; use a sequence to specify denominations?
 
-solution: euler031
+SOLUTION: euler031
diff --git a/demos/project-euler/032/032.factor b/demos/project-euler/032/032.factor
index afe8f6efb0..e3389e958b 100644
--- a/demos/project-euler/032/032.factor
+++ b/demos/project-euler/032/032.factor
@@ -77,4 +77,4 @@ PRIVATE>
 ! [ euler032a ] 10 ave-time
 ! 2624 ms ave run time - 131.91 SD (10 trials)
 
-solution: euler032a
+SOLUTION: euler032a
diff --git a/demos/project-euler/033/033.factor b/demos/project-euler/033/033.factor
index f88153216d..fc9595c973 100644
--- a/demos/project-euler/033/033.factor
+++ b/demos/project-euler/033/033.factor
@@ -52,4 +52,4 @@ PRIVATE>
 ! [ euler033 ] 100 ave-time
 ! 7 ms ave run time - 1.31 SD (100 trials)
 
-solution: euler033
+SOLUTION: euler033
diff --git a/demos/project-euler/034/034.factor b/demos/project-euler/034/034.factor
index 70f199ade7..f62e24392b 100644
--- a/demos/project-euler/034/034.factor
+++ b/demos/project-euler/034/034.factor
@@ -44,4 +44,4 @@ PRIVATE>
 ! [ euler034 ] 10 ave-time
 ! 5506 ms ave run time - 144.0 SD (10 trials)
 
-solution: euler034
+SOLUTION: euler034
diff --git a/demos/project-euler/035/035.factor b/demos/project-euler/035/035.factor
index 838abd827e..d9527794c5 100644
--- a/demos/project-euler/035/035.factor
+++ b/demos/project-euler/035/035.factor
@@ -58,4 +58,4 @@ PRIVATE>
 ! TODO: try using bit arrays or other methods outlined here:
 !     http://home.comcast.net/~babdulbaki/Circular_Primes.html
 
-solution: euler035
+SOLUTION: euler035
diff --git a/demos/project-euler/036/036.factor b/demos/project-euler/036/036.factor
index a53ad3f60c..6a4ab0fbf3 100644
--- a/demos/project-euler/036/036.factor
+++ b/demos/project-euler/036/036.factor
@@ -36,4 +36,4 @@ PRIVATE>
 ! [ euler036 ] 100 ave-time
 ! 1703 ms ave run time - 96.6 SD (100 trials)
 
-solution: euler036
+SOLUTION: euler036
diff --git a/demos/project-euler/037/037.factor b/demos/project-euler/037/037.factor
index 5bd82cfc37..3a0f9de774 100644
--- a/demos/project-euler/037/037.factor
+++ b/demos/project-euler/037/037.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler037 ] 100 ave-time
 ! 130 ms ave run time - 6.27 SD (100 trials)
 
-solution: euler037
+SOLUTION: euler037
diff --git a/demos/project-euler/038/038.factor b/demos/project-euler/038/038.factor
index d0649b808a..83ba48069a 100644
--- a/demos/project-euler/038/038.factor
+++ b/demos/project-euler/038/038.factor
@@ -53,4 +53,4 @@ PRIVATE>
 ! [ euler038 ] 100 ave-time
 ! 11 ms ave run time - 1.5 SD (100 trials)
 
-solution: euler038
+SOLUTION: euler038
diff --git a/demos/project-euler/039/039.factor b/demos/project-euler/039/039.factor
index e7d090d49f..d82ef2ad87 100644
--- a/demos/project-euler/039/039.factor
+++ b/demos/project-euler/039/039.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler039 ] 100 ave-time
 ! 1 ms ave run time - 0.37 SD (100 trials)
 
-solution: euler039
+SOLUTION: euler039
diff --git a/demos/project-euler/040/040.factor b/demos/project-euler/040/040.factor
index 470e03bcc2..0d038ecb01 100644
--- a/demos/project-euler/040/040.factor
+++ b/demos/project-euler/040/040.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler040 ] 100 ave-time
 ! 444 ms ave run time - 23.64 SD (100 trials)
 
-solution: euler040
+SOLUTION: euler040
diff --git a/demos/project-euler/041/041.factor b/demos/project-euler/041/041.factor
index 0daf467397..5bf7075208 100644
--- a/demos/project-euler/041/041.factor
+++ b/demos/project-euler/041/041.factor
@@ -37,4 +37,4 @@ IN: project-euler.041
 ! [ euler041 ] 100 ave-time
 ! 64 ms ave run time - 4.22 SD (100 trials)
 
-solution: euler041
+SOLUTION: euler041
diff --git a/demos/project-euler/042/042.factor b/demos/project-euler/042/042.factor
index 49d1bcadbc..b289a3fbd8 100644
--- a/demos/project-euler/042/042.factor
+++ b/demos/project-euler/042/042.factor
@@ -71,4 +71,4 @@ PRIVATE>
 ! [ euler042a ] 100 ave-time
 ! 21 ms ave run time - 2.2 SD (100 trials)
 
-solution: euler042a
+SOLUTION: euler042a
diff --git a/demos/project-euler/043/043.factor b/demos/project-euler/043/043.factor
index bc7a1fbce2..f92dc34e6e 100644
--- a/demos/project-euler/043/043.factor
+++ b/demos/project-euler/043/043.factor
@@ -98,4 +98,4 @@ PRIVATE>
 ! [ euler043a ] 100 ave-time
 ! 10 ms ave run time - 1.37 SD (100 trials)
 
-solution: euler043a
+SOLUTION: euler043a
diff --git a/demos/project-euler/044/044.factor b/demos/project-euler/044/044.factor
index 2976b72e46..4c5c139af7 100644
--- a/demos/project-euler/044/044.factor
+++ b/demos/project-euler/044/044.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler044 ] 10 ave-time
 ! 289 ms ave run time - 0.27 SD (10 trials)
 
-solution: euler044
+SOLUTION: euler044
diff --git a/demos/project-euler/045/045.factor b/demos/project-euler/045/045.factor
index f559885bb9..2e39d503b9 100644
--- a/demos/project-euler/045/045.factor
+++ b/demos/project-euler/045/045.factor
@@ -46,4 +46,4 @@ PRIVATE>
 ! [ euler045 ] 100 ave-time
 ! 12 ms ave run time - 1.71 SD (100 trials)
 
-solution: euler045
+SOLUTION: euler045
diff --git a/demos/project-euler/046/046.factor b/demos/project-euler/046/046.factor
index a2e7b0178a..cec60ada1d 100644
--- a/demos/project-euler/046/046.factor
+++ b/demos/project-euler/046/046.factor
@@ -50,4 +50,4 @@ PRIVATE>
 ! [ euler046 ] 100 ave-time
 ! 37 ms ave run time - 3.39 SD (100 trials)
 
-solution: euler046
+SOLUTION: euler046
diff --git a/demos/project-euler/047/047.factor b/demos/project-euler/047/047.factor
index 5a6378e7ff..a4c2cfc718 100644
--- a/demos/project-euler/047/047.factor
+++ b/demos/project-euler/047/047.factor
@@ -93,4 +93,4 @@ PRIVATE>
 ! TODO: I don't like that you have to specify the upper bound, maybe try making
 ! this lazy so it could also short-circuit when it finds the answer?
 
-solution: euler047a
+SOLUTION: euler047a
diff --git a/demos/project-euler/048/048.factor b/demos/project-euler/048/048.factor
index 0be7938006..d0e267f73c 100644
--- a/demos/project-euler/048/048.factor
+++ b/demos/project-euler/048/048.factor
@@ -23,4 +23,4 @@ IN: project-euler.048
 ! [ euler048 ] 100 ave-time
 ! 276 ms run / 1 ms GC ave time - 100 trials
 
-solution: euler048
+SOLUTION: euler048
diff --git a/demos/project-euler/049/049.factor b/demos/project-euler/049/049.factor
index 0c8b52dcdc..0f2ccb6b9b 100644
--- a/demos/project-euler/049/049.factor
+++ b/demos/project-euler/049/049.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler049 ] 100 ave-time
 ! 206 ms ave run time - 10.25 SD (100 trials)
 
-solution: euler049
+SOLUTION: euler049
diff --git a/demos/project-euler/050/050.factor b/demos/project-euler/050/050.factor
index ce0ff3bb8b..13c4eea0f9 100644
--- a/demos/project-euler/050/050.factor
+++ b/demos/project-euler/050/050.factor
@@ -85,4 +85,4 @@ PRIVATE>
 ! [ euler050 ] 100 ave-time
 ! 291 ms run / 20.6 ms GC ave time - 100 trials
 
-solution: euler050
+SOLUTION: euler050
diff --git a/demos/project-euler/051/051.factor b/demos/project-euler/051/051.factor
index ca0c4347d6..32305264de 100644
--- a/demos/project-euler/051/051.factor
+++ b/demos/project-euler/051/051.factor
@@ -81,4 +81,4 @@ PRIVATE>
 : euler051 ( -- answer )
     2 (euler051) ;
 
-solution: euler051
+SOLUTION: euler051
diff --git a/demos/project-euler/052/052.factor b/demos/project-euler/052/052.factor
index d55f5957a5..7847df1d25 100644
--- a/demos/project-euler/052/052.factor
+++ b/demos/project-euler/052/052.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler052 ] 100 ave-time
 ! 92 ms ave run time - 6.29 SD (100 trials)
 
-solution: euler052
+SOLUTION: euler052
diff --git a/demos/project-euler/053/053.factor b/demos/project-euler/053/053.factor
index f29faa0625..2e2d317401 100644
--- a/demos/project-euler/053/053.factor
+++ b/demos/project-euler/053/053.factor
@@ -32,4 +32,4 @@ IN: project-euler.053
 ! [ euler053 ] 100 ave-time
 ! 52 ms ave run time - 4.44 SD (100 trials)
 
-solution: euler053
+SOLUTION: euler053
diff --git a/demos/project-euler/054/054.factor b/demos/project-euler/054/054.factor
index 6c4187663b..516be85b6f 100644
--- a/demos/project-euler/054/054.factor
+++ b/demos/project-euler/054/054.factor
@@ -81,4 +81,4 @@ PRIVATE>
 ! [ euler054 ] 100 ave-time
 ! 34 ms ave run time - 2.65 SD (100 trials)
 
-solution: euler054
+SOLUTION: euler054
diff --git a/demos/project-euler/055/055.factor b/demos/project-euler/055/055.factor
index dc6dc15fc7..838687f027 100644
--- a/demos/project-euler/055/055.factor
+++ b/demos/project-euler/055/055.factor
@@ -66,4 +66,4 @@ PRIVATE>
 ! [ euler055 ] 100 ave-time
 ! 478 ms ave run time - 30.63 SD (100 trials)
 
-solution: euler055
+SOLUTION: euler055
diff --git a/demos/project-euler/056/056.factor b/demos/project-euler/056/056.factor
index 1e82e54390..98e39ebd36 100644
--- a/demos/project-euler/056/056.factor
+++ b/demos/project-euler/056/056.factor
@@ -29,4 +29,4 @@ IN: project-euler.056
 ! [ euler056 ] 100 ave-time
 ! 22 ms ave run time - 2.13 SD (100 trials)
 
-solution: euler056
+SOLUTION: euler056
diff --git a/demos/project-euler/057/057.factor b/demos/project-euler/057/057.factor
index 45e2aa760f..4e35c9da58 100644
--- a/demos/project-euler/057/057.factor
+++ b/demos/project-euler/057/057.factor
@@ -41,4 +41,4 @@ IN: project-euler.057
 ! [ euler057 ] 100 ave-time
 ! 1728 ms ave run time - 80.81 SD (100 trials)
 
-solution: euler057
+SOLUTION: euler057
diff --git a/demos/project-euler/058/058.factor b/demos/project-euler/058/058.factor
index 25f932d165..ef98b2df76 100644
--- a/demos/project-euler/058/058.factor
+++ b/demos/project-euler/058/058.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler058 ] 10 ave-time
 ! 12974 ms ave run time - 284.46 SD (10 trials)
 
-solution: euler058
+SOLUTION: euler058
diff --git a/demos/project-euler/059/059.factor b/demos/project-euler/059/059.factor
index 3d0d98cf2b..58e7c39861 100644
--- a/demos/project-euler/059/059.factor
+++ b/demos/project-euler/059/059.factor
@@ -89,4 +89,4 @@ PRIVATE>
 ! [ euler059 ] 100 ave-time
 ! 8 ms ave run time - 1.4 SD (100 trials)
 
-solution: euler059
+SOLUTION: euler059
diff --git a/demos/project-euler/062/062.factor b/demos/project-euler/062/062.factor
index 248cd5fba2..6c9e2a03bb 100644
--- a/demos/project-euler/062/062.factor
+++ b/demos/project-euler/062/062.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler062 ] 100 ave-time
 ! 78 ms ave run time - 0.9 SD (100 trials)
 
-solution: euler062
+SOLUTION: euler062
diff --git a/demos/project-euler/063/063.factor b/demos/project-euler/063/063.factor
index c3306cc678..59552db882 100644
--- a/demos/project-euler/063/063.factor
+++ b/demos/project-euler/063/063.factor
@@ -34,4 +34,4 @@ IN: project-euler.063
 ! [ euler063 ] 100 ave-time
 ! 0 ms ave run time - 0.0 SD (100 trials)
 
-solution: euler063
+SOLUTION: euler063
diff --git a/demos/project-euler/065/065.factor b/demos/project-euler/065/065.factor
index b8da76f2c4..69112eab9c 100644
--- a/demos/project-euler/065/065.factor
+++ b/demos/project-euler/065/065.factor
@@ -74,4 +74,4 @@ PRIVATE>
 ! [ euler065 ] 100 ave-time
 ! 4 ms ave run time - 0.33 SD (100 trials)
 
-solution: euler065
+SOLUTION: euler065
diff --git a/demos/project-euler/067/067.factor b/demos/project-euler/067/067.factor
index b78b3c40a2..a7eed4812e 100644
--- a/demos/project-euler/067/067.factor
+++ b/demos/project-euler/067/067.factor
@@ -59,4 +59,4 @@ PRIVATE>
 ! [ euler067a ] 100 ave-time
 ! 21 ms ave run time - 2.65 SD (100 trials)
 
-solution: euler067a
+SOLUTION: euler067a
diff --git a/demos/project-euler/069/069.factor b/demos/project-euler/069/069.factor
index 87bb22ab9b..0a94553e29 100644
--- a/demos/project-euler/069/069.factor
+++ b/demos/project-euler/069/069.factor
@@ -81,4 +81,4 @@ PRIVATE>
 ! [ euler069a ] 100 ave-time
 ! 0 ms ave run time - 0.01 SD (100 trials)
 
-solution: euler069a
+SOLUTION: euler069a
diff --git a/demos/project-euler/070/070.factor b/demos/project-euler/070/070.factor
index 66b15ae9a4..d32dea6f81 100644
--- a/demos/project-euler/070/070.factor
+++ b/demos/project-euler/070/070.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler070 ] 100 ave-time
 ! 379 ms ave run time - 1.15 SD (100 trials)
 
-solution: euler070
+SOLUTION: euler070
diff --git a/demos/project-euler/071/071.factor b/demos/project-euler/071/071.factor
index b95fd54fbf..0fd93a8f2d 100644
--- a/demos/project-euler/071/071.factor
+++ b/demos/project-euler/071/071.factor
@@ -39,4 +39,4 @@ IN: project-euler.071
 ! [ euler071 ] 100 ave-time
 ! 155 ms ave run time - 6.95 SD (100 trials)
 
-solution: euler071
+SOLUTION: euler071
diff --git a/demos/project-euler/072/072.factor b/demos/project-euler/072/072.factor
index c61b077997..cdd11bb55c 100644
--- a/demos/project-euler/072/072.factor
+++ b/demos/project-euler/072/072.factor
@@ -35,4 +35,4 @@ IN: project-euler.072
 ! [ euler072 ] 100 ave-time
 ! 5274 ms ave run time - 102.7 SD (100 trials)
 
-solution: euler072
+SOLUTION: euler072
diff --git a/demos/project-euler/073/073.factor b/demos/project-euler/073/073.factor
index d553b4253e..66eeea0d25 100644
--- a/demos/project-euler/073/073.factor
+++ b/demos/project-euler/073/073.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler073 ] 10 ave-time
 ! 20506 ms ave run time - 937.07 SD (10 trials)
 
-solution: euler073
+SOLUTION: euler073
diff --git a/demos/project-euler/074/074.factor b/demos/project-euler/074/074.factor
index 4bd7246c5d..0caab8c4dd 100644
--- a/demos/project-euler/074/074.factor
+++ b/demos/project-euler/074/074.factor
@@ -64,4 +64,4 @@ PRIVATE>
 ! [ euler074 ] 10 ave-time
 ! 25134 ms ave run time - 31.96 SD (10 trials)
 
-solution: euler074
+SOLUTION: euler074
diff --git a/demos/project-euler/075/075.factor b/demos/project-euler/075/075.factor
index 198b6450f5..d336b66715 100644
--- a/demos/project-euler/075/075.factor
+++ b/demos/project-euler/075/075.factor
@@ -75,4 +75,4 @@ PRIVATE>
 ! [ euler075 ] 10 ave-time
 ! 3341 ms ave run timen - 157.77 SD (10 trials)
 
-solution: euler075
+SOLUTION: euler075
diff --git a/demos/project-euler/076/076.factor b/demos/project-euler/076/076.factor
index 3f1b8eebd3..e1d1d2a08e 100644
--- a/demos/project-euler/076/076.factor
+++ b/demos/project-euler/076/076.factor
@@ -56,4 +56,4 @@ PRIVATE>
 ! [ euler076 ] 100 ave-time
 ! 560 ms ave run time - 17.74 SD (100 trials)
 
-solution: euler076
+SOLUTION: euler076
diff --git a/demos/project-euler/079/079.factor b/demos/project-euler/079/079.factor
index 65667cedf1..8362566409 100644
--- a/demos/project-euler/079/079.factor
+++ b/demos/project-euler/079/079.factor
@@ -63,4 +63,4 @@ PRIVATE>
 ! TODO: set words on sequences are relatively slow; topological sort could be
 ! cleaned up and generalized much better, but it works for this problem
 
-solution: euler079
+SOLUTION: euler079
diff --git a/demos/project-euler/081/081.factor b/demos/project-euler/081/081.factor
index 238aba9dea..852bc72d18 100644
--- a/demos/project-euler/081/081.factor
+++ b/demos/project-euler/081/081.factor
@@ -72,4 +72,4 @@ PRIVATE>
 ! [ euler081 ] 100 ave-time
 ! 9 ms ave run time - 0.39 SD (100 trials)
 
-solution: euler081
+SOLUTION: euler081
diff --git a/demos/project-euler/085/085.factor b/demos/project-euler/085/085.factor
index 0062bd2a59..a133a5e04c 100644
--- a/demos/project-euler/085/085.factor
+++ b/demos/project-euler/085/085.factor
@@ -58,4 +58,4 @@ PRIVATE>
 ! [ euler085 ] 100 ave-time
 ! 791 ms ave run time - 17.15 SD (100 trials)
 
-solution: euler085
+SOLUTION: euler085
diff --git a/demos/project-euler/089/089.factor b/demos/project-euler/089/089.factor
index 977fde98f8..34b40a7aa6 100644
--- a/demos/project-euler/089/089.factor
+++ b/demos/project-euler/089/089.factor
@@ -45,4 +45,4 @@ IN: project-euler.089
 ! [ euler089 ] 100 ave-time
 ! 14 ms ave run time - 0.27 SD (100 trials)
 
-solution: euler089
+SOLUTION: euler089
diff --git a/demos/project-euler/092/092.factor b/demos/project-euler/092/092.factor
index a609215150..2aa03d29b2 100644
--- a/demos/project-euler/092/092.factor
+++ b/demos/project-euler/092/092.factor
@@ -50,4 +50,4 @@ PRIVATE>
 
 ! TODO: this solution is not very efficient, much better optimizations exist
 
-solution: euler092
+SOLUTION: euler092
diff --git a/demos/project-euler/097/097.factor b/demos/project-euler/097/097.factor
index 5fe7589065..35c3629035 100644
--- a/demos/project-euler/097/097.factor
+++ b/demos/project-euler/097/097.factor
@@ -28,4 +28,4 @@ IN: project-euler.097
 ! [ euler097 ] 100 ave-time
 ! 0 ms ave run timen - 0.22 SD (100 trials)
 
-solution: euler097
+SOLUTION: euler097
diff --git a/demos/project-euler/099/099.factor b/demos/project-euler/099/099.factor
index 1e62c79900..a715a1c87b 100644
--- a/demos/project-euler/099/099.factor
+++ b/demos/project-euler/099/099.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler099 ] 100 ave-time
 ! 16 ms ave run timen - 1.67 SD (100 trials)
 
-solution: euler099
+SOLUTION: euler099
diff --git a/demos/project-euler/100/100.factor b/demos/project-euler/100/100.factor
index 7ad8d0888e..55a108aa68 100644
--- a/demos/project-euler/100/100.factor
+++ b/demos/project-euler/100/100.factor
@@ -32,4 +32,4 @@ IN: project-euler.100
 ! [ euler100 ] 100 ave-time
 ! 0 ms ave run time - 0.14 SD (100 trials)
 
-solution: euler100
+SOLUTION: euler100
diff --git a/demos/project-euler/102/102.factor b/demos/project-euler/102/102.factor
index d7e04a249f..2aed5edee6 100644
--- a/demos/project-euler/102/102.factor
+++ b/demos/project-euler/102/102.factor
@@ -61,4 +61,4 @@ PRIVATE>
 ! [ euler102 ] 100 ave-time
 ! 12 ms ave run time - 0.92 SD (100 trials)
 
-solution: euler102
+SOLUTION: euler102
diff --git a/demos/project-euler/112/112.factor b/demos/project-euler/112/112.factor
index 1a5155e4b4..c3469c9fab 100644
--- a/demos/project-euler/112/112.factor
+++ b/demos/project-euler/112/112.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler112 ] 100 ave-time
 ! 2749 ms ave run time - 33.76 SD (100 trials)
 
-solution: euler112
+SOLUTION: euler112
diff --git a/demos/project-euler/116/116.factor b/demos/project-euler/116/116.factor
index 4c84e4f1cf..e5d293756d 100644
--- a/demos/project-euler/116/116.factor
+++ b/demos/project-euler/116/116.factor
@@ -57,4 +57,4 @@ PRIVATE>
 ! [ euler116 ] 100 ave-time
 ! 0 ms ave run time - 0.34 SD (100 trials)
 
-solution: euler116
+SOLUTION: euler116
diff --git a/demos/project-euler/117/117.factor b/demos/project-euler/117/117.factor
index 79a34830cb..36fd3bca09 100644
--- a/demos/project-euler/117/117.factor
+++ b/demos/project-euler/117/117.factor
@@ -41,4 +41,4 @@ PRIVATE>
 ! [ euler117 ] 100 ave-time
 ! 0 ms ave run time - 0.29 SD (100 trials)
 
-solution: euler117
+SOLUTION: euler117
diff --git a/demos/project-euler/124/124.factor b/demos/project-euler/124/124.factor
index f4f77c9332..cb09fdee89 100644
--- a/demos/project-euler/124/124.factor
+++ b/demos/project-euler/124/124.factor
@@ -60,4 +60,4 @@ PRIVATE>
 ! array in the way of the sieve of eratosthene would scale
 ! better on bigger values.
 
-solution: euler124
+SOLUTION: euler124
diff --git a/demos/project-euler/134/134.factor b/demos/project-euler/134/134.factor
index 024168a210..37a07fd90e 100644
--- a/demos/project-euler/134/134.factor
+++ b/demos/project-euler/134/134.factor
@@ -45,4 +45,4 @@ PRIVATE>
 ! [ euler134 ] 10 ave-time
 ! 933 ms ave run timen - 19.58 SD (10 trials)
 
-solution: euler134
+SOLUTION: euler134
diff --git a/demos/project-euler/148/148.factor b/demos/project-euler/148/148.factor
index e544634649..1e62d489ba 100644
--- a/demos/project-euler/148/148.factor
+++ b/demos/project-euler/148/148.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler148 ] 100 ave-time
 ! 0 ms ave run time - 0.17 SD (100 trials)
 
-solution: euler148
+SOLUTION: euler148
diff --git a/demos/project-euler/150/150.factor b/demos/project-euler/150/150.factor
index 145cefd502..09ddbb92c3 100644
--- a/demos/project-euler/150/150.factor
+++ b/demos/project-euler/150/150.factor
@@ -70,4 +70,4 @@ PRIVATE>
 ! [ euler150 ] 10 ave-time
 ! 30208 ms ave run time - 593.45 SD (10 trials)
 
-solution: euler150
+SOLUTION: euler150
diff --git a/demos/project-euler/151/151.factor b/demos/project-euler/151/151.factor
index b15603d880..1c5ee22b75 100644
--- a/demos/project-euler/151/151.factor
+++ b/demos/project-euler/151/151.factor
@@ -74,4 +74,4 @@ DEFER: (euler151)
 ! [ euler151 ] 100 ave-time
 ! ? ms run time - 100 trials
 
-solution: euler151
+SOLUTION: euler151
diff --git a/demos/project-euler/164/164.factor b/demos/project-euler/164/164.factor
index c7337dbb6b..0622fd0baf 100644
--- a/demos/project-euler/164/164.factor
+++ b/demos/project-euler/164/164.factor
@@ -35,4 +35,4 @@ PRIVATE>
 ! [ euler164 ] 100 ave-time
 ! 7 ms ave run time - 1.23 SD (100 trials)
 
-solution: euler164
+SOLUTION: euler164
diff --git a/demos/project-euler/169/169.factor b/demos/project-euler/169/169.factor
index 1be8137b00..efd1c8ee60 100644
--- a/demos/project-euler/169/169.factor
+++ b/demos/project-euler/169/169.factor
@@ -39,4 +39,4 @@ MEMO: fn ( n -- x )
 ! [ euler169 ] 100 ave-time
 ! 0 ms ave run time - 0.2 SD (100 trials)
 
-solution: euler169
+SOLUTION: euler169
diff --git a/demos/project-euler/173/173.factor b/demos/project-euler/173/173.factor
index 2edeca0b32..c6f49b924e 100644
--- a/demos/project-euler/173/173.factor
+++ b/demos/project-euler/173/173.factor
@@ -35,4 +35,4 @@ PRIVATE>
 ! [ euler173 ] 100 ave-time
 ! 0 ms ave run time - 0.35 SD (100 trials)
 
-solution: euler173
+SOLUTION: euler173
diff --git a/demos/project-euler/175/175.factor b/demos/project-euler/175/175.factor
index 602d32117a..e8b4780443 100644
--- a/demos/project-euler/175/175.factor
+++ b/demos/project-euler/175/175.factor
@@ -55,4 +55,4 @@ PRIVATE>
 ! [ euler175 ] 100 ave-time
 ! 0 ms ave run time - 0.31 SD (100 trials)
 
-solution: euler175
+SOLUTION: euler175
diff --git a/demos/project-euler/186/186.factor b/demos/project-euler/186/186.factor
index fb8cf9fbdb..922a28cb22 100644
--- a/demos/project-euler/186/186.factor
+++ b/demos/project-euler/186/186.factor
@@ -73,4 +73,4 @@ IN: project-euler.186
 ! [ euler186 ] 10 ave-time
 ! 18572 ms ave run time - 796.87 SD (10 trials)
 
-solution: euler186
+SOLUTION: euler186
diff --git a/demos/project-euler/188/188.factor b/demos/project-euler/188/188.factor
index 09956a1fe0..77554b4a2e 100644
--- a/demos/project-euler/188/188.factor
+++ b/demos/project-euler/188/188.factor
@@ -40,4 +40,4 @@ PRIVATE>
 ! [ euler188 ] 100 ave-time
 ! 4 ms ave run time - 0.05 SD (100 trials)
 
-solution: euler188
+SOLUTION: euler188
diff --git a/demos/project-euler/190/190.factor b/demos/project-euler/190/190.factor
index 1368082e52..274e263d81 100644
--- a/demos/project-euler/190/190.factor
+++ b/demos/project-euler/190/190.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler150 ] 100 ave-time
 ! 5 ms ave run time - 1.01 SD (100 trials)
 
-solution: euler190
+SOLUTION: euler190
diff --git a/demos/project-euler/203/203.factor b/demos/project-euler/203/203.factor
index 12ed38ebc9..6ed4e33f69 100644
--- a/demos/project-euler/203/203.factor
+++ b/demos/project-euler/203/203.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler203 ] 100 ave-time
 ! 12 ms ave run time - 1.6 SD (100 trials)
 
-solution: euler203
+SOLUTION: euler203
diff --git a/demos/project-euler/206/206.factor b/demos/project-euler/206/206.factor
index 8c9cdceb5e..1c4df2807e 100644
--- a/demos/project-euler/206/206.factor
+++ b/demos/project-euler/206/206.factor
@@ -44,4 +44,4 @@ PRIVATE>
 ! [ euler206 ] 100 ave-time
 ! 321 ms ave run time - 8.33 SD (100 trials)
 
-solution: euler206
+SOLUTION: euler206
diff --git a/demos/project-euler/215/215.factor b/demos/project-euler/215/215.factor
index 11b4ffeb89..dc55f6b9d9 100644
--- a/demos/project-euler/215/215.factor
+++ b/demos/project-euler/215/215.factor
@@ -89,4 +89,4 @@ PRIVATE>
 ! [ euler215 ] 100 ave-time
 ! 208 ms ave run time - 9.06 SD (100 trials)
 
-solution: euler215
+SOLUTION: euler215
diff --git a/demos/project-euler/255/255.factor b/demos/project-euler/255/255.factor
index 70314e9866..6a66000748 100644
--- a/demos/project-euler/255/255.factor
+++ b/demos/project-euler/255/255.factor
@@ -104,4 +104,4 @@ PRIVATE>
 ! [ euler255 ] gc time
 ! Running time: 37.468911341 seconds
 
-solution: euler255
+SOLUTION: euler255
diff --git a/demos/project-euler/265/265.factor b/demos/project-euler/265/265.factor
index 7ef407bbee..67e468119d 100644
--- a/demos/project-euler/265/265.factor
+++ b/demos/project-euler/265/265.factor
@@ -61,4 +61,4 @@ CONSTANT: N 5 ;
 ! [ euler265 ] time
 ! Running time: 0.376389019 seconds
 
-solution: euler265
+SOLUTION: euler265
diff --git a/demos/project-euler/common/common.factor b/demos/project-euler/common/common.factor
index 47fab9f56a..ad636b3b3d 100644
--- a/demos/project-euler/common/common.factor
+++ b/demos/project-euler/common/common.factor
@@ -158,7 +158,7 @@ PRIVATE>
 : d-transform ( triple -- new-triple )
     { { -1 -2 -2 } { 2 1 2 } { 2 2 3 } } transform ;
 
-SYNTAX: \ solution:
+SYNTAX: \ SOLUTION:
     scan-word
     [ name>> "-main" append create-word-in ] keep
     [ drop current-vocab main<< ]
diff --git a/modern-transition.factor b/modern-transition.factor
deleted file mode 100644
index 2a9a0b6617..0000000000
--- a/modern-transition.factor
+++ /dev/null
@@ -1,94 +0,0 @@
-! add each syntax word to core/bootstrap/syntax.factor
-! scp boot.unix-x86.64.image.locals-and-roots slava_pestov@downloads.factorcode.org:downloads.factorcode.org/images/boot.unix-x86.64.image.locals-and-roots
-! find . -type f -name '*.factor' -exec sed -i '' 's/\(^CALLBACK:.* (.*)\)/\1 ;/g' {} +
-! lexable-core-paths [ dup . flush path>literals ] map-zip
-
-"resource:language" vocabs-from
-{ } diff
-[ dup <vocab-link> . flush vocab>literals ] map-zip
-
-"resource:collections" vocabs-from
-{ "specialized-arrays" "specialized-vectors"
-} diff
-[ dup <vocab-link> . flush vocab>literals ] map-zip
-
-"resource:ffi" vocabs-from
-{ } diff
-[ dup <vocab-link> . flush vocab>literals ] map-zip
-
-"resource:libs" vocabs-from
-{ "metar" 
- "math.blas.matrices" "math.blas.vectors"
-"math.vectors.simd" "math.vectors.simd.cords"
- "yaml.conversion"
-} diff
-[ dup <vocab-link> . flush vocab>literals ] map-zip
-
-"resource:frameworks" vocabs-from
-{  } diff
-[ dup <vocab-link>  . flush vocab>literals ] map-zip
-
-"resource:tools" vocabs-from
-{  } diff
-[ dup <vocab-link> . flush vocab>literals ] map-zip
-
-"resource:demos" vocabs-from
-{  "bunny.outlined" "smalltalk.library" "talks.tc-lisp-talk" } diff
-[ dup <vocab-link>  . flush vocab>literals ] map-zip
-
-IN: syntax
-
-USING: classes.tuple.parser classes.builtin ;
-
-SYNTAX: in: scan-token set-current-vocab ;
-SYNTAX: use: scan-token use-vocab ;
-SYNTAX: UNUSE: scan-token unuse-vocab ;
-SYNTAX: postpone\ scan-word suffix! ;
-SYNTAX: postpone\ scan-word suffix! ;
-
-SYNTAX: @inline last-word make-inline ;
-SYNTAX: @recursive last-word make-recursive ;
-SYNTAX: @foldable last-word make-foldable ;
-SYNTAX: @flushable last-word make-flushable ;
-SYNTAX: @delimiter last-word t "delimiter" set-word-prop ;
-SYNTAX: @deprecated last-word make-deprecated ;
-SYNTAX: @final last-word make-final ;
-
-SYNTAX: symbol: scan-new-word define-symbol ;
-SYNTAX: singleton: scan-new-class define-singleton-class ;
-SYNTAX: MIXIN: scan-new-class define-mixin-class ;
-
-SYNTAX: FORGET: scan-object forget ;
-
-SYNTAX: MAIN:
-    scan-word dup ( -- ) check-stack-effect
-    [ current-vocab main<< ]
-    [ current-source-file get [ main<< ] [ drop ] if* ] bi ;
-
-SYNTAX: nan: 16 scan-base <fp-nan> suffix! ;
-
-SYNTAX: char:
-    lexer get parse-raw [ "token" throw-unexpected-eof ] unless* 
-    {
-        { [ dup length 1 = ] [ first ] }
-        { [ "\\" ?head ] [ next-escape >string "" assert= ] }
-        [ name>char-hook get ( name -- char ) call-effect ]
-    } cond suffix! ;
-
-SYNTAX: DEFER:
-    scan-token current-vocab create-word
-    [ fake-definition ] [ set-last-word ]
-    [ undefined-def define ] tri ;
-
-SYNTAX: PRIMITIVE:
-    current-vocab name>> scan-word scan-effect ";" expect ensure-primitive ;
-
-
-SYNTAX: CONSTANT: scan-new-word scan-object ";" expect define-constant ;
-
-SYNTAX: QUALIFIED: scan-token dup add-qualified ;
-
-SYNTAX: QUALIFIED-WITH: scan-token scan-token ";" expect add-qualified ;
-
-SYNTAX: POSTPONE\ scan-word suffix! ;
-SYNTAX: postpone\ scan-word suffix! ;
diff --git a/tools/tools/test/fuzz/fuzz.factor b/tools/tools/test/fuzz/fuzz.factor
index d3f128cfda..cb27c310f3 100644
--- a/tools/tools/test/fuzz/fuzz.factor
+++ b/tools/tools/test/fuzz/fuzz.factor
@@ -38,4 +38,4 @@ M: fuzz-test-failure summary
 
 PRIVATE>
 
-test: fuzz-test
+TEST: fuzz-test
diff --git a/tools/tools/test/test.factor b/tools/tools/test/test.factor
index fa056435b5..23a2c1283d 100644
--- a/tools/tools/test/test.factor
+++ b/tools/tools/test/test.factor
@@ -108,7 +108,7 @@ MACRO: <experiment> ( word -- quot )
 
 COMPILE<
 
-SYNTAX: \ test:
+SYNTAX: \ TEST:
     scan-token
     [ create-word-in ]
     [ "(" ")" surround search '[ _ parse-test ] ] bi
@@ -163,11 +163,11 @@ PRIVATE>
 : with-test-directory ( ..a quot: ( ..a -- ..b ) -- ..b )
     [ cleanup-unique-directory ] with-temp-directory ; inline
 
-test: unit-test
-test: must-infer-as
-test: must-infer
-test: must-fail-with
-test: must-fail
+TEST: unit-test
+TEST: must-infer-as
+TEST: must-infer
+TEST: must-fail-with
+TEST: must-fail
 
 M: test-failure error. ( error -- )
     {