Pending renames and cleanups after commits

pkg/compiler/lib/src/js_backend/interceptor_data.dart

Index: pkg/compiler/lib/src/js_backend/interceptor_data.dart
diff --git a/pkg/compiler/lib/src/js_backend/interceptor_data.dart b/pkg/compiler/lib/src/js_backend/interceptor_data.dart
index b6c0a65bc3317b835646b3bdc0a7c6709744fca4..1b56aa1719996fc3e6f9a77ea8a830b0d796f7d7 100644
--- a/pkg/compiler/lib/src/js_backend/interceptor_data.dart
+++ b/pkg/compiler/lib/src/js_backend/interceptor_data.dart
@@ -49,7 +49,7 @@ abstract class InterceptorDataBuilder {
 }
 
 class InterceptorDataImpl implements InterceptorData {
-  final NativeClassData _nativeData;
+  final NativeBasicData _nativeData;
   final BackendHelpers _helpers;
   final ClosedWorld _closedWorld;
 
@@ -217,7 +217,7 @@ class InterceptorDataImpl implements InterceptorData {
 }
 
 class InterceptorDataBuilderImpl implements InterceptorDataBuilder {
-  final NativeClassData _nativeData;
+  final NativeBasicData _nativeData;
   final BackendHelpers _helpers;
   final CommonElements _commonElements;
   final Resolution _resolution;