all types changed

53 files changed, 89 insertions, 166 deletions

diff --git a/src/luarocks/admin/cmd/add.tl b/src/luarocks/admin/cmd/add.tl
index 666e96b1..03342d48 100644
--- a/src/luarocks/admin/cmd/add.tl
+++ b/src/luarocks/admin/cmd/add.tl
@@ -15,8 +15,7 @@ local index = require("luarocks.admin.index")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function add.add_to_parser(parser: Parser)
    local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
diff --git a/src/luarocks/admin/cmd/make_manifest.tl b/src/luarocks/admin/cmd/make_manifest.tl
index c8e46f89..dcb7c377 100644
--- a/src/luarocks/admin/cmd/make_manifest.tl
+++ b/src/luarocks/admin/cmd/make_manifest.tl
@@ -15,8 +15,7 @@ local dir = require("luarocks.dir")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function make_manifest.add_to_parser(parser: Parser)
    local cmd = parser:command("make_manifest", "Compile a manifest file for a repository.", util.see_also())
diff --git a/src/luarocks/admin/cmd/refresh_cache.tl b/src/luarocks/admin/cmd/refresh_cache.tl
index 09b26373..665aa652 100644
--- a/src/luarocks/admin/cmd/refresh_cache.tl
+++ b/src/luarocks/admin/cmd/refresh_cache.tl
@@ -10,8 +10,7 @@ local cache = require("luarocks.admin.cache")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function refresh_cache.add_to_parser(parser: Parser)
    local cmd = parser:command("refresh_cache", "Refresh local cache of a remote rocks server.", util.see_also())
diff --git a/src/luarocks/admin/cmd/remove.tl b/src/luarocks/admin/cmd/remove.tl
index 78bf652e..93d04d3e 100644
--- a/src/luarocks/admin/cmd/remove.tl
+++ b/src/luarocks/admin/cmd/remove.tl
@@ -15,8 +15,7 @@ local index = require("luarocks.admin.index")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function admin_remove.add_to_parser(parser: Parser)
    local cmd = parser:command("remove", "Remove a rock or rockspec from a rocks server.", util.see_also())
diff --git a/src/luarocks/admin/index.tl b/src/luarocks/admin/index.tl
index e1b01f10..2cd47baf 100644
--- a/src/luarocks/admin/index.tl
+++ b/src/luarocks/admin/index.tl
@@ -12,8 +12,7 @@ local manif = require("luarocks.manif")
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type m = require("luarocks.core.types.manifest")
-local type Entry = m.Manifest.Entry
+local type Entry = require("luarocks.core.types.manifest").Manifest.Entry
 
 local ext_url_target = ' target="_blank"'
 
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl
index 4e314b87..1fb00b16 100644
--- a/src/luarocks/cmd.tl
+++ b/src/luarocks/cmd.tl
@@ -26,13 +26,11 @@ local type Tree = require("luarocks.core.types.tree").Tree
 
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type Module = cmd.Module
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local type Config = cfg
 
diff --git a/src/luarocks/cmd/config.tl b/src/luarocks/cmd/config.tl
index 6fe63471..1015432c 100644
--- a/src/luarocks/cmd/config.tl
+++ b/src/luarocks/cmd/config.tl
@@ -15,8 +15,7 @@ local json = require("luarocks.vendor.dkjson")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
diff --git a/src/luarocks/cmd/doc.tl b/src/luarocks/cmd/doc.tl
index 79d8e019..90ae8c3a 100644
--- a/src/luarocks/cmd/doc.tl
+++ b/src/luarocks/cmd/doc.tl
@@ -16,8 +16,7 @@ local download = require("luarocks.download")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function doc.add_to_parser(parser:  Parser)
    local cmd = parser:command("doc", "Show documentation for an installed rock.\n\n"..
diff --git a/src/luarocks/cmd/download.tl b/src/luarocks/cmd/download.tl
index d088ea71..2f9a8832 100644
--- a/src/luarocks/cmd/download.tl
+++ b/src/luarocks/cmd/download.tl
@@ -10,8 +10,7 @@ local download = require("luarocks.download")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function cmd_download.add_to_parser(parser: Parser)
    local cmd = parser:command("download", "Download a specific rock file from a rocks server.", util.see_also())
diff --git a/src/luarocks/cmd/init.tl b/src/luarocks/cmd/init.tl
index f56e6031..6553fbb1 100644
--- a/src/luarocks/cmd/init.tl
+++ b/src/luarocks/cmd/init.tl
@@ -15,15 +15,12 @@ local write_rockspec = require("luarocks.cmd.write_rockspec")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
-local type tr = require("luarocks.core.types.tree")
-local type Tree = tr.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 function init.add_to_parser(parser: Parser)
    local cmd = parser:command("init", "Initialize a directory for a Lua project using LuaRocks.", util.see_also())
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl
index 506716ef..0df083ce 100644
--- a/src/luarocks/cmd/install.tl
+++ b/src/luarocks/cmd/install.tl
@@ -20,8 +20,7 @@ local cfg = require("luarocks.core.cfg")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 
 local type IOpts = require("luarocks.core.types.installs").IOpts
diff --git a/src/luarocks/cmd/lint.tl b/src/luarocks/cmd/lint.tl
index f3845bfa..9f3db2d4 100644
--- a/src/luarocks/cmd/lint.tl
+++ b/src/luarocks/cmd/lint.tl
@@ -11,8 +11,7 @@ local fetch = require("luarocks.fetch")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function lint.add_to_parser(parser: Parser)
    local cmd = parser:command("lint", "Check syntax of a rockspec.\n\n"..
diff --git a/src/luarocks/cmd/list.tl b/src/luarocks/cmd/list.tl
index 0e3f1fd1..014b1370 100644
--- a/src/luarocks/cmd/list.tl
+++ b/src/luarocks/cmd/list.tl
@@ -22,13 +22,11 @@ local type Outdated = list.Outdated
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 function list.add_to_parser(parser: Parser)
    local cmd = parser:command("list", "List currently installed rocks.", util.see_also())
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl
index a92bc23e..2357c5e5 100644
--- a/src/luarocks/cmd/make.tl
+++ b/src/luarocks/cmd/make.tl
@@ -20,8 +20,7 @@ local fs = require("luarocks.fs")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type BOpts = require("luarocks.core.types.bopts").BOpts
 
diff --git a/src/luarocks/cmd/new_version.tl b/src/luarocks/cmd/new_version.tl
index c3129055..e61649c7 100644
--- a/src/luarocks/cmd/new_version.tl
+++ b/src/luarocks/cmd/new_version.tl
@@ -15,11 +15,9 @@ local type_rockspec = require("luarocks.type.rockspec")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
diff --git a/src/luarocks/cmd/pack.tl b/src/luarocks/cmd/pack.tl
index 0baaab10..1be72a4f 100644
--- a/src/luarocks/cmd/pack.tl
+++ b/src/luarocks/cmd/pack.tl
@@ -11,8 +11,7 @@ local queries = require("luarocks.queries")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function cmd_pack.add_to_parser(parser: Parser)
    local cmd = parser:command("pack", "Create a rock, packing sources or binaries.", util.see_also())
diff --git a/src/luarocks/cmd/path.tl b/src/luarocks/cmd/path.tl
index 082c96bf..8c4c57fb 100644
--- a/src/luarocks/cmd/path.tl
+++ b/src/luarocks/cmd/path.tl
@@ -11,8 +11,7 @@ local fs = require("luarocks.fs")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function path_cmd.add_to_parser(parser: Parser)
    local cmd = parser:command("path", [[
diff --git a/src/luarocks/cmd/purge.tl b/src/luarocks/cmd/purge.tl
index b83f8e52..371ae934 100644
--- a/src/luarocks/cmd/purge.tl
+++ b/src/luarocks/cmd/purge.tl
@@ -17,8 +17,7 @@ local queries = require("luarocks.queries")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type args = require("luarocks.core.types.args")
-local type Args = args.Args
+local type Args = require("luarocks.core.types.args").Args
 
 
 function purge.add_to_parser(parser: Parser)
diff --git a/src/luarocks/cmd/remove.tl b/src/luarocks/cmd/remove.tl
index 4dbef645..0b5db35e 100644
--- a/src/luarocks/cmd/remove.tl
+++ b/src/luarocks/cmd/remove.tl
@@ -16,8 +16,7 @@ local queries = require("luarocks.queries")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function cmd_remove.add_to_parser(parser: Parser)
    -- luacheck: push ignore 431
diff --git a/src/luarocks/cmd/search.tl b/src/luarocks/cmd/search.tl
index 8474cf60..5c5ef133 100644
--- a/src/luarocks/cmd/search.tl
+++ b/src/luarocks/cmd/search.tl
@@ -13,11 +13,9 @@ local results = require("luarocks.results")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
-local type res = require("luarocks.core.types.result")
-local type Result = res.Result
+local type Result = require("luarocks.core.types.result").Result
 
 function cmd_search.add_to_parser(parser: Parser)
    local cmd = parser:command("search", "Query the LuaRocks servers.", util.see_also())
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl
index a5c95b18..67443a1c 100644
--- a/src/luarocks/cmd/show.tl
+++ b/src/luarocks/cmd/show.tl
@@ -25,19 +25,16 @@ local type RenderData = {string: string | {string}}
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
-local type m = require("luarocks.core.types.manifest")
-local type Entry = m.Manifest.Entry
+local type Entry = require("luarocks.core.types.manifest").Manifest.Entry
 
 function show.add_to_parser(parser: Parser)
    local cmd = parser:command("show", [[
diff --git a/src/luarocks/cmd/test.tl b/src/luarocks/cmd/test.tl
index 144cfdac..7d8e2988 100644
--- a/src/luarocks/cmd/test.tl
+++ b/src/luarocks/cmd/test.tl
@@ -10,8 +10,7 @@ local test = require("luarocks.test")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function cmd_test.add_to_parser(parser: Parser)
    local cmd = parser:command("test", [[
diff --git a/src/luarocks/cmd/unpack.tl b/src/luarocks/cmd/unpack.tl
index f6a1526a..f8d1d2f3 100644
--- a/src/luarocks/cmd/unpack.tl
+++ b/src/luarocks/cmd/unpack.tl
@@ -14,8 +14,7 @@ local search = require("luarocks.search")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index db62a9e9..94c956e2 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -23,8 +23,7 @@ local type Response = upload.Response
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function upload.add_to_parser(parser: Parser)
    local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) "..
diff --git a/src/luarocks/cmd/which.tl b/src/luarocks/cmd/which.tl
index 7566e704..84d51c95 100644
--- a/src/luarocks/cmd/which.tl
+++ b/src/luarocks/cmd/which.tl
@@ -11,8 +11,7 @@ local util = require("luarocks.util")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 function which_cmd.add_to_parser(parser: Parser)
    local cmd = parser:command("which", 'Given a module name like "foo.bar", '..
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index 0d95d62a..5d21ec58 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -16,11 +16,9 @@ local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 local type Option = argparse.Option
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local type BuiltinBuild = require("luarocks.core.types.build").BuiltinBuild
 
diff --git a/src/luarocks/config.tl b/src/luarocks/config.tl
index 7e589fce..74d4ec81 100644
--- a/src/luarocks/config.tl
+++ b/src/luarocks/config.tl
@@ -10,8 +10,7 @@ local cfg_skip: {string: boolean} = {
    upload_servers = true,
 }
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 function config.should_skip(k: string, v: any): boolean
    return v is function or cfg_skip[k]
diff --git a/src/luarocks/core/manif.tl b/src/luarocks/core/manif.tl
index 0b0bf9f8..f75bf28e 100644
--- a/src/luarocks/core/manif.tl
+++ b/src/luarocks/core/manif.tl
@@ -12,15 +12,12 @@ local path = require("luarocks.core.path")
 
 --------------------------------------------------------------------------------
 
-local type tr = require("luarocks.core.types.tree")
-local type Tree = tr.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
-local type m = require("luarocks.core.types.manifest")
-local type Manifest = m.Manifest
-local type Tree_manifest = m.Tree_manifest
+local type Manifest = require("luarocks.core.types.manifest").Manifest
+local type Tree_manifest = require("luarocks.core.types.manifest").Tree_manifest
 
 
 
diff --git a/src/luarocks/core/types/manifest.d.tl b/src/luarocks/core/types/manifest.d.tl
index 205a8dc9..e562c7cf 100644
--- a/src/luarocks/core/types/manifest.d.tl
+++ b/src/luarocks/core/types/manifest.d.tl
@@ -1,5 +1,4 @@
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
diff --git a/src/luarocks/core/types/query.tl b/src/luarocks/core/types/query.tl
index b23579af..19e1a2a4 100644
--- a/src/luarocks/core/types/query.tl
+++ b/src/luarocks/core/types/query.tl
@@ -1,5 +1,4 @@
-local type v = require("luarocks.core.types.version")
-local type Constraint = v.Constraint
+local type Constraint = require("luarocks.core.types.version").Constraint
 
 local record query
     record Query
diff --git a/src/luarocks/core/types/result.tl b/src/luarocks/core/types/result.tl
index a23339d4..94bb0d9c 100644
--- a/src/luarocks/core/types/result.tl
+++ b/src/luarocks/core/types/result.tl
@@ -1,5 +1,4 @@
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local record result
     record Result
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index 22216f1d..f482461d 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -1,5 +1,4 @@
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local type Build = require("luarocks.core.types.build").Build
 
diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index d8d6c1b5..a9be2d43 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -4,9 +4,8 @@ end
 
 --------------------------------------------------------------------------------
 
-local type ord = require("luarocks.core.types.ordering")
-local type Ordering = ord.Ordering
-local type SortBy = ord.SortBy
+local type Ordering = require("luarocks.core.types.ordering").Ordering
+local type SortBy = require("luarocks.core.types.ordering").SortBy
 
 local dir_sep = package.config:sub(1, 1)
 
diff --git a/src/luarocks/core/vers.tl b/src/luarocks/core/vers.tl
index 62701f74..0d870886 100644
--- a/src/luarocks/core/vers.tl
+++ b/src/luarocks/core/vers.tl
@@ -2,9 +2,8 @@ local record vers
 end
 
 local util = require("luarocks.core.util")
-local type ver = require("luarocks.core.types.version")
-local type Version = ver.Version
-local type Constraint = ver.Constraint
+local type Version = require("luarocks.core.types.version").Version
+local type Constraint = require("luarocks.core.types.version").Constraint
 --------------------------------------------------------------------------------
 
 local deltas: {string: integer} = {
diff --git a/src/luarocks/deplocks.tl b/src/luarocks/deplocks.tl
index 494db3a9..37c0c700 100644
--- a/src/luarocks/deplocks.tl
+++ b/src/luarocks/deplocks.tl
@@ -5,8 +5,7 @@ local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local persist = require("luarocks.persist")
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local deptable: PersistableTable = {}
 local deptable_mode = "start"
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index c1fefe2c..2ccbbb89 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -17,28 +17,23 @@ local deplocks = require("luarocks.deplocks")
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
-local type bld = require("luarocks.core.types.build")
-local type BuiltinBuild = bld.BuiltinBuild
+local type BuiltinBuild = require("luarocks.core.types.build").BuiltinBuild
 local type Module = BuiltinBuild.Module
-local type Build = bld.Build
+
+local type Build = require("luarocks.core.types.build").Build
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
-local type ver = require("luarocks.core.types.version")
-local type Version = ver.Version
+local type Version = require("luarocks.core.types.version").Version
 
-local type per = require("luarocks.core.types.persist")
-local type PersistableTable = per.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
-local type res = require("luarocks.core.types.result")
-local type Result = res.Result
+local type Result = require("luarocks.core.types.result").Result
 
-local type dr = require("luarocks.core.types.dir")
-local type Dir = dr.Dir
-local type Dirs = dr.Dirs
+local type Dir = require("luarocks.core.types.dir").Dir
+local type Dirs = require("luarocks.core.types.dir").Dirs
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/fetch/git.tl b/src/luarocks/fetch/git.tl
index 35e28272..1e429369 100644
--- a/src/luarocks/fetch/git.tl
+++ b/src/luarocks/fetch/git.tl
@@ -10,8 +10,7 @@ local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
-local type v = require("luarocks.core.types.version")
-local type Version = v.Version
+local type Version = require("luarocks.core.types.version").Version
 
 local cached_git_version: Version
 
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index 5d4fa79e..3d145bab 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -1,5 +1,4 @@
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local record fs
    verbose: function(): FILE | boolean, string, integer
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index ce3ca5c0..23ed081b 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -9,9 +9,8 @@ local record manif
    rock_manifest_cache: {string: RockManifest}
 end
 
-local type rm = require("luarocks.core.types.rockmanifest")
-local type RockManifest = rm.RockManifest
-local type Entry = rm.RockManifest.Entry
+local type RockManifest = require("luarocks.core.types.rockmanifest").RockManifest
+local type Entry = require("luarocks.core.types.rockmanifest").RockManifest.Entry
 
 local core = require("luarocks.core.manif")
 local persist = require("luarocks.persist")
@@ -25,11 +24,9 @@ local queries = require("luarocks.queries")
 local type_manifest = require("luarocks.type.manifest")
 
 local type Tree = require("luarocks.core.types.tree").Tree
-local type m = require("luarocks.core.types.manifest")
-local type Manifest = m.Manifest
-local type Tree_manifest = m.Tree_manifest
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Manifest = require("luarocks.core.types.manifest").Manifest
+local type Tree_manifest = require("luarocks.core.types.manifest").Tree_manifest
+local type Query = require("luarocks.core.types.query").Query
 
 manif.cache_manifest = core.cache_manifest
 manif.load_rocks_tree_manifests = core.load_rocks_tree_manifests
diff --git a/src/luarocks/manif/writer.tl b/src/luarocks/manif/writer.tl
index 24161af5..324fac4b 100644
--- a/src/luarocks/manif/writer.tl
+++ b/src/luarocks/manif/writer.tl
@@ -16,20 +16,16 @@ local persist = require("luarocks.persist")
 local manif = require("luarocks.manif")
 local queries = require("luarocks.queries")
 
-local type m = require("luarocks.core.types.manifest")
-local type Manifest = m.Manifest
+local type Manifest = require("luarocks.core.types.manifest").Manifest
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type res = require("luarocks.core.types.result")
-local type Result = res.Result
+local type Result = require("luarocks.core.types.result").Result
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
-local type rm = require("luarocks.core.types.rockmanifest")
-local type RockManifest = rm.RockManifest
-local type Entry = rm.RockManifest.Entry
+local type RockManifest = require("luarocks.core.types.rockmanifest").RockManifest
+local type Entry = require("luarocks.core.types.rockmanifest").RockManifest.Entry
 
 --- Update storage table to account for items provided by a package.
 -- @param storage table: a table storing items in the following format:
diff --git a/src/luarocks/pack.tl b/src/luarocks/pack.tl
index e4ffd117..8bb284f7 100644
--- a/src/luarocks/pack.tl
+++ b/src/luarocks/pack.tl
@@ -17,11 +17,9 @@ local signing = require("luarocks.signing")
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
-local type rm = require("luarocks.core.types.rockmanifest")
-local type Entry = rm.RockManifest.Entry
+local type Entry = require("luarocks.core.types.rockmanifest").RockManifest.Entry
 
 --- Create a source rock.
 -- Packages a rockspec and its required source files in a rock
diff --git a/src/luarocks/persist.tl b/src/luarocks/persist.tl
index a2666563..62260290 100644
--- a/src/luarocks/persist.tl
+++ b/src/luarocks/persist.tl
@@ -19,11 +19,9 @@ local cfg = require("luarocks.core.cfg")
 
 local type Config = cfg
 
-local type o = require("luarocks.core.types.ordering")
-local type SortBy = o.SortBy
+local type SortBy = require("luarocks.core.types.ordering").SortBy
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local type Writer = persist.Writer
 
diff --git a/src/luarocks/queries.tl b/src/luarocks/queries.tl
index 3bd0802f..c894a6c4 100644
--- a/src/luarocks/queries.tl
+++ b/src/luarocks/queries.tl
@@ -9,9 +9,8 @@ local cfg = require("luarocks.core.cfg")
 local query = require("luarocks.core.types.query")
 local type Query = query.Query
 
-local type ver = require("luarocks.core.types.version")
-local type Version = ver.Version
-local type Constraint = ver.Constraint
+local type Version = require("luarocks.core.types.version").Version
+local type Constraint = require("luarocks.core.types.version").Constraint
 
 local query_mt: metatable<Query> = {}
 
diff --git a/src/luarocks/remove.tl b/src/luarocks/remove.tl
index 81935652..e3368f67 100644
--- a/src/luarocks/remove.tl
+++ b/src/luarocks/remove.tl
@@ -13,8 +13,7 @@ local cfg = require("luarocks.core.cfg")
 local manif = require("luarocks.manif")
 local queries = require("luarocks.queries")
 
-local type r = require("luarocks.core.types.result")
-local type Result = r.Result
+local type Result = require("luarocks.core.types.result").Result
 
 --- Obtain a list of packages that depend on the given set of packages
 -- (where all packages of the set are versions of one program).
diff --git a/src/luarocks/repos.tl b/src/luarocks/repos.tl
index ee4fcf62..d5498591 100644
--- a/src/luarocks/repos.tl
+++ b/src/luarocks/repos.tl
@@ -24,8 +24,7 @@ local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 local vers = require("luarocks.core.vers")
 
-local type rm = require("luarocks.core.types.rockmanifest")
-local type RockManifest = rm.RockManifest
+local type RockManifest = require("luarocks.core.types.rockmanifest").RockManifest
 local type Entry = RockManifest.Entry
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
diff --git a/src/luarocks/results.tl b/src/luarocks/results.tl
index cf7e109c..d135341c 100644
--- a/src/luarocks/results.tl
+++ b/src/luarocks/results.tl
@@ -3,8 +3,7 @@ end
 
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local type result = require("luarocks.core.types.result")
 local type Result = result.Result
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index 1c01e043..8e2ba339 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -14,8 +14,7 @@ local rock = require("luarocks.core.types.rockspec")
 local type Dependencies = rock.Dependencies
 local type Rockspec = rock.Rockspec
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
 local vendored_build_type_set: {string: boolean} = {
    ["builtin"] = true,
diff --git a/src/luarocks/search.tl b/src/luarocks/search.tl
index 97287a0f..33b03750 100644
--- a/src/luarocks/search.tl
+++ b/src/luarocks/search.tl
@@ -9,14 +9,11 @@ local util = require("luarocks.util")
 local queries = require("luarocks.queries")
 local results = require("luarocks.results")
 
-local type r = require("luarocks.core.types.result")
-local type Result = r.Result
+local type Result = require("luarocks.core.types.result").Result
 
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
+local type Query = require("luarocks.core.types.query").Query
 
-local type ver = require("luarocks.core.types.version")
-local type Version = ver.Version
+local type Version = require("luarocks.core.types.version").Version
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
diff --git a/src/luarocks/test.tl b/src/luarocks/test.tl
index d2e36409..6c1761f0 100644
--- a/src/luarocks/test.tl
+++ b/src/luarocks/test.tl
@@ -8,8 +8,7 @@ local util = require("luarocks.util")
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
-local type t = require("luarocks.core.types.testrunner")
-local type TestRunner = t.TestRunner
+local type TestRunner = require("luarocks.core.types.testrunner").TestRunner
 
 local test_types = {
    "busted",
diff --git a/src/luarocks/type/manifest.tl b/src/luarocks/type/manifest.tl
index 2f9a8a5d..11bdc566 100644
--- a/src/luarocks/type/manifest.tl
+++ b/src/luarocks/type/manifest.tl
@@ -1,8 +1,7 @@
 local record type_manifest
 end
 
-local type m = require("luarocks.core.types.manifest")
-local type Manifest = m.Manifest
+local type Manifest = require("luarocks.core.types.manifest").Manifest
 
 local type_check = require("luarocks.type_check")
 
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 52c0c029..5db0c4c4 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -3,8 +3,7 @@ local record type_rockspec
    rockspec_format: string
 end
 
-local type o = require("luarocks.core.types.ordering")
-local type Ordering = o.Ordering
+local type Ordering = require("luarocks.core.types.ordering").Ordering
 
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
diff --git a/src/luarocks/upload/api.tl b/src/luarocks/upload/api.tl
index 86a9e5cb..770f1cbf 100644
--- a/src/luarocks/upload/api.tl
+++ b/src/luarocks/upload/api.tl
@@ -28,8 +28,7 @@ local type Args = require("luarocks.core.types.args").Args
 local type Configuration = api.Configuration
 local type File = multipart.File
 
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
 
 local function upload_config_file(): string
    if not cfg.config_files.user.file then
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index 79378416..3a56c3ff 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -7,9 +7,8 @@
 local core = require("luarocks.core.util")
 local cfg = require("luarocks.core.cfg")
 
-local type o = require("luarocks.core.types.ordering")
-local type Ordering= o.Ordering
-local type SortBy = o.SortBy
+local type Ordering= require("luarocks.core.types.ordering").Ordering
+local type SortBy = require("luarocks.core.types.ordering").SortBy
 
 local record util
    cleanup_path: function(string, string, string, boolean): string