diff --git a/compiler/java/com/google/dart/compiler/parser/DartParser.java b/compiler/java/com/google/dart/compiler/parser/DartParser.java
index 03e009d463a..0f60a714892 100644
--- a/compiler/java/com/google/dart/compiler/parser/DartParser.java
+++ b/compiler/java/com/google/dart/compiler/parser/DartParser.java
@@ -5628,7 +5628,7 @@ public class DartParser extends CompletionHooksParserBase {
         && !Elements.isLibrarySource(source, "/crypto/crypto.dart")
         && !Elements.isLibrarySource(source, "/uri/uri.dart")
         && !Elements.isLibrarySource(source, "/utf/utf.dart")
-        && !Elements.isLibrarySource(source, "/typeddata/typeddata.dart")
+        && !Elements.isLibrarySource(source, "/typed_data/typed_data.dart")
         ) {
       super.reportError(position, errorCode);
     }
diff --git a/pkg/http/lib/http.dart b/pkg/http/lib/http.dart
index 72ce68f6eae..dda24f24856 100644
--- a/pkg/http/lib/http.dart
+++ b/pkg/http/lib/http.dart
@@ -68,7 +68,7 @@
 library http;
 
 import 'dart:async';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:uri';
 
 import 'src/client.dart';
diff --git a/pkg/http/lib/src/base_client.dart b/pkg/http/lib/src/base_client.dart
index eb9fca7f2e2..df6e73067bb 100644
--- a/pkg/http/lib/src/base_client.dart
+++ b/pkg/http/lib/src/base_client.dart
@@ -6,7 +6,7 @@ library base_client;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:uri';
 
 import 'base_request.dart';
diff --git a/pkg/http/lib/src/byte_stream.dart b/pkg/http/lib/src/byte_stream.dart
index f2c6a0bcaa0..eba08d40079 100644
--- a/pkg/http/lib/src/byte_stream.dart
+++ b/pkg/http/lib/src/byte_stream.dart
@@ -6,7 +6,7 @@ library byte_stream;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 import 'utils.dart';
 
diff --git a/pkg/http/lib/src/client.dart b/pkg/http/lib/src/client.dart
index 302b8c70092..bf214c480da 100644
--- a/pkg/http/lib/src/client.dart
+++ b/pkg/http/lib/src/client.dart
@@ -6,7 +6,7 @@ library client;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 import 'base_client.dart';
 import 'base_request.dart';
diff --git a/pkg/http/lib/src/request.dart b/pkg/http/lib/src/request.dart
index 9d685084667..20da3c1292c 100644
--- a/pkg/http/lib/src/request.dart
+++ b/pkg/http/lib/src/request.dart
@@ -6,7 +6,7 @@ library request;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:uri';
 
 import 'base_request.dart';
diff --git a/pkg/http/lib/src/response.dart b/pkg/http/lib/src/response.dart
index 2376f721bfc..c036fe91b8b 100644
--- a/pkg/http/lib/src/response.dart
+++ b/pkg/http/lib/src/response.dart
@@ -6,7 +6,7 @@ library response;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 import 'base_request.dart';
 import 'base_response.dart';
diff --git a/pkg/http/lib/src/utils.dart b/pkg/http/lib/src/utils.dart
index 26b8d0f3862..d99b9be2614 100644
--- a/pkg/http/lib/src/utils.dart
+++ b/pkg/http/lib/src/utils.dart
@@ -7,7 +7,7 @@ library utils;
 import 'dart:async';
 import 'dart:crypto';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:uri';
 import 'dart:utf';
 
diff --git a/runtime/bin/io.dart b/runtime/bin/io.dart
index 4b2e666ce67..2bec045a696 100644
--- a/runtime/bin/io.dart
+++ b/runtime/bin/io.dart
@@ -14,6 +14,6 @@ import "dart:isolate";
 import 'dart:json' as JSON;
 import "dart:math";
 import "dart:nativewrappers";
-import "dart:typeddata";
+import "dart:typed_data";
 import "dart:uri";
 import "dart:utf";
diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h
index 5da6c6aba9f..fcb839d4195 100755
--- a/runtime/include/dart_api.h
+++ b/runtime/include/dart_api.h
@@ -943,8 +943,8 @@ DART_EXPORT bool Dart_Post(Dart_Port port_id, Dart_Handle object);
  *
  * The string encoding in the 'value.as_string' is UTF-8.
  *
- * All the different types from dart:typeddata are exposed as type
- * kTypedData. The specific type from dart:typeddata is in the type
+ * All the different types from dart:typed_data are exposed as type
+ * kTypedData. The specific type from dart:typed_data is in the type
  * field of the as_typed_data structure. The length in the
  * as_typed_data structure is always in bytes.
  */
diff --git a/runtime/lib/core_patch.dart b/runtime/lib/core_patch.dart
index 0a274296287..3f7f5d2ef4f 100644
--- a/runtime/lib/core_patch.dart
+++ b/runtime/lib/core_patch.dart
@@ -3,6 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "dart:math";
-import "dart:typeddata";
+import "dart:typed_data";
 
 import "dart:_collection-dev" as _symbol_dev;
diff --git a/runtime/lib/math_patch.dart b/runtime/lib/math_patch.dart
index d17d82e711b..5682bec829f 100644
--- a/runtime/lib/math_patch.dart
+++ b/runtime/lib/math_patch.dart
@@ -2,7 +2,7 @@
 // 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 "dart:typeddata";
+import "dart:typed_data";
 
 // A VM patch of the dart:math library.
 patch num pow(num x, num exponent) {
diff --git a/runtime/lib/typeddata.cc b/runtime/lib/typed_data.cc
similarity index 100%
rename from runtime/lib/typeddata.cc
rename to runtime/lib/typed_data.cc
diff --git a/runtime/lib/typeddata.dart b/runtime/lib/typed_data.dart
similarity index 96%
rename from runtime/lib/typeddata.dart
rename to runtime/lib/typed_data.dart
index 75cd3624843..2c530587f4c 100644
--- a/runtime/lib/typeddata.dart
+++ b/runtime/lib/typed_data.dart
@@ -2206,7 +2206,7 @@ class _TypedListIterator<E> implements Iterator<E> {
 
 class _TypedListView extends _TypedListBase implements TypedData {
   _TypedListView(ByteBuffer _buffer, int _offset, int _length)
-    : _typeddata = _buffer,  // This assignment is type safe.
+    : _typedData = _buffer,  // This assignment is type safe.
       offsetInBytes = _offset,
       length = _length {
   }
@@ -2219,10 +2219,10 @@ class _TypedListView extends _TypedListBase implements TypedData {
   }
 
   ByteBuffer get buffer {
-    return _typeddata.buffer;
+    return _typedData.buffer;
   }
 
-  final TypedData _typeddata;
+  final TypedData _typedData;
   final int offsetInBytes;
   final int length;
 }
@@ -2247,7 +2247,7 @@ class _Int8ArrayView extends _TypedListView implements Int8List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getInt8(offsetInBytes +
+    return _typedData._getInt8(offsetInBytes +
                                (index * Int8List.BYTES_PER_ELEMENT));
   }
 
@@ -2255,7 +2255,7 @@ class _Int8ArrayView extends _TypedListView implements Int8List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setInt8(offsetInBytes + (index * Int8List.BYTES_PER_ELEMENT),
+    _typedData._setInt8(offsetInBytes + (index * Int8List.BYTES_PER_ELEMENT),
                         _toInt8(value));
   }
 
@@ -2298,7 +2298,7 @@ class _Uint8ArrayView extends _TypedListView implements Uint8List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getUint8(offsetInBytes +
+    return _typedData._getUint8(offsetInBytes +
                                 (index * Uint8List.BYTES_PER_ELEMENT));
   }
 
@@ -2306,7 +2306,7 @@ class _Uint8ArrayView extends _TypedListView implements Uint8List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setUint8(offsetInBytes + (index * Uint8List.BYTES_PER_ELEMENT),
+    _typedData._setUint8(offsetInBytes + (index * Uint8List.BYTES_PER_ELEMENT),
                          _toUint8(value));
   }
 
@@ -2350,7 +2350,7 @@ class _Uint8ClampedArrayView extends _TypedListView implements Uint8ClampedList
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getUint8(offsetInBytes +
+    return _typedData._getUint8(offsetInBytes +
                                 (index * Uint8List.BYTES_PER_ELEMENT));
   }
 
@@ -2358,7 +2358,7 @@ class _Uint8ClampedArrayView extends _TypedListView implements Uint8ClampedList
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setUint8(offsetInBytes + (index * Uint8List.BYTES_PER_ELEMENT),
+    _typedData._setUint8(offsetInBytes + (index * Uint8List.BYTES_PER_ELEMENT),
                          _toClampedUint8(value));
   }
 
@@ -2401,7 +2401,7 @@ class _Int16ArrayView extends _TypedListView implements Int16List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getInt16(offsetInBytes +
+    return _typedData._getInt16(offsetInBytes +
                                 (index * Int16List.BYTES_PER_ELEMENT));
   }
 
@@ -2409,7 +2409,7 @@ class _Int16ArrayView extends _TypedListView implements Int16List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setInt16(offsetInBytes + (index * Int16List.BYTES_PER_ELEMENT),
+    _typedData._setInt16(offsetInBytes + (index * Int16List.BYTES_PER_ELEMENT),
                          _toInt16(value));
   }
 
@@ -2452,7 +2452,7 @@ class _Uint16ArrayView extends _TypedListView implements Uint16List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getUint16(offsetInBytes +
+    return _typedData._getUint16(offsetInBytes +
                                  (index * Uint16List.BYTES_PER_ELEMENT));
   }
 
@@ -2460,7 +2460,7 @@ class _Uint16ArrayView extends _TypedListView implements Uint16List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setUint16(offsetInBytes + (index * Uint16List.BYTES_PER_ELEMENT),
+    _typedData._setUint16(offsetInBytes + (index * Uint16List.BYTES_PER_ELEMENT),
                           _toUint16(value));
   }
 
@@ -2503,7 +2503,7 @@ class _Int32ArrayView extends _TypedListView implements Int32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getInt32(offsetInBytes +
+    return _typedData._getInt32(offsetInBytes +
                                 (index * Int32List.BYTES_PER_ELEMENT));
   }
 
@@ -2511,7 +2511,7 @@ class _Int32ArrayView extends _TypedListView implements Int32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setInt32(offsetInBytes + (index * Int32List.BYTES_PER_ELEMENT),
+    _typedData._setInt32(offsetInBytes + (index * Int32List.BYTES_PER_ELEMENT),
                          _toInt32(value));
   }
 
@@ -2554,7 +2554,7 @@ class _Uint32ArrayView extends _TypedListView implements Uint32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getUint32(offsetInBytes +
+    return _typedData._getUint32(offsetInBytes +
                                  (index * Uint32List.BYTES_PER_ELEMENT));
   }
 
@@ -2562,7 +2562,7 @@ class _Uint32ArrayView extends _TypedListView implements Uint32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setUint32(offsetInBytes + (index * Uint32List.BYTES_PER_ELEMENT),
+    _typedData._setUint32(offsetInBytes + (index * Uint32List.BYTES_PER_ELEMENT),
                           _toUint32(value));
   }
 
@@ -2605,7 +2605,7 @@ class _Int64ArrayView extends _TypedListView implements Int64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getInt64(offsetInBytes +
+    return _typedData._getInt64(offsetInBytes +
                                 (index * Int64List.BYTES_PER_ELEMENT));
   }
 
@@ -2613,7 +2613,7 @@ class _Int64ArrayView extends _TypedListView implements Int64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setInt64(offsetInBytes + (index * Int64List.BYTES_PER_ELEMENT),
+    _typedData._setInt64(offsetInBytes + (index * Int64List.BYTES_PER_ELEMENT),
                          _toInt64(value));
   }
 
@@ -2656,7 +2656,7 @@ class _Uint64ArrayView extends _TypedListView implements Uint64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getUint64(offsetInBytes +
+    return _typedData._getUint64(offsetInBytes +
                                  (index * Uint64List.BYTES_PER_ELEMENT));
   }
 
@@ -2664,7 +2664,7 @@ class _Uint64ArrayView extends _TypedListView implements Uint64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setUint64(offsetInBytes + (index * Uint64List.BYTES_PER_ELEMENT),
+    _typedData._setUint64(offsetInBytes + (index * Uint64List.BYTES_PER_ELEMENT),
                           _toUint64(value));
   }
 
@@ -2707,7 +2707,7 @@ class _Float32ArrayView extends _TypedListView implements Float32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getFloat32(offsetInBytes +
+    return _typedData._getFloat32(offsetInBytes +
                                   (index * Float32List.BYTES_PER_ELEMENT));
   }
 
@@ -2715,7 +2715,7 @@ class _Float32ArrayView extends _TypedListView implements Float32List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setFloat32(offsetInBytes +
+    _typedData._setFloat32(offsetInBytes +
                            (index * Float32List.BYTES_PER_ELEMENT), value);
   }
 
@@ -2758,7 +2758,7 @@ class _Float64ArrayView extends _TypedListView implements Float64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getFloat64(offsetInBytes +
+    return _typedData._getFloat64(offsetInBytes +
                                   (index * Float64List.BYTES_PER_ELEMENT));
   }
 
@@ -2766,7 +2766,7 @@ class _Float64ArrayView extends _TypedListView implements Float64List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setFloat64(offsetInBytes +
+    _typedData._setFloat64(offsetInBytes +
                           (index * Float64List.BYTES_PER_ELEMENT), value);
   }
 
@@ -2809,7 +2809,7 @@ class _Float32x4ArrayView extends _TypedListView implements Float32x4List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    return _typeddata._getFloat32x4(offsetInBytes +
+    return _typedData._getFloat32x4(offsetInBytes +
                                   (index * Float32x4List.BYTES_PER_ELEMENT));
   }
 
@@ -2817,7 +2817,7 @@ class _Float32x4ArrayView extends _TypedListView implements Float32x4List {
     if (index < 0 || index >= length) {
       _throwRangeError(index, length);
     }
-    _typeddata._setFloat32x4(offsetInBytes +
+    _typedData._setFloat32x4(offsetInBytes +
                              (index * Float32x4List.BYTES_PER_ELEMENT), value);
   }
 
@@ -2843,7 +2843,7 @@ class _Float32x4ArrayView extends _TypedListView implements Float32x4List {
 
 class _ByteDataView implements ByteData {
   _ByteDataView(ByteBuffer _buffer, int _offsetInBytes, int _lengthInBytes)
-    : _typeddata = _buffer,  // _buffer is guaranteed to be a TypedData here.
+    : _typedData = _buffer,  // _buffer is guaranteed to be a TypedData here.
       _offset = _offsetInBytes,
       length = _lengthInBytes {
     _rangeCheck(_buffer.lengthInBytes, _offset, length);
@@ -2853,7 +2853,7 @@ class _ByteDataView implements ByteData {
   // Method(s) implementing TypedData interface.
 
   ByteBuffer get buffer {
-    return _typeddata.buffer;
+    return _typedData.buffer;
   }
 
   int get lengthInBytes {
@@ -2870,33 +2870,33 @@ class _ByteDataView implements ByteData {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    return _typeddata._getInt8(_offset + byteOffset);
+    return _typedData._getInt8(_offset + byteOffset);
   }
   void setInt8(int byteOffset, int value) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    _typeddata._setInt8(_offset + byteOffset, _toInt8(value));
+    _typedData._setInt8(_offset + byteOffset, _toInt8(value));
   }
 
   int getUint8(int byteOffset) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    return _typeddata._getUint8(_offset + byteOffset);
+    return _typedData._getUint8(_offset + byteOffset);
   }
   void setUint8(int byteOffset, int value) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    _typeddata._setUint8(_offset + byteOffset, _toUint8(value));
+    _typedData._setUint8(_offset + byteOffset, _toUint8(value));
   }
 
   int getInt16(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getInt16(_offset + byteOffset);
+    var result = _typedData._getInt16(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -2912,14 +2912,14 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianInt16(set_value, endian._littleEndian);
     }
-    _typeddata._setInt16(_offset + byteOffset, set_value);
+    _typedData._setInt16(_offset + byteOffset, set_value);
   }
 
   int getUint16(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getUint16(_offset + byteOffset);
+    var result = _typedData._getUint16(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -2935,14 +2935,14 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianUint16(set_value, endian._littleEndian);
     }
-    _typeddata._setUint16(_offset + byteOffset, set_value);
+    _typedData._setUint16(_offset + byteOffset, set_value);
   }
 
   int getInt32(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getInt32(_offset + byteOffset);
+    var result = _typedData._getInt32(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -2958,14 +2958,14 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianInt32(set_value, endian._littleEndian);
     }
-    _typeddata._setInt32(_offset + byteOffset, set_value);
+    _typedData._setInt32(_offset + byteOffset, set_value);
   }
 
   int getUint32(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getUint32(_offset + byteOffset);
+    var result = _typedData._getUint32(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -2981,14 +2981,14 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianUint32(set_value, endian._littleEndian);
     }
-    _typeddata._setUint32(_offset + byteOffset, set_value);
+    _typedData._setUint32(_offset + byteOffset, set_value);
   }
 
   int getInt64(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getInt64(_offset + byteOffset);
+    var result = _typedData._getInt64(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -3004,14 +3004,14 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianInt64(set_value, endian._littleEndian);
     }
-    _typeddata._setInt64(_offset + byteOffset, set_value);
+    _typedData._setInt64(_offset + byteOffset, set_value);
   }
 
   int getUint64(int byteOffset, [Endianness endian = Endianness.BIG_ENDIAN]) {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getUint64(_offset + byteOffset);
+    var result = _typedData._getUint64(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -3027,7 +3027,7 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianUint64(set_value, endian._littleEndian);
     }
-    _typeddata._setUint64(_offset + byteOffset, set_value);
+    _typedData._setUint64(_offset + byteOffset, set_value);
   }
 
   double getFloat32(int byteOffset,
@@ -3035,7 +3035,7 @@ class _ByteDataView implements ByteData {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getFloat32(_offset + byteOffset);
+    var result = _typedData._getFloat32(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -3051,7 +3051,7 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianFloat32(set_value, endian._littleEndian);
     }
-    _typeddata._setFloat32(_offset + byteOffset, set_value);
+    _typedData._setFloat32(_offset + byteOffset, set_value);
   }
 
   double getFloat64(int byteOffset,
@@ -3059,7 +3059,7 @@ class _ByteDataView implements ByteData {
     if (byteOffset < 0 || byteOffset >= length) {
       _throwRangeError(byteOffset, length);
     }
-    var result = _typeddata._getFloat64(_offset + byteOffset);
+    var result = _typedData._getFloat64(_offset + byteOffset);
     if (identical(endian, Endianness.HOST_ENDIAN)) {
       return result;
     }
@@ -3075,7 +3075,7 @@ class _ByteDataView implements ByteData {
     if (!identical(endian, Endianness.HOST_ENDIAN)) {
       set_value = _toEndianFloat64(set_value, endian._littleEndian);
     }
-    _typeddata._setFloat64(_offset + byteOffset, set_value);
+    _typedData._setFloat64(_offset + byteOffset, set_value);
   }
 
   Float32x4 getFloat32x4(int byteOffset,
@@ -3084,7 +3084,7 @@ class _ByteDataView implements ByteData {
       _throwRangeError(byteOffset, length);
     }
     // TODO(johnmccutchan) : Need to resolve this for endianity.
-    return _typeddata._getFloat32x4(_offset + byteOffset);
+    return _typedData._getFloat32x4(_offset + byteOffset);
   }
   void setFloat32x4(int byteOffset,
                     Float32x4 value,
@@ -3093,7 +3093,7 @@ class _ByteDataView implements ByteData {
       _throwRangeError(byteOffset, length);
     }
     // TODO(johnmccutchan) : Need to resolve this for endianity.
-    _typeddata._setFloat32x4(_offset + byteOffset, value);
+    _typedData._setFloat32x4(_offset + byteOffset, value);
 
   }
 
@@ -3118,7 +3118,7 @@ class _ByteDataView implements ByteData {
       native "ByteData_ToEndianFloat64";
 
 
-  final TypedData _typeddata;
+  final TypedData _typedData;
   final int _offset;
   final int length;
 }
diff --git a/runtime/lib/typeddata_sources.gypi b/runtime/lib/typed_data_sources.gypi
similarity index 73%
rename from runtime/lib/typeddata_sources.gypi
rename to runtime/lib/typed_data_sources.gypi
index fc5ba11b08a..28d6a53e538 100644
--- a/runtime/lib/typeddata_sources.gypi
+++ b/runtime/lib/typed_data_sources.gypi
@@ -2,12 +2,12 @@
 # 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.
 
-# Sources visible via dart:typeddata library.
+# Sources visible via dart:typed_data library.
 
 {
   'sources': [
-    'typeddata.cc',
-    'typeddata.dart',
+    'typed_data.cc',
+    'typed_data.dart',
     'simd128.cc',
   ],
 }
diff --git a/runtime/tests/vm/dart/byte_array_optimized_test.dart b/runtime/tests/vm/dart/byte_array_optimized_test.dart
index 80bba3475e9..fafef826396 100644
--- a/runtime/tests/vm/dart/byte_array_optimized_test.dart
+++ b/runtime/tests/vm/dart/byte_array_optimized_test.dart
@@ -6,7 +6,7 @@
 library byte_array_test;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 // This test exercises optimized [] and []= operators
 // on byte array views.
diff --git a/runtime/tests/vm/dart/byte_array_test.dart b/runtime/tests/vm/dart/byte_array_test.dart
index f57f5511271..0f3fe967349 100644
--- a/runtime/tests/vm/dart/byte_array_test.dart
+++ b/runtime/tests/vm/dart/byte_array_test.dart
@@ -6,7 +6,7 @@
 library byte_array_test;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 class ByteArrayTest {
   static testInt8ListImpl(Int8List array) {
diff --git a/runtime/vm/benchmark_test.cc b/runtime/vm/benchmark_test.cc
index ef35ba4af43..177110735c6 100644
--- a/runtime/vm/benchmark_test.cc
+++ b/runtime/vm/benchmark_test.cc
@@ -400,7 +400,7 @@ BENCHMARK(CoreSnapshotSize) {
       "import 'dart:math';\n"
       "import 'dart:isolate';\n"
       "import 'dart:mirrors';\n"
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "\n";
 
   // Start an Isolate, load a script and create a full snapshot.
@@ -426,7 +426,7 @@ BENCHMARK(StandaloneSnapshotSize) {
       "import 'dart:math';\n"
       "import 'dart:isolate';\n"
       "import 'dart:mirrors';\n"
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "import 'dart:uri';\n"
       "import 'dart:utf';\n"
       "import 'dart:json';\n"
diff --git a/runtime/vm/bootstrap.cc b/runtime/vm/bootstrap.cc
index d52fc5e3109..132478c5b6a 100644
--- a/runtime/vm/bootstrap.cc
+++ b/runtime/vm/bootstrap.cc
@@ -92,8 +92,8 @@ RawScript* Bootstrap::LoadMirrorsScript(bool patch)  {
 
 
 RawScript* Bootstrap::LoadTypedDataScript(bool patch) {
-  const char* url = patch ? "dart:typeddata_patch" : "dart:typeddata";
-  const char* source = patch ? typeddata_patch_ : typeddata_source_;
+  const char* url = patch ? "dart:typed_data_patch" : "dart:typed_data";
+  const char* source = patch ? typed_data_patch_ : typed_data_source_;
   return LoadScript(url, source, patch);
 }
 
diff --git a/runtime/vm/bootstrap.h b/runtime/vm/bootstrap.h
index 020d819b621..93619a4dbd6 100644
--- a/runtime/vm/bootstrap.h
+++ b/runtime/vm/bootstrap.h
@@ -52,8 +52,8 @@ class Bootstrap : public AllStatic {
   static const char math_patch_[];
   static const char mirrors_source_[];
   static const char mirrors_patch_[];
-  static const char typeddata_source_[];
-  static const char typeddata_patch_[];
+  static const char typed_data_source_[];
+  static const char typed_data_patch_[];
   static const char uri_source_[];
   static const char utf_source_[];
 };
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index 3aaa758c638..4800db2b6a8 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -1964,7 +1964,7 @@ void ClassFinalizer::VerifyImplicitFieldOffsets() {
     field ^= fields_array.At(0);
     ASSERT(field.Offset() == TypedDataView::data_offset());
     name ^= field.name();
-    expected_name ^= String::New("_typeddata");
+    expected_name ^= String::New("_typed_data");
     ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
     field ^= fields_array.At(1);
     ASSERT(field.Offset() == TypedDataView::offset_in_bytes_offset());
@@ -1983,7 +1983,7 @@ void ClassFinalizer::VerifyImplicitFieldOffsets() {
   field ^= fields_array.At(0);
   ASSERT(field.Offset() == TypedDataView::data_offset());
   name ^= field.name();
-  expected_name ^= String::New("_typeddata");
+  expected_name ^= String::New("_typed_data");
   ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
   field ^= fields_array.At(1);
   ASSERT(field.Offset() == TypedDataView::offset_in_bytes_offset());
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 15958e444cf..be450c9da17 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -2442,7 +2442,7 @@ static RawObject* GetByteDataConstructor(Isolate* isolate,
                                          const String& constructor_name,
                                          intptr_t num_args) {
   const Library& lib =
-      Library::Handle(isolate->object_store()->typeddata_library());
+      Library::Handle(isolate->object_store()->typed_data_library());
   ASSERT(!lib.IsNull());
   const Class& cls =
       Class::Handle(isolate, lib.LookupClassAllowPrivate(Symbols::ByteData()));
diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc
index a5c682e924d..210e1fa4d85 100644
--- a/runtime/vm/dart_api_impl_test.cc
+++ b/runtime/vm/dart_api_impl_test.cc
@@ -905,7 +905,7 @@ static Dart_NativeFunction ByteDataNativeResolver(Dart_Handle name,
 
 TEST_CASE(ByteDataAccess) {
   const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "class Expect {\n"
       "  static equals(a, b) {\n"
       "    if (a != b) {\n"
@@ -967,7 +967,7 @@ TEST_CASE(ExternalByteDataAccess) {
   // TODO(asiva): Once we have getInt16LE and getInt16BE support use the
   // appropriate getter instead of the host endian format used now.
   const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "class Expect {\n"
       "  static equals(a, b) {\n"
       "    if (a != b) {\n"
@@ -1086,7 +1086,7 @@ static void TestDirectAccess(Dart_Handle lib,
 
 TEST_CASE(TypedDataDirectAccess1) {
   const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "class Expect {\n"
       "  static equals(a, b) {\n"
       "    if (a != b) {\n"
@@ -1133,7 +1133,7 @@ TEST_CASE(TypedDataDirectAccess1) {
 
 TEST_CASE(TypedDataViewDirectAccess) {
   const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "class Expect {\n"
       "  static equals(a, b) {\n"
       "    if (a != b) {\n"
@@ -1172,7 +1172,7 @@ TEST_CASE(TypedDataViewDirectAccess) {
 
 TEST_CASE(ByteDataDirectAccess) {
   const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "class Expect {\n"
       "  static equals(a, b) {\n"
       "    if (a != b) {\n"
@@ -1377,7 +1377,7 @@ static void CheckFloat32x4Data(Dart_Handle obj) {
 
 TEST_CASE(Float32x4List) {
     const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "Float32x4List float32x4() {\n"
       "  return new Float32x4List(10);\n"
       "}\n";
diff --git a/runtime/vm/dart_api_message.cc b/runtime/vm/dart_api_message.cc
index 5df30aa2fa4..c28bd7cbad9 100644
--- a/runtime/vm/dart_api_message.cc
+++ b/runtime/vm/dart_api_message.cc
@@ -244,7 +244,7 @@ static Dart_CObject::TypedDataType GetTypedDataTypeFromView(
       object->cls->internal.as_class.library_url->value.as_string;
   char* class_name =
       object->cls->internal.as_class.class_name->value.as_string;
-  if (strcmp("dart:typeddata", library_url) != 0) {
+  if (strcmp("dart:typed_data", library_url) != 0) {
     return Dart_CObject::kNumberOfTypedDataTypes;
   }
   int i = 0;
diff --git a/runtime/vm/intrinsifier.cc b/runtime/vm/intrinsifier.cc
index f7303a92aa2..068c817fa98 100644
--- a/runtime/vm/intrinsifier.cc
+++ b/runtime/vm/intrinsifier.cc
@@ -123,9 +123,9 @@ void Intrinsifier::InitializeState() {
   lib = Library::MathLibrary();
   MATH_LIB_INTRINSIC_LIST(SETUP_FUNCTION);
 
-  // Set up all dart:typeddata lib functions that can be intrisified.
+  // Set up all dart:typed_data lib functions that can be intrisified.
   lib = Library::TypedDataLibrary();
-  TYPEDDATA_LIB_INTRINSIC_LIST(SETUP_FUNCTION);
+  TYPED_DATA_LIB_INTRINSIC_LIST(SETUP_FUNCTION);
 
 #undef SETUP_FUNCTION
 }
@@ -150,7 +150,7 @@ bool Intrinsifier::Intrinsify(const Function& function, Assembler* assembler) {
   if (lib.raw() == Library::CoreLibrary()) {
     CORE_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
   } else if (lib.raw() == Library::TypedDataLibrary()) {
-    TYPEDDATA_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
+    TYPED_DATA_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
   } else if (lib.raw() == Library::MathLibrary()) {
     MATH_LIB_INTRINSIC_LIST(FIND_INTRINSICS);
   }
diff --git a/runtime/vm/intrinsifier.h b/runtime/vm/intrinsifier.h
index 1b851aa62dc..b60dd835ad7 100644
--- a/runtime/vm/intrinsifier.h
+++ b/runtime/vm/intrinsifier.h
@@ -91,32 +91,32 @@ namespace dart {
   V(::, cos, Math_cos, 1749547468)                                             \
 
 
-#define TYPEDDATA_LIB_INTRINSIC_LIST(V)                                        \
-  V(_TypedList, get:length, TypedData_getLength, 231908172)                    \
-  V(_Int8Array, _new, TypedData_Int8Array_new, 844274443)                      \
-  V(_Uint8Array, _new, TypedData_Uint8Array_new, 997951645)                    \
-  V(_Uint8ClampedArray, _new, TypedData_Uint8ClampedArray_new, 1025045044)     \
-  V(_Int16Array, _new, TypedData_Int16Array_new, 1064563368)                   \
-  V(_Uint16Array, _new, TypedData_Uint16Array_new, 110927177)                  \
-  V(_Int32Array, _new, TypedData_Int32Array_new, 770802406)                    \
-  V(_Uint32Array, _new, TypedData_Uint32Array_new, 856841876)                  \
-  V(_Int64Array, _new, TypedData_Int64Array_new, 941769528)                    \
-  V(_Uint64Array, _new, TypedData_Uint64Array_new, 977566635)                  \
-  V(_Float32Array, _new, TypedData_Float32Array_new, 1053133615)               \
-  V(_Float64Array, _new, TypedData_Float64Array_new, 936673303)                \
-  V(_Float32x4Array, _new, TypedData_Float32x4Array_new, 212088644)            \
-  V(_Int8Array, ., TypedData_Int8Array_factory, 156009974)                     \
-  V(_Uint8Array, ., TypedData_Uint8Array_factory, 1465460956)                  \
-  V(_Uint8ClampedArray, ., TypedData_Uint8ClampedArray_factory, 970170700)     \
-  V(_Int16Array, ., TypedData_Int16Array_factory, 1520309224)                  \
-  V(_Uint16Array, ., TypedData_Uint16Array_factory, 195493071)                 \
-  V(_Int32Array, ., TypedData_Int32Array_factory, 27437702)                    \
-  V(_Uint32Array, ., TypedData_Uint32Array_factory, 1702451035)                \
-  V(_Int64Array, ., TypedData_Int64Array_factory, 225360944)                   \
-  V(_Uint64Array, ., TypedData_Uint64Array_factory, 1730375031)                \
-  V(_Float32Array, ., TypedData_Float32Array_factory, 563498394)               \
-  V(_Float64Array, ., TypedData_Float64Array_factory, 492220296)               \
-  V(_Float32x4Array, ., TypedData_Float32x4Array_factory, 1845796718)          \
+#define TYPED_DATA_LIB_INTRINSIC_LIST(V)                                       \
+  V(_TypedList, get:length, TypedData_getLength, 1004567191)                   \
+  V(_Int8Array, _new, TypedData_Int8Array_new, 48970297)                       \
+  V(_Uint8Array, _new, TypedData_Uint8Array_new, 389788863)                    \
+  V(_Uint8ClampedArray, _new, TypedData_Uint8ClampedArray_new, 59021935)       \
+  V(_Int16Array, _new, TypedData_Int16Array_new, 465688649)                    \
+  V(_Uint16Array, _new, TypedData_Uint16Array_new, 169304657)                  \
+  V(_Int32Array, _new, TypedData_Int32Array_new, 947562951)                    \
+  V(_Uint32Array, _new, TypedData_Uint32Array_new, 85066537)                   \
+  V(_Int64Array, _new, TypedData_Int64Array_new, 775415132)                    \
+  V(_Uint64Array, _new, TypedData_Uint64Array_new, 536384146)                  \
+  V(_Float32Array, _new, TypedData_Float32Array_new, 723829075)                \
+  V(_Float64Array, _new, TypedData_Float64Array_new, 111654177)                \
+  V(_Float32x4Array, _new, TypedData_Float32x4Array_new, 984763738)            \
+  V(_Int8Array, ., TypedData_Int8Array_factory, 974805301)                     \
+  V(_Uint8Array, ., TypedData_Uint8Array_factory, 839639001)                   \
+  V(_Uint8ClampedArray, ., TypedData_Uint8ClampedArray_factory, 1947193032)    \
+  V(_Int16Array, ., TypedData_Int16Array_factory, 1492289327)                  \
+  V(_Uint16Array, ., TypedData_Uint16Array_factory, 358109132)                 \
+  V(_Int32Array, ., TypedData_Int32Array_factory, 1238390459)                  \
+  V(_Uint32Array, ., TypedData_Uint32Array_factory, 1091191177)                \
+  V(_Int64Array, ., TypedData_Int64Array_factory, 569474614)                   \
+  V(_Uint64Array, ., TypedData_Uint64Array_factory, 1778132384)                \
+  V(_Float32Array, ., TypedData_Float32Array_factory, 630024167)               \
+  V(_Float64Array, ., TypedData_Float64Array_factory, 740945295)               \
+  V(_Float32x4Array, ., TypedData_Float32x4Array_factory, 1881134784)          \
 
 // TODO(srdjan): Implement _FixedSizeArrayIterator, get:current and
 //   _FixedSizeArrayIterator, moveNext.
@@ -140,7 +140,7 @@ class Intrinsifier : public AllStatic {
 
   CORE_LIB_INTRINSIC_LIST(DECLARE_FUNCTION)
   MATH_LIB_INTRINSIC_LIST(DECLARE_FUNCTION)
-  TYPEDDATA_LIB_INTRINSIC_LIST(DECLARE_FUNCTION)
+  TYPED_DATA_LIB_INTRINSIC_LIST(DECLARE_FUNCTION)
 
 #undef DECLARE_FUNCTION
 };
diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/intrinsifier_arm.cc
index 6b006a9bbfd..ad286f74a96 100644
--- a/runtime/vm/intrinsifier_arm.cc
+++ b/runtime/vm/intrinsifier_arm.cc
@@ -85,15 +85,15 @@ bool Intrinsifier::TypedData_getLength(Assembler* assembler) {
 }
 
 
-#define TYPEDDATA_ALLOCATOR(clazz)                                             \
+#define TYPED_DATA_ALLOCATOR(clazz)                                            \
 bool Intrinsifier::TypedData_##clazz##_new(Assembler* assembler) {             \
   return false;                                                                \
 }                                                                              \
 bool Intrinsifier::TypedData_##clazz##_factory(Assembler* assembler) {         \
   return false;                                                                \
 }
-CLASS_LIST_TYPED_DATA(TYPEDDATA_ALLOCATOR)
-#undef TYPEDDATA_ALLOCATOR
+CLASS_LIST_TYPED_DATA(TYPED_DATA_ALLOCATOR)
+#undef TYPED_DATA_ALLOCATOR
 
 
 bool Intrinsifier::Integer_addFromInteger(Assembler* assembler) {
diff --git a/runtime/vm/intrinsifier_ia32.cc b/runtime/vm/intrinsifier_ia32.cc
index 2afcd700cf6..25632ee6f69 100644
--- a/runtime/vm/intrinsifier_ia32.cc
+++ b/runtime/vm/intrinsifier_ia32.cc
@@ -574,7 +574,7 @@ static ScaleFactor GetScaleFactor(intptr_t size) {
 };
 
 
-#define TYPEDDATA_ALLOCATOR(clazz)                                             \
+#define TYPED_DATA_ALLOCATOR(clazz)                                            \
 bool Intrinsifier::TypedData_##clazz##_new(Assembler* assembler) {             \
   intptr_t size = TypedData::ElementSizeInBytes(kTypedData##clazz##Cid);       \
   intptr_t max_len = TypedData::MaxElements(kTypedData##clazz##Cid);           \
@@ -589,8 +589,8 @@ bool Intrinsifier::TypedData_##clazz##_factory(Assembler* assembler) {         \
   TYPED_ARRAY_ALLOCATION(TypedData, kTypedData##clazz##Cid, max_len, scale);   \
   return false;                                                                \
 }
-CLASS_LIST_TYPED_DATA(TYPEDDATA_ALLOCATOR)
-#undef TYPEDDATA_ALLOCATOR
+CLASS_LIST_TYPED_DATA(TYPED_DATA_ALLOCATOR)
+#undef TYPED_DATA_ALLOCATOR
 
 
 // Tests if two top most arguments are smis, jumps to label not_smi if not.
diff --git a/runtime/vm/intrinsifier_mips.cc b/runtime/vm/intrinsifier_mips.cc
index 75e10ddaf8a..f09c712b9cc 100644
--- a/runtime/vm/intrinsifier_mips.cc
+++ b/runtime/vm/intrinsifier_mips.cc
@@ -85,15 +85,15 @@ bool Intrinsifier::TypedData_getLength(Assembler* assembler) {
 }
 
 
-#define TYPEDDATA_ALLOCATOR(clazz)                                             \
+#define TYPED_DATA_ALLOCATOR(clazz)                                            \
 bool Intrinsifier::TypedData_##clazz##_new(Assembler* assembler) {             \
   return false;                                                                \
 }                                                                              \
 bool Intrinsifier::TypedData_##clazz##_factory(Assembler* assembler) {         \
   return false;                                                                \
 }
-CLASS_LIST_TYPED_DATA(TYPEDDATA_ALLOCATOR)
-#undef TYPEDDATA_ALLOCATOR
+CLASS_LIST_TYPED_DATA(TYPED_DATA_ALLOCATOR)
+#undef TYPED_DATA_ALLOCATOR
 
 
 bool Intrinsifier::Integer_addFromInteger(Assembler* assembler) {
diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc
index 59f1794f474..cbb5e49460f 100644
--- a/runtime/vm/intrinsifier_x64.cc
+++ b/runtime/vm/intrinsifier_x64.cc
@@ -534,7 +534,7 @@ static ScaleFactor GetScaleFactor(intptr_t size) {
 };
 
 
-#define TYPEDDATA_ALLOCATOR(clazz)                                             \
+#define TYPED_DATA_ALLOCATOR(clazz)                                            \
 bool Intrinsifier::TypedData_##clazz##_new(Assembler* assembler) {             \
   intptr_t size = TypedData::ElementSizeInBytes(kTypedData##clazz##Cid);       \
   intptr_t max_len = TypedData::MaxElements(kTypedData##clazz##Cid);           \
@@ -549,8 +549,8 @@ bool Intrinsifier::TypedData_##clazz##_factory(Assembler* assembler) {         \
   TYPED_ARRAY_ALLOCATION(TypedData, kTypedData##clazz##Cid, max_len, scale);   \
   return false;                                                                \
 }
-CLASS_LIST_TYPED_DATA(TYPEDDATA_ALLOCATOR)
-#undef TYPEDDATA_ALLOCATOR
+CLASS_LIST_TYPED_DATA(TYPED_DATA_ALLOCATOR)
+#undef TYPED_DATA_ALLOCATOR
 
 
 // Tests if two top most arguments are smis, jumps to label not_smi if not.
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 450ba1c0b4d..b43f041d86e 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -889,20 +889,20 @@ RawError* Object::Init(Isolate* isolate) {
   Library::InitNativeWrappersLibrary(isolate);
   ASSERT(isolate->object_store()->native_wrappers_library() != Library::null());
 
-  // Pre-register the typeddata library so the native class implementations
+  // Pre-register the typed_data library so the native class implementations
   // can be hooked up before compiling it.
-  LOAD_LIBRARY(TypedData, typeddata);
+  LOAD_LIBRARY(TypedData, typed_data);
   ASSERT(!lib.IsNull());
   ASSERT(lib.raw() == Library::TypedDataLibrary());
-  const intptr_t typeddata_class_array_length =
+  const intptr_t typed_data_class_array_length =
       RawObject::NumberOfTypedDataClasses();
-  Array& typeddata_classes =
-      Array::Handle(Array::New(typeddata_class_array_length));
+  Array& typed_data_classes =
+      Array::Handle(Array::New(typed_data_class_array_length));
   int index = 0;
 #define REGISTER_TYPED_DATA_CLASS(clazz)                                       \
   cls = Class::NewTypedDataClass(kTypedData##clazz##Cid);                      \
   index = kTypedData##clazz##Cid - kTypedDataInt8ArrayCid;                     \
-  typeddata_classes.SetAt(index, cls);                                         \
+  typed_data_classes.SetAt(index, cls);                                        \
   RegisterPrivateClass(cls, Symbols::_##clazz(), lib);                         \
 
   CLASS_LIST_TYPED_DATA(REGISTER_TYPED_DATA_CLASS);
@@ -910,21 +910,21 @@ RawError* Object::Init(Isolate* isolate) {
 #define REGISTER_TYPED_DATA_VIEW_CLASS(clazz)                                  \
   cls = Class::NewTypedDataViewClass(kTypedData##clazz##ViewCid);              \
   index = kTypedData##clazz##ViewCid - kTypedDataInt8ArrayCid;                 \
-  typeddata_classes.SetAt(index, cls);                                         \
+  typed_data_classes.SetAt(index, cls);                                        \
   RegisterPrivateClass(cls, Symbols::_##clazz##View(), lib);                   \
   pending_classes.Add(cls, Heap::kOld);                                        \
 
   CLASS_LIST_TYPED_DATA(REGISTER_TYPED_DATA_VIEW_CLASS);
   cls = Class::NewTypedDataViewClass(kByteDataViewCid);
   index = kByteDataViewCid - kTypedDataInt8ArrayCid;
-  typeddata_classes.SetAt(index, cls);
+  typed_data_classes.SetAt(index, cls);
   RegisterPrivateClass(cls, Symbols::_ByteDataView(), lib);
   pending_classes.Add(cls, Heap::kOld);
 #undef REGISTER_TYPED_DATA_VIEW_CLASS
 #define REGISTER_EXT_TYPED_DATA_CLASS(clazz)                                   \
   cls = Class::NewExternalTypedDataClass(kExternalTypedData##clazz##Cid);      \
   index = kExternalTypedData##clazz##Cid - kTypedDataInt8ArrayCid;             \
-  typeddata_classes.SetAt(index, cls);                                         \
+  typed_data_classes.SetAt(index, cls);                                        \
   RegisterPrivateClass(cls, Symbols::_External##clazz(), lib);                 \
 
   CLASS_LIST_TYPED_DATA(REGISTER_EXT_TYPED_DATA_CLASS);
@@ -950,7 +950,7 @@ RawError* Object::Init(Isolate* isolate) {
   type = Type::NewNonParameterizedType(cls);
   object_store->set_uint32x4_type(type);
 
-  object_store->set_typeddata_classes(typeddata_classes);
+  object_store->set_typed_data_classes(typed_data_classes);
 
   // Set the super type of class Stacktrace to Object type so that the
   // 'toString' method is implemented.
@@ -1043,7 +1043,7 @@ RawError* Object::Init(Isolate* isolate) {
   INIT_LIBRARY(Json, json, true);
   INIT_LIBRARY(Math, math, true);
   INIT_LIBRARY(Mirrors, mirrors, true);
-  INIT_LIBRARY(TypedData, typeddata, true);
+  INIT_LIBRARY(TypedData, typed_data, true);
   INIT_LIBRARY(Utf, utf, false);
   INIT_LIBRARY(Uri, uri, false);
 
@@ -6617,7 +6617,7 @@ RawLibrary* Library::NativeWrappersLibrary() {
 
 
 RawLibrary* Library::TypedDataLibrary() {
-  return Isolate::Current()->object_store()->typeddata_library();
+  return Isolate::Current()->object_store()->typed_data_library();
 }
 
 
@@ -6907,7 +6907,7 @@ void Library::CheckFunctionFingerprints() {
   MATH_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS);
 
   lib = Library::TypedDataLibrary();
-  TYPEDDATA_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS);
+  TYPED_DATA_LIB_INTRINSIC_LIST(CHECK_FINGERPRINTS);
 
 #undef CHECK_FINGERPRINTS
   if (has_errors) {
diff --git a/runtime/vm/object_store.cc b/runtime/vm/object_store.cc
index 648f236974e..6b2f039ef04 100644
--- a/runtime/vm/object_store.cc
+++ b/runtime/vm/object_store.cc
@@ -41,7 +41,7 @@ ObjectStore::ObjectStore()
     growable_object_array_class_(Class::null()),
     float32x4_class_(Class::null()),
     uint32x4_class_(Class::null()),
-    typeddata_classes_(Array::null()),
+    typed_data_classes_(Array::null()),
     stacktrace_class_(Class::null()),
     jsregexp_class_(Class::null()),
     weak_property_class_(Class::null()),
@@ -58,7 +58,7 @@ ObjectStore::ObjectStore()
     mirrors_library_(Library::null()),
     native_wrappers_library_(Library::null()),
     root_library_(Library::null()),
-    typeddata_library_(Library::null()),
+    typed_data_library_(Library::null()),
     uri_library_(Library::null()),
     utf_library_(Library::null()),
     libraries_(GrowableObjectArray::null()),
diff --git a/runtime/vm/object_store.h b/runtime/vm/object_store.h
index 5ceabd50200..8eb1d16414f 100644
--- a/runtime/vm/object_store.h
+++ b/runtime/vm/object_store.h
@@ -194,11 +194,11 @@ class ObjectStore {
   RawType* uint32x4_type() const { return uint32x4_type_; }
   void set_uint32x4_type(const Type& value) { uint32x4_type_ = value.raw(); }
 
-  RawArray* typeddata_classes() const {
-    return typeddata_classes_;
+  RawArray* typed_data_classes() const {
+    return typed_data_classes_;
   }
-  void set_typeddata_classes(const Array& value) {
-    typeddata_classes_ = value.raw();
+  void set_typed_data_classes(const Array& value) {
+    typed_data_classes_ = value.raw();
   }
 
   RawClass* stacktrace_class() const {
@@ -319,11 +319,11 @@ class ObjectStore {
     root_library_ = value.raw();
   }
 
-  RawLibrary* typeddata_library() const {
-    return typeddata_library_;
+  RawLibrary* typed_data_library() const {
+    return typed_data_library_;
   }
-  void set_typeddata_library(const Library& value) {
-    typeddata_library_ = value.raw();
+  void set_typed_data_library(const Library& value) {
+    typed_data_library_ = value.raw();
   }
 
   RawLibrary* uri_library() const {
@@ -464,7 +464,7 @@ class ObjectStore {
   RawClass* growable_object_array_class_;
   RawClass* float32x4_class_;
   RawClass* uint32x4_class_;
-  RawArray* typeddata_classes_;
+  RawArray* typed_data_classes_;
   RawClass* stacktrace_class_;
   RawClass* jsregexp_class_;
   RawClass* weak_property_class_;
@@ -483,7 +483,7 @@ class ObjectStore {
   RawLibrary* mirrors_library_;
   RawLibrary* native_wrappers_library_;
   RawLibrary* root_library_;
-  RawLibrary* typeddata_library_;
+  RawLibrary* typed_data_library_;
   RawLibrary* uri_library_;
   RawLibrary* utf_library_;
   RawGrowableObjectArray* libraries_;
diff --git a/runtime/vm/snapshot_test.cc b/runtime/vm/snapshot_test.cc
index d219122efe8..15481fabee8 100644
--- a/runtime/vm/snapshot_test.cc
+++ b/runtime/vm/snapshot_test.cc
@@ -1775,7 +1775,7 @@ UNIT_TEST_CASE(DartGeneratedArrayLiteralMessages) {
 UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
   const int kArrayLength = 10;
   static const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "final int kArrayLength = 10;\n"
       "getStringList() {\n"
       "  var s = 'Hello, world!';\n"
@@ -1974,7 +1974,7 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
 UNIT_TEST_CASE(DartGeneratedArrayLiteralMessagesWithBackref) {
   const int kArrayLength = 10;
   static const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "final int kArrayLength = 10;\n"
       "getStringList() {\n"
       "  var s = 'Hello, world!';\n"
@@ -2185,7 +2185,7 @@ static void CheckTypedData(Dart_CObject* object,
 
 UNIT_TEST_CASE(DartGeneratedListMessagesWithTypedData) {
   static const char* kScriptChars =
-      "import 'dart:typeddata';\n"
+      "import 'dart:typed_data';\n"
       "getTypedDataList() {\n"
       "  var list = new List(10);\n"
       "  var index = 0;\n"
diff --git a/runtime/vm/symbols.h b/runtime/vm/symbols.h
index 9240190b32a..779aa1cae7a 100644
--- a/runtime/vm/symbols.h
+++ b/runtime/vm/symbols.h
@@ -238,7 +238,7 @@ class ObjectPointerVisitor;
   V(DartMath, "dart:math")                                                     \
   V(DartIsolate, "dart:isolate")                                               \
   V(DartMirrors, "dart:mirrors")                                               \
-  V(DartTypedData, "dart:typeddata")                                           \
+  V(DartTypedData, "dart:typed_data")                                          \
   V(DartNativeWrappers, "dart:nativewrappers")                                 \
   V(DartAsync, "dart:async")                                                   \
   V(DartUri, "dart:uri")                                                       \
diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
index ccaa4e8d59a..d55ace1da9c 100644
--- a/runtime/vm/vm.gypi
+++ b/runtime/vm/vm.gypi
@@ -23,8 +23,8 @@
     'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc',
     'json_cc_file': '<(gen_source_dir)/json_gen.cc',
     'json_patch_cc_file': '<(gen_source_dir)/json_patch_gen.cc',
-    'typeddata_cc_file': '<(gen_source_dir)/typeddata_gen.cc',
-    'typeddata_patch_cc_file': '<(gen_source_dir)/typeddata_patch_gen.cc',
+    'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc',
+    'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc',
     'uri_cc_file': '<(gen_source_dir)/uri_gen.cc',
     'utf_cc_file': '<(gen_source_dir)/utf_gen.cc',
     'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat',
@@ -112,8 +112,8 @@
         'generate_json_patch_cc_file',
         'generate_mirrors_cc_file',
         'generate_mirrors_patch_cc_file',
-        'generate_typeddata_cc_file',
-        'generate_typeddata_patch_cc_file',
+        'generate_typed_data_cc_file',
+        'generate_typed_data_patch_cc_file',
         'generate_uri_cc_file',
         'generate_utf_cc_file',
       ],
@@ -124,7 +124,7 @@
         '../lib/isolate_sources.gypi',
         '../lib/math_sources.gypi',
         '../lib/mirrors_sources.gypi',
-        '../lib/typeddata_sources.gypi',
+        '../lib/typed_data_sources.gypi',
       ],
       'sources': [
         'bootstrap.cc',
@@ -146,8 +146,8 @@
         '<(json_patch_cc_file)',
         '<(mirrors_cc_file)',
         '<(mirrors_patch_cc_file)',
-        '<(typeddata_cc_file)',
-        '<(typeddata_patch_cc_file)',
+        '<(typed_data_cc_file)',
+        '<(typed_data_patch_cc_file)',
         '<(uri_cc_file)',
         '<(utf_cc_file)',
       ],
@@ -166,7 +166,7 @@
         '../lib/isolate_sources.gypi',
         '../lib/math_sources.gypi',
         '../lib/mirrors_sources.gypi',
-        '../lib/typeddata_sources.gypi',
+        '../lib/typed_data_sources.gypi',
       ],
       'sources': [
         'bootstrap_nocorelib.cc',
@@ -994,15 +994,15 @@
       ]
     },
     {
-      'target_name': 'generate_typeddata_cc_file',
+      'target_name': 'generate_typed_data_cc_file',
       'type': 'none',
       'toolsets':['host', 'target'],
       'variables': {
-        'typeddata_dart': '<(gen_source_dir)/typeddata_gen.dart',
+        'typed_data_dart': '<(gen_source_dir)/typed_data_gen.dart',
       },
       'includes': [
         # Load the shared library sources.
-        '../../sdk/lib/typeddata/typeddata_sources.gypi',
+        '../../sdk/lib/typed_data/typed_data_sources.gypi',
       ],
       'sources/': [
         # Exclude all .[cc|h] files.
@@ -1013,51 +1013,51 @@
       ],
       'actions': [
         {
-          'action_name': 'generate_typeddata_dart',
+          'action_name': 'generate_typed_data_dart',
           'inputs': [
             '../tools/concat_library.py',
             '<@(_sources)',
           ],
           'outputs': [
-            '<(typeddata_dart)',
+            '<(typed_data_dart)',
           ],
           'action': [
             'python',
             '<@(_inputs)',
-            '--output', '<(typeddata_dart)',
+            '--output', '<(typed_data_dart)',
           ],
-          'message': 'Generating ''<(typeddata_dart)'' file.',
+          'message': 'Generating ''<(typed_data_dart)'' file.',
         },
         {
-          'action_name': 'generate_typeddata_cc',
+          'action_name': 'generate_typed_data_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
-            '<(typeddata_dart)',
+            '<(typed_data_dart)',
           ],
           'outputs': [
-            '<(typeddata_cc_file)',
+            '<(typed_data_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
-            '--output', '<(typeddata_cc_file)',
+            '--output', '<(typed_data_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'vm/bootstrap.h',
-            '--var_name', 'dart::Bootstrap::typeddata_source_',
-            '<(typeddata_dart)',
+            '--var_name', 'dart::Bootstrap::typed_data_source_',
+            '<(typed_data_dart)',
           ],
-          'message': 'Generating ''<(typeddata_cc_file)'' file.'
+          'message': 'Generating ''<(typed_data_cc_file)'' file.'
         },
       ]
     },
     {
-      'target_name': 'generate_typeddata_patch_cc_file',
+      'target_name': 'generate_typed_data_patch_cc_file',
       'type': 'none',
       'toolsets':['host', 'target'],
       'includes': [
         # Load the runtime implementation sources.
-        '../lib/typeddata_sources.gypi',
+        '../lib/typed_data_sources.gypi',
       ],
       'sources/': [
         # Exclude all .[cc|h] files.
@@ -1068,25 +1068,25 @@
       ],
       'actions': [
         {
-          'action_name': 'generate_typeddata_patch_cc',
+          'action_name': 'generate_typed_data_patch_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
-            '<(typeddata_patch_cc_file)',
+            '<(typed_data_patch_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
-            '--output', '<(typeddata_patch_cc_file)',
+            '--output', '<(typed_data_patch_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'vm/bootstrap.h',
-            '--var_name', 'dart::Bootstrap::typeddata_patch_',
+            '--var_name', 'dart::Bootstrap::typed_data_patch_',
             '<@(_sources)',
           ],
-          'message': 'Generating ''<(typeddata_patch_cc_file)'' file.'
+          'message': 'Generating ''<(typed_data_patch_cc_file)'' file.'
         },
       ]
     },
diff --git a/sdk/lib/_internal/compiler/implementation/lib/typeddata_patch.dart b/sdk/lib/_internal/compiler/implementation/lib/typed_data_patch.dart
similarity index 98%
rename from sdk/lib/_internal/compiler/implementation/lib/typeddata_patch.dart
rename to sdk/lib/_internal/compiler/implementation/lib/typed_data_patch.dart
index ba50d05d698..183dec21f1d 100644
--- a/sdk/lib/_internal/compiler/implementation/lib/typeddata_patch.dart
+++ b/sdk/lib/_internal/compiler/implementation/lib/typed_data_patch.dart
@@ -2,9 +2,9 @@
 // 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.
 
-// This is an empty dummy patch file for the VM dart:typeddata library.
+// This is an empty dummy patch file for the VM dart:typed_data library.
 // This is needed in order to be able to generate documentation for the
-// typeddata library.
+// typed_data library.
 
 patch class Int8List {
   patch factory Int8List(int length) {
diff --git a/sdk/lib/_internal/compiler/implementation/native_handler.dart b/sdk/lib/_internal/compiler/implementation/native_handler.dart
index 68947c288d4..243cd239e18 100644
--- a/sdk/lib/_internal/compiler/implementation/native_handler.dart
+++ b/sdk/lib/_internal/compiler/implementation/native_handler.dart
@@ -489,7 +489,7 @@ void maybeEnableNative(Compiler compiler,
       || libraryName == 'dart:html_common'
       || libraryName == 'dart:indexed_db'
       || libraryName == 'dart:svg'
-      || libraryName == 'dart:typeddata'
+      || libraryName == 'dart:typed_data'
       || libraryName == 'dart:web_audio'
       || libraryName == 'dart:web_gl'
       || libraryName == 'dart:web_sql') {
diff --git a/sdk/lib/_internal/compiler/implementation/tools/mini_parser.dart b/sdk/lib/_internal/compiler/implementation/tools/mini_parser.dart
index 3b0c2fb4006..17578d5abaf 100644
--- a/sdk/lib/_internal/compiler/implementation/tools/mini_parser.dart
+++ b/sdk/lib/_internal/compiler/implementation/tools/mini_parser.dart
@@ -5,7 +5,7 @@
 library parser;
 
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:collection';
 import 'dart:utf';
 
diff --git a/sdk/lib/_internal/libraries.dart b/sdk/lib/_internal/libraries.dart
index 5776c537a06..551ddab4a01 100644
--- a/sdk/lib/_internal/libraries.dart
+++ b/sdk/lib/_internal/libraries.dart
@@ -86,9 +86,9 @@ const Map<String, LibraryInfo> LIBRARIES = const {
       documented: false,
       platforms: VM_PLATFORM),
 
-  "typeddata": const LibraryInfo(
-      "typeddata/typeddata.dart",
-      dart2jsPath: "typeddata/dart2js/typeddata_dart2js.dart"),
+  "typed_data": const LibraryInfo(
+      "typed_data/typed_data.dart",
+      dart2jsPath: "typed_data/dart2js/typed_data_dart2js.dart"),
 
   "svg": const LibraryInfo(
         "svg/dartium/svg_dartium.dart",
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 3dadbd6a856..815a6fd32a1 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -9,7 +9,7 @@ import 'dart:indexed_db';
 import 'dart:isolate';
 import 'dart:json' as json;
 import 'dart:math';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:svg' as svg;
 import 'dart:web_audio' as web_audio;
 import 'dart:web_gl' as gl;
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index fd85475cb85..d6a78e961e7 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -10,7 +10,7 @@ import 'dart:isolate';
 import 'dart:json' as json;
 import 'dart:math';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:web_gl' as gl;
 import 'dart:web_sql';
 import 'dart:svg' as svg;
diff --git a/sdk/lib/html/html_common/html_common_dart2js.dart b/sdk/lib/html/html_common/html_common_dart2js.dart
index 7053ef19e85..1f0a19f0703 100644
--- a/sdk/lib/html/html_common/html_common_dart2js.dart
+++ b/sdk/lib/html/html_common/html_common_dart2js.dart
@@ -6,7 +6,7 @@ library html_common;
 
 import 'dart:collection';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, Returns;
 import 'dart:_foreign_helper' show JS;
 
diff --git a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
index 92c2a897a16..a67b5d3912a 100644
--- a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
+++ b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
@@ -3,7 +3,7 @@ library dart.dom.indexed_db;
 import 'dart:async';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, Returns, JSName, Null;
 import 'dart:_foreign_helper' show JS;
 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
diff --git a/sdk/lib/io/io.dart b/sdk/lib/io/io.dart
index 56943c5b914..2d7000f445d 100644
--- a/sdk/lib/io/io.dart
+++ b/sdk/lib/io/io.dart
@@ -23,7 +23,7 @@ import 'dart:json' as JSON;
 import 'dart:math';
 import 'dart:uri';
 import 'dart:utf';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 part 'base64.dart';
 part 'buffer_list.dart';
diff --git a/sdk/lib/typeddata/dart2js/typeddata_dart2js.dart b/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart
similarity index 99%
rename from sdk/lib/typeddata/dart2js/typeddata_dart2js.dart
rename to sdk/lib/typed_data/dart2js/typed_data_dart2js.dart
index 347aa739f1c..20d88d2f1d2 100644
--- a/sdk/lib/typeddata/dart2js/typeddata_dart2js.dart
+++ b/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// The Dart TypedData library.
-library dart.typeddata;
+library dart.typed_data;
 
 import 'dart:collection';
 import 'dart:_collection-dev';
diff --git a/sdk/lib/typeddata/typeddata.dart b/sdk/lib/typed_data/typed_data.dart
similarity index 99%
rename from sdk/lib/typeddata/typeddata.dart
rename to sdk/lib/typed_data/typed_data.dart
index e90f3ce20a8..c907dc5705e 100644
--- a/sdk/lib/typeddata/typeddata.dart
+++ b/sdk/lib/typed_data/typed_data.dart
@@ -2,7 +2,7 @@
 // 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 dart.typeddata;
+library dart.typed_data;
 
 import 'dart:collection';
 import 'dart:_collection-dev';
diff --git a/sdk/lib/typeddata/typeddata_sources.gypi b/sdk/lib/typed_data/typed_data_sources.gypi
similarity index 93%
rename from sdk/lib/typeddata/typeddata_sources.gypi
rename to sdk/lib/typed_data/typed_data_sources.gypi
index 92ce89d4455..3cad00d0e0e 100644
--- a/sdk/lib/typeddata/typeddata_sources.gypi
+++ b/sdk/lib/typed_data/typed_data_sources.gypi
@@ -4,7 +4,7 @@
 
 {
   'sources': [
-    'typeddata.dart',
+    'typed_data.dart',
     # The above file needs to be first if additional parts are added to the lib.
   ],
 }
diff --git a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart
index 6c4e1b37452..1dea2a141e9 100644
--- a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart
+++ b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart
@@ -5,7 +5,7 @@ import 'dart:collection';
 import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, Returns, convertDartClosureToJS;
 import 'dart:_foreign_helper' show JS;
 // DO NOT EDIT - unless you are editing documentation as per:
diff --git a/sdk/lib/web_audio/dartium/web_audio_dartium.dart b/sdk/lib/web_audio/dartium/web_audio_dartium.dart
index b1d5ba5a7e7..0a06b2e2a93 100644
--- a/sdk/lib/web_audio/dartium/web_audio_dartium.dart
+++ b/sdk/lib/web_audio/dartium/web_audio_dartium.dart
@@ -6,7 +6,7 @@ import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 // DO NOT EDIT
 // Auto-generated dart:audio library.
 
diff --git a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
index daa31b0b476..2c5f0ee17dc 100644
--- a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
+++ b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
@@ -4,7 +4,7 @@ import 'dart:collection';
 import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, JSName, Null, Returns, convertDartClosureToJS;
 import 'dart:_foreign_helper' show JS;
 // DO NOT EDIT - unless you are editing documentation as per:
diff --git a/sdk/lib/web_gl/dartium/web_gl_dartium.dart b/sdk/lib/web_gl/dartium/web_gl_dartium.dart
index 55a371b95d8..e0a973c77be 100644
--- a/sdk/lib/web_gl/dartium/web_gl_dartium.dart
+++ b/sdk/lib/web_gl/dartium/web_gl_dartium.dart
@@ -6,7 +6,7 @@ import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 // DO NOT EDIT
 // Auto-generated dart:web_gl library.
 
diff --git a/tests/html/audiocontext_test.dart b/tests/html/audiocontext_test.dart
index db0a2de46f5..de151dca3b3 100644
--- a/tests/html/audiocontext_test.dart
+++ b/tests/html/audiocontext_test.dart
@@ -2,7 +2,7 @@ library AudioContextTest;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:web_audio';
 import 'dart:async';
 
diff --git a/tests/html/blob_constructor_test.dart b/tests/html/blob_constructor_test.dart
index 480ab88b24e..ea3ec66c39f 100644
--- a/tests/html/blob_constructor_test.dart
+++ b/tests/html/blob_constructor_test.dart
@@ -6,7 +6,7 @@ library blob_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/crypto_test.dart b/tests/html/crypto_test.dart
index d0ee241f55b..b4992a308fc 100644
--- a/tests/html/crypto_test.dart
+++ b/tests/html/crypto_test.dart
@@ -6,7 +6,7 @@ library crypto_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlIndividualConfiguration();
diff --git a/tests/html/postmessage_structured_test.dart b/tests/html/postmessage_structured_test.dart
index 3cc6f6189a1..e56e3b1fd5e 100644
--- a/tests/html/postmessage_structured_test.dart
+++ b/tests/html/postmessage_structured_test.dart
@@ -7,7 +7,7 @@ import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 import 'dart:collection';  // SplayTreeMap
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'utils.dart';
 
 injectSource(code) {
diff --git a/tests/html/transferables_test.dart b/tests/html/transferables_test.dart
index 88d744f0a13..d2ad13f34b8 100644
--- a/tests/html/transferables_test.dart
+++ b/tests/html/transferables_test.dart
@@ -6,7 +6,7 @@ library TransferableTest;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_1_test.dart b/tests/html/typed_arrays_1_test.dart
index 1c791a184ea..a2de291b029 100644
--- a/tests/html/typed_arrays_1_test.dart
+++ b/tests/html/typed_arrays_1_test.dart
@@ -6,7 +6,7 @@ library TypedArrays1Test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlIndividualConfiguration();
diff --git a/tests/html/typed_arrays_2_test.dart b/tests/html/typed_arrays_2_test.dart
index 994c68902af..e223ea7d668 100644
--- a/tests/html/typed_arrays_2_test.dart
+++ b/tests/html/typed_arrays_2_test.dart
@@ -6,7 +6,7 @@ library TypedArrays2Test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_3_test.dart b/tests/html/typed_arrays_3_test.dart
index 16537cb53fb..53f0b8d94b5 100644
--- a/tests/html/typed_arrays_3_test.dart
+++ b/tests/html/typed_arrays_3_test.dart
@@ -6,7 +6,7 @@ library TypedArrays3Test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_4_test.dart b/tests/html/typed_arrays_4_test.dart
index 71b0281ca92..11a39e8da85 100644
--- a/tests/html/typed_arrays_4_test.dart
+++ b/tests/html/typed_arrays_4_test.dart
@@ -6,7 +6,7 @@ library TypedArrays4Test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_5_test.dart b/tests/html/typed_arrays_5_test.dart
index df36a826f1c..3c6948de432 100644
--- a/tests/html/typed_arrays_5_test.dart
+++ b/tests/html/typed_arrays_5_test.dart
@@ -6,7 +6,7 @@ library typed_arrays_5_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_arraybuffer_test.dart b/tests/html/typed_arrays_arraybuffer_test.dart
index dc36cbc8365..af75ab9b2ab 100644
--- a/tests/html/typed_arrays_arraybuffer_test.dart
+++ b/tests/html/typed_arrays_arraybuffer_test.dart
@@ -6,7 +6,7 @@ library typed_arrays_arraybuffer_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_dataview_test.dart b/tests/html/typed_arrays_dataview_test.dart
index fb50a488bf8..d1823da28d6 100644
--- a/tests/html/typed_arrays_dataview_test.dart
+++ b/tests/html/typed_arrays_dataview_test.dart
@@ -6,7 +6,7 @@ library typed_arrays_dataview_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/typed_arrays_range_checks_test.dart b/tests/html/typed_arrays_range_checks_test.dart
index 696d9cdd544..b7b7350df46 100644
--- a/tests/html/typed_arrays_range_checks_test.dart
+++ b/tests/html/typed_arrays_range_checks_test.dart
@@ -6,7 +6,7 @@ library TypedArraysRangeCheckTest;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/url_test.dart b/tests/html/url_test.dart
index 58cdf09b3f1..2b3260bdb3b 100644
--- a/tests/html/url_test.dart
+++ b/tests/html/url_test.dart
@@ -6,7 +6,7 @@ library url_test;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 main() {
   useHtmlConfiguration();
diff --git a/tests/html/utils.dart b/tests/html/utils.dart
index cac5559d8cd..24e77117db2 100644
--- a/tests/html/utils.dart
+++ b/tests/html/utils.dart
@@ -2,7 +2,7 @@ library TestUtils;
 
 import 'dart:async';
 import 'dart:html';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import '../../pkg/unittest/lib/unittest.dart';
 
 /**
diff --git a/tests/html/xhr_test.dart b/tests/html/xhr_test.dart
index ae4faea80c5..9d44746ff1f 100644
--- a/tests/html/xhr_test.dart
+++ b/tests/html/xhr_test.dart
@@ -8,7 +8,7 @@ import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:async';
 import 'dart:html';
 import 'dart:json' as json;
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void fail(message) {
   guardAsync(() {
diff --git a/tests/isolate/typed_data_message_test.dart b/tests/isolate/typed_data_message_test.dart
index 3631ded7ae2..b725b1c9a6c 100644
--- a/tests/isolate/typed_data_message_test.dart
+++ b/tests/isolate/typed_data_message_test.dart
@@ -7,7 +7,7 @@
 
 library TypedDataMessageTest;
 import 'dart:isolate';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import '../../pkg/unittest/lib/unittest.dart';
 
 // ---------------------------------------------------------------------------
diff --git a/tests/lib/analyzer/test_config.dart b/tests/lib/analyzer/test_config.dart
index c944979ddec..1a385d67841 100644
--- a/tests/lib/analyzer/test_config.dart
+++ b/tests/lib/analyzer/test_config.dart
@@ -9,7 +9,7 @@ import '../../../tools/testing/dart/test_suite.dart';
 
 class AnalyzeLibraryTestSuite extends DartcCompilationTestSuite {
   final libraries = [ 'async', 'core', 'crypto', 'io', 'isolate', 'json',
-                      'math', 'mirrors', 'typeddata', 'uri',
+                      'math', 'mirrors', 'typed_data', 'uri',
                       'utf' ];
 
   AnalyzeLibraryTestSuite(Map configuration)
diff --git a/tests/lib/lib.status b/tests/lib/lib.status
index 77928add70c..33be3ca87f4 100644
--- a/tests/lib/lib.status
+++ b/tests/lib/lib.status
@@ -4,14 +4,14 @@
 
 async/stream_periodic4_test: Fail, Pass # floitsch: Marking as flaky while collection debug information. http://dartbug.com/9619
 
-# The typeddata library is not supported by dart2js or dart2dart yet.
+# The typed_data library is not supported by dart2js or dart2dart yet.
 [ $compiler == dart2js  || $compiler == dart2dart ]
-typeddata/*: Fail
+typed_data/*: Fail
 
 
-# The typeddata library is not supported by dart2js or dart2dart yet.
+# The typed_data library is not supported by dart2js or dart2dart yet.
 [ $compiler == dart2js  || $compiler == dart2dart ]
-typeddata/*: Skip
+typed_data/*: Skip
 
 
 [ $compiler == dart2js ]
diff --git a/tests/lib/typeddata/float32x4_list_test.dart b/tests/lib/typed_data/float32x4_list_test.dart
similarity index 99%
rename from tests/lib/typeddata/float32x4_list_test.dart
rename to tests/lib/typed_data/float32x4_list_test.dart
index 4885033c8a4..79ffdbc101d 100644
--- a/tests/lib/typeddata/float32x4_list_test.dart
+++ b/tests/lib/typed_data/float32x4_list_test.dart
@@ -7,7 +7,7 @@
 library float32x4_list_test;
 
 import 'package:expect/expect.dart';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 testLoadStore(array) {
   Expect.equals(8, array.length);
diff --git a/tests/lib/typeddata/float32x4_test.dart b/tests/lib/typed_data/float32x4_test.dart
similarity index 99%
rename from tests/lib/typeddata/float32x4_test.dart
rename to tests/lib/typed_data/float32x4_test.dart
index 490009a2d29..9dbaab4c0b1 100644
--- a/tests/lib/typeddata/float32x4_test.dart
+++ b/tests/lib/typed_data/float32x4_test.dart
@@ -6,7 +6,7 @@
 library float32x4_test;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 testAdd() {
   var m = new Float32x4(-1.0, -2.0, -3.0, -4.0);
diff --git a/tests/lib/typeddata/float32x4_unbox_regress_test.dart b/tests/lib/typed_data/float32x4_unbox_regress_test.dart
similarity index 98%
rename from tests/lib/typeddata/float32x4_unbox_regress_test.dart
rename to tests/lib/typed_data/float32x4_unbox_regress_test.dart
index dd84dfce67b..ed389703655 100644
--- a/tests/lib/typeddata/float32x4_unbox_regress_test.dart
+++ b/tests/lib/typed_data/float32x4_unbox_regress_test.dart
@@ -7,7 +7,7 @@
 library float32x4_unbox_regress_test;
 
 import 'package:expect/expect.dart';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 testListStore(array, index, value) {
   array[index] = value;
diff --git a/tests/standalone/byte_array_view_optimized_test.dart b/tests/standalone/byte_array_view_optimized_test.dart
index b50e387479d..94ccf7b9404 100644
--- a/tests/standalone/byte_array_view_optimized_test.dart
+++ b/tests/standalone/byte_array_view_optimized_test.dart
@@ -8,7 +8,7 @@
 library ByteArrayViewOptimizedTest;
 
 import "package:expect/expect.dart";
-import "dart:typeddata";
+import "dart:typed_data";
 
 li16(v) => v[0];
 
diff --git a/tests/standalone/bytedata_test.dart b/tests/standalone/bytedata_test.dart
index 9a69bb89863..068a9845c6e 100644
--- a/tests/standalone/bytedata_test.dart
+++ b/tests/standalone/bytedata_test.dart
@@ -8,7 +8,7 @@
 library ByteDataTest;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 testGetters() {
   bool host_is_little_endian = 
diff --git a/tests/standalone/float_array_test.dart b/tests/standalone/float_array_test.dart
index 562b91ece66..5a01aa53ec2 100644
--- a/tests/standalone/float_array_test.dart
+++ b/tests/standalone/float_array_test.dart
@@ -8,7 +8,7 @@
 library FloatArrayTest;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testCreateFloat32Array() {
   Float32List floatArray;
diff --git a/tests/standalone/int_array_deopt.dart b/tests/standalone/int_array_deopt.dart
index 8897f1e9688..6049a300917 100644
--- a/tests/standalone/int_array_deopt.dart
+++ b/tests/standalone/int_array_deopt.dart
@@ -4,7 +4,7 @@
 //
 // Dart deoptimization of Uint32Array and Int32Array loads.
 
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 loadI32(a) => a[0] + 1;
 loadUi32(a) => a[0] + 1;
diff --git a/tests/standalone/int_array_load_elimination_test.dart b/tests/standalone/int_array_load_elimination_test.dart
index c3792b0b021..4e8dea6a3c4 100644
--- a/tests/standalone/int_array_load_elimination_test.dart
+++ b/tests/standalone/int_array_load_elimination_test.dart
@@ -8,7 +8,7 @@
 library int_array_load_elimination;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testUint16() {
   Uint16List intArray = new Uint16List(1);
diff --git a/tests/standalone/int_array_test.dart b/tests/standalone/int_array_test.dart
index 3712a4275cd..1f3d0cdfb9e 100644
--- a/tests/standalone/int_array_test.dart
+++ b/tests/standalone/int_array_test.dart
@@ -8,7 +8,7 @@
 library IntArrayTest;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testInt16() {
   Int16List intArray = new Int16List(4);
diff --git a/tests/standalone/io/file_typed_data_test.dart b/tests/standalone/io/file_typed_data_test.dart
index 2c00cef0d53..9e02bcd5c27 100644
--- a/tests/standalone/io/file_typed_data_test.dart
+++ b/tests/standalone/io/file_typed_data_test.dart
@@ -8,7 +8,7 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testWriteInt8ListAndView() {
   ReceivePort port = new ReceivePort();
diff --git a/tests/standalone/io/http_client_request_test.dart b/tests/standalone/io/http_client_request_test.dart
index a9434d31781..b72551f1cde 100644
--- a/tests/standalone/io/http_client_request_test.dart
+++ b/tests/standalone/io/http_client_request_test.dart
@@ -5,7 +5,7 @@
 import "package:expect/expect.dart";
 import "dart:io";
 import "dart:isolate";
-import "dart:typeddata";
+import "dart:typed_data";
 
 void testClientRequest(void handler(request)) {
   HttpServer.bind().then((server) {
diff --git a/tests/standalone/io/http_close_test.dart b/tests/standalone/io/http_close_test.dart
index cc9fd62adf2..d44cdbeec97 100644
--- a/tests/standalone/io/http_close_test.dart
+++ b/tests/standalone/io/http_close_test.dart
@@ -10,7 +10,7 @@
 import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
-import "dart:typeddata";
+import "dart:typed_data";
 
 
 void testClientAndServerCloseNoListen(int connections) {
diff --git a/tests/standalone/io/http_compression_test.dart b/tests/standalone/io/http_compression_test.dart
index 8bec0a2e117..c86c4bfae62 100644
--- a/tests/standalone/io/http_compression_test.dart
+++ b/tests/standalone/io/http_compression_test.dart
@@ -9,7 +9,7 @@
 
 import 'package:expect/expect.dart';
 import 'dart:io';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testServerCompress() {
   void test(List<int> data) {
diff --git a/tests/standalone/io/http_parser_test.dart b/tests/standalone/io/http_parser_test.dart
index 00d5b8e8529..5742510e6cc 100644
--- a/tests/standalone/io/http_parser_test.dart
+++ b/tests/standalone/io/http_parser_test.dart
@@ -5,7 +5,7 @@
 import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:math';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:isolate';
 import 'dart:uri';
 
diff --git a/tests/standalone/io/http_server_response_test.dart b/tests/standalone/io/http_server_response_test.dart
index ac019c81125..2df33cd4553 100644
--- a/tests/standalone/io/http_server_response_test.dart
+++ b/tests/standalone/io/http_server_response_test.dart
@@ -10,7 +10,7 @@
 import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
-import "dart:typeddata";
+import "dart:typed_data";
 
 void testServerRequest(void handler(server, request), {int bytes}) {
   HttpServer.bind().then((server) {
diff --git a/tests/standalone/io/web_socket_protocol_processor_test.dart b/tests/standalone/io/web_socket_protocol_processor_test.dart
index eb15db0ad01..39f9d91eb07 100644
--- a/tests/standalone/io/web_socket_protocol_processor_test.dart
+++ b/tests/standalone/io/web_socket_protocol_processor_test.dart
@@ -7,7 +7,7 @@ import "dart:utf";
 import "dart:math";
 import "dart:async";
 import "dart:collection";
-import "dart:typeddata";
+import "dart:typed_data";
 import "dart:isolate";
 
 part "../../../sdk/lib/io/http.dart";
diff --git a/tests/standalone/io/web_socket_test.dart b/tests/standalone/io/web_socket_test.dart
index 2bee0d8670e..df434a0e01a 100644
--- a/tests/standalone/io/web_socket_test.dart
+++ b/tests/standalone/io/web_socket_test.dart
@@ -11,7 +11,7 @@ import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
-import "dart:typeddata";
+import "dart:typed_data";
 import "dart:uri";
 
 const String CERT_NAME = 'localhost_cert';
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index 46302ec23ba..37eae947332 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -78,14 +78,14 @@ io/process_exit_negative_test: Fail  # This is a compilation-time negative test.
 
 [ $compiler == dart2js ]
 number_identity_test: Skip # Bigints and int/double diff. not supported.
-typed_data_test: Skip # dart:typeddata support needed.
-bytedata_test: Skip # dart:typeddata support needed.
-typed_data_view_test: Skip # dart:typeddata support needed.
-typed_data_isolate_test: Skip # dart:typeddata support needed.
-typed_array_test: Skip # dart:typeddata support needed.
-float_array_test: Skip # dart:typeddata support needed.
-int_array_test: Skip  # dart:typeddata support needed.
-byte_array_view_optimized_test: Skip # dart:typeddata support needed.
+typed_data_test: Skip # dart:typed_data support needed.
+bytedata_test: Skip # dart:typed_data support needed.
+typed_data_view_test: Skip # dart:typed_data support needed.
+typed_data_isolate_test: Skip # dart:typed_data support needed.
+typed_array_test: Skip # dart:typed_data support needed.
+float_array_test: Skip # dart:typed_data support needed.
+int_array_test: Skip  # dart:typed_data support needed.
+byte_array_view_optimized_test: Skip # dart:typed_data support needed.
 io/web_socket_protocol_processor_test: Skip  # Importing code with external keyword
 int_array_load_elimination_test: Skip  # This is a VM test
 medium_integer_test: Fail, OK # Test fails with JS number semantics: issue 1533.
diff --git a/tests/standalone/typed_array_test.dart b/tests/standalone/typed_array_test.dart
index 007f9ec1074..b7d5b875fee 100644
--- a/tests/standalone/typed_array_test.dart
+++ b/tests/standalone/typed_array_test.dart
@@ -8,7 +8,7 @@
 library TypedArray;
 import "package:expect/expect.dart";
 import 'dart:isolate';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void main() {
   int8_receiver();
diff --git a/tests/standalone/typed_data_test.dart b/tests/standalone/typed_data_test.dart
index 141a0827465..21f17a5bc06 100644
--- a/tests/standalone/typed_data_test.dart
+++ b/tests/standalone/typed_data_test.dart
@@ -8,7 +8,7 @@
 library TypedDataTest;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 void testCreateUint8TypedData() {
   Uint8List typed_data;
diff --git a/tests/standalone/typed_data_view_test.dart b/tests/standalone/typed_data_view_test.dart
index dbdab31bd93..1a71282ad14 100644
--- a/tests/standalone/typed_data_view_test.dart
+++ b/tests/standalone/typed_data_view_test.dart
@@ -8,7 +8,7 @@
 library TypedDataTest;
 
 import "package:expect/expect.dart";
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 validate(TypedData list, num expected) {
   for (int i = 0; i < list.length; i++) {
diff --git a/tools/create_sdk.py b/tools/create_sdk.py
index be09394e22b..1f035bcc657 100755
--- a/tools/create_sdk.py
+++ b/tools/create_sdk.py
@@ -38,7 +38,7 @@
 # ......mirrors/
 # ......uri/
 # ......utf/
-# ......typeddata/
+# ......typed_data/
 # ....packages/
 # ......args/
 # ......intl/
@@ -219,7 +219,7 @@ def Main(argv):
                   join('html', 'dart2js'), join('html', 'dartium'),
                   join('html', 'html_common'),
                   join('indexed_db', 'dart2js'), join('indexed_db', 'dartium'),
-                  'json', 'math', 'mirrors', 'typeddata',
+                  'json', 'math', 'mirrors', 'typed_data',
                   join('svg', 'dart2js'), join('svg', 'dartium'),
                   'uri', 'utf',
                   join('web_audio', 'dart2js'), join('web_audio', 'dartium'),
diff --git a/tools/dom/scripts/generator.py b/tools/dom/scripts/generator.py
index c5a8649ab4f..6163f534726 100644
--- a/tools/dom/scripts/generator.py
+++ b/tools/dom/scripts/generator.py
@@ -385,7 +385,7 @@ class OperationInfo(object):
     else:
       # TODO(antonm): temporary ugly hack.
       # While in transition phase we allow both DOM's ArrayBuffer
-      # and dart:typeddata's ByteBuffer for IDLs' ArrayBuffers,
+      # and dart:typed_data's ByteBuffer for IDLs' ArrayBuffers,
       # hence ArrayBuffer is mapped to dynamic in arguments and return
       # values.  To compensate for that when generating ArrayBuffer itself,
       # we need to lie a bit:
@@ -1379,7 +1379,7 @@ class TypeData(object):
 def TypedListTypeData(item_type):
   return TypeData(
       clazz='TypedList',
-      dart_type='List<%s>' % item_type, # TODO(antonm): proper typeddata interfaces.
+      dart_type='List<%s>' % item_type, # TODO(antonm): proper typed_data interfaces.
       item_type=item_type,
       is_typed_array=True)
 
diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
index 776a0821529..86b20b64a4d 100644
--- a/tools/dom/scripts/htmlrenamer.py
+++ b/tools/dom/scripts/htmlrenamer.py
@@ -727,7 +727,7 @@ class HtmlRenamer(object):
         return 'web_gl'
 
     if interface.id in typed_array_renames:
-      return 'typeddata'
+      return 'typed_data'
 
     return 'html'
 
diff --git a/tools/dom/scripts/systemhtml.py b/tools/dom/scripts/systemhtml.py
index 5454ba98c0c..f88a451c61b 100644
--- a/tools/dom/scripts/systemhtml.py
+++ b/tools/dom/scripts/systemhtml.py
@@ -263,7 +263,7 @@ _element_constructors = {
   'html': _html_element_constructors,
   'indexed_db': {},
   'svg': _svg_element_constructors,
-  'typeddata': {},
+  'typed_data': {},
   'web_audio': {},
   'web_gl': {},
   'web_sql': {},
@@ -282,7 +282,7 @@ _factory_ctr_strings = {
     'provider_name': '_SvgElementFactoryProvider',
     'constructor_name': 'createSvgElement_tag',
   },
-  'typeddata': {
+  'typed_data': {
       'provider_name': 'document',
       'constructor_name': '$dom_createElement'
   },
diff --git a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
index 59ecdd658e5..47a986191a2 100644
--- a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
@@ -17,7 +17,7 @@ import 'dart:indexed_db';
 import 'dart:isolate';
 import 'dart:json' as json;
 import 'dart:math';
-import 'dart:typeddata';
+import 'dart:typed_data';
 // Not actually used, but imported since dart:html can generate these objects.
 import 'dart:svg' as svg;
 import 'dart:web_audio' as web_audio;
diff --git a/tools/dom/templates/html/dart2js/indexed_db_dart2js.darttemplate b/tools/dom/templates/html/dart2js/indexed_db_dart2js.darttemplate
index 20f5cce7729..8a96fbb8234 100644
--- a/tools/dom/templates/html/dart2js/indexed_db_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/indexed_db_dart2js.darttemplate
@@ -11,7 +11,7 @@ library dart.dom.indexed_db;
 import 'dart:async';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, Returns, JSName, Null;
 import 'dart:_foreign_helper' show JS;
 
diff --git a/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate b/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate
index 6abe949418e..e9e62f31c1d 100644
--- a/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate
@@ -9,7 +9,7 @@ import 'dart:collection';
 import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, Returns, convertDartClosureToJS;
 import 'dart:_foreign_helper' show JS;
 
diff --git a/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate b/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate
index 5703fe96386..bb5c1ea644e 100644
--- a/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate
@@ -8,7 +8,7 @@ import 'dart:collection';
 import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:_js_helper' show Creates, JSName, Null, Returns, convertDartClosureToJS;
 import 'dart:_foreign_helper' show JS;
 
diff --git a/tools/dom/templates/html/dartium/html_dartium.darttemplate b/tools/dom/templates/html/dartium/html_dartium.darttemplate
index d4f62a442c5..07780e331d2 100644
--- a/tools/dom/templates/html/dartium/html_dartium.darttemplate
+++ b/tools/dom/templates/html/dartium/html_dartium.darttemplate
@@ -17,7 +17,7 @@ import 'dart:isolate';
 import 'dart:json' as json;
 import 'dart:math';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 import 'dart:web_gl' as gl;
 import 'dart:web_sql';
 // Not actually used, but imported since dart:html can generate these objects.
diff --git a/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate b/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate
index a8a78434224..97b9424dc56 100644
--- a/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate
+++ b/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate
@@ -9,6 +9,6 @@ import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 $!GENERATED_DART_FILES
diff --git a/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate b/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate
index e1b29b3321c..ec1dcc9bdc3 100644
--- a/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate
+++ b/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate
@@ -9,7 +9,7 @@ import 'dart:_collection-dev';
 import 'dart:html';
 import 'dart:html_common';
 import 'dart:nativewrappers';
-import 'dart:typeddata';
+import 'dart:typed_data';
 
 part '$AUXILIARY_DIR/WebGLConstants.dart';