8 files changed, 51 insertions, 51 deletions
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
index 9b8e1e38a..c289d9af0 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
@@ -88,7 +88,7 @@
     [//category.#Custom custom customs]
     )
 
-  (def: .public (remember name registry)
+  (def: .public (id name registry)
     (-> Text Registry (Maybe ID))
     (|> (:representation registry)
         (value@ #resolver)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/dependency.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux
index 9d04addde..2a464b397 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/dependency.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux
@@ -23,10 +23,10 @@
      ["[0]" reference {"+" Constant}]
      [language
       [lux
-       ["[0]" analysis
-        ["[1]/[0]" complex]]
        ["[0]" synthesis {"+" Synthesis Path}]
-       ["[0]" generation {"+" Context Operation}]]]
+       ["[0]" generation {"+" Context Operation}]
+       ["[0]" analysis
+        ["[1]/[0]" complex]]]]
      [meta
       ["[0]" archive {"+" Archive}
        ["[0]" artifact]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux
index 7b8a98a61..e61b8cad2 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux
@@ -1,26 +1,26 @@
 (.using
-  [library
-   [lux {"-" Module}
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" Try}]
-     ["[0]" state]
-     [function
-      ["[0]" memo {"+" Memo}]]]
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" Dictionary}]
-      ["[0]" set {"+" Set}]]]]]
-  [///
-   ["[0]" archive {"+" Output Archive}
-    [key {"+" Key}]
-    ["[0]" descriptor {"+" Module Descriptor}]
-    ["[0]" document {"+" Document}]]])
+ [library
+  [lux {"-" Module}
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" maybe ("[1]#[0]" functor)]
+    ["[0]" try {"+" Try}]
+    ["[0]" state]
+    [function
+     ["[0]" memo {"+" Memo}]]]
+   [data
+    ["[0]" text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" list ("[1]#[0]" functor mix)]
+     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" set {"+" Set}]]]]]
+ [///
+  ["[0]" archive {"+" Output Archive}
+   [key {"+" Key}]
+   ["[0]" descriptor {"+" Module Descriptor}]
+   ["[0]" document {"+" Document}]]])
 
 (type: .public Ancestry
   (Set Module))
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index b5fae7763..94e96ca26 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -41,8 +41,8 @@
     ["[0]" document {"+" Document}]
     ["[0]" artifact {"+" Artifact Dependency}
      ["[0]" category {"+" Category}]]]
-   [cache
-    ["[0]" dependency]]
+   ["[0]" cache "_"
+    ["[1]/[0]" module]]
    ["/[1]" // {"+" Input}
     [language
      ["$" lux
@@ -395,7 +395,7 @@
 
 (def: (full_purge caches load_order)
   (-> (List [Bit [Module [archive.ID [Descriptor (Document .Module)]]]])
-      dependency.Order
+      cache/module.Order
       Purge)
   (list#mix (function (_ [module_name [module_id [descriptor document]]] purge)
               (let [purged? (: (Predicate Module)
@@ -439,7 +439,7 @@
                                (function (_ [module [module_id [descriptor document]]] archive)
                                  (archive.has module [descriptor document (: Output sequence.empty)] archive))
                                archive)
-                    (# try.monad each (dependency.load_order $.key))
+                    (# try.monad each (cache/module.load_order $.key))
                     (# try.monad conjoint)
                     async#in)
      .let [purge (..full_purge pre_loaded_caches load_order)]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager.lux b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
index d434c4603..9f37fff18 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
@@ -13,8 +13,8 @@
    [world
     ["[0]" file]]]]
  [//
-  [cache
-   ["[0]" dependency]]
+  ["[0]" cache "_"
+   ["[1]/[0]" module]]
   ["[0]" archive {"+" Archive}
    ["[0]" descriptor]
    ["[0]" artifact]
@@ -35,7 +35,7 @@
   (List [archive.ID (List artifact.ID)]))
 
 (def: .public order
-  (-> dependency.Order Order)
+  (-> cache/module.Order Order)
   (list#each (function (_ [module [module_id [descriptor document]]])
                (|> descriptor
                    (value@ descriptor.#registry)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
index 0f933172d..594f14dd8 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
@@ -33,10 +33,10 @@
   [//
    ["[0]" archive {"+" Output}
     ["[0]" descriptor {"+" Module}]
-    ["[0]" artifact]
-    ["tree_shaking" dependency]]
-   [cache
-    ["[0]" dependency]]
+    ["[0]" artifact]]
+   ["[0]" cache "_"
+    ["[1]/[0]" module]
+    ["[1]/[0]" artifact]]
    ["[0]" io "_"
     ["[1]" archive]]
    [//
@@ -253,8 +253,8 @@
   (-> Static Packager)
   (function (_ host_dependencies archive program)
     (do [! try.monad]
-      [.let [necessary_dependencies (tree_shaking.necessary_dependencies archive)]
-       order (dependency.load_order $.key archive)
+      [.let [necessary_dependencies (cache/artifact.necessary_dependencies archive)]
+       order (cache/module.load_order $.key archive)
        .let [buffer (java/io/ByteArrayOutputStream::new (.int ..mebi_byte))]
        sink (|> order
                 (list#each (function (_ [module [module_id [descriptor document output]]])
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux
index a375a908a..4cc20607c 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux
@@ -33,10 +33,10 @@
    ["[0]" archive {"+" Output}
     ["[0]" descriptor {"+" Module Descriptor}]
     ["[0]" artifact]
-    ["[0]" document {"+" Document}]
-    ["tree_shaking" dependency]]
-   [cache
-    ["[0]" dependency {"+" Order}]]
+    ["[0]" document {"+" Document}]]
+   ["[0]" cache "_"
+    ["[1]/[0]" module {"+" Order}]
+    ["[1]/[0]" artifact]]
    ["[0]" io "_"
     ["[1]" archive]]
    [//
@@ -116,8 +116,8 @@
 (def: .public (package host_dependencies archive program)
   Packager
   (do [! try.monad]
-    [.let [necessary_dependencies (tree_shaking.necessary_dependencies archive)]
-     order (dependency.load_order $.key archive)
+    [.let [necessary_dependencies (cache/artifact.necessary_dependencies archive)]
+     order (cache/module.load_order $.key archive)
      entries (monad.mix ! (..write_module (module_id_mapping order) necessary_dependencies) {.#End} order)
      .let [included_modules (..included_modules entries)
            imports (|> order
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
index 7d6954d1a..c3f3e4867 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
@@ -24,10 +24,10 @@
   [//
    ["[0]" archive {"+" Output}
     ["[0]" descriptor]
-    ["[0]" artifact]
-    ["tree_shaking" dependency]]
-   [cache
-    ["[0]" dependency]]
+    ["[0]" artifact]]
+   ["[0]" cache "_"
+    ["[1]/[0]" module]
+    ["[1]/[0]" artifact]]
    ["[0]" io "_"
     ["[1]" archive]]
    [//
@@ -68,8 +68,8 @@
         Packager))
   (function (package host_dependencies archive program)
     (do [! try.monad]
-      [.let [necessary_dependencies (tree_shaking.necessary_dependencies archive)]
-       order (dependency.load_order $.key archive)]
+      [.let [necessary_dependencies (cache/artifact.necessary_dependencies archive)]
+       order (cache/module.load_order $.key archive)]
       (|> order
           (list#each (function (_ [module [module_id [descriptor document output]]])
                        [module_id output]))