diff --git a/tools/auth.js b/tools/auth.js
index 20c55bf83b..b9e7a4e490 100644
--- a/tools/auth.js
+++ b/tools/auth.js
@@ -15,8 +15,8 @@ var Future = require('fibers/future');
 var auth = exports;
 
 var getLoadedPackages = _.once(function () {
-  var unipackage = require('./unipackage.js');
-  return unipackage.load({
+  var uniload = require('./uniload.js');
+  return uniload.load({
     packages: [ 'meteor', 'livedata' ],
     release: release.current.name
   });
diff --git a/tools/bundler.js b/tools/bundler.js
index ee140d47e9..5d0a9ca0de 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -168,7 +168,7 @@ var fs = require('fs');
 var _ = require('underscore');
 var project = require(path.join(__dirname, 'project.js'));
 var builder = require(path.join(__dirname, 'builder.js'));
-var unipackage = require(path.join(__dirname, 'unipackage.js'));
+var uniload = require(path.join(__dirname, 'uniload.js'));
 var watch = require('./watch.js');
 var release = require('./release.js');
 var Fiber = require('fibers');
@@ -467,7 +467,7 @@ _.extend(Target.prototype, {
 
     // Minify, if requested
     if (options.minify) {
-      var minifiers = unipackage.load({
+      var minifiers = uniload.load({
         packages: ['minifiers']
       }).minifiers;
       self.minifyJs(minifiers);
@@ -788,7 +788,7 @@ _.extend(ClientTarget.prototype, {
   // allow them to appear in the middle of a file.
   mergeCss: function () {
     var self = this;
-    var minifiers = unipackage.load({
+    var minifiers = uniload.load({
       packages: ['minifiers']
     }).minifiers;
     var CssTools = minifiers.CssTools;
@@ -881,7 +881,7 @@ _.extend(ClientTarget.prototype, {
   // template should be part of WebApp, and we should make sure that all
   // information that it needs is in the manifest (ie, make sure to include head
   // and body).  Then it will just need to do one level of templating instead
-  // of two.  Alternatively, use spacebars with unipackage.load here.
+  // of two.  Alternatively, use spacebars with uniload.load here.
   generateHtmlBoilerplate: function () {
     var self = this;
 
@@ -1201,7 +1201,7 @@ _.extend(JsImage.prototype, {
 
       if (item.sourceMap) {
         // Write the source map.
-        // XXX this code is very similar to saveAsUnipackage.
+        // XXX this code is very similar to unipackage.saveToPath.
         loadItem.sourceMap = builder.writeToGeneratedFilename(
           item.targetPath + '.map',
           { data: new Buffer(item.sourceMap, 'utf8') }
@@ -1299,7 +1299,7 @@ JsImage.readFromDisk = function (controlFilePath) {
     };
 
     if (item.sourceMap) {
-      // XXX this is the same code as initFromUnipackage
+      // XXX this is the same code as unipackage.initFromPath
       rejectBadPath(item.sourceMap);
       loadItem.sourceMap = fs.readFileSync(
         path.join(dir, item.sourceMap), 'utf8');
@@ -1441,7 +1441,7 @@ _.extend(ServerTarget.prototype, {
         path.join(files.getDevBundle(), '.bundle_version.txt'), 'utf8');
     devBundleVersion = devBundleVersion.split('\n')[0];
 
-    var script = unipackage.load({
+    var script = uniload.load({
       packages: ['dev-bundle-fetcher']
     })["dev-bundle-fetcher"].DevBundleFetcher.script();
     script = script.replace(/##PLATFORM##/g, platform);
diff --git a/tools/commands.js b/tools/commands.js
index 377540f6c8..f768fa7002 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -5,7 +5,7 @@ var fs = require("fs");
 var files = require('./files.js');
 var deploy = require('./deploy.js');
 var buildmessage = require('./buildmessage.js');
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var project = require('./project.js');
 var warehouse = require('./warehouse.js');
 var auth = require('./auth.js');
@@ -622,7 +622,7 @@ constraint.packageName + "@" + constraint.versionConstraint  + ": no such versio
       var usingIndirectly = project.getDepsAsObj(project.getIndirectDependencies(options.appDir));
 
       // Call the constraint solver.
-      var ConstraintSolver = unipackage.load({
+      var ConstraintSolver = uniload.load({
         packages: ['constraint-solver'],
         release: release.current.name
       })['constraint-solver'].ConstraintSolver;
@@ -1333,7 +1333,7 @@ main.registerCommand({
       }
       catalog.addLocalPackage(packageName, packageDir);
 
-      world = unipackage.load({
+      world = uniload.load({
         packages: [ packageName ],
         release: release.current.name
       });
diff --git a/tools/compiler.js b/tools/compiler.js
index 065f1720be..c793dfea9a 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-class.js').Unipackage;
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var bundler = require('./bundler.js');
 
 var compiler = exports;
@@ -519,7 +519,7 @@ var compileSlice = function (unipackage, inputSlice, packageLoader) {
   // default slice is not allowed to depend on anything!)
   var jsAnalyze = null;
   if (! _.isEmpty(js) && inputSlice.pkg.name !== "js-analyze") {
-    jsAnalyze = unipackage.load({
+    jsAnalyze = uniload.load({
       packages: ["js-analyze"]
     })["js-analyze"].JSAnalyze;
   }
diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
index 5172ef00a3..d1ef2665d6 100644
--- a/tools/deploy-galaxy.js
+++ b/tools/deploy-galaxy.js
@@ -3,7 +3,7 @@ var files = require('./files.js');
 var config = require('./config.js');
 var path = require('path');
 var fs = require('fs');
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var fiberHelpers = require('./fiber-helpers.js');
 var Fiber = require('fibers');
 var httpHelpers = require('./http-helpers.js');
@@ -15,7 +15,7 @@ var buildmessage = require('./buildmessage.js');
 
 // a bit of a hack
 var getPackage = _.once(function () {
-  return unipackage.load({
+  return uniload.load({
     packages: [ 'meteor', 'livedata' ],
     release: release.current.name
   });
@@ -440,7 +440,7 @@ exports.logs = function (options) {
 
   try {
     var lastLogId = null;
-    var Log = unipackage.load({
+    var Log = uniload.load({
       packages: [ 'logging' ],
       release: release.current.name
     }).logging.Log;
diff --git a/tools/package-client.js b/tools/package-client.js
index 4c41138ee0..d1aa7f22dd 100644
--- a/tools/package-client.js
+++ b/tools/package-client.js
@@ -9,8 +9,8 @@ var Future = require('fibers/future');
 var _ = require('underscore');
 
 var getLoadedPackages = _.once(function () {
-  var unipackage = require('./unipackage.js');
-  return unipackage.load({
+  var uniload = require('./uniload.js');
+  return uniload.load({
     packages: [ 'meteor', 'livedata', 'minimongo', 'mongo-livedata' ],
     release: release.current.name
   });
diff --git a/tools/run-log.js b/tools/run-log.js
index cf90ec9c4e..a9fe482daa 100644
--- a/tools/run-log.js
+++ b/tools/run-log.js
@@ -1,5 +1,5 @@
 var _ = require('underscore');
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var release = require('./release.js');
 
 // runLog is primarily used by the parts of the tool which run apps locally. It
@@ -18,7 +18,7 @@ var release = require('./release.js');
 
 
 var getLoggingPackage = _.once(function () {
-  var Log = unipackage.load({
+  var Log = uniload.load({
     packages: ['logging']
   }).logging.Log;
 
diff --git a/tools/run-mongo.js b/tools/run-mongo.js
index 41e2d81740..17d7d2bd06 100644
--- a/tools/run-mongo.js
+++ b/tools/run-mongo.js
@@ -9,7 +9,7 @@ var inFiber = require('./fiber-helpers.js').inFiber;
 var runLog = require('./run-log.js').runLog;
 
 var _ = require('underscore');
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var Fiber = require('fibers');
 var Future = require('fibers/future');
 
@@ -233,7 +233,7 @@ var launchMongo = function (options) {
       });
 
       // Load mongo-livedata so we'll be able to talk to it.
-      var mongoNpmModule = unipackage.load({
+      var mongoNpmModule = uniload.load({
         packages: [ 'mongo-livedata' ],
         release: release.current.name
       })['mongo-livedata'].MongoInternals.NpmModule;
diff --git a/tools/test-utils.js b/tools/test-utils.js
index cd36ee0d3f..a67089c9db 100644
--- a/tools/test-utils.js
+++ b/tools/test-utils.js
@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var release = require('./release.js');
-var unipackage = require('./unipackage.js');
+var uniload = require('./uniload.js');
 var config = require('./config.js');
 
 var randomString = function (charsCount) {
@@ -162,7 +162,7 @@ exports.deployWithNewEmail = function (s, email, appName) {
 };
 
 var getLoadedPackages = _.once(function () {
-  return unipackage.load({
+  return uniload.load({
     packages: ['meteor', 'livedata'],
     release: release.current.name
   });
diff --git a/tools/tests/constraint-solver.js b/tools/tests/constraint-solver.js
index cb21cea1d2..d3c53f5302 100644
--- a/tools/tests/constraint-solver.js
+++ b/tools/tests/constraint-solver.js
@@ -4,8 +4,8 @@ var selftest = require('../selftest.js');
 var semver = require('semver');
 var fail = selftest.fail;
 
-var unipackage = require('./unipackage.js');
-var LocalCollection = unipackage.load({
+var uniload = require('./uniload.js');
+var LocalCollection = uniload.load({
   packages: [ 'meteor', 'minimongo' ],
   release: release.current.name
 }).minimongo.LocalCollection;
diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 2d501bedc0..6f98a1b928 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -5,7 +5,7 @@ var assert = require('assert');
 var Future = require('fibers/future');
 var files = require('../../files.js');
 var bundler = require('../../bundler.js');
-var unipackage = require('../../unipackage.js');
+var uniload = require('../../uniload.js');
 var release = require('../../release.js');
 
 var appWithPublic = path.join(__dirname, 'app-with-public');
@@ -120,7 +120,7 @@ var runTest = function () {
   console.log("Use Assets API from unipackage");
   assert.doesNotThrow(function () {
     release._resetPackageDirs([ path.join(appWithPrivate, "packages") ]);
-    var testPackage = unipackage.load({
+    var testPackage = uniload.load({
       library: release.current.library,
       packages: ['test-package']
     })['test-package'].TestAsset;
diff --git a/tools/unipackage.js b/tools/uniload.js
similarity index 99%
rename from tools/unipackage.js
rename to tools/uniload.js
index c11877464f..34c59279bd 100644
--- a/tools/unipackage.js
+++ b/tools/uniload.js
@@ -110,7 +110,7 @@ var load = function (options) {
   return ret;
 };
 
-var unipackage = exports;
+var uniload = exports;
 _.extend(exports, {
   load: load
 });