6 files changed, 23 insertions, 23 deletions
diff --git a/stdlib/source/lux/host/jvm/constant.lux b/stdlib/source/lux/host/jvm/constant.lux
index 0d6bbcbfe..d9fcc2731 100644
--- a/stdlib/source/lux/host/jvm/constant.lux
+++ b/stdlib/source/lux/host/jvm/constant.lux
@@ -68,7 +68,7 @@
         (|>> :representation)
         Equivalence<kind>))
 
-  (do-template [<constructor> <type> <marker>]
+  (template [<constructor> <type> <marker>]
     [(type: #export <type> (Value <marker>))
 
      (def: #export <constructor>
@@ -82,7 +82,7 @@
     [string  String  (Index UTF8)]
     )
 
-  (do-template [<name> <type> <read> <write> <base>]
+  (template [<name> <type> <read> <write> <base>]
     [(def: <name>
        (Format <type>)
        (binary.adapt (|>> <read> :abstraction)
@@ -103,7 +103,7 @@
   {#class (Index Class)
    #name-and-type (Index Name-And-Type)})
 
-(do-template [<type> <equivalence> <format>]
+(template [<type> <equivalence> <format>]
   [(def: #export <equivalence>
      (Equivalence <type>)
      ($_ equivalence.product
@@ -173,7 +173,7 @@
                                        )]
     {#binary.reader (do parser.monad
                       [tag (get@ #binary.reader /tag.format)]
-                      (`` (cond (~~ (do-template [<case> <tag> <format>]
+                      (`` (cond (~~ (template [<case> <tag> <format>]
                                       [(/tag;= <tag> tag)
                                        (:: @ map (|>> <case>) (get@ #binary.reader <format>))]
 
diff --git a/stdlib/source/lux/host/jvm/constant/tag.lux b/stdlib/source/lux/host/jvm/constant/tag.lux
index 3862f5158..0339489f9 100644
--- a/stdlib/source/lux/host/jvm/constant/tag.lux
+++ b/stdlib/source/lux/host/jvm/constant/tag.lux
@@ -20,7 +20,7 @@
       (u1/= (:representation reference)
             (:representation sample))))
 
-  (do-template [<code> <name>]
+  (template [<code> <name>]
     [(def: #export <name>
        Tag
        (:abstraction (encoding.to-u1 <code>)))]
diff --git a/stdlib/source/lux/host/jvm/descriptor.lux b/stdlib/source/lux/host/jvm/descriptor.lux
index 1647e32ea..d350cec65 100644
--- a/stdlib/source/lux/host/jvm/descriptor.lux
+++ b/stdlib/source/lux/host/jvm/descriptor.lux
@@ -28,14 +28,14 @@
   (type: #export (Value kind) (Return (Value' kind)))
   (type: #export Void (Return Void'))
 
-  (do-template [<refined> <raw>]
+  (template [<refined> <raw>]
     [(type: #export <refined> (Value <raw>))]
 
     [Base Base']
     [Object Object']
     [Array Array'])
 
-  (do-template [<sigil> <name> <kind>]
+  (template [<sigil> <name> <kind>]
     [(def: #export <name>
        (Descriptor <kind>)
        (:abstraction <sigil>))]
diff --git a/stdlib/source/lux/host/jvm/encoding.lux b/stdlib/source/lux/host/jvm/encoding.lux
index 08213e268..7d7fb636d 100644
--- a/stdlib/source/lux/host/jvm/encoding.lux
+++ b/stdlib/source/lux/host/jvm/encoding.lux
@@ -11,7 +11,7 @@
    [type
     abstract]])
 
-(do-template [<bytes> <name> <size> <to> <from> <equivalence>]
+(template [<bytes> <name> <size> <to> <from> <equivalence>]
   [(abstract: #export <name>
      {}
 
@@ -40,7 +40,7 @@
   [4 U4 u4-bytes to-u4 from-u4 u4-equivalence]
   )
 
-(do-template [<name> <type> <format> <pre-write> <post-read>]
+(template [<name> <type> <format> <pre-write> <post-read>]
   [(def: #export <name>
      (Format <type>)
      (binary.adapt <post-read> <pre-write> <format>))]
diff --git a/stdlib/source/lux/host/jvm/modifier.lux b/stdlib/source/lux/host/jvm/modifier.lux
index cb535a96b..e25e14b78 100644
--- a/stdlib/source/lux/host/jvm/modifier.lux
+++ b/stdlib/source/lux/host/jvm/modifier.lux
@@ -53,7 +53,7 @@
                        (abstract.:abstraction (//encoding.to-u2 (i64.and (//encoding.from-u2 (abstract.:representation (~ g!parameter)))
                                                                          (//encoding.from-u2 (abstract.:representation (~ g!subject)))))))
 
-                     (.do-template [(~ g!<code>) (~ g!<name>)]
+                     (.template [(~ g!<code>) (~ g!<name>)]
                        [(.def: (~' #export) (~ g!<name>)
                           (~ g!name)
                           (.|> ((~! number.hex) (~ g!<code>)) //encoding.to-u2 abstract.:abstraction))]
diff --git a/stdlib/source/lux/host/jvm/version.lux b/stdlib/source/lux/host/jvm/version.lux
index 8641dd393..dd76a594d 100644
--- a/stdlib/source/lux/host/jvm/version.lux
+++ b/stdlib/source/lux/host/jvm/version.lux
@@ -14,23 +14,23 @@
   (-> Nat Version)
   //encoding.to-u2)
 
-(do-template [<name> <number>]
+(template [<number> <name>]
   [(def: #export <name>
      Major
      (..version <number>))]
 
-  [v1_1 45]
-  [v1_2 46]
-  [v1_3 47]
-  [v1_4 48]
-  [v5_0 49]
-  [v6_0 50]
-  [v7 51]
-  [v8 52]
-  [v9 53]
-  [v10 54]
-  [v11 55]
-  [v12 56]
+  [45 v1_1]
+  [46 v1_2]
+  [47 v1_3]
+  [48 v1_4]
+  [49 v5_0]
+  [50 v6_0]
+  [51 v7]
+  [52 v8]
+  [53 v9]
+  [54 v10]
+  [55 v11]
+  [56 v12]
   )
 
 (def: #export format