Pay some naming debt.

pkg/front_end/lib/src/fasta/source/outline_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.outline_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 165 matching lines @@
   @override
   void endLibraryName(Token libraryKeyword, Token semicolon) {
     debugEvent("endLibraryName");
     String name = pop();
     List<MetadataBuilder> metadata = pop();
     library.name = name;
     library.metadata = metadata;
   }
 
   @override
-  void beginClassDeclaration(Token token) {
-    library.beginNestedScope();
+  void beginClassDeclaration(Token begin) {
+    library.beginNestedDeclaration();
   }
 
   @override
   void endClassDeclaration(int interfacesCount, Token beginToken,
       Token extendsKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endClassDeclaration");
     List<TypeBuilder> interfaces = popList(interfacesCount);
     TypeBuilder supertype = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addClass(
         metadata, modifiers, name, typeVariables, supertype, interfaces);
     checkEmpty();
   }
 
   ProcedureKind computeProcedureKind(Token token) {
     if (token == null) return ProcedureKind.Method;
     if (optional("get", token)) return ProcedureKind.Getter;
     if (optional("set", token)) return ProcedureKind.Setter;
     return internalError("Unhandled: ${token.value}");
   }
 
   @override
   void beginTopLevelMethod(Token token, Token name) {
-    library.beginNestedScope(hasMembers: false);
+    library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   ProcedureBuilder endTopLevelMethod(
       Token beginToken, Token getOrSet, Token endToken) {
     debugEvent("endTopLevelMethod");
     MethodBody kind = pop();
     AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
@@ skipping 14 matching lines @@
   }
 
   @override
   void handleFunctionBodySkipped(Token token) {
     debugEvent("handleFunctionBodySkipped");
     push(MethodBody.Regular);
   }
 
   @override
   void beginMethod(Token token, Token name) {
-    library.beginNestedScope(hasMembers: false);
+    library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     debugEvent("Method");
     MethodBody kind = pop();
     if (kind == MethodBody.RedirectingFactoryBody) {
       // This will cause an error later.
       pop();
     }
@@ skipping 15 matching lines @@
   @override
   void endMixinApplication() {
     debugEvent("MixinApplication");
     List<TypeBuilder> mixins = pop();
     TypeBuilder supertype = pop();
     push(library.addMixinApplication(supertype, mixins));
   }
 
   @override
   void beginNamedMixinApplication(Token token) {
-    library.beginNestedScope(hasMembers: false);
+    library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   void endNamedMixinApplication(
       Token classKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endNamedMixinApplication");
     List<TypeBuilder> interfaces = popIfNotNull(implementsKeyword);
     TypeBuilder mixinApplication = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addNamedMixinApplication(
         metadata, name, typeVariables, modifiers, mixinApplication, interfaces);
     checkEmpty();
   }
 
   @override
   void endTypeArguments(int count, Token beginToken, Token endToken) {
     debugEvent("TypeArguments");
     push(popList(count) ?? NullValue.TypeArguments);
   }
 
   @override
   void endType(Token beginToken, Token endToken) {
     debugEvent("Type");
     List<TypeBuilder> arguments = pop();
     String name = pop();
-    push(library.addInterfaceType(name, arguments));
+    push(library.addNamedType(name, arguments));
   }
 
   @override
   void endTypeList(int count) {
     debugEvent("TypeList");
     push(popList(count) ?? NullValue.TypeList);
   }
 
   @override
   void endTypeVariables(int count, Token beginToken, Token endToken) {
@@ skipping 80 matching lines @@
   void endEnum(Token enumKeyword, Token endBrace, int count) {
     List<String> constants = popList(count);
     String name = pop();
     List<MetadataBuilder> metadata = pop();
     library.addEnum(metadata, name, constants);
     checkEmpty();
   }
 
   @override
   void beginFunctionTypeAlias(Token token) {
-    library.beginNestedScope();
+    library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   void endFunctionTypeAlias(Token typedefKeyword, Token endToken) {
     debugEvent("endFunctionTypeAlias");
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     TypeBuilder returnType = pop();
     List<MetadataBuilder> metadata = pop();
@@ skipping 135 matching lines @@
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!isDartLibrary || identifiers.isEmpty) return identifiers;
     return removeNativeClause(identifiers);
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }