Pending renames and cleanups after commits

tests/compiler/dart2js/kernel/closed_world_test.dart

Index: tests/compiler/dart2js/kernel/closed_world_test.dart
diff --git a/tests/compiler/dart2js/kernel/closed_world_test.dart b/tests/compiler/dart2js/kernel/closed_world_test.dart
index c21da9758db8b57591a9a511712b426070d942f9..40546928b103c0c3d30df270205752b8366f1cfc 100644
--- a/tests/compiler/dart2js/kernel/closed_world_test.dart
+++ b/tests/compiler/dart2js/kernel/closed_world_test.dart
@@ -133,17 +133,17 @@ EnqueuerListener createResolutionEnqueuerListener(Compiler compiler) {
       backend.helpers,
       backend.impacts,
       backend.backendClasses,
-      backend.nativeClassData,
+      backend.nativeBaseData,
       backend.interceptorDataBuilder,
       backend.backendUsageBuilder,
       backend.rtiNeedBuilder,
       backend.mirrorsData,
       backend.noSuchMethodRegistry,
       backend.customElementsResolutionAnalysis,
-      backend.lookupMapLibraryAccess,
+      backend.lookupMapResolutionAnalysis,
       backend.mirrorsAnalysis,
-      new TypeVariableAnalysis(compiler.elementEnvironment, backend.impacts,
-          backend.backendUsageBuilder),
+      new TypeVariableResolutionAnalysis(compiler.elementEnvironment,
+          backend.impacts, backend.backendUsageBuilder),
       backend.nativeResolutionEnqueuer);
 }