diff --git a/tools/bundler.js b/tools/bundler.js
index 7f0a78668a..d99f9617bf 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -441,9 +441,9 @@ _.extend(Target.prototype, {
   // target-type-dependent function such as write() or toJsImage().
   //
   // options
-  // - packages: packages to include (Package or 'foo' or 'foo.slice'),
+  // - packages: packages to include (Unipackage or 'foo' or 'foo.slice'),
   //   per _determineLoadOrder
-  // - test: packages to test (Package or 'foo'), per _determineLoadOrder
+  // - test: packages to test (Unipackage or 'foo'), per _determineLoadOrder
   // - minify: true to minify
   // - addCacheBusters: if true, make all files cacheable by adding
   //   unique query strings to their URLs. unlikely to be of much use
@@ -491,11 +491,11 @@ _.extend(Target.prototype, {
   //
   // options include:
   // - packages: an array of packages (or, properly speaking, slices)
-  //   to include. Each element should either be a Package object or a
+  //   to include. Each element should either be a Unipackage object or a
   //   package name as a string (to include that package's default
   //   slices for this arch, or a string of the form 'package.slice'
   //   to include a particular named slice from a particular package.
-  // - test: an array of packages (as Package objects or as name
+  // - test: an array of packages (as Unipackage objects or as name
   //   strings) whose test slices should be included
   _determineLoadOrder: function (options) {
     var self = this;
@@ -1769,7 +1769,7 @@ exports.bundle = function (options) {
       watchSet, path.join(appDir, 'no-default-targets')) === null;
 
     if (includeDefaultTargets) {
-      // Create a Package object that represents the app
+      // Create a Unipackage object that represents the app
       var app = packageCache.packageCache.loadAppAtPath(appDir, ignoreFiles);
 
       // Client
diff --git a/tools/commands.js b/tools/commands.js
index f949de5823..2c7cef5229 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -1266,7 +1266,7 @@ main.registerCommand({
       // have a trailing slash.
       //
       // Why use addLocalPackage instead of just loading the packages
-      // and passing Package objects to the bundler? Because we
+      // and passing Unipackage objects to the bundler? Because we
       // actually need the Catalog to know about the package, so that
       // we are able to resolve the test slice's dependency on the
       // main slice. This is not ideal (I hate how this mutates global
diff --git a/tools/package-cache.js b/tools/package-cache.js
index 440627ebba..c0bff38ffe 100644
--- a/tools/package-cache.js
+++ b/tools/package-cache.js
@@ -10,13 +10,13 @@ var Unipackage = require("./unipackage.js");
 
 var packageCache = exports;
 
-// both map from package load path to:
-// - pkg: cached Package object
-// - sourceDir: directory that contained its source code, or null
-// - buildDir: directory from which the built package was loaded
 var PackageCache = function () {
   var self = this;
 
+  // both map from package load path to:
+  // - pkg: cached Unipackage object
+  // - sourceDir: directory that contained its source code, or null
+  // - buildDir: directory from which the built package was loaded
   self.softReloadCache = {};
   self.loadedPackages = {};
 };
diff --git a/tools/package-loader.js b/tools/package-loader.js
index 73d4dbdb0d..ba343dec9e 100644
--- a/tools/package-loader.js
+++ b/tools/package-loader.js
@@ -14,7 +14,7 @@ var PackageLoader = function (options) {
 };
 
 _.extend(PackageLoader.prototype, {
-  // Given the name of a package, return a Package object, or throw an
+  // Given the name of a package, return a Unipackage object, or throw an
   // error if the package wasn't included in the 'versions' passed on
   // initalization or isn't available (for example, hasn't been
   // downloaded yet).
diff --git a/tools/uniload.js b/tools/uniload.js
index bfef1b7b50..b48ad4dcf7 100644
--- a/tools/uniload.js
+++ b/tools/uniload.js
@@ -13,7 +13,7 @@ var packageCache = require("./package-cache.js");
 // this function you load another, distinct copy of all of the
 // packages (except see note about caching below). The return value is
 // an object that maps package name to package exports (that is, it is
-// the Package object from inside the sandbox created for the newly
+// the Unipackage object from inside the sandbox created for the newly
 // loaded packages).
 //
 // Caching: There is a simple cache. If you call this function with