Pending renames and cleanups after commits

tests/compiler/dart2js/serialization/native_data_test.dart

Index: tests/compiler/dart2js/serialization/native_data_test.dart
diff --git a/tests/compiler/dart2js/serialization/native_data_test.dart b/tests/compiler/dart2js/serialization/native_data_test.dart
index e949e8a98dd70f127df85dff015b55725e8b2b7a..bdb65386cbdf2e9e4df5b7f92f81619a4214f26d 100644
--- a/tests/compiler/dart2js/serialization/native_data_test.dart
+++ b/tests/compiler/dart2js/serialization/native_data_test.dart
@@ -47,8 +47,8 @@ Future checkNativeData(Uri uri, {bool verbose: false}) async {
 
   JavaScriptBackend backend1 = compiler1.backend;
   JavaScriptBackend backend2 = compiler2.backend;
-  NativeClassDataImpl nativeClassData1 = backend1.nativeClassData;
-  NativeClassDataImpl nativeClassData2 = backend2.nativeClassData;
+  NativeBasicDataImpl nativeBaseData1 = backend1.nativeBaseData;
+  NativeBasicDataImpl nativeBaseData2 = backend2.nativeBaseData;
   NativeDataImpl nativeData1 = backend1.nativeData;
   NativeDataImpl nativeData2 = backend2.nativeData;
 
@@ -73,8 +73,8 @@ Future checkNativeData(Uri uri, {bool verbose: false}) async {
       verbose: verbose);
 
   checkMaps(
-      nativeClassData1.nativeClassTagInfo,
-      nativeClassData2.nativeClassTagInfo,
+      nativeBaseData1.nativeClassTagInfo,
+      nativeBaseData2.nativeClassTagInfo,
       "NativeData.nativeClassTagInfo",
       areElementsEquivalent,
       equality,