diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 49323d41af..635ffa292a 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -147,7 +147,7 @@ class DartDoc extends PackageBuilder {
     }
   }
 
-  Package package;
+  PackageGraph packageGraph;
 
   /// Generate DartDoc documentation.
   ///
@@ -157,10 +157,10 @@ class DartDoc extends PackageBuilder {
   Future<DartDocResults> generateDocs() async {
     Stopwatch _stopwatch = new Stopwatch()..start();
     double seconds;
-    package = await buildPackage();
+    packageGraph = await buildPackageGraph();
     seconds = _stopwatch.elapsedMilliseconds / 1000.0;
     logInfo(
-        "Initialized dartdoc with ${package.libraries.length} librar${package.libraries.length == 1 ? 'y' : 'ies'} "
+        "Initialized dartdoc with ${packageGraph.libraries.length} librar${packageGraph.libraries.length == 1 ? 'y' : 'ies'} "
         "in ${seconds.toStringAsFixed(1)} seconds");
     _stopwatch.reset();
 
@@ -168,12 +168,12 @@ class DartDoc extends PackageBuilder {
     if (!outputDir.existsSync()) outputDir.createSync(recursive: true);
 
     for (var generator in generators) {
-      await generator.generate(package, outputDir.path);
+      await generator.generate(packageGraph, outputDir.path);
       writtenFiles.addAll(generator.writtenFiles.map(path.normalize));
     }
-    if (config.validateLinks) validateLinks(package, outputDir.path);
-    int warnings = package.packageWarningCounter.warningCount;
-    int errors = package.packageWarningCounter.errorCount;
+    if (config.validateLinks) validateLinks(packageGraph, outputDir.path);
+    int warnings = packageGraph.packageWarningCounter.warningCount;
+    int errors = packageGraph.packageWarningCounter.errorCount;
     if (warnings == 0 && errors == 0) {
       logInfo("no issues found");
     } else {
@@ -183,23 +183,24 @@ class DartDoc extends PackageBuilder {
 
     seconds = _stopwatch.elapsedMilliseconds / 1000.0;
     logInfo(
-        "Documented ${package.publicLibraries.length} public librar${package.publicLibraries.length == 1 ? 'y' : 'ies'} "
+        "Documented ${packageGraph.publicLibraries.length} public librar${packageGraph.publicLibraries.length == 1 ? 'y' : 'ies'} "
         "in ${seconds.toStringAsFixed(1)} seconds");
 
-    if (package.publicLibraries.isEmpty) {
+    if (packageGraph.publicLibraries.isEmpty) {
       throw new DartDocFailure(
           "dartdoc could not find any libraries to document. Run `pub get` and try again.");
     }
 
-    if (package.packageWarningCounter.errorCount > 0) {
+    if (packageGraph.packageWarningCounter.errorCount > 0) {
       throw new DartDocFailure("dartdoc encountered errors while processing");
     }
 
-    return new DartDocResults(packageMeta, package, outputDir);
+    return new DartDocResults(packageMeta, packageGraph, outputDir);
   }
 
   /// Warn on file paths.
-  void _warn(Package package, PackageWarning kind, String warnOn, String origin,
+  void _warn(PackageGraph packageGraph, PackageWarning kind, String warnOn,
+      String origin,
       {String referredFrom}) {
     // Ordinarily this would go in [Package.warn], but we don't actually know what
     // ModelElement to warn on yet.
@@ -235,14 +236,15 @@ class DartDoc extends PackageBuilder {
     }
 
     if (referredFromElements.isEmpty && referredFrom == 'index.html')
-      referredFromElements.add(package);
+      referredFromElements.add(packageGraph);
     String message = warnOn;
     if (referredFrom == 'index.json') message = '$warnOn (from index.json)';
-    package.warnOnElement(warnOnElement, kind,
+    packageGraph.warnOnElement(warnOnElement, kind,
         message: message, referredFrom: referredFromElements);
   }
 
-  void _doOrphanCheck(Package package, String origin, Set<String> visited) {
+  void _doOrphanCheck(
+      PackageGraph packageGraph, String origin, Set<String> visited) {
     String normalOrigin = path.normalize(origin);
     String staticAssets = path.joinAll([normalOrigin, 'static-assets', '']);
     String indexJson = path.joinAll([normalOrigin, 'index.json']);
@@ -264,15 +266,16 @@ class DartDoc extends PackageBuilder {
       if (visited.contains(fullPath)) continue;
       if (!writtenFiles.contains(fullPath)) {
         // This isn't a file we wrote (this time); don't claim we did.
-        _warn(package, PackageWarning.unknownFile, fullPath, normalOrigin);
+        _warn(packageGraph, PackageWarning.unknownFile, fullPath, normalOrigin);
       } else {
-        _warn(package, PackageWarning.orphanedFile, fullPath, normalOrigin);
+        _warn(
+            packageGraph, PackageWarning.orphanedFile, fullPath, normalOrigin);
       }
       _onCheckProgress.add(fullPath);
     }
 
     if (!foundIndexJson) {
-      _warn(package, PackageWarning.brokenLink, indexJson, normalOrigin);
+      _warn(packageGraph, PackageWarning.brokenLink, indexJson, normalOrigin);
       _onCheckProgress.add(indexJson);
     }
   }
@@ -300,7 +303,7 @@ class DartDoc extends PackageBuilder {
   }
 
   void _doSearchIndexCheck(
-      Package package, String origin, Set<String> visited) {
+      PackageGraph packageGraph, String origin, Set<String> visited) {
     String fullPath = path.joinAll([origin, 'index.json']);
     String indexPath = path.joinAll([origin, 'index.html']);
     File file = new File("$fullPath");
@@ -319,7 +322,7 @@ class DartDoc extends PackageBuilder {
       if (entry.containsKey('href')) {
         String entryPath = path.joinAll([origin, entry['href']]);
         if (!visited.contains(entryPath)) {
-          _warn(package, PackageWarning.brokenLink, entryPath,
+          _warn(packageGraph, PackageWarning.brokenLink, entryPath,
               path.normalize(origin),
               referredFrom: fullPath);
         }
@@ -329,14 +332,14 @@ class DartDoc extends PackageBuilder {
     // Missing from search index
     Set<String> missing_from_search = visited.difference(found);
     for (String s in missing_from_search) {
-      _warn(package, PackageWarning.missingFromSearchIndex, s,
+      _warn(packageGraph, PackageWarning.missingFromSearchIndex, s,
           path.normalize(origin),
           referredFrom: fullPath);
     }
   }
 
-  void _doCheck(
-      Package package, String origin, Set<String> visited, String pathToCheck,
+  void _doCheck(PackageGraph packageGraph, String origin, Set<String> visited,
+      String pathToCheck,
       [String source, String fullPath]) {
     if (fullPath == null) {
       fullPath = path.joinAll([origin, pathToCheck]);
@@ -345,7 +348,7 @@ class DartDoc extends PackageBuilder {
 
     Tuple2 stringLinksAndHref = _getStringLinksAndHref(fullPath);
     if (stringLinksAndHref == null) {
-      _warn(package, PackageWarning.brokenLink, pathToCheck,
+      _warn(packageGraph, PackageWarning.brokenLink, pathToCheck,
           path.normalize(origin),
           referredFrom: source);
       _onCheckProgress.add(pathToCheck);
@@ -387,7 +390,7 @@ class DartDoc extends PackageBuilder {
       }
     }
     for (Tuple2 visitPaths in toVisit) {
-      _doCheck(package, origin, visited, visitPaths.item1, pathToCheck,
+      _doCheck(packageGraph, origin, visited, visitPaths.item1, pathToCheck,
           visitPaths.item2);
     }
     _onCheckProgress.add(pathToCheck);
@@ -397,16 +400,16 @@ class DartDoc extends PackageBuilder {
 
   /// Don't call this method more than once, and only after you've
   /// generated all docs for the Package.
-  void validateLinks(Package package, String origin) {
+  void validateLinks(PackageGraph packageGraph, String origin) {
     assert(_hrefs == null);
-    _hrefs = package.allHrefs;
+    _hrefs = packageGraph.allHrefs;
 
     final Set<String> visited = new Set();
     final String start = 'index.html';
     logInfo('Validating docs...');
-    _doCheck(package, origin, visited, start);
-    _doOrphanCheck(package, origin, visited);
-    _doSearchIndexCheck(package, origin, visited);
+    _doCheck(packageGraph, origin, visited, start);
+    _doOrphanCheck(packageGraph, origin, visited);
+    _doSearchIndexCheck(packageGraph, origin, visited);
   }
 }
 
@@ -424,10 +427,10 @@ class DartDocFailure {
 /// The results of a [DartDoc.generateDocs] call.
 class DartDocResults {
   final PackageMeta packageMeta;
-  final Package package;
+  final PackageGraph packageGraph;
   final Directory outDir;
 
-  DartDocResults(this.packageMeta, this.package, this.outDir);
+  DartDocResults(this.packageMeta, this.packageGraph, this.outDir);
 }
 
 class _Error implements Comparable<_Error> {
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index 81247db60f..67a3f9e646 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -37,7 +37,7 @@ class ElementType extends Privacy {
   @override
   bool get isPublic {
     Class canonicalClass =
-        element.package.findCanonicalModelElementFor(element.element) ??
+        element.packageGraph.findCanonicalModelElementFor(element.element) ??
             element;
     return canonicalClass.isPublic;
   }
@@ -139,7 +139,7 @@ class ElementType extends Privacy {
 
   ElementType get _returnType {
     var rt = _returnTypeCore;
-    Library lib = element.package.findLibraryFor(rt.element);
+    Library lib = element.packageGraph.findLibraryFor(rt.element);
     if (lib == null) {
       lib = new ModelElement.from(rt.element.library, element.library);
     }
diff --git a/lib/src/generator.dart b/lib/src/generator.dart
index 5536a20914..ac4bc7bb89 100644
--- a/lib/src/generator.dart
+++ b/lib/src/generator.dart
@@ -8,7 +8,7 @@ library dartdoc.generator;
 import 'dart:async' show Stream, Future;
 import 'dart:io' show File;
 
-import 'model.dart' show Package;
+import 'model.dart' show PackageGraph;
 
 /// An abstract class that defines a generator that generates documentation for
 /// a given package.
@@ -17,7 +17,7 @@ import 'model.dart' show Package;
 abstract class Generator {
   /// Generate the documentation for the given package in the specified
   /// directory. Completes the returned future when done.
-  Future generate(Package package, String outputDirectoryPath);
+  Future generate(PackageGraph packageGraph, String outputDirectoryPath);
 
   /// Fires when a file is created.
   Stream<File> get onFileCreated;
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index cdf4a45d73..cbe1385410 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -67,9 +67,9 @@ class HtmlGenerator extends Generator {
 
   @override
 
-  /// Actually write out the documentation for [package].
+  /// Actually write out the documentation for [packageGraph].
   /// Stores the HtmlGeneratorInstance so we can access it in [writtenFiles].
-  Future generate(Package package, String outputDirectoryPath) async {
+  Future generate(PackageGraph packageGraph, String outputDirectoryPath) async {
     assert(_instance == null);
 
     var enabled = true;
@@ -102,7 +102,7 @@ class HtmlGenerator extends Generator {
 
     try {
       _instance =
-          new HtmlGeneratorInstance(_options, _templates, package, write);
+          new HtmlGeneratorInstance(_options, _templates, packageGraph, write);
       await _instance.generate();
     } finally {
       enabled = false;
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index 8002ac8892..80b87c6cf0 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -24,15 +24,15 @@ typedef void FileWriter(String path, Object content, {bool allowOverwrite});
 class HtmlGeneratorInstance {
   final HtmlGeneratorOptions _options;
   final Templates _templates;
-  final Package _package;
+  final PackageGraph _packageGraph;
   final List<ModelElement> _documentedElements = <ModelElement>[];
   final FileWriter _writer;
 
   HtmlGeneratorInstance(
-      this._options, this._templates, this._package, this._writer);
+      this._options, this._templates, this._packageGraph, this._writer);
 
   Future generate() async {
-    if (_package != null) {
+    if (_packageGraph != null) {
       _generateDocs();
       _generateSearchIndex();
     }
@@ -85,178 +85,181 @@ class HtmlGeneratorInstance {
   }
 
   void _generateDocs() {
-    if (_package == null) return;
+    if (_packageGraph == null) return;
 
     generatePackage();
 
-    for (var lib in filterNonDocumented(_package.libraries)) {
-      generateLibrary(_package, lib);
+    for (var lib in filterNonDocumented(_packageGraph.libraries)) {
+      generateLibrary(_packageGraph, lib);
 
       for (var clazz in filterNonDocumented(lib.allClasses)) {
-        generateClass(_package, lib, clazz);
+        generateClass(_packageGraph, lib, clazz);
 
         for (var constructor in filterNonDocumented(clazz.constructors)) {
           if (!constructor.isCanonical) continue;
-          generateConstructor(_package, lib, clazz, constructor);
+          generateConstructor(_packageGraph, lib, clazz, constructor);
         }
 
         for (var constant in filterNonDocumented(clazz.constants)) {
           if (!constant.isCanonical) continue;
-          generateConstant(_package, lib, clazz, constant);
+          generateConstant(_packageGraph, lib, clazz, constant);
         }
 
         for (var property in filterNonDocumented(clazz.staticProperties)) {
           if (!property.isCanonical) continue;
-          generateProperty(_package, lib, clazz, property);
+          generateProperty(_packageGraph, lib, clazz, property);
         }
 
         for (var property in filterNonDocumented(clazz.propertiesForPages)) {
           if (!property.isCanonical) continue;
-          generateProperty(_package, lib, clazz, property);
+          generateProperty(_packageGraph, lib, clazz, property);
         }
 
         for (var method in filterNonDocumented(clazz.methodsForPages)) {
           if (!method.isCanonical) continue;
-          generateMethod(_package, lib, clazz, method);
+          generateMethod(_packageGraph, lib, clazz, method);
         }
 
         for (var operator in filterNonDocumented(clazz.operatorsForPages)) {
           if (!operator.isCanonical) continue;
-          generateMethod(_package, lib, clazz, operator);
+          generateMethod(_packageGraph, lib, clazz, operator);
         }
 
         for (var method in filterNonDocumented(clazz.staticMethods)) {
           if (!method.isCanonical) continue;
-          generateMethod(_package, lib, clazz, method);
+          generateMethod(_packageGraph, lib, clazz, method);
         }
       }
 
       for (var eNum in filterNonDocumented(lib.enums)) {
-        generateEnum(_package, lib, eNum);
+        generateEnum(_packageGraph, lib, eNum);
         for (var property in filterNonDocumented(eNum.propertiesForPages)) {
-          generateProperty(_package, lib, eNum, property);
+          generateProperty(_packageGraph, lib, eNum, property);
         }
         for (var operator in filterNonDocumented(eNum.operatorsForPages)) {
-          generateMethod(_package, lib, eNum, operator);
+          generateMethod(_packageGraph, lib, eNum, operator);
         }
         for (var method in filterNonDocumented(eNum.methodsForPages)) {
-          generateMethod(_package, lib, eNum, method);
+          generateMethod(_packageGraph, lib, eNum, method);
         }
       }
 
       for (var constant in filterNonDocumented(lib.constants)) {
-        generateTopLevelConstant(_package, lib, constant);
+        generateTopLevelConstant(_packageGraph, lib, constant);
       }
 
       for (var property in filterNonDocumented(lib.properties)) {
-        generateTopLevelProperty(_package, lib, property);
+        generateTopLevelProperty(_packageGraph, lib, property);
       }
 
       for (var function in filterNonDocumented(lib.functions)) {
-        generateFunction(_package, lib, function);
+        generateFunction(_packageGraph, lib, function);
       }
 
       for (var typeDef in filterNonDocumented(lib.typedefs)) {
-        generateTypeDef(_package, lib, typeDef);
+        generateTypeDef(_packageGraph, lib, typeDef);
       }
     }
   }
 
   void generatePackage() {
-    TemplateData data = new PackageTemplateData(_options, _package);
-    logInfo('documenting ${_package.name}');
+    TemplateData data = new PackageTemplateData(_options, _packageGraph);
+    logInfo('documenting ${_packageGraph.name}');
 
     _build('index.html', _templates.indexTemplate, data);
   }
 
-  void generateLibrary(Package package, Library lib) {
+  void generateLibrary(PackageGraph packageGraph, Library lib) {
     logInfo(
         'Generating docs for library ${lib.name} from ${lib.element.source.uri}...');
     if (!lib.isAnonymous && !lib.hasDocumentation) {
-      package.warnOnElement(lib, PackageWarning.noLibraryLevelDocs);
+      packageGraph.warnOnElement(lib, PackageWarning.noLibraryLevelDocs);
     }
-    TemplateData data = new LibraryTemplateData(_options, package, lib);
+    TemplateData data = new LibraryTemplateData(_options, packageGraph, lib);
 
     _build(path.join(lib.dirName, '${lib.fileName}'),
         _templates.libraryTemplate, data);
   }
 
-  void generateClass(Package package, Library lib, Class clazz) {
-    TemplateData data = new ClassTemplateData(_options, package, lib, clazz);
+  void generateClass(PackageGraph packageGraph, Library lib, Class clazz) {
+    TemplateData data =
+        new ClassTemplateData(_options, packageGraph, lib, clazz);
     _build(path.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
-  void generateConstructor(
-      Package package, Library lib, Class clazz, Constructor constructor) {
-    TemplateData data =
-        new ConstructorTemplateData(_options, package, lib, clazz, constructor);
+  void generateConstructor(PackageGraph packageGraph, Library lib, Class clazz,
+      Constructor constructor) {
+    TemplateData data = new ConstructorTemplateData(
+        _options, packageGraph, lib, clazz, constructor);
 
     _build(path.joinAll(constructor.href.split('/')),
         _templates.constructorTemplate, data);
   }
 
-  void generateEnum(Package package, Library lib, Enum eNum) {
-    TemplateData data = new EnumTemplateData(_options, package, lib, eNum);
+  void generateEnum(PackageGraph packageGraph, Library lib, Enum eNum) {
+    TemplateData data = new EnumTemplateData(_options, packageGraph, lib, eNum);
 
     _build(path.joinAll(eNum.href.split('/')), _templates.enumTemplate, data);
   }
 
-  void generateFunction(Package package, Library lib, ModelFunction function) {
+  void generateFunction(
+      PackageGraph packageGraph, Library lib, ModelFunction function) {
     TemplateData data =
-        new FunctionTemplateData(_options, package, lib, function);
+        new FunctionTemplateData(_options, packageGraph, lib, function);
 
     _build(path.joinAll(function.href.split('/')), _templates.functionTemplate,
         data);
   }
 
   void generateMethod(
-      Package package, Library lib, Class clazz, Method method) {
+      PackageGraph packageGraph, Library lib, Class clazz, Method method) {
     TemplateData data =
-        new MethodTemplateData(_options, package, lib, clazz, method);
+        new MethodTemplateData(_options, packageGraph, lib, clazz, method);
 
     _build(
         path.joinAll(method.href.split('/')), _templates.methodTemplate, data);
   }
 
   void generateConstant(
-      Package package, Library lib, Class clazz, Field property) {
+      PackageGraph packageGraph, Library lib, Class clazz, Field property) {
     TemplateData data =
-        new ConstantTemplateData(_options, package, lib, clazz, property);
+        new ConstantTemplateData(_options, packageGraph, lib, clazz, property);
 
     _build(path.joinAll(property.href.split('/')), _templates.constantTemplate,
         data);
   }
 
   void generateProperty(
-      Package package, Library lib, Class clazz, Field property) {
+      PackageGraph packageGraph, Library lib, Class clazz, Field property) {
     TemplateData data =
-        new PropertyTemplateData(_options, package, lib, clazz, property);
+        new PropertyTemplateData(_options, packageGraph, lib, clazz, property);
 
     _build(path.joinAll(property.href.split('/')), _templates.propertyTemplate,
         data);
   }
 
   void generateTopLevelProperty(
-      Package package, Library lib, TopLevelVariable property) {
+      PackageGraph packageGraph, Library lib, TopLevelVariable property) {
     TemplateData data =
-        new TopLevelPropertyTemplateData(_options, package, lib, property);
+        new TopLevelPropertyTemplateData(_options, packageGraph, lib, property);
 
     _build(path.joinAll(property.href.split('/')),
         _templates.topLevelPropertyTemplate, data);
   }
 
   void generateTopLevelConstant(
-      Package package, Library lib, TopLevelVariable property) {
+      PackageGraph packageGraph, Library lib, TopLevelVariable property) {
     TemplateData data =
-        new TopLevelConstTemplateData(_options, package, lib, property);
+        new TopLevelConstTemplateData(_options, packageGraph, lib, property);
 
     _build(path.joinAll(property.href.split('/')),
         _templates.topLevelConstantTemplate, data);
   }
 
-  void generateTypeDef(Package package, Library lib, Typedef typeDef) {
+  void generateTypeDef(
+      PackageGraph packageGraph, Library lib, Typedef typeDef) {
     TemplateData data =
-        new TypedefTemplateData(_options, package, lib, typeDef);
+        new TypedefTemplateData(_options, packageGraph, lib, typeDef);
 
     _build(path.joinAll(typeDef.href.split('/')), _templates.typeDefTemplate,
         data);
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 0cdd99f0df..05e57ecabf 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -21,12 +21,12 @@ class Subnav {
 }
 
 abstract class TemplateData<T extends Documentable> {
-  final Package package;
+  final PackageGraph packageGraph;
   final HtmlOptions htmlOptions;
 
   List<Subnav> _subNameItemCache;
 
-  TemplateData(this.htmlOptions, this.package);
+  TemplateData(this.htmlOptions, this.packageGraph);
 
   String get documentation => self.documentation;
   String get oneLineDoc => self.oneLineDoc;
@@ -85,35 +85,35 @@ abstract class TemplateData<T extends Documentable> {
   }
 }
 
-class PackageTemplateData extends TemplateData<Package> {
-  PackageTemplateData(HtmlOptions htmlOptions, Package package)
-      : super(htmlOptions, package);
+class PackageTemplateData extends TemplateData<PackageGraph> {
+  PackageTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph)
+      : super(htmlOptions, packageGraph);
 
   @override
   bool get includeVersion => true;
   @override
   List get navLinks => [];
   @override
-  String get title => '${package.name} - Dart API docs';
+  String get title => '${packageGraph.name} - Dart API docs';
   @override
-  Package get self => package;
+  PackageGraph get self => packageGraph;
   @override
-  String get layoutTitle => _layoutTitle(package.name, kind, false);
+  String get layoutTitle => _layoutTitle(packageGraph.name, kind, false);
   @override
   String get metaDescription =>
-      '${package.name} API docs, for the Dart programming language.';
+      '${packageGraph.name} API docs, for the Dart programming language.';
   @override
   Iterable<Subnav> getSubNavItems() {
-    return [new Subnav('Libraries', '${package.href}#libraries')];
+    return [new Subnav('Libraries', '${packageGraph.href}#libraries')];
   }
 
   @override
-  bool get hasHomepage => package.hasHomepage;
+  bool get hasHomepage => packageGraph.hasHomepage;
   @override
-  String get homepage => package.homepage;
+  String get homepage => packageGraph.homepage;
 
   @override
-  String get kind => (useCategories || package.isSdk) ? '' : 'package';
+  String get kind => (useCategories || packageGraph.isSdk) ? '' : 'package';
 
   /// `null` for packages because they are at the root – not needed
   @override
@@ -123,8 +123,9 @@ class PackageTemplateData extends TemplateData<Package> {
 class LibraryTemplateData extends TemplateData<Library> {
   final Library library;
 
-  LibraryTemplateData(HtmlOptions htmlOptions, Package package, this.library)
-      : super(htmlOptions, package);
+  LibraryTemplateData(
+      HtmlOptions htmlOptions, PackageGraph packageGraph, this.library)
+      : super(htmlOptions, packageGraph);
 
   @override
   String get title => '${library.name} library - Dart API';
@@ -136,7 +137,7 @@ class LibraryTemplateData extends TemplateData<Library> {
   String get metaDescription =>
       '${library.name} library API docs, for the Dart programming language.';
   @override
-  List get navLinks => [package];
+  List get navLinks => [packageGraph];
   @override
   Iterable<Subnav> getSubNavItems() sync* {
     if (library.hasPublicClasses)
@@ -168,9 +169,9 @@ class ClassTemplateData extends TemplateData<Class> {
   final Library library;
   Class _objectType;
 
-  ClassTemplateData(
-      HtmlOptions htmlOptions, Package package, this.library, this.clazz)
-      : super(htmlOptions, package);
+  ClassTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.clazz)
+      : super(htmlOptions, packageGraph);
 
   @override
   Class get self => clazz;
@@ -188,7 +189,7 @@ class ClassTemplateData extends TemplateData<Class> {
   String get layoutTitle => _layoutTitle(
       clazz.nameWithLinkedGenerics, clazz.fullkind, clazz.isDeprecated);
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   String get htmlBase => '..';
   @override
@@ -214,7 +215,7 @@ class ClassTemplateData extends TemplateData<Class> {
       return _objectType;
     }
 
-    Library dc = package.libraries
+    Library dc = packageGraph.libraries
         .firstWhere((it) => it.name == "dart:core", orElse: () => null);
 
     if (dc == null) {
@@ -230,9 +231,9 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
   final Class clazz;
   final Constructor constructor;
 
-  ConstructorTemplateData(HtmlOptions htmlOptions, Package package,
+  ConstructorTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
       this.library, this.clazz, this.constructor)
-      : super(htmlOptions, package);
+      : super(htmlOptions, packageGraph);
 
   @override
   Constructor get self => constructor;
@@ -240,7 +241,7 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
   String get layoutTitle => _layoutTitle(
       constructor.name, constructor.fullKind, constructor.isDeprecated);
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   List get navLinksWithGenerics => [clazz];
   @override
@@ -258,9 +259,9 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
 }
 
 class EnumTemplateData extends TemplateData<Enum> {
-  EnumTemplateData(
-      HtmlOptions htmlOptions, Package package, this.library, this.eNum)
-      : super(htmlOptions, package);
+  EnumTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.eNum)
+      : super(htmlOptions, packageGraph);
 
   final Library library;
   final Enum eNum;
@@ -275,7 +276,7 @@ class EnumTemplateData extends TemplateData<Enum> {
       'API docs for the ${eNum.name} enum from the ${library.name} library, '
       'for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   String get htmlBase => '..';
   @override
@@ -291,9 +292,9 @@ class FunctionTemplateData extends TemplateData<ModelFunction> {
   final ModelFunction function;
   final Library library;
 
-  FunctionTemplateData(
-      HtmlOptions htmlOptions, Package package, this.library, this.function)
-      : super(htmlOptions, package);
+  FunctionTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.function)
+      : super(htmlOptions, packageGraph);
 
   @override
   ModelFunction get self => function;
@@ -308,7 +309,7 @@ class FunctionTemplateData extends TemplateData<ModelFunction> {
       'API docs for the ${function.name} function from the '
       '${library.name} library, for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   Iterable<Subnav> getSubNavItems() => _gatherSubnavForInvokable(function);
   @override
@@ -320,9 +321,9 @@ class MethodTemplateData extends TemplateData<Method> {
   final Method method;
   final Class clazz;
 
-  MethodTemplateData(HtmlOptions htmlOptions, Package package, this.library,
-      this.clazz, this.method)
-      : super(htmlOptions, package);
+  MethodTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.clazz, this.method)
+      : super(htmlOptions, packageGraph);
 
   @override
   Method get self => method;
@@ -337,7 +338,7 @@ class MethodTemplateData extends TemplateData<Method> {
       'API docs for the ${method.name} method from the ${clazz.name} class, '
       'for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   List get navLinksWithGenerics => [clazz];
   @override
@@ -351,9 +352,9 @@ class PropertyTemplateData extends TemplateData<Field> {
   final Class clazz;
   final Field property;
 
-  PropertyTemplateData(HtmlOptions htmlOptions, Package package, this.library,
-      this.clazz, this.property)
-      : super(htmlOptions, package);
+  PropertyTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.clazz, this.property)
+      : super(htmlOptions, packageGraph);
 
   @override
   Field get self => property;
@@ -369,7 +370,7 @@ class PropertyTemplateData extends TemplateData<Field> {
       'API docs for the ${property.name} $type from the ${clazz.name} class, '
       'for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   List get navLinksWithGenerics => [clazz];
   @override
@@ -379,9 +380,9 @@ class PropertyTemplateData extends TemplateData<Field> {
 }
 
 class ConstantTemplateData extends PropertyTemplateData {
-  ConstantTemplateData(HtmlOptions htmlOptions, Package package,
+  ConstantTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
       Library library, Class clazz, Field property)
-      : super(htmlOptions, package, library, clazz, property);
+      : super(htmlOptions, packageGraph, library, clazz, property);
 
   @override
   String get type => 'constant';
@@ -391,9 +392,9 @@ class TypedefTemplateData extends TemplateData<Typedef> {
   final Library library;
   final Typedef typeDef;
 
-  TypedefTemplateData(
-      HtmlOptions htmlOptions, Package package, this.library, this.typeDef)
-      : super(htmlOptions, package);
+  TypedefTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      this.library, this.typeDef)
+      : super(htmlOptions, packageGraph);
 
   @override
   Typedef get self => typeDef;
@@ -409,7 +410,7 @@ class TypedefTemplateData extends TemplateData<Typedef> {
       'API docs for the ${typeDef.name} property from the '
       '${library.name} library, for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   String get htmlBase => '..';
   @override
@@ -420,9 +421,9 @@ class TopLevelPropertyTemplateData extends TemplateData<TopLevelVariable> {
   final Library library;
   final TopLevelVariable property;
 
-  TopLevelPropertyTemplateData(
-      HtmlOptions htmlOptions, Package package, this.library, this.property)
-      : super(htmlOptions, package);
+  TopLevelPropertyTemplateData(HtmlOptions htmlOptions,
+      PackageGraph packageGraph, this.library, this.property)
+      : super(htmlOptions, packageGraph);
 
   @override
   TopLevelVariable get self => property;
@@ -438,7 +439,7 @@ class TopLevelPropertyTemplateData extends TemplateData<TopLevelVariable> {
       'API docs for the ${property.name} $_type from the '
       '${library.name} library, for the Dart programming language.';
   @override
-  List get navLinks => [package, library];
+  List get navLinks => [packageGraph, library];
   @override
   String get htmlBase => '..';
 
@@ -446,9 +447,9 @@ class TopLevelPropertyTemplateData extends TemplateData<TopLevelVariable> {
 }
 
 class TopLevelConstTemplateData extends TopLevelPropertyTemplateData {
-  TopLevelConstTemplateData(HtmlOptions htmlOptions, Package package,
+  TopLevelConstTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
       Library library, TopLevelVariable property)
-      : super(htmlOptions, package, library, property);
+      : super(htmlOptions, packageGraph, library, property);
 
   @override
   String get _type => 'constant';
diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
index 2fd7053ead..335de243a9 100644
--- a/lib/src/markdown_processor.dart
+++ b/lib/src/markdown_processor.dart
@@ -269,7 +269,8 @@ MatchingLinkResult _getMatchingLinkElement(
     Element refElement = _getRefElementFromCommentRefs(commentRefs, codeRef);
     if (refElement != null) {
       refModelElement = new ModelElement.fromElement(
-          _getRefElementFromCommentRefs(commentRefs, codeRef), element.package);
+          _getRefElementFromCommentRefs(commentRefs, codeRef),
+          element.packageGraph);
       refModelElement =
           refModelElement.canonicalModelElement ?? refModelElement;
     }
@@ -292,7 +293,8 @@ MatchingLinkResult _getMatchingLinkElement(
   // There have been places in the code which helpfully cache entities
   // regardless of what package they are associated with.  This assert
   // will protect us from reintroducing that.
-  assert(refModelElement == null || refModelElement.package == element.package);
+  assert(refModelElement == null ||
+      refModelElement.packageGraph == element.packageGraph);
   if (refModelElement != null) {
     return new MatchingLinkResult(refModelElement, null);
   }
@@ -376,12 +378,12 @@ Map<String, Set<ModelElement>> _findRefElementCache;
 ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
     List<CommentReference> commentRefs, Class preferredClass) {
   assert(element != null);
-  assert(element.package.allLibrariesAdded);
+  assert(element.packageGraph.allLibrariesAdded);
 
   String codeRefChomped = codeRef.replaceFirst(isConstructor, '');
 
   final Library library = element is ModelElement ? element.library : null;
-  final Package package = library.package;
+  final PackageGraph packageGraph = library.packageGraph;
   final Set<ModelElement> results = new Set();
 
   // This might be an operator.  Strip the operator prefix and try again.
@@ -443,7 +445,7 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
     for (Class tryClass in tryClasses) {
       if (tryClass != null) {
         _getResultsForClass(
-            tryClass, codeRefChomped, results, codeRef, package);
+            tryClass, codeRefChomped, results, codeRef, packageGraph);
       }
       results.remove(null);
       if (results.isNotEmpty) break;
@@ -454,7 +456,7 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
           in realClass.publicSuperChain.map((et) => et.element as Class)) {
         if (!tryClasses.contains(superClass)) {
           _getResultsForClass(
-              superClass, codeRefChomped, results, codeRef, package);
+              superClass, codeRefChomped, results, codeRef, packageGraph);
         }
         results.remove(null);
         if (results.isNotEmpty) break;
@@ -469,9 +471,10 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
   //                   when referring to objects in libraries outside the
   //                   documented set.
   if (results.isEmpty && _findRefElementCache == null) {
-    assert(package.allLibrariesAdded);
+    assert(packageGraph.allLibrariesAdded);
     _findRefElementCache = new Map();
-    for (final modelElement in filterNonDocumented(package.allModelElements)) {
+    for (final modelElement
+        in filterNonDocumented(packageGraph.allModelElements)) {
       _findRefElementCache.putIfAbsent(
           modelElement.fullyQualifiedNameWithoutLibrary, () => new Set());
       _findRefElementCache.putIfAbsent(
@@ -494,7 +497,8 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
       // might make no sense.  Instead, use the enclosing class from the
       // element in [_findRefElementCache], because that element's enclosing
       // class will be preferred from [codeRefChomped]'s perspective.
-      results.add(package.findCanonicalModelElementFor(modelElement.element,
+      results.add(packageGraph.findCanonicalModelElementFor(
+          modelElement.element,
           preferredClass: modelElement.enclosingElement is Class
               ? modelElement.enclosingElement
               : null));
@@ -507,7 +511,8 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
     for (final modelElement in library.allModelElements) {
       if (!_ConsiderIfConstructor(codeRef, modelElement)) continue;
       if (codeRefChomped == modelElement.fullyQualifiedNameWithoutLibrary) {
-        results.add(package.findCanonicalModelElementFor(modelElement.element,
+        results.add(packageGraph.findCanonicalModelElementFor(
+            modelElement.element,
             preferredClass: preferredClass));
       }
     }
@@ -520,7 +525,8 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
       if (codeRefChomped == modelElement.fullyQualifiedNameWithoutLibrary ||
           (modelElement is Library &&
               codeRefChomped == modelElement.fullyQualifiedName)) {
-        results.add(package.findCanonicalModelElementFor(modelElement.element));
+        results.add(
+            packageGraph.findCanonicalModelElementFor(modelElement.element));
       }
     }
   }
@@ -633,7 +639,7 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
 // _getResultsForClass assumes codeRefChomped might be a member of tryClass (inherited or not)
 // and will add to [results]
 void _getResultsForClass(Class tryClass, String codeRefChomped,
-    Set<ModelElement> results, String codeRef, Package package) {
+    Set<ModelElement> results, String codeRef, PackageGraph packageGraph) {
   // This might be part of the type arguments for the class, if so, add them.
   // Otherwise, search the class.
   if ((tryClass.modelType.typeArguments.map((e) => e.name))
@@ -644,7 +650,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
   } else {
     // People like to use 'this' in docrefs too.
     if (codeRef == 'this') {
-      results.add(package.findCanonicalModelElementFor(tryClass.element));
+      results.add(packageGraph.findCanonicalModelElementFor(tryClass.element));
     } else {
       // TODO(jcollins-g): get rid of reimplementation of identifier resolution
       //                   or integrate into ModelElement in a simpler way.
@@ -670,7 +676,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
           }
           // TODO(jcollins-g): fix operators so we can use 'name' here or similar.
           if (codeRefChomped == namePart) {
-            results.add(package.findCanonicalModelElementFor(
+            results.add(packageGraph.findCanonicalModelElementFor(
                 modelElement.element,
                 preferredClass: tryClass));
             continue;
@@ -682,7 +688,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
           // when it is referenced from a non-documented element?
           // TODO(jcollins-g): We could probably check this early.
           if (codeRefParts.first == c.name && codeRefParts.last == namePart) {
-            results.add(package.findCanonicalModelElementFor(
+            results.add(packageGraph.findCanonicalModelElementFor(
                 modelElement.element,
                 preferredClass: tryClass));
             continue;
@@ -696,7 +702,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
               if (codeRefClass == c.name &&
                   codeRefConstructor ==
                       modelElement.fullyQualifiedName.split('.').last) {
-                results.add(package.findCanonicalModelElementFor(
+                results.add(packageGraph.findCanonicalModelElementFor(
                     modelElement.element,
                     preferredClass: tryClass));
                 continue;
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 75b2611efc..1a47583f39 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -128,7 +128,7 @@ abstract class Inheritable implements ModelElement {
   ModelElement get definingEnclosingElement {
     if (_definingEnclosingClass == null) {
       _definingEnclosingClass =
-          new ModelElement.fromElement(element.enclosingElement, package);
+          new ModelElement.fromElement(element.enclosingElement, packageGraph);
     }
     return _definingEnclosingClass;
   }
@@ -144,7 +144,7 @@ abstract class Inheritable implements ModelElement {
     if (!_canonicalEnclosingClassIsSet) {
       if (isInherited) {
         searchElement = searchElement is Member
-            ? Package.getBasestElement(searchElement)
+            ? PackageGraph.getBasestElement(searchElement)
             : searchElement;
         // TODO(jcollins-g): generate warning if an inherited element's definition
         // is in an intermediate non-canonical class in the inheritance chain?
@@ -153,14 +153,15 @@ abstract class Inheritable implements ModelElement {
         for (Class c in inheritance.reversed) {
           // Filter out mixins.
           if (c.contains(searchElement)) {
-            if ((package.inheritThrough.contains(previous) &&
+            if ((packageGraph.inheritThrough.contains(previous) &&
                     c != definingEnclosingElement) ||
-                (package.inheritThrough.contains(c) &&
+                (packageGraph.inheritThrough.contains(c) &&
                     c == definingEnclosingElement)) {
               return (previousNonSkippable.memberByExample(this) as Inheritable)
                   .canonicalEnclosingElement;
             }
-            Class canonicalC = package.findCanonicalModelElementFor(c.element);
+            Class canonicalC =
+                packageGraph.findCanonicalModelElementFor(c.element);
             // TODO(jcollins-g): invert this lookup so traversal is recursive
             // starting from the ModelElement.
             if (canonicalC != null) {
@@ -172,7 +173,7 @@ abstract class Inheritable implements ModelElement {
             }
           }
           previous = c;
-          if (!package.inheritThrough.contains(c)) {
+          if (!packageGraph.inheritThrough.contains(c)) {
             previousNonSkippable = c;
           }
         }
@@ -184,7 +185,7 @@ abstract class Inheritable implements ModelElement {
         }
       } else {
         _canonicalEnclosingClass =
-            package.findCanonicalModelElementFor(enclosingElement.element);
+            packageGraph.findCanonicalModelElementFor(enclosingElement.element);
       }
       _canonicalEnclosingClassIsSet = true;
       assert(_canonicalEnclosingClass == null ||
@@ -200,15 +201,16 @@ abstract class Inheritable implements ModelElement {
     inheritance.addAll((enclosingElement as Class).inheritanceChain);
     if (!inheritance.contains(definingEnclosingElement) &&
         definingEnclosingElement != null) {
-      assert(definingEnclosingElement == package.objectElement);
+      assert(definingEnclosingElement == packageGraph.objectElement);
     }
     // Unless the code explicitly extends dart-core's Object, we won't get
     // an entry here.  So add it.
-    if (inheritance.last != package.objectElement &&
-        package.objectElement != null) {
-      inheritance.add(package.objectElement);
+    if (inheritance.last != packageGraph.objectElement &&
+        packageGraph.objectElement != null) {
+      inheritance.add(packageGraph.objectElement);
     }
-    assert(inheritance.where((e) => e == package.objectElement).length == 1);
+    assert(
+        inheritance.where((e) => e == packageGraph.objectElement).length == 1);
     return inheritance;
   }
 }
@@ -363,7 +365,7 @@ class Accessor extends ModelElement
   @override
   ModelElement get enclosingElement {
     if (_accessor.enclosingElement is CompilationUnitElement) {
-      return package
+      return packageGraph
           .findOrCreateLibraryFor(_accessor.enclosingElement.enclosingElement);
     }
 
@@ -387,7 +389,7 @@ class Accessor extends ModelElement
   ModelElement _overriddenElement;
   @override
   Accessor get overriddenElement {
-    assert(package.allLibrariesAdded);
+    assert(packageGraph.allLibrariesAdded);
     if (!_overriddenElementIsSet) {
       _overriddenElementIsSet = true;
       Element parent = element.enclosingElement;
@@ -398,10 +400,10 @@ class Accessor extends ModelElement
               : t.getSetter(element.name);
           if (accessor != null) {
             if (accessor is Member) {
-              accessor = Package.getBasestElement(accessor);
+              accessor = PackageGraph.getBasestElement(accessor);
             }
             Class parentClass =
-                new ModelElement.fromElement(t.element, package);
+                new ModelElement.fromElement(t.element, packageGraph);
             List<Field> possibleFields = [];
             possibleFields.addAll(parentClass.allInstanceProperties);
             possibleFields.addAll(parentClass.staticProperties);
@@ -459,7 +461,7 @@ class Class extends ModelElement
     _mixins = _cls.mixins
         .map((f) {
           ElementType t = new ElementType(
-              f, new ModelElement.fromElement(f.element, package));
+              f, new ModelElement.fromElement(f.element, packageGraph));
           return t;
         })
         .where((mixin) => mixin != null)
@@ -467,12 +469,12 @@ class Class extends ModelElement
 
     if (_cls.supertype != null && _cls.supertype.element.supertype != null) {
       _supertype = new ElementType(_cls.supertype,
-          new ModelElement.fromElement(_cls.supertype.element, package));
+          new ModelElement.fromElement(_cls.supertype.element, packageGraph));
     }
 
     _interfaces = _cls.interfaces
         .map((f) => new ElementType(
-            f, new ModelElement.fromElement(f.element, package)))
+            f, new ModelElement.fromElement(f.element, packageGraph)))
         .toList(growable: false);
   }
 
@@ -692,9 +694,10 @@ class Class extends ModelElement
 
   /// Returns all the implementors of this class.
   Iterable<Class> get publicImplementors {
-    return filterNonPublic(findCanonicalFor(package._implementors[href] != null
-        ? package._implementors[href]
-        : []));
+    return filterNonPublic(findCanonicalFor(
+        packageGraph._implementors[href] != null
+            ? packageGraph._implementors[href]
+            : []));
   }
 
   List<Method> get inheritedMethods {
@@ -1063,7 +1066,7 @@ class Class extends ModelElement
   // a stronger hash?
   @override
   List<TypeParameter> get typeParameters => _cls.typeParameters.map((f) {
-        var lib = new Library(f.enclosingElement.library, package);
+        var lib = new Library(f.enclosingElement.library, packageGraph);
         return new ModelElement.from(f, lib);
       }).toList();
 
@@ -1072,7 +1075,7 @@ class Class extends ModelElement
       o is Class &&
       name == o.name &&
       o.library.name == library.name &&
-      o.library.package.name == library.package.name;
+      o.library.packageGraph.name == library.packageGraph.name;
 }
 
 class Constructor extends ModelElement
@@ -1165,7 +1168,7 @@ abstract class Documentable extends Nameable {
   bool get hasExtendedDocumentation;
   String get oneLineDoc;
   Documentable get overriddenDocumentedElement;
-  Package get package;
+  PackageGraph get packageGraph;
   bool get isDocumented;
 }
 
@@ -1197,7 +1200,7 @@ abstract class Canonicalization extends Object
     // Penalty for deprecated libraries.
     if (lib.isDeprecated) scoredCandidate.alterScore(-1.0, 'is deprecated');
     // Give a big boost if the library has the package name embedded in it.
-    if (package.namePieces.intersection(lib.namePieces).length > 0) {
+    if (packageGraph.namePieces.intersection(lib.namePieces).length > 0) {
       scoredCandidate.alterScore(1.0, 'embeds package name');
     }
     // Give a tiny boost for libraries with long names, assuming they're
@@ -1229,13 +1232,13 @@ abstract class Canonicalization extends Object
 
 class Dynamic extends ModelElement {
   @override
-  Package package;
+  PackageGraph packageGraph;
 
-  Dynamic(Element element, Library library, Package p)
+  Dynamic(Element element, Library library, PackageGraph p)
       : super(element, library, null) {
-    package = p;
-    assert(package != null || library != null);
-    if (p == null) package = library.package;
+    packageGraph = p;
+    assert(packageGraph != null || library != null);
+    if (p == null) packageGraph = library.packageGraph;
   }
 
   @override
@@ -1527,7 +1530,8 @@ abstract class GetterSetterCombo implements ModelElement {
         .toString();
     Element staticElement =
         (constantInitializer as InstanceCreationExpression).staticElement;
-    Constructor target = new ModelElement.fromElement(staticElement, package);
+    Constructor target =
+        new ModelElement.fromElement(staticElement, packageGraph);
     Class targetClass = target.enclosingElement;
     // TODO(jcollins-g): this logic really should be integrated into Constructor,
     // but that's not trivial because of linkedName's usage.
@@ -1696,7 +1700,7 @@ abstract class GetterSetterCombo implements ModelElement {
 
 class Library extends ModelElement {
   @override
-  final Package package;
+  final PackageGraph packageGraph;
 
   List<Class> _classes;
   List<Class> _enums;
@@ -1706,11 +1710,12 @@ class Library extends ModelElement {
   Namespace _exportedNamespace;
   String _name;
   String _packageName;
-  factory Library(LibraryElement element, Package package) {
-    return package.findOrCreateLibraryFor(element);
+  factory Library(LibraryElement element, PackageGraph packageGraph) {
+    return packageGraph.findOrCreateLibraryFor(element);
   }
 
-  Library._(LibraryElement element, this.package) : super(element, null, null) {
+  Library._(LibraryElement element, this.packageGraph)
+      : super(element, null, null) {
     if (element == null) throw new ArgumentError.notNull('element');
     _exportedNamespace =
         new NamespaceBuilder().createExportNamespaceForLibrary(element);
@@ -1731,14 +1736,16 @@ class Library extends ModelElement {
         Accessor setter;
         if (e is GetterSetterCombo) {
           if (e.hasGetter) {
-            getter = new ModelElement.fromElement(e.getter.element, package);
+            getter =
+                new ModelElement.fromElement(e.getter.element, packageGraph);
           }
           if (e.hasSetter) {
-            setter = new ModelElement.fromElement(e.setter.element, package);
+            setter =
+                new ModelElement.fromElement(e.setter.element, packageGraph);
           }
         }
         return new ModelElement.from(
-                e.element, package.findOrCreateLibraryFor(e.element),
+                e.element, packageGraph.findOrCreateLibraryFor(e.element),
                 getter: getter, setter: setter)
             .fullyQualifiedName;
       }).toList();
@@ -1755,8 +1762,8 @@ class Library extends ModelElement {
   }
 
   SdkLibrary get sdkLib {
-    if (package.sdkLibrarySources.containsKey(element.librarySource)) {
-      return package.sdkLibrarySources[element.librarySource];
+    if (packageGraph.sdkLibrarySources.containsKey(element.librarySource)) {
+      return packageGraph.sdkLibrarySources[element.librarySource];
     }
     return null;
   }
@@ -1791,7 +1798,7 @@ class Library extends ModelElement {
   Set<Library> _packageImportedExportedLibraries;
 
   /// Returns all libraries either imported by or exported by any public library
-  /// this library's package.  (Not [Package], but sharing a package name).
+  /// this library's package.  (Not [PackageGraph], but sharing a package name).
   ///
   /// Note: will still contain non-public libraries because those can be
   /// imported or exported.
@@ -1800,7 +1807,7 @@ class Library extends ModelElement {
   Set<Library> get packageImportedExportedLibraries {
     if (_packageImportedExportedLibraries == null) {
       _packageImportedExportedLibraries = new Set();
-      package.publicLibraries
+      packageGraph.publicLibraries
           .where((l) => l.packageName == packageName)
           .forEach((l) {
         _packageImportedExportedLibraries.addAll(l.importedExportedLibraries);
@@ -1999,17 +2006,21 @@ class Library extends ModelElement {
   /// for anonymous libraries in subdirectories or other packages.
   String get nameFromPath {
     if (_nameFromPath == null) {
-      _nameFromPath =
-          getNameFromPath(element, package.driver, package.packageMeta);
+      _nameFromPath = getNameFromPath(
+          element, packageGraph.driver, packageGraph.packageMeta);
     }
     return _nameFromPath;
   }
 
   /// The real package, as opposed to the package we are documenting it with,
-  /// [Package.name]
+  /// [PackageGraph.name]
   String get packageName {
     if (_packageName == null) {
-      _packageName = packageMeta?.name ?? '';
+      if (name.startsWith('dart:')) {
+        _packageName = 'Dart Core';
+      } else {
+        _packageName = packageMeta?.name ?? '';
+      }
     }
     return _packageName;
   }
@@ -2135,7 +2146,7 @@ class Library extends ModelElement {
   }
 
   /// Reverses URIs if needed to get a package URI.
-  /// Not the same as [Package.name] because there we always strip all
+  /// Not the same as [PackageGraph.name] because there we always strip all
   /// path components; this function only strips the package prefix if the
   /// library is part of the default package.
   static String getNameFromPath(LibraryElement element, AnalysisDriver driver,
@@ -2269,7 +2280,7 @@ class Library extends ModelElement {
   /// If not, then the situation is either ambiguous, or the reverse is true.
   /// Computing this is expensive, so cache it.
   bool isReexportedBy(Library library) {
-    assert(package.allLibrariesAdded);
+    assert(packageGraph.allLibrariesAdded);
     if (_isReexportedBy.containsKey(library)) return _isReexportedBy[library];
     Set<Element> otherElements = new Set()
       ..addAll(library.allModelElements.map((l) => l.element));
@@ -2373,7 +2384,7 @@ class Method extends ModelElement
       Element e = t.getMethod(element.name);
       if (e != null) {
         assert(e.enclosingElement is ClassElement);
-        return new ModelElement.fromElement(e, package);
+        return new ModelElement.fromElement(e, packageGraph);
       }
     }
     return null;
@@ -2425,8 +2436,8 @@ ModelElement resolveMultiplyInheritedElement(
     MultiplyInheritedExecutableElement e,
     Library library,
     Class enclosingClass) {
-  Iterable<Inheritable> inheritables = e.inheritedElements.map(
-      (ee) => new ModelElement.fromElement(ee, library.package) as Inheritable);
+  Iterable<Inheritable> inheritables = e.inheritedElements.map((ee) =>
+      new ModelElement.fromElement(ee, library.packageGraph) as Inheritable);
   Inheritable foundInheritable;
   int lowIndex = enclosingClass.inheritanceChain.length;
   for (var inheritable in inheritables) {
@@ -2447,7 +2458,7 @@ abstract class Privacy {
 }
 
 /// This class is the foundation of Dartdoc's model for source code.
-/// All ModelElements are contained within a [Package], and laid out in a
+/// All ModelElements are contained within a [PackageGraph], and laid out in a
 /// structure that mirrors the availability of identifiers in the various
 /// namespaces within that package.  For example, multiple [Class] objects
 /// for a particular identifier ([ModelElement.element]) may show up in
@@ -2457,14 +2468,14 @@ abstract class Privacy {
 /// documentation: canonicalization.
 ///
 /// A ModelElement is canonical if it is the element in the namespace where that
-/// element 'comes from' in the public interface to this [Package].  That often
-/// means the [ModelElement.library] is contained in [Package.libraries], but
+/// element 'comes from' in the public interface to this [PackageGraph].  That often
+/// means the [ModelElement.library] is contained in [PackageGraph.libraries], but
 /// there are many exceptions and ambiguities the code tries to address here.
 ///
 /// Non-canonical elements should refer to their canonical counterparts, making
 /// it easy to calculate links via [ModelElement.href] without having to
 /// know in a particular namespace which elements are canonical or not.
-/// A number of [Package] methods, such as [Package.findCanonicalModelElementFor]
+/// A number of [PackageGraph] methods, such as [PackageGraph.findCanonicalModelElementFor]
 /// can help with this.
 ///
 /// When documenting, Dartdoc should only write out files corresponding to
@@ -2493,9 +2504,9 @@ abstract class ModelElement extends Canonicalization
   // is fixed.
   ModelElement(this._element, this._library, this._originalMember) {}
 
-  factory ModelElement.fromElement(Element e, Package p) {
+  factory ModelElement.fromElement(Element e, PackageGraph p) {
     Library lib = _findOrCreateEnclosingLibraryForStatic(e, p);
-    return new ModelElement.from(e, lib, package: p);
+    return new ModelElement.from(e, lib, packageGraph: p);
   }
 
   // TODO(jcollins-g): this way of using the optional parameter is messy,
@@ -2512,7 +2523,7 @@ abstract class ModelElement extends Canonicalization
       {Class enclosingClass,
       Accessor getter,
       Accessor setter,
-      Package package}) {
+      PackageGraph packageGraph}) {
     // With AnalysisDriver, we sometimes get ElementHandles when building
     // docs for the SDK, seen via [Library.importedExportedLibraries].  Why?
     if (e is ElementHandle) {
@@ -2523,7 +2534,7 @@ abstract class ModelElement extends Canonicalization
     // TODO(jcollins-g): Refactor object model to instantiate 'ModelMembers'
     //                   for members?
     if (e is Member) {
-      var basest = Package.getBasestElement(e);
+      var basest = PackageGraph.getBasestElement(e);
       originalMember = e;
       e = basest;
     }
@@ -2531,19 +2542,19 @@ abstract class ModelElement extends Canonicalization
         new Tuple3(e, library, enclosingClass);
     ModelElement newModelElement;
     if (e.kind != ElementKind.DYNAMIC &&
-        library.package._allConstructedModelElements.containsKey(key)) {
-      newModelElement = library.package._allConstructedModelElements[key];
+        library.packageGraph._allConstructedModelElements.containsKey(key)) {
+      newModelElement = library.packageGraph._allConstructedModelElements[key];
       assert(newModelElement.element is! MultiplyInheritedExecutableElement);
     } else {
       if (e.kind == ElementKind.DYNAMIC) {
-        newModelElement = new Dynamic(e, library, package);
+        newModelElement = new Dynamic(e, library, packageGraph);
       }
       if (e is MultiplyInheritedExecutableElement) {
         newModelElement =
             resolveMultiplyInheritedElement(e, library, enclosingClass);
       } else {
         if (e is LibraryElement) {
-          newModelElement = new Library(e, library.package);
+          newModelElement = new Library(e, library.packageGraph);
         }
         // Also handles enums
         if (e is ClassElement) {
@@ -2552,14 +2563,17 @@ abstract class ModelElement extends Canonicalization
             if (newModelElement.name == 'Object' &&
                 newModelElement.library.name == 'dart:core') {
               // We've found Object.  This is an important object, so save it in the package.
-              assert(newModelElement.library.package._objectElement == null);
-              newModelElement.library.package._objectElement = newModelElement;
+              assert(
+                  newModelElement.library.packageGraph._objectElement == null);
+              newModelElement.library.packageGraph._objectElement =
+                  newModelElement;
             }
             if (newModelElement.name == 'Interceptor' &&
                 newModelElement.library.name == 'dart:_interceptors') {
               // We've found Interceptor.  Another important object.
-              assert(!newModelElement.library.package._interceptorUsed);
-              newModelElement.library.package.interceptor = newModelElement;
+              assert(!newModelElement.library.packageGraph._interceptorUsed);
+              newModelElement.library.packageGraph.interceptor =
+                  newModelElement;
             }
           } else {
             newModelElement = new Enum(e, library);
@@ -2660,12 +2674,12 @@ abstract class ModelElement extends Canonicalization
     // TODO(jcollins-g): Reenable Parameter caching when dart-lang/sdk#30146
     //                   is fixed?
     if (library != null && newModelElement is! Parameter) {
-      library.package._allConstructedModelElements[key] = newModelElement;
+      library.packageGraph._allConstructedModelElements[key] = newModelElement;
       if (newModelElement is Inheritable) {
         Tuple2<Element, Library> iKey = new Tuple2(e, library);
-        library.package._allInheritableElements
+        library.packageGraph._allInheritableElements
             .putIfAbsent(iKey, () => new Set());
-        library.package._allInheritableElements[iKey].add(newModelElement);
+        library.packageGraph._allInheritableElements[iKey].add(newModelElement);
       }
     }
     if (newModelElement is GetterSetterCombo) {
@@ -2678,7 +2692,8 @@ abstract class ModelElement extends Canonicalization
   }
 
   Set<Library> get exportedInLibraries {
-    return library.package.libraryElementReexportedBy[this.element.library];
+    return library
+        .packageGraph.libraryElementReexportedBy[this.element.library];
   }
 
   // TODO(jcollins-g): annotations should now be able to use the utility
@@ -2691,8 +2706,8 @@ abstract class ModelElement extends Canonicalization
     return md.map((ElementAnnotation a) {
       String annotation = (const HtmlEscape()).convert(a.toSource());
       // a.element can be null if the element can't be resolved.
-      var me =
-          package.findCanonicalModelElementFor(a.element?.enclosingElement);
+      var me = packageGraph
+          .findCanonicalModelElementFor(a.element?.enclosingElement);
       if (me != null)
         annotation = annotation.replaceFirst(me.name, me.linkedName);
       return annotation;
@@ -2754,7 +2769,7 @@ abstract class ModelElement extends Canonicalization
     if (enclosingElement is Class) {
       preferredClass = enclosingElement;
     }
-    return package.findCanonicalModelElementFor(element,
+    return packageGraph.findCanonicalModelElementFor(element,
         preferredClass: preferredClass);
   }
 
@@ -2840,7 +2855,7 @@ abstract class ModelElement extends Canonicalization
         documentationFrom.map((e) => e.documentationLocal).join('<p>'));
   }
 
-  Library get definingLibrary => package.findOrCreateLibraryFor(element);
+  Library get definingLibrary => packageGraph.findOrCreateLibraryFor(element);
 
   Library _canonicalLibrary;
   // _canonicalLibrary can be null so we can't check against null to see whether
@@ -2850,7 +2865,7 @@ abstract class ModelElement extends Canonicalization
   Library get canonicalLibrary {
     if (!_canonicalLibraryIsSet) {
       // This is not accurate if we are constructing the Package.
-      assert(package.allLibrariesAdded);
+      assert(packageGraph.allLibrariesAdded);
       // Since we're may be looking for a library, find the [Element] immediately
       // contained by a [CompilationUnitElement] in the tree.
       Element topLevelElement = element;
@@ -2865,8 +2880,8 @@ abstract class ModelElement extends Canonicalization
       // just shortcut them out.
       if (!hasPublicName(element)) {
         _canonicalLibrary = null;
-      } else if (!package.publicLibraries.contains(definingLibrary)) {
-        List<Library> candidateLibraries = package
+      } else if (!packageGraph.publicLibraries.contains(definingLibrary)) {
+        List<Library> candidateLibraries = packageGraph
             .libraryElementReexportedBy[definingLibrary.element]
             ?.where((l) => l.isPublic)
             ?.toList();
@@ -2883,7 +2898,7 @@ abstract class ModelElement extends Canonicalization
           }).toList();
           // Start with our top-level element.
           ModelElement warnable =
-              new ModelElement.fromElement(topLevelElement, package);
+              new ModelElement.fromElement(topLevelElement, packageGraph);
           if (candidateLibraries.length > 1) {
             // Heuristic scoring to determine which library a human likely
             // considers this element to be primarily 'from', and therefore,
@@ -2915,7 +2930,7 @@ abstract class ModelElement extends Canonicalization
       if (this is Inheritable) {
         if ((this as Inheritable).isInherited &&
             _canonicalLibrary == null &&
-            package.publicLibraries.contains(library)) {
+            packageGraph.publicLibraries.contains(library)) {
           // In the event we've inherited a field from an object that isn't directly reexported,
           // we may need to pretend we are canonical for this.
           _canonicalLibrary = library;
@@ -2924,7 +2939,7 @@ abstract class ModelElement extends Canonicalization
       _canonicalLibraryIsSet = true;
     }
     assert(_canonicalLibrary == null ||
-        package.publicLibraries.contains(_canonicalLibrary));
+        packageGraph.publicLibraries.contains(_canonicalLibrary));
     return _canonicalLibrary;
   }
 
@@ -3100,8 +3115,10 @@ abstract class ModelElement extends Canonicalization
           (_originalMember is ExecutableMember ||
               _originalMember is ParameterMember)) {
         dynamic originalMember = _originalMember;
-        _modelType = new ElementType(originalMember.type,
-            new ModelElement.fromElement(originalMember.type.element, package));
+        _modelType = new ElementType(
+            originalMember.type,
+            new ModelElement.fromElement(
+                originalMember.type.element, packageGraph));
       } else if (element is ExecutableElement ||
           element is FunctionTypedElement ||
           element is ParameterElement ||
@@ -3110,7 +3127,7 @@ abstract class ModelElement extends Canonicalization
         _modelType = new ElementType(
             (element as dynamic).type,
             new ModelElement.fromElement(
-                (element as dynamic).type.element, package));
+                (element as dynamic).type.element, packageGraph));
       }
     }
     return _modelType;
@@ -3167,11 +3184,12 @@ abstract class ModelElement extends Canonicalization
   }
 
   @override
-  Package get package =>
-      (this is Library) ? (this as Library).package : this.library.package;
+  PackageGraph get packageGraph => (this is Library)
+      ? (this as Library).packageGraph
+      : this.library.packageGraph;
 
   bool get isPublicAndPackageDocumented =>
-      isPublic && library.package.packageDocumentedFor(this);
+      isPublic && library.packageGraph.packageDocumentedFor(this);
 
   List<Parameter> _allParameters;
   // TODO(jcollins-g): This is in the wrong place.  Move parts to GetterSetterCombo,
@@ -3237,7 +3255,7 @@ abstract class ModelElement extends Canonicalization
       {String message,
       Iterable<Locatable> referredFrom,
       Iterable<String> extendedDebug}) {
-    package.warnOnElement(this, kind,
+    packageGraph.warnOnElement(this, kind,
         message: message,
         referredFrom: referredFrom,
         extendedDebug: extendedDebug);
@@ -3437,14 +3455,14 @@ abstract class ModelElement extends Canonicalization
   // searching for the [Library] associated with this element's enclosing
   // Library before trying to create one.
   static Library _findOrCreateEnclosingLibraryForStatic(
-      Element e, Package package) {
+      Element e, PackageGraph packageGraph) {
     var element = e.getAncestor((l) => l is LibraryElement);
     var lib;
     if (element != null) {
-      lib = package.findLibraryFor(element);
+      lib = packageGraph.findLibraryFor(element);
     }
     if (lib == null) {
-      lib = package.findOrCreateLibraryFor(e);
+      lib = packageGraph.findOrCreateLibraryFor(e);
     }
     if (lib == null) {
       assert(e.kind == ElementKind.DYNAMIC);
@@ -3471,7 +3489,7 @@ abstract class ModelElement extends Canonicalization
   ///     {@example abc/def/xyz_component.dart region=template lang=html}
   ///
   String _injectExamples(String rawdocs) {
-    final dirPath = this.package.packageMeta.dir.path;
+    final dirPath = this.packageGraph.packageMeta.dir.path;
     RegExp exampleRE = new RegExp(r'{@example\s+([^}]+)}');
     return rawdocs.replaceAllMapped(exampleRE, (match) {
       var args = _getExampleArgs(match[1]);
@@ -3526,7 +3544,7 @@ abstract class ModelElement extends Canonicalization
   String _injectMacros(String rawDocs) {
     final macroRegExp = new RegExp(r'{@macro\s+([^}]+)}');
     return rawDocs.replaceAllMapped(macroRegExp, (match) {
-      String macro = package.getMacro(match[1]);
+      String macro = packageGraph.getMacro(match[1]);
       if (macro == null) {
         warn(PackageWarning.unknownMacro, message: match[1]);
       }
@@ -3547,7 +3565,7 @@ abstract class ModelElement extends Canonicalization
         r'[ ]*{@template\s+(.+?)}([\s\S]+?){@endtemplate}[ ]*\n?',
         multiLine: true);
     return rawDocs.replaceAllMapped(templateRegExp, (match) {
-      package._addMacro(match[1].trim(), match[2].trim());
+      packageGraph._addMacro(match[1].trim(), match[2].trim());
       return "";
     });
   }
@@ -3760,10 +3778,7 @@ class Operator extends Method {
 
 // TODO(jcollins-g): Break [Package] out into a real single-package only
 // class, and a container class for a set of packages.
-class Package extends Canonicalization with Nameable, Warnable {
-  // Library objects serving as entry points for documentation.
-  final List<Library> _libraries = [];
-
+class PackageGraph extends Canonicalization with Nameable, Warnable {
   // All library objects related to this package; a superset of _libraries.
   final Map<LibraryElement, Library> allLibraries = new Map();
 
@@ -3788,7 +3803,10 @@ class Package extends Canonicalization with Nameable, Warnable {
   Library get canonicalLibrary => null;
 
   @override
-  Package get package => this;
+  PackageGraph get packageGraph => this;
+
+  /// Map of package name to Package.
+  final Map<String, Package> packages = {};
 
   final AnalysisDriver driver;
   final DartSdk sdk;
@@ -3825,7 +3843,7 @@ class Package extends Canonicalization with Nameable, Warnable {
   bool allLibrariesAdded = false;
   bool _macrosAdded = false;
 
-  Package(Iterable<LibraryElement> libraryElements, this.packageMeta,
+  PackageGraph(Iterable<LibraryElement> libraryElements, this.packageMeta,
       this._packageWarningOptions, this.driver,
       [this.sdk]) {
     assert(_allConstructedModelElements.isEmpty);
@@ -3833,16 +3851,20 @@ class Package extends Canonicalization with Nameable, Warnable {
     _packageWarningCounter = new PackageWarningCounter(_packageWarningOptions);
     libraryElements.forEach((element) {
       var lib = new Library._(element, this);
-      _libraries.add(lib);
+      packages.putIfAbsent(
+          lib.packageName, () => new Package(lib.packageName, this));
+      packages[lib.packageName]._libraries.add(lib);
       allLibraries[element] = lib;
       assert(!_elementToLibrary.containsKey(lib.element));
       _elementToLibrary[element] = lib;
     });
 
-    _libraries.sort((a, b) => compareNatural(a.name, b.name));
     allLibrariesAdded = true;
-    _libraries.forEach((library) {
-      library._allClasses.forEach(_addToImplementors);
+    packages.values.forEach((package) {
+      package._libraries.sort((a, b) => compareNatural(a.name, b.name));
+      package._libraries.forEach((library) {
+        library._allClasses.forEach(_addToImplementors);
+      });
     });
 
     _implementors.values.forEach((l) => l.sort());
@@ -4072,31 +4094,17 @@ class Package extends Canonicalization with Nameable, Warnable {
     return locatable.fullyQualifiedName.replaceFirst(':', '-');
   }
 
-  List<PackageCategory> get categories {
-    Map<String, PackageCategory> result = {};
-
-    for (Library library in publicLibraries) {
-      String name = '';
-
-      if (library.name.startsWith('dart:')) {
-        name = 'Dart Core';
-      } else {
-        name = library.packageName;
-      }
-
-      if (!result.containsKey(name)) {
-        result[name] = new PackageCategory(name, this);
-      }
-      result[name]._libraries.add(library);
-    }
+  List<Package> get categories {
     // Help the user if they pass us a category that doesn't exist.
     for (String categoryName in config.categoryOrder) {
-      if (!result.containsKey(categoryName))
+      if (!packages.containsKey(categoryName))
         warnOnElement(null, PackageWarning.categoryOrderGivesMissingPackageName,
-            message: "${categoryName}, categories: ${result.keys.join(',')}");
+            message: "${categoryName}, categories: ${packages.keys.join(',')}");
     }
-    List<PackageCategory> packageCategories = result.values.toList()..sort();
-    return packageCategories;
+    List<Package> publicPackages = packages.values
+        .where((p) => p.libraries.any((l) => l.isPublic))
+        .toList();
+    return publicPackages..sort();
   }
 
   Map<LibraryElement, Set<Library>> _libraryElementReexportedBy = new Map();
@@ -4149,10 +4157,12 @@ class Package extends Canonicalization with Nameable, Warnable {
       hrefMap.putIfAbsent(modelElement.href, () => new Set());
       hrefMap[modelElement.href].add(modelElement);
     }
-    for (Library library in _libraries) {
-      if (library.href == null) continue;
-      hrefMap.putIfAbsent(library.href, () => new Set());
-      hrefMap[library.href].add(library);
+    for (Package package in packages.values) {
+      for (Library library in package._libraries) {
+        if (library.href == null) continue;
+        hrefMap.putIfAbsent(library.href, () => new Set());
+        hrefMap[library.href].add(library);
+      }
     }
     return hrefMap;
   }
@@ -4209,7 +4219,8 @@ class Package extends Canonicalization with Nameable, Warnable {
     }
   }
 
-  List<Library> get libraries => _libraries.toList(growable: false);
+  List<Library> get libraries =>
+      packages.values.expand((p) => p.libraries).toList()..sort();
   Iterable<Library> get publicLibraries => filterNonPublic(libraries);
 
   bool get hasHomepage =>
@@ -4220,7 +4231,7 @@ class Package extends Canonicalization with Nameable, Warnable {
   String get name => packageMeta.name;
 
   String get kind =>
-      (packageMeta.useCategories || package.isSdk) ? '' : 'package';
+      (packageMeta.useCategories || packageGraph.isSdk) ? '' : 'package';
 
   @override
   String get oneLineDoc => '';
@@ -4334,7 +4345,7 @@ class Package extends Canonicalization with Nameable, Warnable {
   /// this element is related to a particular class, pass preferredClass to
   /// disambiguate.
   ///
-  /// This doesn't know anything about [Package.inheritThrough] and probably
+  /// This doesn't know anything about [PackageGraph.inheritThrough] and probably
   /// shouldn't, so using it with [Inheritable]s without special casing is
   /// not advised.
   ModelElement findCanonicalModelElementFor(Element e, {Class preferredClass}) {
@@ -4497,12 +4508,12 @@ class Package extends Canonicalization with Nameable, Warnable {
   }
 }
 
-class PackageCategory implements Comparable<PackageCategory> {
+class Package implements Comparable<Package> {
   final String name;
   final List<Library> _libraries = [];
-  Package package;
+  PackageGraph packageGraph;
 
-  PackageCategory(this.name, this.package);
+  Package(this.name, this.packageGraph);
 
   List<Library> get libraries => _libraries;
 
@@ -4520,14 +4531,14 @@ class PackageCategory implements Comparable<PackageCategory> {
   /// 3 otherwise.
   int get _group {
     if (config.categoryOrder.contains(name)) return -1;
-    if (name.toLowerCase() == package.name.toLowerCase()) return 0;
+    if (name.toLowerCase() == packageGraph.name.toLowerCase()) return 0;
     if (name == "Dart Core") return 1;
-    if (name.toLowerCase().contains(package.name.toLowerCase())) return 2;
+    if (name.toLowerCase().contains(packageGraph.name.toLowerCase())) return 2;
     return 3;
   }
 
   @override
-  int compareTo(PackageCategory other) {
+  int compareTo(Package other) {
     if (_group == other._group) {
       if (_group == -1) {
         return Comparable.compare(config.categoryOrder.indexOf(name),
@@ -4660,7 +4671,7 @@ abstract class SourceCodeMixin {
       var source = node.element.source;
       var filePath = source.fullName;
       var uri = source.uri.toString();
-      var packageMeta = library.package.packageMeta;
+      var packageMeta = library.packageGraph.packageMeta;
       if (uri.startsWith("package:")) {
         var splittedUri =
             uri.replaceAll(new RegExp(r"^package:"), "").split("/");
@@ -4882,7 +4893,7 @@ class TypeParameter extends ModelElement {
     var bound = _typeParameter.bound;
     if (bound != null) {
       ModelElement boundClass =
-          new ModelElement.fromElement(bound.element, package);
+          new ModelElement.fromElement(bound.element, packageGraph);
       return new ElementType(bound, boundClass);
     }
     return null;
@@ -4933,9 +4944,9 @@ class PackageBuilder {
 
   void logAnalysisErrors(Set<Source> sources) {}
 
-  Future<Package> buildPackage() async {
+  Future<PackageGraph> buildPackageGraph() async {
     Set<LibraryElement> libraries = await getLibraries(getFiles);
-    return new Package(
+    return new PackageGraph(
         libraries, packageMeta, getWarningOptions(), driver, sdk);
   }
 
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index 2033480f9c..25fed99f0e 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -34,8 +34,8 @@ Iterable<T> filterNonPublic<T extends Privacy>(Iterable<T> privacyItems) {
 /// Finds canonical classes for all classes in the iterable, if possible.
 /// If a canonical class can not be found, returns the original class.
 Iterable<Class> findCanonicalFor(Iterable<Class> classes) {
-  return classes.map(
-      (c) => c.package.findCanonicalModelElementFor(c.element) as Class ?? c);
+  return classes.map((c) =>
+      c.packageGraph.findCanonicalModelElementFor(c.element) as Class ?? c);
 }
 
 String getFileContentsFor(Element e) {
diff --git a/lib/templates/_footer.html b/lib/templates/_footer.html
index 9b855974e2..27edba0a81 100644
--- a/lib/templates/_footer.html
+++ b/lib/templates/_footer.html
@@ -2,7 +2,7 @@
 
 <footer>
   <span class="no-break">
-    {{package.name}} {{package.version}}
+    {{packageGraph.name}} {{packageGraph.version}}
   </span>
 
   <!-- footer-text placeholder -->
diff --git a/lib/templates/index.html b/lib/templates/index.html
index 5474e1a448..fa12a1f4c9 100644
--- a/lib/templates/index.html
+++ b/lib/templates/index.html
@@ -5,33 +5,33 @@ <h5>{{self.name}} {{self.kind}}</h5>
 
     {{#useCategories}}
     <ol>
-      {{#package.categories}}
+      {{#packageGraph.categories}}
         <li class="section-title">{{name}}</li>
         {{#libraries}}
         <li>{{{linkedName}}}</li>
         {{/libraries}}
-      {{/package.categories}}
+      {{/packageGraph.categories}}
 
     </ol>
     {{/useCategories}}
 
     {{^useCategories}}
     <ol>
-      <li class="section-title"><a href="{{package.href}}#libraries">Libraries</a></li>
-      {{#package.publicLibraries}}
+      <li class="section-title"><a href="{{packageGraph.href}}#libraries">Libraries</a></li>
+      {{#packageGraph.publicLibraries}}
       <li>{{{linkedName}}}</li>
-      {{/package.publicLibraries}}
+      {{/packageGraph.publicLibraries}}
     </ol>
     {{/useCategories}}
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    {{#package}}
+    {{#packageGraph}}
       {{>documentation}}
-    {{/package}}
+    {{/packageGraph}}
 
     {{#useCategories}}
-      {{#package.categories}}
+      {{#packageGraph.categories}}
         <section class="summary">
           <h2>{{name}}</h2>
           <dl>
@@ -45,7 +45,7 @@ <h2>{{name}}</h2>
             {{/libraries}}
           </dl>
         </section>
-      {{/package.categories}}
+      {{/packageGraph.categories}}
 
     {{/useCategories}}
 
@@ -53,14 +53,14 @@ <h2>{{name}}</h2>
       <section class="summary" id="libraries">
         <h2>Libraries</h2>
         <dl>
-          {{#package.publicLibraries}}
+          {{#packageGraph.publicLibraries}}
             <dt id="{{htmlId}}">
               <span class="name">{{{ linkedName }}}</span>
             </dt>
             <dd>
               {{{ oneLineDoc }}}
             </dd>
-          {{/package.publicLibraries}}
+          {{/packageGraph.publicLibraries}}
         </dl>
       </section>
     {{/useCategories}}
diff --git a/lib/templates/library.html b/lib/templates/library.html
index c544b7a22b..ec14b7795b 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -4,21 +4,21 @@
     <h5>{{parent.name}} {{parent.kind}}</h5>
     {{#useCategories}}
     <ol>
-      {{#package.categories}}
+      {{#packageGraph.categories}}
         <li class="section-title">{{name}}</li>
         {{#publicLibraries}}
         <li>{{{linkedName}}}</li>
         {{/publicLibraries}}
-      {{/package.categories}}
+      {{/packageGraph.categories}}
     </ol>
     {{/useCategories}}
 
     {{^useCategories}}
     <ol>
-      <li class="section-title"><a href="{{package.href}}#libraries">Libraries</a></li>
-      {{#package.publicLibraries}}
+      <li class="section-title"><a href="{{packageGraph.href}}#libraries">Libraries</a></li>
+      {{#packageGraph.publicLibraries}}
       <li>{{{linkedName}}}</li>
-      {{/package.publicLibraries}}
+      {{/packageGraph.publicLibraries}}
     </ol>
     {{/useCategories}}
   </div>
diff --git a/pubspec.lock b/pubspec.lock
index 486558e805..50af15f877 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,5 +1,5 @@
 # Generated by pub
-# See http://pub.dartlang.org/doc/glossary.html#lockfile
+# See https://www.dartlang.org/tools/pub/glossary#lockfile
 packages:
   analyzer:
     dependency: "direct main"
@@ -415,4 +415,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev <=2.0.0-dev.30.0"
+  dart: ">=2.0.0-dev <=2.0.0-dev.32.0"
diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart
index faab077f97..a2e023857a 100644
--- a/test/dartdoc_test.dart
+++ b/test/dartdoc_test.dart
@@ -35,9 +35,9 @@ void main() {
           testPackageDir, [], getSdkDir(), [], tempDir, meta, [], []);
 
       DartDocResults results = await dartdoc.generateDocs();
-      expect(results.package, isNotNull);
+      expect(results.packageGraph, isNotNull);
 
-      Package p = results.package;
+      PackageGraph p = results.packageGraph;
       expect(p.name, 'test_package');
       expect(p.hasDocumentationFile, isTrue);
       expect(p.publicLibraries, hasLength(10));
@@ -63,9 +63,9 @@ void main() {
           testPackageWithNoReadme, [], getSdkDir(), [], tempDir, meta, [], []);
 
       DartDocResults results = await dartdoc.generateDocs();
-      expect(results.package, isNotNull);
+      expect(results.packageGraph, isNotNull);
 
-      Package p = results.package;
+      PackageGraph p = results.packageGraph;
       expect(p.name, 'test_package_small');
       expect(p.hasHomepage, isFalse);
       expect(p.hasDocumentationFile, isFalse);
@@ -78,9 +78,9 @@ void main() {
           testPackageDir, [], getSdkDir(), [], tempDir, meta, ['fake'], []);
 
       DartDocResults results = await dartdoc.generateDocs();
-      expect(results.package, isNotNull);
+      expect(results.packageGraph, isNotNull);
 
-      Package p = results.package;
+      PackageGraph p = results.packageGraph;
       expect(p.name, 'test_package');
       expect(p.hasDocumentationFile, isTrue);
       expect(p.libraries, hasLength(1));
@@ -112,9 +112,9 @@ void main() {
           getSdkDir(), [], tempDir, meta, [], []);
 
       DartDocResults results = await dartdoc.generateDocs();
-      expect(results.package, isNotNull);
+      expect(results.packageGraph, isNotNull);
 
-      Package p = results.package;
+      PackageGraph p = results.packageGraph;
       expect(p.name, 'test_package_embedder_yaml');
       expect(p.hasDocumentationFile, isFalse);
       expect(p.libraries, hasLength(3));
diff --git a/test/model_test.dart b/test/model_test.dart
index cc9f6895ff..62ffa182ac 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -23,25 +23,26 @@ void main() {
     exit(1);
   }
 
-  Package package;
-  Package ginormousPackage;
+  PackageGraph packageGraph;
+  PackageGraph ginormousPackageGraph;
   Library exLibrary;
   Library fakeLibrary;
   Library twoExportsLib;
   Library interceptorsLib;
-  Package sdkAsPackage;
+  PackageGraph sdkAsPackageGraph;
 
   setUpAll(() async {
     await utils.init();
-    package = utils.testPackage;
-    ginormousPackage = utils.testPackageGinormous;
-    exLibrary = package.libraries.firstWhere((lib) => lib.name == 'ex');
-    fakeLibrary = package.libraries.firstWhere((lib) => lib.name == 'fake');
+    packageGraph = utils.testPackageGraph;
+    ginormousPackageGraph = utils.testPackageGraphGinormous;
+    exLibrary = packageGraph.libraries.firstWhere((lib) => lib.name == 'ex');
+    fakeLibrary =
+        packageGraph.libraries.firstWhere((lib) => lib.name == 'fake');
     twoExportsLib =
-        package.libraries.firstWhere((lib) => lib.name == 'two_exports');
-    interceptorsLib =
-        package.libraries.firstWhere((lib) => lib.name == 'dart:_interceptors');
-    sdkAsPackage = utils.testPackageSdk;
+        packageGraph.libraries.firstWhere((lib) => lib.name == 'two_exports');
+    interceptorsLib = packageGraph.libraries
+        .firstWhere((lib) => lib.name == 'dart:_interceptors');
+    sdkAsPackageGraph = utils.testPackageGraphSdk;
   });
 
   group('Package', () {
@@ -51,36 +52,37 @@ void main() {
       });
 
       test('name', () {
-        expect(package.name, 'test_package');
+        expect(packageGraph.name, 'test_package');
       });
 
       test('libraries', () {
-        expect(package.libraries, hasLength(9));
+        expect(packageGraph.libraries, hasLength(9));
         expect(interceptorsLib.isPublic, isFalse);
       });
 
       test('homepage', () {
-        expect(package.hasHomepage, true);
-        expect(package.homepage, equals('http://github.com/dart-lang'));
+        expect(packageGraph.hasHomepage, true);
+        expect(packageGraph.homepage, equals('http://github.com/dart-lang'));
       });
 
       test('categories', () {
-        expect(package.categories, hasLength(1));
+        expect(packageGraph.categories, hasLength(1));
 
-        PackageCategory category = package.categories.first;
+        Package category = packageGraph.categories.first;
         expect(category.name, 'test_package');
         expect(category.libraries, hasLength(8));
       });
 
       test('multiple categories, sorted default', () {
-        expect(ginormousPackage.categories, hasLength(3));
-        expect(ginormousPackage.categories.first.name, equals('test_package'));
+        expect(ginormousPackageGraph.categories, hasLength(3));
+        expect(ginormousPackageGraph.categories.first.name,
+            equals('test_package'));
       });
 
       test('multiple categories, specified sort order', () {
         setConfig(categoryOrder: ['meta', 'test_package']);
-        expect(ginormousPackage.categories, hasLength(3));
-        expect(ginormousPackage.categories.first.name, equals('meta'));
+        expect(ginormousPackageGraph.categories, hasLength(3));
+        expect(ginormousPackageGraph.categories.first.name, equals('meta'));
       });
 
       test('is documented in library', () {
@@ -88,43 +90,45 @@ void main() {
       });
 
       test('has documentation', () {
-        expect(package.hasDocumentationFile, isTrue);
-        expect(package.hasDocumentation, isTrue);
+        expect(packageGraph.hasDocumentationFile, isTrue);
+        expect(packageGraph.hasDocumentation, isTrue);
       });
 
       test('documentation exists', () {
-        expect(package.documentation.startsWith('# Best Package'), isTrue);
+        expect(packageGraph.documentation.startsWith('# Best Package'), isTrue);
       });
 
       test('documentation can be rendered as HTML', () {
-        expect(package.documentationAsHtml, contains('<h1>Best Package</h1>'));
+        expect(packageGraph.documentationAsHtml,
+            contains('<h1>Best Package</h1>'));
       });
 
       test('sdk name', () {
-        expect(sdkAsPackage.name, equals('Dart SDK'));
+        expect(sdkAsPackageGraph.name, equals('Dart SDK'));
       });
 
       test('sdk homepage', () {
-        expect(sdkAsPackage.hasHomepage, isTrue);
-        expect(
-            sdkAsPackage.homepage, equals('https://github.com/dart-lang/sdk'));
+        expect(sdkAsPackageGraph.hasHomepage, isTrue);
+        expect(sdkAsPackageGraph.homepage,
+            equals('https://github.com/dart-lang/sdk'));
       });
 
       test('sdk version', () {
-        expect(sdkAsPackage.version, isNotNull);
+        expect(sdkAsPackageGraph.version, isNotNull);
       });
 
       test('sdk description', () {
-        expect(sdkAsPackage.documentation,
+        expect(sdkAsPackageGraph.documentation,
             startsWith('Welcome to the Dart API reference doc'));
       });
 
       test('has anonymous libraries', () {
         expect(
-            package.libraries.where((lib) => lib.name == 'anonymous_library'),
+            packageGraph.libraries
+                .where((lib) => lib.name == 'anonymous_library'),
             hasLength(1));
         expect(
-            package.libraries
+            packageGraph.libraries
                 .where((lib) => lib.name == 'another_anonymous_lib'),
             hasLength(1));
       });
@@ -132,22 +136,22 @@ void main() {
 
     group('test small package', () {
       test('does not have documentation', () {
-        expect(utils.testPackageSmall.hasDocumentation, isFalse);
-        expect(utils.testPackageSmall.hasDocumentationFile, isFalse);
-        expect(utils.testPackageSmall.documentationFile, isNull);
-        expect(utils.testPackageSmall.documentation, isNull);
+        expect(utils.testPackageGraphSmall.hasDocumentation, isFalse);
+        expect(utils.testPackageGraphSmall.hasDocumentationFile, isFalse);
+        expect(utils.testPackageGraphSmall.documentationFile, isNull);
+        expect(utils.testPackageGraphSmall.documentation, isNull);
       });
     });
 
     group('SDK-specific cases', () {
       test('Verify Interceptor is hidden from inheritance in docs', () {
-        Library htmlLibrary =
-            sdkAsPackage.libraries.singleWhere((l) => l.name == 'dart:html');
+        Library htmlLibrary = sdkAsPackageGraph.libraries
+            .singleWhere((l) => l.name == 'dart:html');
         Class EventTarget =
             htmlLibrary.allClasses.singleWhere((c) => c.name == 'EventTarget');
         Field hashCode = EventTarget.allPublicInstanceProperties
             .singleWhere((f) => f.name == 'hashCode');
-        Class objectModelElement = sdkAsPackage.objectElement;
+        Class objectModelElement = sdkAsPackageGraph.objectElement;
         // If this fails, EventTarget might have been changed to no longer
         // inherit from Interceptor.  If that's true, adjust test case to
         // another class that does.
@@ -175,25 +179,25 @@ void main() {
     Class SomeClass, SomeOtherClass, YetAnotherClass, AUnicornClass;
 
     setUp(() {
-      dartAsyncLib = utils.testPackageSdk.libraries
+      dartAsyncLib = utils.testPackageGraphSdk.libraries
           .firstWhere((l) => l.name == 'dart:async');
 
-      anonLib = package.libraries
+      anonLib = packageGraph.libraries
           .firstWhere((lib) => lib.name == 'anonymous_library');
 
-      someLib = package.allLibraries.values
+      someLib = packageGraph.allLibraries.values
           .firstWhere((lib) => lib.name == 'reexport.somelib');
-      reexportOneLib =
-          package.libraries.firstWhere((lib) => lib.name == 'reexport_one');
-      reexportTwoLib =
-          package.libraries.firstWhere((lib) => lib.name == 'reexport_two');
+      reexportOneLib = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'reexport_one');
+      reexportTwoLib = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'reexport_two');
       SomeClass = someLib.getClassByName('SomeClass');
       SomeOtherClass = someLib.getClassByName('SomeOtherClass');
       YetAnotherClass = someLib.getClassByName('YetAnotherClass');
       AUnicornClass = someLib.getClassByName('AUnicornClass');
 
-      isDeprecated =
-          package.libraries.firstWhere((lib) => lib.name == 'is_deprecated');
+      isDeprecated = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'is_deprecated');
 
       // Make sure the first library is dart:async
       expect(dartAsyncLib.name, 'dart:async');
@@ -280,26 +284,26 @@ void main() {
           '(reexport_one, reexport_two) -> reexport_two (confidence 0.000)';
       // Unicorn class has a warning because two @canonicalFors cancel each other out.
       expect(
-          package.packageWarningCounter.hasWarning(
+          packageGraph.packageWarningCounter.hasWarning(
               AUnicornClass, PackageWarning.ambiguousReexport, warningMsg),
           isTrue);
       // This class is ambiguous without a @canonicalFor
       expect(
-          package.packageWarningCounter.hasWarning(
+          packageGraph.packageWarningCounter.hasWarning(
               YetAnotherClass, PackageWarning.ambiguousReexport, warningMsg),
           isTrue);
       // These two classes have a @canonicalFor
       expect(
-          package.packageWarningCounter.hasWarning(
+          packageGraph.packageWarningCounter.hasWarning(
               SomeClass, PackageWarning.ambiguousReexport, warningMsg),
           isFalse);
       expect(
-          package.packageWarningCounter.hasWarning(
+          packageGraph.packageWarningCounter.hasWarning(
               SomeOtherClass, PackageWarning.ambiguousReexport, warningMsg),
           isFalse);
       // This library has a canonicalFor with no corresponding item
       expect(
-          package.packageWarningCounter.hasWarning(reexportTwoLib,
+          packageGraph.packageWarningCounter.hasWarning(reexportTwoLib,
               PackageWarning.ignoredCanonicalFor, 'something.ThatDoesntExist'),
           isTrue);
     });
@@ -324,7 +328,7 @@ void main() {
           .firstWhere((m) => m.name == 'withPrivateMacro');
       withUndefinedMacro = dog.allInstanceMethods
           .firstWhere((m) => m.name == 'withUndefinedMacro');
-      package.allModelElements.forEach((m) => m.documentation);
+      packageGraph.allModelElements.forEach((m) => m.documentation);
     });
 
     test("renders a macro within the same comment where it's defined", () {
@@ -343,7 +347,7 @@ void main() {
 
     test("a warning is generated for unknown macros", () {
       expect(
-          package.packageWarningCounter.hasWarning(withUndefinedMacro,
+          packageGraph.packageWarningCounter.hasWarning(withUndefinedMacro,
               PackageWarning.unknownMacro, 'ThatDoesNotExist'),
           isTrue);
     });
@@ -733,11 +737,17 @@ void main() {
   });
 
   group('Class edge cases', () {
-    test('ExecutableElements from private classes and from public interfaces (#1561)', () {
-      Class MIEEMixinWithOverride = fakeLibrary.publicClasses.firstWhere((c) => c.name == 'MIEEMixinWithOverride');
-      Operator problematicOperator = MIEEMixinWithOverride.inheritedOperators.firstWhere((o) => o.name == 'operator []=');
-      expect(problematicOperator.element.enclosingElement.name, equals('_MIEEPrivateOverride'));
-      expect(problematicOperator.canonicalModelElement.enclosingElement.name, equals('MIEEMixinWithOverride'));
+    test(
+        'ExecutableElements from private classes and from public interfaces (#1561)',
+        () {
+      Class MIEEMixinWithOverride = fakeLibrary.publicClasses
+          .firstWhere((c) => c.name == 'MIEEMixinWithOverride');
+      Operator problematicOperator = MIEEMixinWithOverride.inheritedOperators
+          .firstWhere((o) => o.name == 'operator []=');
+      expect(problematicOperator.element.enclosingElement.name,
+          equals('_MIEEPrivateOverride'));
+      expect(problematicOperator.canonicalModelElement.enclosingElement.name,
+          equals('MIEEMixinWithOverride'));
     });
   });
 
@@ -1059,21 +1069,21 @@ void main() {
       f1 = exLibrary.functions.first;
       genericFunction =
           exLibrary.functions.firstWhere((f) => f.name == 'genericFunction');
-      paramOfFutureOrNull =
-          fakeLibrary.functions.firstWhere((f) => f.name == 'paramOfFutureOrNull');
+      paramOfFutureOrNull = fakeLibrary.functions
+          .firstWhere((f) => f.name == 'paramOfFutureOrNull');
       thisIsAsync =
           fakeLibrary.functions.firstWhere((f) => f.name == 'thisIsAsync');
       thisIsFutureOr =
           fakeLibrary.functions.firstWhere((f) => f.name == 'thisIsFutureOr');
-      thisIsFutureOrNull =
-          fakeLibrary.functions.firstWhere((f) => f.name == 'thisIsFutureOrNull');
+      thisIsFutureOrNull = fakeLibrary.functions
+          .firstWhere((f) => f.name == 'thisIsFutureOrNull');
       thisIsFutureOrT =
           fakeLibrary.functions.firstWhere((f) => f.name == 'thisIsFutureOrT');
       topLevelFunction =
           fakeLibrary.functions.firstWhere((f) => f.name == 'topLevelFunction');
-      typeParamOfFutureOr =
-          fakeLibrary.functions.firstWhere((f) => f.name == 'typeParamOfFutureOr');
-     });
+      typeParamOfFutureOr = fakeLibrary.functions
+          .firstWhere((f) => f.name == 'typeParamOfFutureOr');
+    });
 
     test('has a fully qualified name', () {
       expect(thisIsAsync.fullyQualifiedName, 'fake.thisIsAsync');
@@ -1123,20 +1133,28 @@ void main() {
 
     test('function returning FutureOr<Null>', () {
       expect(thisIsFutureOrNull.isAsynchronous, isFalse);
-      expect(thisIsFutureOrNull.linkedReturnType, equals('FutureOr<span class="signature">&lt;Null&gt;</span>'));
+      expect(thisIsFutureOrNull.linkedReturnType,
+          equals('FutureOr<span class="signature">&lt;Null&gt;</span>'));
     });
 
     test('function returning FutureOr<T>', () {
       expect(thisIsFutureOrNull.isAsynchronous, isFalse);
-      expect(thisIsFutureOrT.linkedReturnType, equals('FutureOr<span class="signature">&lt;T&gt;</span>'));
+      expect(thisIsFutureOrT.linkedReturnType,
+          equals('FutureOr<span class="signature">&lt;T&gt;</span>'));
     });
 
     test('function with a parameter having type FutureOr<Null>', () {
-      expect(paramOfFutureOrNull.linkedParams(), equals('<span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;Null&gt;</span></span> <span class="parameter-name">future</span></span>'));
+      expect(
+          paramOfFutureOrNull.linkedParams(),
+          equals(
+              '<span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;Null&gt;</span></span> <span class="parameter-name">future</span></span>'));
     });
 
     test('function with a bound type to FutureOr', () {
-      expect(typeParamOfFutureOr.linkedGenericParameters, equals('<span class=\"signature\">&lt;T extends FutureOr<span class=\"signature\">&lt;List&gt;</span>&gt;</span>'));
+      expect(
+          typeParamOfFutureOr.linkedGenericParameters,
+          equals(
+              '<span class=\"signature\">&lt;T extends FutureOr<span class=\"signature\">&lt;List&gt;</span>&gt;</span>'));
     });
 
     test('docs do not lose brackets in code blocks', () {
@@ -1613,8 +1631,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('indentation is not lost inside indented code samples', () {
-      expect(aProperty.documentation, equals(
-          'This property is quite fancy, and requires sample code to understand.\n'
+      expect(
+          aProperty.documentation,
+          equals(
+              'This property is quite fancy, and requires sample code to understand.\n'
               '\n'
               '```dart\n'
               'AClassWithFancyProperties x = new AClassWithFancyProperties();\n'
@@ -1625,8 +1645,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
               '    print ("I am indented even more!!!");\n'
               '  }\n'
               '}\n'
-              '```'
-      ));
+              '```'));
     });
 
     test('annotations from getters and setters are accumulated in Fields', () {
diff --git a/test/src/utils.dart b/test/src/utils.dart
index c7504f727b..c8710c0336 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -16,10 +16,10 @@ import 'package:path/path.dart' as p;
 
 Directory sdkDir;
 PackageMeta sdkPackageMeta;
-Package testPackage;
-Package testPackageGinormous;
-Package testPackageSmall;
-Package testPackageSdk;
+PackageGraph testPackageGraph;
+PackageGraph testPackageGraphGinormous;
+PackageGraph testPackageGraphSmall;
+PackageGraph testPackageGraphSdk;
 
 final Directory testPackageBadDir = new Directory('testing/test_package_bad');
 final Directory testPackageDir = new Directory('testing/test_package');
@@ -37,24 +37,24 @@ init() async {
   sdkPackageMeta = new PackageMeta.fromSdk(sdkDir);
   setConfig();
 
-  testPackage = await bootBasicPackage(
+  testPackageGraph = await bootBasicPackage(
       'testing/test_package', ['css', 'code_in_comments', 'excluded'], false);
-  testPackageGinormous = await bootBasicPackage(
+  testPackageGraphGinormous = await bootBasicPackage(
       'testing/test_package', ['css', 'code_in_commnets', 'excluded'], true);
 
-  testPackageSmall =
+  testPackageGraphSmall =
       await bootBasicPackage('testing/test_package_small', [], false);
-  testPackageSdk = await bootSdkPackage();
+  testPackageGraphSdk = await bootSdkPackage();
 }
 
-Future<Package> bootSdkPackage() {
+Future<PackageGraph> bootSdkPackage() {
   Directory dir = new Directory(p.current);
   return new PackageBuilder(
           dir, [], [], sdkDir, sdkPackageMeta, [], [], true, false)
-      .buildPackage();
+      .buildPackageGraph();
 }
 
-Future<Package> bootBasicPackage(
+Future<PackageGraph> bootBasicPackage(
     String dirPath, List<String> excludes, bool withAutoIncludedDependencies) {
   Directory dir = new Directory(dirPath);
   return new PackageBuilder(
@@ -67,5 +67,5 @@ Future<Package> bootBasicPackage(
           [],
           true,
           withAutoIncludedDependencies)
-      .buildPackage();
+      .buildPackageGraph();
 }
diff --git a/test/utils_test.dart b/test/utils_test.dart
index 4c2b980a11..57b17054da 100644
--- a/test/utils_test.dart
+++ b/test/utils_test.dart
@@ -180,17 +180,17 @@ void main() {
   group('leadingWhitespace', () {
     test('strip common leading whitespace, but no more', () {
       String input = '   3 space indent\n'
-                     '    4 space indent (one preserved)\n'
-                     '       7 space indent (four preserved)\n'
-                     '\t  2 spaces, one tab (same as 3 space)\n'
-                     '    \t4 spaces, one tab (preserve the tab)\n'
-                     '   3 space indent again\n';
+          '    4 space indent (one preserved)\n'
+          '       7 space indent (four preserved)\n'
+          '\t  2 spaces, one tab (same as 3 space)\n'
+          '    \t4 spaces, one tab (preserve the tab)\n'
+          '   3 space indent again\n';
       String output = '3 space indent\n'
-                      ' 4 space indent (one preserved)\n'
-                      '    7 space indent (four preserved)\n'
-                      '2 spaces, one tab (same as 3 space)\n'
-                      ' \t4 spaces, one tab (preserve the tab)\n'
-                      '3 space indent again\n';
+          ' 4 space indent (one preserved)\n'
+          '    7 space indent (four preserved)\n'
+          '2 spaces, one tab (same as 3 space)\n'
+          ' \t4 spaces, one tab (preserve the tab)\n'
+          '3 space indent again\n';
       expect(stripCommonWhitespace(input), equals(output));
     });
   });