Renamed some scoping classes to make their usage clearer.

pkg/compiler/lib/src/kernel/element_map.dart

 // Copyright (c) 2017, 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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart';
 import '../common.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
@@ skipping 297 matching lines @@
   JumpTarget getJumpTargetForFor(ir.ForStatement node);
 
   /// Returns the [JumpTarget] defined by the for-in statement [node] or `null`
   /// if [node] is not a jump target.
   JumpTarget getJumpTargetForForIn(ir.ForInStatement node);
 
   /// Returns the [JumpTarget] defined by the while statement [node] or `null`
   /// if [node] is not a jump target.
   JumpTarget getJumpTargetForWhile(ir.WhileStatement node);
 
-  /// Returns the [LoopClosureScope] for the loop [node] in [closureClassMaps].
-  LoopClosureScope getLoopClosureScope(
+  /// Returns the [CapturedLoopScope] for the loop [node] in
+  /// [closureClassMaps].
+  CapturedLoopScope getCapturedLoopScope(
       ClosureDataLookup closureLookup, ir.TreeNode node);
 }
 
 /// Comparator for the canonical order or named arguments.
 // TODO(johnniwinther): Remove this when named parameters are sorted in dill.
 int namedOrdering(ir.VariableDeclaration a, ir.VariableDeclaration b) {
   return a.name.compareTo(b.name);
 }