diff --git a/tools/bundler.js b/tools/bundler.js
index 233ca93570..6b34e558e7 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1997,9 +1997,9 @@ exports.readJsImage = function (controlFilePath) {
 // Given an array of unipackage names, invokes the callback with each
 // corresponding Unipackage object, plus all of their transitive dependencies,
 // with a topological sort.
-exports.iterateOverAllUsedUnipackages = function (packageLoader, arch,
+exports.iterateOverAllUsedUnipackages = function (loader, arch,
                                                   packageNames, callback) {
-  var target = new Target({packageLoader: packageLoader,
+  var target = new Target({packageLoader: loader,
                            arch: arch});
   target._determineLoadOrder({packages: packageNames});
   _.each(target.unibuilds, function (unibuild) {
diff --git a/tools/commands-packages.js b/tools/commands-packages.js
index 549904cab7..55202fa915 100644
--- a/tools/commands-packages.js
+++ b/tools/commands-packages.js
@@ -19,7 +19,6 @@ var httpHelpers = require('./http-helpers.js');
 var archinfo = require('./archinfo.js');
 var tropohouse = require('./tropohouse.js');
 var packageCache = require('./package-cache.js');
-var PackageLoader = require('./package-loader.js').PackageLoader;
 var PackageSource = require('./package-source.js');
 var compiler = require('./compiler.js');
 var catalog = require('./catalog.js');
diff --git a/tools/commands.js b/tools/commands.js
index 5844062913..2063e0275d 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -19,7 +19,7 @@ var httpHelpers = require('./http-helpers.js');
 var archinfo = require('./archinfo.js');
 var tropohouse = require('./tropohouse.js');
 var packageCache = require('./package-cache.js');
-var PackageLoader = require('./package-loader.js').PackageLoader;
+var packageLoader = require('./package-loader.js');
 var PackageSource = require('./package-source.js');
 var compiler = require('./compiler.js');
 var catalog = require('./catalog.js');
diff --git a/tools/compiler.js b/tools/compiler.js
index 9870c53dc8..fcbea04bf0 100644
--- a/tools/compiler.js
+++ b/tools/compiler.js
@@ -5,7 +5,7 @@ var buildmessage = require('./buildmessage.js');
 var archinfo = require(path.join(__dirname, 'archinfo.js'));
 var linker = require('./linker.js');
 var Unipackage = require('./unipackage.js').Unipackage;
-var packageLoaderModule = require('./package-loader.js');
+var packageLoader = require('./package-loader.js');
 var uniload = require('./uniload.js');
 var bundler = require('./bundler.js');
 var catalog = require('./catalog.js');
@@ -733,13 +733,13 @@ compiler.compile = function (packageSource, options) {
       rootPath: packageSource.sourceRoot
     }, function () {
 
-      var packageLoader = new packageLoaderModule.PackageLoader({
+      var loader = new packageLoader.PackageLoader({
         versions: buildTimeDeps.pluginDependencies[info.name]
       });
 
       var buildResult = bundler.buildJsImage({
         name: info.name,
-        packageLoader: packageLoader,
+        packageLoader: loader,
         use: info.use,
         sourceRoot: packageSource.sourceRoot,
         sources: info.sources,
@@ -811,12 +811,12 @@ compiler.compile = function (packageSource, options) {
   });
 
   // Compile unibuilds. Might use our plugins, so needs to happen second.
-  var packageLoader = new packageLoaderModule.PackageLoader({
+  var loader = new packageLoader.PackageLoader({
     versions: buildTimeDeps.packageDependencies
   });
 
   _.each(packageSource.architectures, function (unibuild) {
-    var unibuildSources = compileUnibuild(unipackage, unibuild, packageLoader,
+    var unibuildSources = compileUnibuild(unipackage, unibuild, loader,
                                           nodeModulesPath, isPortable);
     sources.push.apply(sources, unibuildSources);
   });
@@ -945,7 +945,7 @@ compiler.checkUpToDate = function (packageSource, unipackage) {
     return false;
   }
 
-  var directDepsPackageLoader = new packageLoaderModule.PackageLoader({
+  var directDepsPackageLoader = new packageLoader.PackageLoader({
     versions: buildTimeDeps.directDependencies
   });
   var directDepsMatch = _.all(
@@ -978,7 +978,7 @@ compiler.checkUpToDate = function (packageSource, unipackage) {
 
       // For each plugin, check that the resolved build-time deps for
       // that plugin match the unipackage's build time deps for it.
-      var packageLoaderForPlugin = new packageLoaderModule.PackageLoader({
+      var packageLoaderForPlugin = new packageLoader.PackageLoader({
         versions: buildTimeDeps.pluginDependencies[pluginName]
       });
       var unipackagePluginDeps = unipackage.buildTimePluginDependencies[pluginName];
diff --git a/tools/project.js b/tools/project.js
index 0eb18f16a6..43890fe1e8 100644
--- a/tools/project.js
+++ b/tools/project.js
@@ -9,6 +9,7 @@ var release = require('./release.js');
 var watch = require('./watch.js');
 var catalog = require('./catalog.js');
 var buildmessage = require('./buildmessage.js');
+var packageLoader = require('./package-loader.js');
 
 var project = exports;
 
@@ -181,8 +182,7 @@ _.extend(Project.prototype, {
       };
 
       // Finally, initialize the package loader.
-      var PackageLoader = require('./package-loader.js').PackageLoader;
-      self.packageLoader = new PackageLoader({
+      self.packageLoader = new packageLoader.PackageLoader({
         versions: newVersions
       });
 
diff --git a/tools/run-app.js b/tools/run-app.js
index aa9db2cec7..0521702172 100644
--- a/tools/run-app.js
+++ b/tools/run-app.js
@@ -13,7 +13,6 @@ var inFiber = require('./fiber-helpers.js').inFiber;
 var runLog = require('./run-log.js');
 var catalog = require('./catalog.js');
 var packageCache = require('./package-cache.js');
-var PackageLoader = require('./package-loader.js').PackageLoader;
 var stats = require('./stats.js');
 
 // Parse out s as if it were a bash command line.
diff --git a/tools/selftest.js b/tools/selftest.js
index 12e5254e03..4c18c89a72 100644
--- a/tools/selftest.js
+++ b/tools/selftest.js
@@ -7,6 +7,7 @@ var parseStack = require('./parse-stack.js');
 var release = require('./release.js');
 var catalog = require('./catalog.js');
 var archinfo = require('./archinfo.js');
+var packageLoader = require('./package-loader.js');
 var Future = require('fibers/future');
 
 // Exception representing a test failure
@@ -491,8 +492,7 @@ _.extend(Sandbox.prototype, {
     if (catalog.complete.rebuildLocalPackages([toolPackageName]) !== 1) {
       throw Error("didn't rebuild meteor-tool?");
     }
-    var loader = new (require('./package-loader.js').PackageLoader)({
-      versions: null});
+    var loader = new packageLoader.PackageLoader({versions: null});
     var toolPackage = loader.getPackage(toolPackageName);
     var toolPackageDirectory =
           '.' + toolPackage.version + '.XXX++'
diff --git a/tools/uniload.js b/tools/uniload.js
index cf6a0d31fb..57b7649420 100644
--- a/tools/uniload.js
+++ b/tools/uniload.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
 var bundler = require('./bundler.js');
 var buildmessage = require('./buildmessage.js');
 var release = require('./release.js');
-var PackageLoader = require("./package-loader.js").PackageLoader;
+var packageLoader = require("./package-loader.js");
 var packageCache = require("./package-cache.js");
 var files = require('./files.js');
 
@@ -72,7 +72,7 @@ var load = function (options) {
     // Load the code. The uniloader does not call the constraint solver. But
     // keep in mind, that it does use the catalog to build these packages when
     // it gets around to it.
-    var loader = new PackageLoader({
+    var loader = new packageLoader.PackageLoader({
       versions: null,
       uniloadDir: files.getUniloadDir()
     });
diff --git a/tools/unipackage.js b/tools/unipackage.js
index 6c7c460341..456a241cc4 100644
--- a/tools/unipackage.js
+++ b/tools/unipackage.js
@@ -8,7 +8,7 @@ var path = require('path');
 var Builder = require('./builder.js');
 var bundler = require('./bundler.js');
 var watch = require('./watch.js');
-var PackageLoader = require('./package-loader.js').PackageLoader;
+var packageLoader = require('./package-loader.js');
 var catalog = require('./catalog.js');
 var files = require('./files.js');
 var Future = require('fibers/future');
@@ -117,9 +117,9 @@ _.extend(Unibuild.prototype, {
   // the extension handlers we'll use, we previously commited to those
   // versions at package build ('compile') time.)
   //
-  // packageLoader is the PackageLoader that should be used to resolve
+  // loader is the PackageLoader that should be used to resolve
   // the package's bundle-time dependencies.
-  getResources: function (bundleArch, packageLoader) {
+  getResources: function (bundleArch, loader) {
     var self = this;
 
     if (! archinfo.matches(bundleArch, self.arch))
@@ -137,7 +137,7 @@ _.extend(Unibuild.prototype, {
     var imports = {}; // map from symbol to supplying package name
     compiler.eachUsedUnibuild(
       self.uses,
-      bundleArch, packageLoader,
+      bundleArch, loader,
       {skipUnordered: true}, function (depUnibuild) {
         _.each(depUnibuild.packageVariables, function (symbol) {
           // Slightly hacky implementation of test-only exports.
@@ -187,12 +187,11 @@ _.extend(Unibuild.prototype, {
 // packages for which `filter(packageName, version)` returns truthy.
 var getLoadedPackageVersions = function (versions, filter) {
   var result = {};
-      var PLoader = require("./package-loader.js").PackageLoader;
 
-  var packageLoader = new PLoader({ versions: versions });
+  var loader = new packageLoader.PackageLoader({ versions: versions });
   _.each(versions, function (version, packageName) {
     if (! filter || filter(packageName, version)) {
-      var unipackage = packageLoader.getPackage(packageName);
+      var unipackage = loader.getPackage(packageName);
       result[packageName] = unipackage.version;
     }
   });
@@ -938,7 +937,7 @@ _.extend(Unipackage.prototype, {
     });
 
     // We only want to load local packages.
-    var localPackageLoader = new PackageLoader({versions: null});
+    var localPackageLoader = new packageLoader.PackageLoader({versions: null});
     bundler.iterateOverAllUsedUnipackages(
       localPackageLoader, archinfo.host(), self.includeTool,
       function (unipkg) {