diff --git a/lib/application_factory.dart b/lib/application_factory.dart
index 25b95cd40..b7985bd19 100644
--- a/lib/application_factory.dart
+++ b/lib/application_factory.dart
@@ -16,7 +16,7 @@ import 'package:angular/core/parser/parser.dart' show ClosureMap;
 import 'package:angular/change_detection/change_detection.dart';
 import 'package:angular/change_detection/dirty_checking_change_detector_dynamic.dart';
 import 'package:angular/core/registry_dynamic.dart';
-import 'package:angular/core/parser/parser_dynamic.dart';
+import 'package:angular/core/parser/dynamic_closure_map.dart';
 import 'dart:html';
 
 /**
diff --git a/lib/application_factory_static.dart b/lib/application_factory_static.dart
index 3379177ff..d35a8de16 100644
--- a/lib/application_factory_static.dart
+++ b/lib/application_factory_static.dart
@@ -35,7 +35,7 @@ import 'package:di/di.dart' show TypeFactory, Injector;
 import 'package:angular/application.dart';
 import 'package:angular/core/registry.dart';
 import 'package:angular/core/parser/parser.dart';
-import 'package:angular/core/parser/parser_static.dart';
+import 'package:angular/core/parser/static_closure_map.dart';
 import 'package:angular/core/parser/dynamic_parser.dart';
 import 'package:angular/core/registry_static.dart';
 import 'package:angular/change_detection/change_detection.dart';
diff --git a/lib/core/parser/parser_dynamic.dart b/lib/core/parser/dynamic_closure_map.dart
similarity index 97%
rename from lib/core/parser/parser_dynamic.dart
rename to lib/core/parser/dynamic_closure_map.dart
index 967db7bed..663b5c99a 100644
--- a/lib/core/parser/parser_dynamic.dart
+++ b/lib/core/parser/dynamic_closure_map.dart
@@ -1,4 +1,4 @@
-library angular.core.parser_dynamic;
+library angular.core.dynamic_closure_map;
 
 @MirrorsUsed(targets: const [ DynamicClosureMap ], metaTargets: const [] )
 import 'dart:mirrors';
diff --git a/lib/core/parser/parser_static.dart b/lib/core/parser/static_closure_map.dart
similarity index 98%
rename from lib/core/parser/parser_static.dart
rename to lib/core/parser/static_closure_map.dart
index cf1c53255..fd0d6c186 100644
--- a/lib/core/parser/parser_static.dart
+++ b/lib/core/parser/static_closure_map.dart
@@ -1,4 +1,4 @@
-library angular.core.parser_static;
+library angular.core.static_closure_map;
 
 import 'package:angular/core/parser/parser.dart';
 
diff --git a/test/change_detection/watch_group_spec.dart b/test/change_detection/watch_group_spec.dart
index ba5dcdfbd..38c602340 100644
--- a/test/change_detection/watch_group_spec.dart
+++ b/test/change_detection/watch_group_spec.dart
@@ -7,7 +7,7 @@ import 'package:angular/change_detection/watch_group.dart';
 import 'package:angular/change_detection/dirty_checking_change_detector.dart';
 import 'package:angular/change_detection/dirty_checking_change_detector_dynamic.dart';
 import 'dirty_checking_change_detector_spec.dart' hide main;
-import 'package:angular/core/parser/parser_dynamic.dart' show DynamicClosureMap;
+import 'package:angular/core/parser/dynamic_closure_map.dart';
 
 class TestData {
   sub1(a, {b: 0}) => a - b;
diff --git a/test/core/parser/generated_getter_setter.dart b/test/core/parser/generated_getter_setter.dart
index edec759b1..253640ca6 100644
--- a/test/core/parser/generated_getter_setter.dart
+++ b/test/core/parser/generated_getter_setter.dart
@@ -1,6 +1,6 @@
 library angular.service.parser.generated_getter_setter_template;
 
 import 'package:angular/application_factory_static.dart';
-import 'package:angular/core/parser/parser_static.dart' show StaticClosureMap;
+import 'package:angular/core/parser/static_closure_map.dart' show StaticClosureMap;
 
 StaticClosureMap closureMap = null; // REMOVE