diff --git a/modules/angular2/src/compiler/offline_compiler.ts b/modules/angular2/src/compiler/offline_compiler.ts
index de6e5c175a..482209e7e7 100644
--- a/modules/angular2/src/compiler/offline_compiler.ts
+++ b/modules/angular2/src/compiler/offline_compiler.ts
@@ -126,7 +126,7 @@ function _resolveStyleStatements(compileResult: StylesCompileResult): o.Statemen
 function _templateModuleUrl(comp: CompileDirectiveMetadata): string {
   var moduleUrl = comp.type.moduleUrl;
   var urlWithoutSuffix = moduleUrl.substring(0, moduleUrl.length - MODULE_SUFFIX.length);
-  return `${urlWithoutSuffix}.template${MODULE_SUFFIX}`;
+  return `${urlWithoutSuffix}.ngfactory${MODULE_SUFFIX}`;
 }
 
 function _stylesModuleUrl(stylesheetUrl: string, shim: boolean): string {
diff --git a/modules_dart/transform/lib/src/transform/common/names.dart b/modules_dart/transform/lib/src/transform/common/names.dart
index 93972d6d05..2ea8d1d733 100644
--- a/modules_dart/transform/lib/src/transform/common/names.dart
+++ b/modules_dart/transform/lib/src/transform/common/names.dart
@@ -15,11 +15,11 @@ const REFLECTOR_IMPORT = 'package:angular2/src/core/reflection/reflection.dart';
 const REFLECTOR_PREFIX = '_ngRef';
 const REGISTER_TYPE_METHOD_NAME = 'registerType';
 const SUMMARY_META_EXTENSION = '.ng_summary.json';
-const TEMPLATE_EXTENSION = '.template.dart';
+const TEMPLATE_EXTENSION = '.ngfactory.dart';
 
 /// Note that due to the implementation of `_toExtension`, ordering is
 /// important. For example, putting '.dart' first in this list will cause
-/// incorrect behavior because it will (incompletely) match '.template.dart'
+/// incorrect behavior because it will (incompletely) match '.ngfactory.dart'
 /// files.
 const ALL_EXTENSIONS = const [
   DEFERRED_EXTENSION,
diff --git a/modules_dart/transform/lib/src/transform/common/options.dart b/modules_dart/transform/lib/src/transform/common/options.dart
index d3593cd320..9b87ae213f 100644
--- a/modules_dart/transform/lib/src/transform/common/options.dart
+++ b/modules_dart/transform/lib/src/transform/common/options.dart
@@ -90,7 +90,7 @@ class TransformerOptions {
   ///
   /// This option is strictly for internal testing and is not available as an
   /// option on the transformer.
-  /// Setting this to `false` means that our generated .template.dart files do
+  /// Setting this to `false` means that our generated .ngfactory.dart files do
   /// not have any compiled templates or change detectors defined in them.
   /// These files will not be usable, but this allows us to test the code output
   /// of the transformer without breaking when compiled template internals
diff --git a/modules_dart/transform/lib/src/transform/deferred_rewriter/rewriter.dart b/modules_dart/transform/lib/src/transform/deferred_rewriter/rewriter.dart
index 0486ce31ac..c423592a65 100644
--- a/modules_dart/transform/lib/src/transform/deferred_rewriter/rewriter.dart
+++ b/modules_dart/transform/lib/src/transform/deferred_rewriter/rewriter.dart
@@ -17,7 +17,7 @@ import 'package:angular2/src/transform/common/url_resolver.dart';
 ///    `_entryPoint`
 /// 2. Removes any libraries that don't require angular codegen.
 /// 3. For the remaining libraries, rewrites the import to the corresponding
-///    `.template.dart` file.
+///    `.ngfactory.dart` file.
 /// 4. Chains a future to the `loadLibrary` call which initializes the
 ///    library.
 ///
diff --git a/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_deps_linker.dart b/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_deps_linker.dart
index dbeebcf720..84255395b2 100644
--- a/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_deps_linker.dart
+++ b/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_deps_linker.dart
@@ -16,7 +16,7 @@ import 'package:barback/barback.dart';
 ///
 /// For example, if entry_point.dart imports dependency.dart, this will check if
 /// dependency.ng_meta.json exists. If it does, we add an entry to the
-/// `depImports` of [NgDepsModel] for dependency.template.dart.
+/// `depImports` of [NgDepsModel] for dependency.ngfactory.dart.
 ///
 /// We use this information later to ensure that each file's dependencies are
 /// initialized when that file is initialized.
diff --git a/modules_dart/transform/lib/src/transform/directive_metadata_linker/transformer.dart b/modules_dart/transform/lib/src/transform/directive_metadata_linker/transformer.dart
index bcb13d3f34..a5d0e8fb5d 100644
--- a/modules_dart/transform/lib/src/transform/directive_metadata_linker/transformer.dart
+++ b/modules_dart/transform/lib/src/transform/directive_metadata_linker/transformer.dart
@@ -22,8 +22,8 @@ import 'ng_meta_linker.dart';
 /// Said another way, after this step there should be an entry in this `NgMeta`
 /// object for all `Directives` visible from its associated `.dart` file.
 ///
-/// This step also ensures that, if `a.dart` imports `b.dart`, `a.template.dart`
-/// imports `b.template.dart` (if it exists) and we note that this is a
+/// This step also ensures that, if `a.dart` imports `b.dart`, `a.ngfactory.dart`
+/// imports `b.ngfactory.dart` (if it exists) and we note that this is a
 /// ngDeps dependency, ensuring that a's `initReflector` function calls b's
 /// `initReflector' function.
 ///
diff --git a/modules_dart/transform/lib/src/transform/reflection_remover/transformer.dart b/modules_dart/transform/lib/src/transform/reflection_remover/transformer.dart
index 6236160fad..f98cd6d779 100644
--- a/modules_dart/transform/lib/src/transform/reflection_remover/transformer.dart
+++ b/modules_dart/transform/lib/src/transform/reflection_remover/transformer.dart
@@ -19,9 +19,9 @@ import 'remove_reflection_capabilities.dart';
 /// The goal of this is to break the app's dependency on dart:mirrors.
 ///
 /// This transformer assumes that {@link DirectiveProcessor} and {@link DirectiveLinker}
-/// have already been run and that a .template.dart file has been generated for
+/// have already been run and that a .ngfactory.dart file has been generated for
 /// {@link options.entryPoint}. The instantiation of {@link ReflectionCapabilities} is
-/// replaced by calling `initReflector` in that .template.dart file.
+/// replaced by calling `initReflector` in that .ngfactory.dart file.
 class ReflectionRemover extends Transformer implements LazyTransformer {
   final TransformerOptions options;
 
diff --git a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart
index 5eb5477403..4d4aefa50d 100644
--- a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart
+++ b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart
@@ -19,7 +19,7 @@ import 'package:angular2/src/transform/common/options.dart' show CODEGEN_DEBUG_M
 
 import 'compile_data_creator.dart';
 
-/// Generates `.template.dart` files to initialize the Angular2 system.
+/// Generates `.ngfactory.dart` files to initialize the Angular2 system.
 ///
 /// - Processes the `.ng_meta.json` file represented by `assetId` using
 ///   `createCompileData`.
diff --git a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart
index 5cfe0f67de..4f6a154ded 100644
--- a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart
+++ b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart
@@ -3,7 +3,7 @@ library web_foo;
 import 'package:angular2/src/core/application.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
-import 'hello.template.dart' deferred as a; // ng_deps. Should be rewritten.
+import 'hello.ngfactory.dart' deferred as a; // ng_deps. Should be rewritten.
 import 'b.dart' deferred as b; // No ng_deps. Shouldn't be rewritten.
 
 void main() {
diff --git a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart
index 18fc6151c1..42adfe5efd 100644
--- a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart
+++ b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart
@@ -3,7 +3,7 @@ library web_foo;
 import 'package:angular2/src/core/application.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
-import 'hello.template.dart' deferred as a;
+import 'hello.ngfactory.dart' deferred as a;
 
 void main() {
   reflector.reflectionCapabilities = new ReflectionCapabilities();
diff --git a/modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart b/modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart
index 153589d8dc..5be344b98f 100644
--- a/modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart
+++ b/modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart
@@ -625,7 +625,7 @@ void allTests() {
       var linked = (await _testLink(reader, fooAssetId, fooMetaAssetId)).ngDeps;
       expect(linked, isNotNull);
       var linkedImport = linked.depImports
-          .firstWhere((i) => i.uri.endsWith('bar.template.dart'));
+          .firstWhere((i) => i.uri.endsWith('bar.ngfactory.dart'));
       expect(linkedImport, isNotNull);
       expect(linkedImport.prefix.startsWith('i'), isTrue);
     });
@@ -640,7 +640,7 @@ void allTests() {
       var linked = (await _testLink(reader, fooAssetId, fooMetaAssetId)).ngDeps;
       expect(linked, isNotNull);
       var linkedImport = linked.depImports
-          .firstWhere((i) => i.uri.endsWith('bar.template.dart'));
+          .firstWhere((i) => i.uri.endsWith('bar.ngfactory.dart'));
       expect(linkedImport, isNotNull);
       expect(linkedImport.prefix.startsWith('i'), isTrue);
     });
@@ -658,7 +658,7 @@ void allTests() {
       var linked = (await _testLink(reader, fooAssetId, fooMetaAssetId)).ngDeps;
       expect(linked, isNotNull);
       var linkedImport = linked.depImports.firstWhere(
-          (i) => i.uri.endsWith('bar.template.dart'),
+          (i) => i.uri.endsWith('bar.ngfactory.dart'),
           orElse: () => null);
       expect(linkedImport, isNull);
     });
diff --git a/modules_dart/transform/test/transform/integration/all_tests.dart b/modules_dart/transform/test/transform/integration/all_tests.dart
index 53915a4066..4387ca1850 100644
--- a/modules_dart/transform/test/transform/integration/all_tests.dart
+++ b/modules_dart/transform/test/transform/integration/all_tests.dart
@@ -57,10 +57,10 @@ void allTests() {
           'a|web/bar.dart': 'simple_annotation_files/bar.dart'
         },
         outputs: {
-          'a|web/bar.template.dart':
-              'simple_annotation_files/expected/bar.template.dart',
-          'a|web/index.template.dart':
-              'simple_annotation_files/expected/index.template.dart'
+          'a|web/bar.ngfactory.dart':
+              'simple_annotation_files/expected/bar.ngfactory.dart',
+          'a|web/index.ngfactory.dart':
+              'simple_annotation_files/expected/index.ngfactory.dart'
         }),
     new IntegrationTestConfig('should generate proper code for a Component with multiple deps.',
         inputs: {
@@ -69,7 +69,7 @@ void allTests() {
           'a|web/bar.dart': 'two_deps_files/bar.dart'
         },
         outputs: {
-          'a|web/bar.template.dart': 'two_deps_files/expected/bar.template.dart'
+          'a|web/bar.ngfactory.dart': 'two_deps_files/expected/bar.ngfactory.dart'
         }),
     new IntegrationTestConfig(
         'should generate proper code for a Component declaring a '
@@ -80,8 +80,8 @@ void allTests() {
           'a|web/bar.dart': 'list_of_types_files/bar.dart'
         },
         outputs: {
-          'a|web/bar.template.dart':
-              'list_of_types_files/expected/bar.template.dart'
+          'a|web/bar.ngfactory.dart':
+              'list_of_types_files/expected/bar.ngfactory.dart'
         }),
     new IntegrationTestConfig('should generate a factory for a class with no declared ctor.',
         inputs: {
@@ -89,8 +89,8 @@ void allTests() {
           'a|web/bar.dart': 'synthetic_ctor_files/bar.dart'
         },
         outputs: {
-          'a|web/bar.template.dart':
-              'synthetic_ctor_files/expected/bar.template.dart'
+          'a|web/bar.ngfactory.dart':
+              'synthetic_ctor_files/expected/bar.ngfactory.dart'
         }),
     new IntegrationTestConfig('should preserve multiple annotations.', inputs: {
       'a|web/index.dart': 'two_annotations_files/index.dart',
@@ -98,8 +98,8 @@ void allTests() {
       'angular2|lib/src/core/metadata.dart':
           '../../../lib/src/core/metadata.dart'
     }, outputs: {
-      'a|web/bar.template.dart':
-          'two_annotations_files/expected/bar.template.dart'
+      'a|web/bar.ngfactory.dart':
+          'two_annotations_files/expected/bar.ngfactory.dart'
     }),
     new IntegrationTestConfig(
         'should handle Directive dependencies declared on a View.',
@@ -109,8 +109,8 @@ void allTests() {
           'a|web/bar.dart': 'directive_dep_files/bar.dart'
         },
         outputs: {
-          'a|web/bar.template.dart':
-              'directive_dep_files/expected/bar.template.dart'
+          'a|web/bar.ngfactory.dart':
+              'directive_dep_files/expected/bar.ngfactory.dart'
         }),
     new IntegrationTestConfig('should handle chained Directive dependencies declared on a View.',
         inputs: {
@@ -120,8 +120,8 @@ void allTests() {
           'a|web/baz.dart': 'directive_chain_files/baz.dart'
         },
         outputs: {
-          'a|web/bar.template.dart':
-              'directive_chain_files/expected/bar.template.dart'
+          'a|web/bar.ngfactory.dart':
+              'directive_chain_files/expected/bar.ngfactory.dart'
         }),
     new IntegrationTestConfig('should handle empty template files that define directive aliases.',
         inputs: {
@@ -129,10 +129,10 @@ void allTests() {
           'a|web/bar.dart': 'empty_ng_deps_files/bar.dart'
         },
         outputs: {
-      'a|web/foo.template.dart':
-          'empty_ng_deps_files/expected/foo.template.dart',
-      'a|web/bar.template.dart':
-          'empty_ng_deps_files/expected/bar.template.dart'
+      'a|web/foo.ngfactory.dart':
+          'empty_ng_deps_files/expected/foo.ngfactory.dart',
+      'a|web/bar.ngfactory.dart':
+          'empty_ng_deps_files/expected/bar.ngfactory.dart'
     })
   ];
 
@@ -180,8 +180,8 @@ void _testDeferredRewriter() {
   inputs.addAll(commonInputs);
   inputs.keys.forEach((k) => inputs[k] = _readFile(inputs[k]));
   var outputs = {
-    'a|web/bar.template.dart':
-        _readFile('deferred_files/expected/bar.template.dart'),
+    'a|web/bar.ngfactory.dart':
+        _readFile('deferred_files/expected/bar.ngfactory.dart'),
     'a|web/bar.dart': deferredOuts.barContents,
     'a|web/index.dart': deferredOuts.indexContents
   };
diff --git a/modules_dart/transform/test/transform/integration/deferred_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/deferred_files/expected/bar.ngfactory.dart
similarity index 61%
rename from modules_dart/transform/test/transform/integration/deferred_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/deferred_files/expected/bar.ngfactory.dart
index 79895efa55..26fadd6c95 100644
--- a/modules_dart/transform/test/transform/integration/deferred_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/deferred_files/expected/bar.ngfactory.dart
@@ -1,9 +1,9 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
 export 'bar.dart';
 
 var _visited = false;
@@ -13,7 +13,7 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/deferred_files/expected/output.dart b/modules_dart/transform/test/transform/integration/deferred_files/expected/output.dart
index 00906a66a0..93ea0f9cc8 100644
--- a/modules_dart/transform/test/transform/integration/deferred_files/expected/output.dart
+++ b/modules_dart/transform/test/transform/integration/deferred_files/expected/output.dart
@@ -8,7 +8,7 @@ library angular2.test.transform.integration.deferred;
 const indexContents = '''
 library web_foo;
 
-import 'index.template.dart' as ngStaticInit;import 'bar.template.dart' deferred as bar;
+import 'index.ngfactory.dart' as ngStaticInit;import 'bar.ngfactory.dart' deferred as bar;
 
 void main() {
   bar.loadLibrary().then((_) {bar.initReflector();}).then((_) {
@@ -22,7 +22,7 @@ library bar;
 
 import 'package:angular2/src/core/metadata.dart';
 
-import 'dep.template.dart' deferred as dep;
+import 'dep.ngfactory.dart' deferred as dep;
 
 @Component(selector: '[soup]')
 @View(template: '')
diff --git a/modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.ngfactory.dart
similarity index 60%
rename from modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.ngfactory.dart
index 7d28a87c96..7e5d99886c 100644
--- a/modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/directive_chain_files/expected/bar.ngfactory.dart
@@ -1,11 +1,11 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
 import 'baz.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
-import 'baz.template.dart' as i1;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
+import 'baz.ngfactory.dart' as i1;
 export 'bar.dart';
 
 var _visited = false;
@@ -15,8 +15,8 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
   i1.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.ngfactory.dart
similarity index 61%
rename from modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.ngfactory.dart
index 25eaa38639..eb2d3cb173 100644
--- a/modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/directive_dep_files/expected/bar.ngfactory.dart
@@ -1,11 +1,11 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
 import 'foo.dart' as prefix;
-import 'package:angular2/src/core/metadata.template.dart' as i0;
-import 'foo.template.dart' as i1;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
+import 'foo.ngfactory.dart' as i1;
 export 'bar.dart';
 
 var _visited = false;
@@ -15,8 +15,8 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
   i1.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/bar.ngfactory.dart
similarity index 100%
rename from modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/bar.ngfactory.dart
diff --git a/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.template.dart b/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.ngfactory.dart
similarity index 60%
rename from modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.template.dart
rename to modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.ngfactory.dart
index 2f0b3015b4..946e4f54fd 100644
--- a/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.template.dart
+++ b/modules_dart/transform/test/transform/integration/empty_ng_deps_files/expected/foo.ngfactory.dart
@@ -1,11 +1,11 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'foo.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
 import 'bar.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
-import 'bar.template.dart' as i1;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
+import 'bar.ngfactory.dart' as i1;
 export 'foo.dart';
 
 var _visited = false;
@@ -15,8 +15,8 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
   i1.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ngfactory.dart
similarity index 80%
rename from modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ngfactory.dart
index 8f06fe90fc..d8703aa8a7 100644
--- a/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ngfactory.dart
@@ -1,11 +1,11 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
 import 'foo.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
-import 'foo.template.dart' as i1;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
+import 'foo.ngfactory.dart' as i1;
 export 'bar.dart';
 
 var _visited = false;
diff --git a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ngfactory.dart
similarity index 61%
rename from modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ngfactory.dart
index 79895efa55..26fadd6c95 100644
--- a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ngfactory.dart
@@ -1,9 +1,9 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
 export 'bar.dart';
 
 var _visited = false;
@@ -13,7 +13,7 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ngfactory.dart
similarity index 85%
rename from modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
rename to modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ngfactory.dart
index a3966d1880..8c73ed055e 100644
--- a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
+++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ngfactory.dart
@@ -1,11 +1,11 @@
-library web_foo.template.dart;
+library web_foo.ngfactory.dart;
 
 import 'index.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/platform/browser_static.dart' show bootstrapStatic;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'bar.dart';
-import 'bar.template.dart' as i0;
+import 'bar.ngfactory.dart' as i0;
 export 'index.dart';
 
 var _visited = false;
diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ngfactory.dart
similarity index 61%
rename from modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ngfactory.dart
index 79895efa55..26fadd6c95 100644
--- a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ngfactory.dart
@@ -1,9 +1,9 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
-import 'package:angular2/src/core/metadata.template.dart' as i0;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
 export 'bar.dart';
 
 var _visited = false;
@@ -13,7 +13,7 @@ void initReflector() {
   _ngRef.reflector
     ..registerType(
         MyComponent,
-        new _ngRef.ReflectionInfo(const [MyComponentNgFactory], const [],
-            () => new MyComponent()));
+        new _ngRef.ReflectionInfo(
+            const [MyComponentNgFactory], const [], () => new MyComponent()));
   i0.initReflector();
 }
diff --git a/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ngfactory.dart
similarity index 86%
rename from modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ngfactory.dart
index 1455d5e751..c2b77e16e0 100644
--- a/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ngfactory.dart
@@ -1,9 +1,9 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/core.dart';
-import 'package:angular2/core.template.dart' as i0;
+import 'package:angular2/core.ngfactory.dart' as i0;
 export 'bar.dart';
 
 var _visited = false;
diff --git a/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.template.dart b/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ngfactory.dart
similarity index 84%
rename from modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.template.dart
rename to modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ngfactory.dart
index 4dac2f1bf2..918c37e2fb 100644
--- a/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.template.dart
+++ b/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ngfactory.dart
@@ -1,11 +1,11 @@
-library bar.template.dart;
+library bar.ngfactory.dart;
 
 import 'bar.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
 import 'package:angular2/src/core/metadata.dart';
 import 'foo.dart' as prefix;
-import 'package:angular2/src/core/metadata.template.dart' as i0;
-import 'foo.template.dart' as i1;
+import 'package:angular2/src/core/metadata.ngfactory.dart' as i0;
+import 'foo.ngfactory.dart' as i1;
 export 'bar.dart';
 
 var _visited = false;
diff --git a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
index 28b39d7fa6..907fc0bb46 100644
--- a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 
 void main() async {
   var appRef = await bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });
diff --git a/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
index 05c569e429..b109e6a362 100644
--- a/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
@@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.combinator_files;
 // those we are removing.
 
 var code = """
-import 'package:angular2/platform/browser_static.dart' show bootstrapStatic, initReflector;import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart' show bootstrapStatic, initReflector;import 'index.ngfactory.dart' as ngStaticInit;
 
 void main() {
   bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
index 553ad57437..5f4ee58134 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.debug_reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/platform/browser.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser.dart';import 'index.ngfactory.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
index 28310d757d..c20b1c4d9d 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.debug_mirrors_files.expected;
 var code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
index 58d583b018..94f7a0bca4 100644
--- a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
@@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.deferred_bootstrap_files;
 // those we are removing.
 
 var code = """
-import 'package:angular2/platform/browser_static.dart' deferred as ng;import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart' deferred as ng;import 'index.ngfactory.dart' as ngStaticInit;
 
 void main() {
   ng.loadLibrary().then((_) {
diff --git a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
index dc5b150d30..55c757148d 100644
--- a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.function_annotation_files;
 const code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 /*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
index 26e0026daf..3feccd74fc 100644
--- a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.method_annotation_files;
 const code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 
 class TestBootstrapper {
   @AngularEntrypoint("Method entrypoint")
diff --git a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
index b40f0cc4aa..4a2109821d 100644
--- a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 /*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
index 347c4d548b..d11db29357 100644
--- a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.verbose_files.expected;
 var code = """
 library web_foo;
 
-import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.ngfactory.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/template_compiler/all_tests.dart b/modules_dart/transform/test/transform/template_compiler/all_tests.dart
index 0af6b08eb2..4db15d1bc3 100644
--- a/modules_dart/transform/test/transform/template_compiler/all_tests.dart
+++ b/modules_dart/transform/test/transform/template_compiler/all_tests.dart
@@ -163,7 +163,7 @@ void allTests() {
 
     expect(_generatedCode(outputs))
       ..toContain("import 'bar.dart'")
-      ..toContain("import 'bar.template.dart'");
+      ..toContain("import 'bar.ngfactory.dart'");
   });
 
   it('should parse `View` directives with a single prefixed dependency.',
@@ -193,7 +193,7 @@ void allTests() {
 
     expect(_generatedCode(outputs))
       ..toContain("import 'bar.dart'")
-      ..toContain("import 'bar.template.dart'");
+      ..toContain("import 'bar.ngfactory.dart'");
   });
 
   it('should include directives mentioned in directive aliases.', () async {
@@ -221,7 +221,7 @@ void allTests() {
 
     expect(_generatedCode(outputs))
       ..toContain("import 'bar.dart'")
-      ..toContain("import 'bar.template.dart'");
+      ..toContain("import 'bar.ngfactory.dart'");
   });
 
   it('should create the same output for multiple calls.', () async {
diff --git a/modules_dart/transform/test/transform/template_compiler/event_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/event_files/expected/hello.ng_deps.dart
index 2a68aada01..d5b9b5902a 100644
--- a/modules_dart/transform/test/transform/template_compiler/event_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/event_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/inline_expression_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/inline_expression_files/expected/hello.ng_deps.dart
index 7f69ff9bb8..4f4146ec47 100644
--- a/modules_dart/transform/test/transform/template_compiler/inline_expression_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/inline_expression_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/inline_method_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/inline_method_files/expected/hello.ng_deps.dart
index 417a7c5cd3..c1fbb1d1b8 100644
--- a/modules_dart/transform/test/transform/template_compiler/inline_method_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/inline_method_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/one_directive_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/one_directive_files/expected/hello.ng_deps.dart
index 5cbdbfd367..2310fcb6fa 100644
--- a/modules_dart/transform/test/transform/template_compiler/one_directive_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/one_directive_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/url_expression_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/url_expression_files/expected/hello.ng_deps.dart
index 83be207e92..ab2d9a6172 100644
--- a/modules_dart/transform/test/transform/template_compiler/url_expression_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/url_expression_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.src.hello_world.index_common_dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/url_method_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/url_method_files/expected/hello.ng_deps.dart
index 83be207e92..ab2d9a6172 100644
--- a/modules_dart/transform/test/transform/template_compiler/url_method_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/url_method_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.src.hello_world.index_common_dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/goodbye.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/goodbye.ng_deps.dart
index 7f6d68e6a0..94cf6b5691 100644
--- a/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/goodbye.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/goodbye.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'goodbye.template.dart' as _templates;
+import 'goodbye.ngfactory.dart' as _templates;
 
 import 'goodbye.dart';
 import 'package:angular2/angular2.dart'
diff --git a/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/hello.ng_deps.dart
index 4a1aaa476e..85d4211b59 100644
--- a/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/hello.ng_deps.dart
+++ b/modules_dart/transform/test/transform/template_compiler/with_prefix_files/expected/hello.ng_deps.dart
@@ -1,6 +1,6 @@
 library playground.hello_world.index_common_dart.ng_deps.dart;
 
-import 'hello.template.dart' as _templates;
+import 'hello.ngfactory.dart' as _templates;
 
 import 'hello.dart';
 import 'goodbye.dart' as prefix;