diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a787dee..f0ee6398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 0.5.0-beta  
+ 
+This code is considered production quality, but depends on angular2:  
+^3.0.0-alpha+1. The alpha tag represents the evolving nature of the AngularDart  
+api, not code quality (3.0.0-beta+1 is used in production Google apps).  
+  
+ * Rename library to angular_components.
+   
+> All previous versions were published as the 
+> [Pub Package](https://pub.dartlang.org/packages/angular_components) named 
+> `angular2_components`.
+
 ## 0.4.1-beta
 
  * Updated dependencies on `pkg/quiver` and `pkg/intl`.
diff --git a/README.md b/README.md
index 4226b532..1644f7f2 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Firefox, and Safari.
 
 ## Useful links
 
-* **[Example gallery](https://dart-lang.github.io/angular2_components_example/)**
+* **[Example gallery](https://dart-lang.github.io/angular_components_example/)**
 * [AngularDart pub package](https://pub.dartlang.org/packages/angular2)
 * [AngularDart documentation](https://angulardart.org/)
 * [Material Design site](https://material.google.com/)
diff --git a/lib/angular2_components.dart b/lib/angular_components.dart
similarity index 98%
rename from lib/angular2_components.dart
rename to lib/angular_components.dart
index a0e8d1fa..71c56081 100644
--- a/lib/angular2_components.dart
+++ b/lib/angular_components.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 angular2_components;
+library angular_components;
 
 import 'package:angular2/angular2.dart' show Provider;
 import 'src/all_components.dart';
diff --git a/lib/src/all_components.dart b/lib/src/all_components.dart
index cc3699bc..8786c33d 100644
--- a/lib/src/all_components.dart
+++ b/lib/src/all_components.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 angular2_components.all_components;
+library angular_components.all_components;
 
 export 'components/annotations/rtl_annotation.dart';
 export 'components/auto_dismiss/auto_dismiss.dart';
diff --git a/lib/src/css/acux/acux_css_const.dart b/lib/src/css/acux/acux_css_const.dart
index a20ba651..9f811b67 100644
--- a/lib/src/css/acux/acux_css_const.dart
+++ b/lib/src/css/acux/acux_css_const.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 angular2_components.css.shared.acux_css_const;
+library angular_components.css.shared.acux_css_const;
 
 /// Global registry for z-index values used by various components.
 /// A z-index creates a new stacking context and you can go back to using
diff --git a/lib/src/css/acux/zindexer.dart b/lib/src/css/acux/zindexer.dart
index d141f312..76228ec0 100644
--- a/lib/src/css/acux/zindexer.dart
+++ b/lib/src/css/acux/zindexer.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @JS()
-library angular2_components.css.acux.zindexer;
+library angular_components.css.acux.zindexer;
 
 import 'package:angular2/angular2.dart';
 import 'package:js/js.dart';
diff --git a/lib/src/framework_stabilizers/framework_stabilizers.dart b/lib/src/framework_stabilizers/framework_stabilizers.dart
index 555a21e5..b7a56d09 100644
--- a/lib/src/framework_stabilizers/framework_stabilizers.dart
+++ b/lib/src/framework_stabilizers/framework_stabilizers.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @JS()
-library angular2_components.framework_stabilizers.framework_stabilizers;
+library angular_components.framework_stabilizers.framework_stabilizers;
 
 import 'dart:js';
 
diff --git a/lib/src/framework_stabilizers/testability.dart b/lib/src/framework_stabilizers/testability.dart
index 6b4f5167..44b910f3 100644
--- a/lib/src/framework_stabilizers/testability.dart
+++ b/lib/src/framework_stabilizers/testability.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @JS()
-library angular2_components.framework_stabilizers.testability;
+library angular_components.framework_stabilizers.testability;
 
 import 'dart:async';
 
diff --git a/lib/src/laminate/components/modal/modal.dart b/lib/src/laminate/components/modal/modal.dart
index d197ee66..93d38c3c 100644
--- a/lib/src/laminate/components/modal/modal.dart
+++ b/lib/src/laminate/components/modal/modal.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 angular2_components.laminate.components.modal.modal;
+library angular_components.laminate.components.modal.modal;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/components/modal/src/modal_controller_directive.dart b/lib/src/laminate/components/modal/src/modal_controller_directive.dart
index b32ffb2a..6a2191f9 100644
--- a/lib/src/laminate/components/modal/src/modal_controller_directive.dart
+++ b/lib/src/laminate/components/modal/src/modal_controller_directive.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 angular2_components.laminate.components.modal.src.modal_controller_directive;
+library angular_components.laminate.components.modal.src.modal_controller_directive;
 
 import 'package:angular2/angular2.dart';
 
diff --git a/lib/src/laminate/components/popup/base.dart b/lib/src/laminate/components/popup/base.dart
index e3b2bb68..faa5ade9 100644
--- a/lib/src/laminate/components/popup/base.dart
+++ b/lib/src/laminate/components/popup/base.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 angular2_components.laminate.components.popup.base;
+library angular_components.laminate.components.popup.base;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/components/popup/popup.dart b/lib/src/laminate/components/popup/popup.dart
index eee917b0..bef5fe91 100644
--- a/lib/src/laminate/components/popup/popup.dart
+++ b/lib/src/laminate/components/popup/popup.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 angular2_components.laminate.components.popup.popup;
+library angular_components.laminate.components.popup.popup;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/components/popup/src/popup_source_directive.dart b/lib/src/laminate/components/popup/src/popup_source_directive.dart
index faf6d251..627414ba 100644
--- a/lib/src/laminate/components/popup/src/popup_source_directive.dart
+++ b/lib/src/laminate/components/popup/src/popup_source_directive.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 angular2_components.laminate.components.popup.src.popup_source_directive;
+library angular_components.laminate.components.popup.src.popup_source_directive;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/enums/alignment.dart b/lib/src/laminate/enums/alignment.dart
index 02fddfac..bb047f63 100644
--- a/lib/src/laminate/enums/alignment.dart
+++ b/lib/src/laminate/enums/alignment.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 angular2_components.laminate.enums.alignment;
+library angular_components.laminate.enums.alignment;
 
 import 'dart:math';
 
diff --git a/lib/src/laminate/enums/src/base.dart b/lib/src/laminate/enums/src/base.dart
index 8c28ea8e..688a4134 100644
--- a/lib/src/laminate/enums/src/base.dart
+++ b/lib/src/laminate/enums/src/base.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 angular2_components.laminate.enums.src.base;
+library angular_components.laminate.enums.src.base;
 
 /// A function that sets [propertyName] to [propertyValue].
 typedef void SetPropertyFn(String propertyName, propertyValue);
diff --git a/lib/src/laminate/enums/visibility.dart b/lib/src/laminate/enums/visibility.dart
index 883606a8..05e04566 100644
--- a/lib/src/laminate/enums/visibility.dart
+++ b/lib/src/laminate/enums/visibility.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 angular2_components.laminate.enums.visibility;
+library angular_components.laminate.enums.visibility;
 
 import 'src/base.dart';
 
diff --git a/lib/src/laminate/overlay/module.dart b/lib/src/laminate/overlay/module.dart
index ffaa8df9..2a66d34f 100644
--- a/lib/src/laminate/overlay/module.dart
+++ b/lib/src/laminate/overlay/module.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 angular2_components.laminate.overlay.module;
+library angular_components.laminate.overlay.module;
 
 import 'dart:html';
 
diff --git a/lib/src/laminate/overlay/overlay.dart b/lib/src/laminate/overlay/overlay.dart
index 8d4010ef..851bb9e9 100644
--- a/lib/src/laminate/overlay/overlay.dart
+++ b/lib/src/laminate/overlay/overlay.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 angular2_components.laminate.overlay.overlay;
+library angular_components.laminate.overlay.overlay;
 
 export 'src/overlay_ref.dart'
     show BaseOverlayRef, OverlayRef;
diff --git a/lib/src/laminate/overlay/src/overlay_dom_service.dart b/lib/src/laminate/overlay/src/overlay_dom_service.dart
index 73aee294..6faae7c6 100644
--- a/lib/src/laminate/overlay/src/overlay_dom_service.dart
+++ b/lib/src/laminate/overlay/src/overlay_dom_service.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 angular2_components.laminate.overlay.src.overlay_dom_service;
+library angular_components.laminate.overlay.src.overlay_dom_service;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/overlay/src/overlay_ref.dart b/lib/src/laminate/overlay/src/overlay_ref.dart
index ca997033..a3cd9284 100644
--- a/lib/src/laminate/overlay/src/overlay_ref.dart
+++ b/lib/src/laminate/overlay/src/overlay_ref.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 angular2_components.laminate.overlay.src.overlay_ref;
+library angular_components.laminate.overlay.src.overlay_ref;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/overlay/src/overlay_service.dart b/lib/src/laminate/overlay/src/overlay_service.dart
index 6a586908..594eb1f0 100644
--- a/lib/src/laminate/overlay/src/overlay_service.dart
+++ b/lib/src/laminate/overlay/src/overlay_service.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 angular2_components.laminate.overlay.src.overlay_service;
+library angular_components.laminate.overlay.src.overlay_service;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/overlay/src/overlay_state.dart b/lib/src/laminate/overlay/src/overlay_state.dart
index 8de681ca..6ace5082 100644
--- a/lib/src/laminate/overlay/src/overlay_state.dart
+++ b/lib/src/laminate/overlay/src/overlay_state.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 angular2_components.laminate.overlay.src.overlay_state;
+library angular_components.laminate.overlay.src.overlay_state;
 
 import 'dart:async';
 
diff --git a/lib/src/laminate/overlay/src/render/overlay_dom_ref.dart b/lib/src/laminate/overlay/src/render/overlay_dom_ref.dart
index e8f2ca5b..abee93e6 100644
--- a/lib/src/laminate/overlay/src/render/overlay_dom_ref.dart
+++ b/lib/src/laminate/overlay/src/render/overlay_dom_ref.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 angular2_components.laminate.overlay.src.render.overlay_dom_ref;
+library angular_components.laminate.overlay.src.render.overlay_dom_ref;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/overlay/src/render/overlay_dom_render_service.dart b/lib/src/laminate/overlay/src/render/overlay_dom_render_service.dart
index 25055398..696a93b4 100644
--- a/lib/src/laminate/overlay/src/render/overlay_dom_render_service.dart
+++ b/lib/src/laminate/overlay/src/render/overlay_dom_render_service.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 angular2_components.laminate.overlay.src.render.overlay_dom_render_service;
+library angular_components.laminate.overlay.src.render.overlay_dom_render_service;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/overlay/src/render/overlay_style_config.dart b/lib/src/laminate/overlay/src/render/overlay_style_config.dart
index 0c6049b3..ccedc1f2 100644
--- a/lib/src/laminate/overlay/src/render/overlay_style_config.dart
+++ b/lib/src/laminate/overlay/src/render/overlay_style_config.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 angular2_components.laminate.overlay.src.render.overlay_style_config;
+library angular_components.laminate.overlay.src.render.overlay_style_config;
 
 import 'dart:html';
 
diff --git a/lib/src/laminate/popup/module.dart b/lib/src/laminate/popup/module.dart
index 02ca97ea..c6b5bbf1 100644
--- a/lib/src/laminate/popup/module.dart
+++ b/lib/src/laminate/popup/module.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 angular2_components.laminate.popup.module;
+library angular_components.laminate.popup.module;
 
 import 'package:angular2/di.dart';
 
diff --git a/lib/src/laminate/popup/popup.dart b/lib/src/laminate/popup/popup.dart
index 4686fcd1..e603c40b 100644
--- a/lib/src/laminate/popup/popup.dart
+++ b/lib/src/laminate/popup/popup.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 angular2_components.laminate.popup.popup;
+library angular_components.laminate.popup.popup;
 
 // TODO(google): Move this to another exported library.
 export 'src/dom_popup_source.dart';
diff --git a/lib/src/laminate/popup/src/dom_popup_source.dart b/lib/src/laminate/popup/src/dom_popup_source.dart
index a04be656..cee8e865 100644
--- a/lib/src/laminate/popup/src/dom_popup_source.dart
+++ b/lib/src/laminate/popup/src/dom_popup_source.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 angular2_components.laminate.popup.src.dom_popup_source;
+library angular_components.laminate.popup.src.dom_popup_source;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/popup/src/popup_controller_base.dart b/lib/src/laminate/popup/src/popup_controller_base.dart
index ba38b015..4d29a291 100644
--- a/lib/src/laminate/popup/src/popup_controller_base.dart
+++ b/lib/src/laminate/popup/src/popup_controller_base.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 angular2_components.laminate.popup.src.popup_controller_base;
+library angular_components.laminate.popup.src.popup_controller_base;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/popup/src/popup_directive.dart b/lib/src/laminate/popup/src/popup_directive.dart
index 81f72c23..c62e4c29 100644
--- a/lib/src/laminate/popup/src/popup_directive.dart
+++ b/lib/src/laminate/popup/src/popup_directive.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 angular2_components.laminate.popup.src.popup_directive;
+library angular_components.laminate.popup.src.popup_directive;
 
 import 'dart:async';
 
diff --git a/lib/src/laminate/popup/src/popup_event.dart b/lib/src/laminate/popup/src/popup_event.dart
index 1cf0dc55..ef171f00 100644
--- a/lib/src/laminate/popup/src/popup_event.dart
+++ b/lib/src/laminate/popup/src/popup_event.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 angular2_components.laminate.popup.src.popup_event;
+library angular_components.laminate.popup.src.popup_event;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/popup/src/popup_position_mixin.dart b/lib/src/laminate/popup/src/popup_position_mixin.dart
index 5ec5b67a..f51deb71 100644
--- a/lib/src/laminate/popup/src/popup_position_mixin.dart
+++ b/lib/src/laminate/popup/src/popup_position_mixin.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 angular2_components.laminate.popup.src.popup_position_mixin;
+library angular_components.laminate.popup.src.popup_position_mixin;
 
 import 'dart:math';
 
diff --git a/lib/src/laminate/popup/src/popup_ref.dart b/lib/src/laminate/popup/src/popup_ref.dart
index d9f705bb..79c0f41a 100644
--- a/lib/src/laminate/popup/src/popup_ref.dart
+++ b/lib/src/laminate/popup/src/popup_ref.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 angular2_components.laminate.popup.src.popup_ref;
+library angular_components.laminate.popup.src.popup_ref;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/popup/src/popup_service.dart b/lib/src/laminate/popup/src/popup_service.dart
index 028c0fd1..85610c88 100644
--- a/lib/src/laminate/popup/src/popup_service.dart
+++ b/lib/src/laminate/popup/src/popup_service.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 angular2_components.laminate.popup.src.popup_service;
+library angular_components.laminate.popup.src.popup_service;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/popup/src/popup_size_provider.dart b/lib/src/laminate/popup/src/popup_size_provider.dart
index d0ee98ef..0b55dc67 100644
--- a/lib/src/laminate/popup/src/popup_size_provider.dart
+++ b/lib/src/laminate/popup/src/popup_size_provider.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 angular2_components.laminate.popup.src.popup_size_provider;
+library angular_components.laminate.popup.src.popup_size_provider;
 
 /// A handler that provides max width and max height of a popup based on its
 /// position and the current viewport size.
diff --git a/lib/src/laminate/popup/src/popup_size_provider_directive.dart b/lib/src/laminate/popup/src/popup_size_provider_directive.dart
index e083f127..a25f92da 100644
--- a/lib/src/laminate/popup/src/popup_size_provider_directive.dart
+++ b/lib/src/laminate/popup/src/popup_size_provider_directive.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 angular2_components.laminate.popup.src.popup_size_provider_directive;
+library angular_components.laminate.popup.src.popup_size_provider_directive;
 
 import './popup_size_provider.dart';
 import 'package:angular2/angular2.dart';
diff --git a/lib/src/laminate/popup/src/popup_source.dart b/lib/src/laminate/popup/src/popup_source.dart
index 23014209..cb07986d 100644
--- a/lib/src/laminate/popup/src/popup_source.dart
+++ b/lib/src/laminate/popup/src/popup_source.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 angular2_components.laminate.popup.src.popup_source;
+library angular_components.laminate.popup.src.popup_source;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/popup/src/popup_source_directive.dart b/lib/src/laminate/popup/src/popup_source_directive.dart
index 508e2211..6b8f9220 100644
--- a/lib/src/laminate/popup/src/popup_source_directive.dart
+++ b/lib/src/laminate/popup/src/popup_source_directive.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 angular2_components.laminate.popup.src.popup_source_directive;
+library angular_components.laminate.popup.src.popup_source_directive;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/popup/src/popup_state.dart b/lib/src/laminate/popup/src/popup_state.dart
index 9d5e4ec9..d083e533 100644
--- a/lib/src/laminate/popup/src/popup_state.dart
+++ b/lib/src/laminate/popup/src/popup_state.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 angular2_components.laminate.popup.src.popup_state;
+library angular_components.laminate.popup.src.popup_state;
 
 import 'dart:async';
 
diff --git a/lib/src/laminate/portal/portal.dart b/lib/src/laminate/portal/portal.dart
index d2ace3b7..df51fed7 100644
--- a/lib/src/laminate/portal/portal.dart
+++ b/lib/src/laminate/portal/portal.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 angular2_components.laminate.portal.portal;
+library angular_components.laminate.portal.portal;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/ruler/dom_ruler.dart b/lib/src/laminate/ruler/dom_ruler.dart
index bca355b3..e284dd74 100644
--- a/lib/src/laminate/ruler/dom_ruler.dart
+++ b/lib/src/laminate/ruler/dom_ruler.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 angular2_components.laminate.ruler.dom_ruler;
+library angular_components.laminate.ruler.dom_ruler;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/laminate/ruler/module.dart b/lib/src/laminate/ruler/module.dart
index 4f7a3cdb..c745a227 100644
--- a/lib/src/laminate/ruler/module.dart
+++ b/lib/src/laminate/ruler/module.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 angular2_components.laminate.ruler.module;
+library angular_components.laminate.ruler.module;
 
 import 'package:angular2/angular2.dart';
 
diff --git a/lib/src/laminate/ruler/ng_ruler.dart b/lib/src/laminate/ruler/ng_ruler.dart
index 116fae31..df77aa98 100644
--- a/lib/src/laminate/ruler/ng_ruler.dart
+++ b/lib/src/laminate/ruler/ng_ruler.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 angular2_components.laminate.ruler.ng_ruler;
+library angular_components.laminate.ruler.ng_ruler;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/laminate/ruler/src/ruler_interface.dart b/lib/src/laminate/ruler/src/ruler_interface.dart
index c73073d7..19c4c5c4 100644
--- a/lib/src/laminate/ruler/src/ruler_interface.dart
+++ b/lib/src/laminate/ruler/src/ruler_interface.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 angular2_components.laminate.ruler.src.ruler_interface;
+library angular_components.laminate.ruler.src.ruler_interface;
 
 import 'dart:async';
 import 'dart:math';
diff --git a/lib/src/model/action/async_action.dart b/lib/src/model/action/async_action.dart
index d0231f52..7c1e5c5a 100644
--- a/lib/src/model/action/async_action.dart
+++ b/lib/src/model/action/async_action.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 angular2_components.model.action.async_action;
+library angular_components.model.action.async_action;
 
 export 'src/async_action.dart';
 export 'src/async_action_controller.dart';
diff --git a/lib/src/model/action/delayed_action.dart b/lib/src/model/action/delayed_action.dart
index 86ac3c9a..bb2b287d 100644
--- a/lib/src/model/action/delayed_action.dart
+++ b/lib/src/model/action/delayed_action.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 angular2_components.model.action.delayed_action;
+library angular_components.model.action.delayed_action;
 
 import 'dart:async';
 
diff --git a/lib/src/model/action/src/async_action.dart b/lib/src/model/action/src/async_action.dart
index dd704687..833fc83c 100644
--- a/lib/src/model/action/src/async_action.dart
+++ b/lib/src/model/action/src/async_action.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 angular2_components.model.action.src.async_action;
+library angular_components.model.action.src.async_action;
 
 import 'dart:async';
 
diff --git a/lib/src/model/action/src/async_action_controller.dart b/lib/src/model/action/src/async_action_controller.dart
index aca5be12..72f4efd8 100644
--- a/lib/src/model/action/src/async_action_controller.dart
+++ b/lib/src/model/action/src/async_action_controller.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 angular2_components.model.action.src.async_action_controller;
+library angular_components.model.action.src.async_action_controller;
 
 import 'dart:async';
 
diff --git a/lib/src/model/action/src/delegating_async_action.dart b/lib/src/model/action/src/delegating_async_action.dart
index 0b8f72a9..4ab9e8a6 100644
--- a/lib/src/model/action/src/delegating_async_action.dart
+++ b/lib/src/model/action/src/delegating_async_action.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 angular2_components.model.action.src.delegating_async_action;
+library angular_components.model.action.src.delegating_async_action;
 
 import 'dart:async';
 
diff --git a/lib/src/model/collection/combined_list.dart b/lib/src/model/collection/combined_list.dart
index 8e0e90d8..9c876391 100644
--- a/lib/src/model/collection/combined_list.dart
+++ b/lib/src/model/collection/combined_list.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 angular2_components.model.collection.combined_list;
+library angular_components.model.collection.combined_list;
 
 import 'dart:collection';
 
diff --git a/lib/src/model/collection/labeled_list.dart b/lib/src/model/collection/labeled_list.dart
index f76ac81f..c6123397 100644
--- a/lib/src/model/collection/labeled_list.dart
+++ b/lib/src/model/collection/labeled_list.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 angular2_components.model.collection.labeled_list;
+library angular_components.model.collection.labeled_list;
 
 import 'package:collection/collection.dart' as collection;
 
diff --git a/lib/src/model/collection/list_differ.dart b/lib/src/model/collection/list_differ.dart
index f71b80a3..128a5866 100644
--- a/lib/src/model/collection/list_differ.dart
+++ b/lib/src/model/collection/list_differ.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 angular2_components.model.collection.list_differ;
+library angular_components.model.collection.list_differ;
 
 import 'dart:collection';
 
diff --git a/lib/src/model/collection/list_tracker.dart b/lib/src/model/collection/list_tracker.dart
index 25234a7a..2f9e35d6 100644
--- a/lib/src/model/collection/list_tracker.dart
+++ b/lib/src/model/collection/list_tracker.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 angular2_components.model.collection.list_tracker;
+library angular_components.model.collection.list_tracker;
 
 import 'dart:async';
 import 'dart:collection';
diff --git a/lib/src/model/observable/observable.dart b/lib/src/model/observable/observable.dart
index 8dc6641d..11244466 100644
--- a/lib/src/model/observable/observable.dart
+++ b/lib/src/model/observable/observable.dart
@@ -13,7 +13,7 @@
 /// complex domain objects that aren't able to implement [Observable].
 ///
 /// TODO(google): check with jmesserly: how to merge these with package:observe
-library angular2_components.model.observable.observable;
+library angular_components.model.observable.observable;
 
 import 'dart:async';
 
diff --git a/lib/src/model/selection/select.dart b/lib/src/model/selection/select.dart
index 7a9f66c4..b0e27a2e 100644
--- a/lib/src/model/selection/select.dart
+++ b/lib/src/model/selection/select.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 angular2_components.model.selection.select;
+library angular_components.model.selection.select;
 
 import '../../utils/async/async.dart';
 
diff --git a/lib/src/model/selection/selection_model.dart b/lib/src/model/selection/selection_model.dart
index 9cd96e9d..685ab1fa 100644
--- a/lib/src/model/selection/selection_model.dart
+++ b/lib/src/model/selection/selection_model.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 angular2_components.model.selection.selection_model;
+library angular_components.model.selection.selection_model;
 
 import 'dart:async';
 import 'dart:collection';
diff --git a/lib/src/model/selection/selection_options.dart b/lib/src/model/selection/selection_options.dart
index 3e22c467..5ae9f879 100644
--- a/lib/src/model/selection/selection_options.dart
+++ b/lib/src/model/selection/selection_options.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 angular2_components.model.selection.selection_options;
+library angular_components.model.selection.selection_options;
 
 import 'dart:async';
 
diff --git a/lib/src/model/selection/src/future_selection_options_impl.dart b/lib/src/model/selection/src/future_selection_options_impl.dart
index fa2d095d..c5a7166b 100644
--- a/lib/src/model/selection/src/future_selection_options_impl.dart
+++ b/lib/src/model/selection/src/future_selection_options_impl.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.
 
-part of angular2_components.model.selection.selection_options;
+part of angular_components.model.selection.selection_options;
 
 class _FutureSelectionOptions<T> extends SelectionOptions<T> {
   _FutureSelectionOptions(Future<List<OptionGroup<T>>> optionGroupListFuture)
diff --git a/lib/src/model/selection/src/interfaces/filterable.dart b/lib/src/model/selection/src/interfaces/filterable.dart
index 1ccd0fe0..de7ab432 100644
--- a/lib/src/model/selection/src/interfaces/filterable.dart
+++ b/lib/src/model/selection/src/interfaces/filterable.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// **NOTE**: This library is currently unused and will replace select.dart.
-library angular2_components.model.selection.src.interfaces.filterable;
+library angular_components.model.selection.src.interfaces.filterable;
 
 import 'dart:async';
 
diff --git a/lib/src/model/selection/src/interfaces/parent.dart b/lib/src/model/selection/src/interfaces/parent.dart
index 7e0f465c..318879d8 100644
--- a/lib/src/model/selection/src/interfaces/parent.dart
+++ b/lib/src/model/selection/src/interfaces/parent.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// **NOTE**: This library is currently unused and will replace select.dart.
-library angular2_components.model.selection.src.interfaces.parent;
+library angular_components.model.selection.src.interfaces.parent;
 
 import 'dart:async';
 
diff --git a/lib/src/model/selection/src/multi_selection_model_impl.dart b/lib/src/model/selection/src/multi_selection_model_impl.dart
index 96606552..e5f1a8e6 100644
--- a/lib/src/model/selection/src/multi_selection_model_impl.dart
+++ b/lib/src/model/selection/src/multi_selection_model_impl.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.
 
-part of angular2_components.model.selection.selection_model;
+part of angular_components.model.selection.selection_model;
 
 class _MultiSelectionModelImpl<T> extends Observable
     with SelectionChangeNotifier<T>
diff --git a/lib/src/model/selection/src/noop_selection_model_impl.dart b/lib/src/model/selection/src/noop_selection_model_impl.dart
index 2194a11f..862a2f6c 100644
--- a/lib/src/model/selection/src/noop_selection_model_impl.dart
+++ b/lib/src/model/selection/src/noop_selection_model_impl.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.
 
-part of angular2_components.model.selection.selection_model;
+part of angular_components.model.selection.selection_model;
 
 /// Returned internally as a blank selection model.
 class _NoopSelectionModelImpl<T> implements SelectionModel<T> {
diff --git a/lib/src/model/selection/src/selectable_change_notifier.dart b/lib/src/model/selection/src/selectable_change_notifier.dart
index 3f46dde4..a8c7b8c4 100644
--- a/lib/src/model/selection/src/selectable_change_notifier.dart
+++ b/lib/src/model/selection/src/selectable_change_notifier.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.
 
-part of angular2_components.model.selection.selection_model;
+part of angular_components.model.selection.selection_model;
 
 /// Mixin for providing [SelectionModel.selectableChanges].
 abstract class SelectableChangeNotifier<T>
diff --git a/lib/src/model/selection/src/selection_change_notifier.dart b/lib/src/model/selection/src/selection_change_notifier.dart
index 82f573ae..61b429cc 100644
--- a/lib/src/model/selection/src/selection_change_notifier.dart
+++ b/lib/src/model/selection/src/selection_change_notifier.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.
 
-part of angular2_components.model.selection.selection_model;
+part of angular_components.model.selection.selection_model;
 
 /// Interface for something that can be observed for selection.
 abstract class SelectionObservable<T> {
diff --git a/lib/src/model/selection/src/single_selection_model_impl.dart b/lib/src/model/selection/src/single_selection_model_impl.dart
index cda2463d..a5bff207 100644
--- a/lib/src/model/selection/src/single_selection_model_impl.dart
+++ b/lib/src/model/selection/src/single_selection_model_impl.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.
 
-part of angular2_components.model.selection.selection_model;
+part of angular_components.model.selection.selection_model;
 
 class _SingleSelectionModelImpl<T> extends Observable
     with SelectionChangeNotifier<T>
diff --git a/lib/src/model/selection/src/stream_selection_options_impl.dart b/lib/src/model/selection/src/stream_selection_options_impl.dart
index 0b3e4f53..bb1f884d 100644
--- a/lib/src/model/selection/src/stream_selection_options_impl.dart
+++ b/lib/src/model/selection/src/stream_selection_options_impl.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.
 
-part of angular2_components.model.selection.selection_options;
+part of angular_components.model.selection.selection_options;
 
 class _StreamSelectionOptions<T> extends SelectionOptions<T> {
   StreamSubscription _streamSub;
diff --git a/lib/src/model/selection/string_selection_options.dart b/lib/src/model/selection/string_selection_options.dart
index b4ef7dc3..23c6253e 100644
--- a/lib/src/model/selection/string_selection_options.dart
+++ b/lib/src/model/selection/string_selection_options.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 angular2_components.model.selection.string_selection_options;
+library angular_components.model.selection.string_selection_options;
 
 import './select.dart';
 import './selection_options.dart';
diff --git a/lib/src/model/ui/accepts_width.dart b/lib/src/model/ui/accepts_width.dart
index 8339a1ab..86964eca 100644
--- a/lib/src/model/ui/accepts_width.dart
+++ b/lib/src/model/ui/accepts_width.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 angular2_components.model.ui.accepts_width;
+library angular_components.model.ui.accepts_width;
 
 /// Interface for setting widgets programatically.
 /// Preset width, 1 through 5. By default, width #2 is used.
diff --git a/lib/src/model/ui/async_display_name.dart b/lib/src/model/ui/async_display_name.dart
index 4e46e58d..c73df13f 100644
--- a/lib/src/model/ui/async_display_name.dart
+++ b/lib/src/model/ui/async_display_name.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 angular2_components.model.ui.async_display_name;
+library angular_components.model.ui.async_display_name;
 
 import 'dart:async';
 
diff --git a/lib/src/model/ui/display_name.dart b/lib/src/model/ui/display_name.dart
index 8f807468..9aa07ad1 100644
--- a/lib/src/model/ui/display_name.dart
+++ b/lib/src/model/ui/display_name.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 angular2_components.model.ui.display_name;
+library angular_components.model.ui.display_name;
 
 import '../formatters/formatter.dart';
 import 'package:quiver/core.dart';
diff --git a/lib/src/model/ui/has_renderer.dart b/lib/src/model/ui/has_renderer.dart
index 8b4a5559..1049f67c 100644
--- a/lib/src/model/ui/has_renderer.dart
+++ b/lib/src/model/ui/has_renderer.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 angular2_components.model.ui.has_renderer;
+library angular_components.model.ui.has_renderer;
 
 /// Definition for a method that takes in an item and converts it to a string.
 typedef String ItemRenderer<T>(T item);
diff --git a/lib/src/model/ui/highlight_assistant.dart b/lib/src/model/ui/highlight_assistant.dart
index 92d0f9c3..15185b28 100644
--- a/lib/src/model/ui/highlight_assistant.dart
+++ b/lib/src/model/ui/highlight_assistant.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 angular2_components.model.ui.highlight_assistant;
+library angular_components.model.ui.highlight_assistant;
 
 import './has_renderer.dart';
 import './highlighted_text_model.dart';
diff --git a/lib/src/model/ui/highlighted_text_model.dart b/lib/src/model/ui/highlighted_text_model.dart
index f807cc15..ca09db33 100644
--- a/lib/src/model/ui/highlighted_text_model.dart
+++ b/lib/src/model/ui/highlighted_text_model.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 angular2_components.model.ui.highlighted_text_model;
+library angular_components.model.ui.highlighted_text_model;
 
 import 'dart:math' show max;
 
@@ -34,7 +34,7 @@ class HighlightedTextSegment {
   String toString() => isHighlighted ? "*$text*" : text;
 }
 
-final Logger _logger = new Logger('angular2_components.module.ui.highlighted_text_model');
+final Logger _logger = new Logger('angular_components.module.ui.highlighted_text_model');
 
 /// A class to highlight the occurrences of a list of tokens within a string.
 /// By default, matches are only highlighted at the start of words,
diff --git a/lib/src/model/ui/icon.dart b/lib/src/model/ui/icon.dart
index f4096dcd..c0d7c518 100644
--- a/lib/src/model/ui/icon.dart
+++ b/lib/src/model/ui/icon.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 angular2_components.model.ui.icon;
+library angular_components.model.ui.icon;
 
 /// Designates a model class which has a canonical _icon_ field.
 abstract class HasIcon {
diff --git a/lib/src/model/ui/item_sorter.dart b/lib/src/model/ui/item_sorter.dart
index a7d70c63..da53535d 100644
--- a/lib/src/model/ui/item_sorter.dart
+++ b/lib/src/model/ui/item_sorter.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 angular2_components.model.ui.item_sorter;
+library angular_components.model.ui.item_sorter;
 
 import 'dart:collection';
 
diff --git a/lib/src/model/ui/template_support.dart b/lib/src/model/ui/template_support.dart
index b62cc09c..71adf064 100644
--- a/lib/src/model/ui/template_support.dart
+++ b/lib/src/model/ui/template_support.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 angular2_components.model.ui.template_support;
+library angular_components.model.ui.template_support;
 
 import 'package:angular2/angular2.dart';
 
diff --git a/lib/src/model/ui/toggle.dart b/lib/src/model/ui/toggle.dart
index 91ddd99c..c4b9f058 100644
--- a/lib/src/model/ui/toggle.dart
+++ b/lib/src/model/ui/toggle.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 angular2_components.model.ui.toggle;
+library angular_components.model.ui.toggle;
 
 /// Has a binary state that may be toggled on or off.
 ///
diff --git a/lib/src/utils/angular/imperative_view/imperative_view.dart b/lib/src/utils/angular/imperative_view/imperative_view.dart
index 748ac6a0..fb9ff376 100644
--- a/lib/src/utils/angular/imperative_view/imperative_view.dart
+++ b/lib/src/utils/angular/imperative_view/imperative_view.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 angular2_components.utils.angular.imperative_view.imperative_view;
+library angular_components.utils.angular.imperative_view.imperative_view;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/utils/angular/managed_zone/angular_2.dart b/lib/src/utils/angular/managed_zone/angular_2.dart
index 7c07e64c..262bc8a5 100644
--- a/lib/src/utils/angular/managed_zone/angular_2.dart
+++ b/lib/src/utils/angular/managed_zone/angular_2.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 angular2_components.utils.angular.managed_zone.angular_2;
+library angular_components.utils.angular.managed_zone.angular_2;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/angular/managed_zone/interface.dart b/lib/src/utils/angular/managed_zone/interface.dart
index eeaae80b..45b728f7 100644
--- a/lib/src/utils/angular/managed_zone/interface.dart
+++ b/lib/src/utils/angular/managed_zone/interface.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 angular2_components.utils.angular.managed_zone.interface;
+library angular_components.utils.angular.managed_zone.interface;
 
 export 'src/managed_zone.dart'
     show ManagedZone, ManagedZoneBase;
diff --git a/lib/src/utils/angular/managed_zone/src/managed_zone.dart b/lib/src/utils/angular/managed_zone/src/managed_zone.dart
index 5906b73a..28417b80 100644
--- a/lib/src/utils/angular/managed_zone/src/managed_zone.dart
+++ b/lib/src/utils/angular/managed_zone/src/managed_zone.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 angular2_components.utils.angular.managed_zone.src.managed_zone;
+library angular_components.utils.angular.managed_zone.src.managed_zone;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/angular/properties/properties.dart b/lib/src/utils/angular/properties/properties.dart
index 05a84a88..d39f0464 100644
--- a/lib/src/utils/angular/properties/properties.dart
+++ b/lib/src/utils/angular/properties/properties.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 angular2_components.utils.angular.properties.properties;
+library angular_components.utils.angular.properties.properties;
 
 // These are alternative to Angular 2.0 pipes that are lighter weight and typed.
 // However, ideally Angular should help with these.
diff --git a/lib/src/utils/angular/reference/reference.dart b/lib/src/utils/angular/reference/reference.dart
index 521169df..f682a3c5 100644
--- a/lib/src/utils/angular/reference/reference.dart
+++ b/lib/src/utils/angular/reference/reference.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 angular2_components.utils.angular.reference.reference;
+library angular_components.utils.angular.reference.reference;
 
 import 'package:angular2/angular2.dart';
 
diff --git a/lib/src/utils/async/async.dart b/lib/src/utils/async/async.dart
index 5a8407ce..4fe3bcae 100644
--- a/lib/src/utils/async/async.dart
+++ b/lib/src/utils/async/async.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 angular2_components.utils.async.async;
+library angular_components.utils.async.async;
 
 export 'src/async_update_scheduler.dart';
 export 'src/async_where.dart';
diff --git a/lib/src/utils/async/src/async_update_scheduler.dart b/lib/src/utils/async/src/async_update_scheduler.dart
index f1926d25..812179b4 100644
--- a/lib/src/utils/async/src/async_update_scheduler.dart
+++ b/lib/src/utils/async/src/async_update_scheduler.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 angular2_components.utils.async.src.async_update_scheduler;
+library angular_components.utils.async.src.async_update_scheduler;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/async_where.dart b/lib/src/utils/async/src/async_where.dart
index 4dfe426b..8a6717e7 100644
--- a/lib/src/utils/async/src/async_where.dart
+++ b/lib/src/utils/async/src/async_where.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 angular2_components.utils.async.src.async_where;
+library angular_components.utils.async.src.async_where;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/debounce_stream.dart b/lib/src/utils/async/src/debounce_stream.dart
index c7494ea4..58b9f76f 100644
--- a/lib/src/utils/async/src/debounce_stream.dart
+++ b/lib/src/utils/async/src/debounce_stream.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 angular2_components.utils.async.src.debounce_stream;
+library angular_components.utils.async.src.debounce_stream;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/disposable_future.dart b/lib/src/utils/async/src/disposable_future.dart
index a9ad63a0..a4648738 100644
--- a/lib/src/utils/async/src/disposable_future.dart
+++ b/lib/src/utils/async/src/disposable_future.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 angular2_components.utils.async.src.disposable_future;
+library angular_components.utils.async.src.disposable_future;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/lazy_event_emitter.dart b/lib/src/utils/async/src/lazy_event_emitter.dart
index 2563c21b..39bc1bc5 100644
--- a/lib/src/utils/async/src/lazy_event_emitter.dart
+++ b/lib/src/utils/async/src/lazy_event_emitter.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 angular2_components.utils.async.src.lazy_event_emitter;
+library angular_components.utils.async.src.lazy_event_emitter;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/lazy_stream_controller.dart b/lib/src/utils/async/src/lazy_stream_controller.dart
index f1ef4295..833fb107 100644
--- a/lib/src/utils/async/src/lazy_stream_controller.dart
+++ b/lib/src/utils/async/src/lazy_stream_controller.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 angular2_components.utils.async.src.lazy_stream_controller;
+library angular_components.utils.async.src.lazy_stream_controller;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/noop_stream.dart b/lib/src/utils/async/src/noop_stream.dart
index 539fe064..b6abf00b 100644
--- a/lib/src/utils/async/src/noop_stream.dart
+++ b/lib/src/utils/async/src/noop_stream.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 angular2_components.utils.async.src.noop_stream;
+library angular_components.utils.async.src.noop_stream;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/rate_limit.dart b/lib/src/utils/async/src/rate_limit.dart
index 9f7931fb..d5b7af3a 100644
--- a/lib/src/utils/async/src/rate_limit.dart
+++ b/lib/src/utils/async/src/rate_limit.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 angular2_components.utils.async.src.rate_limit;
+library angular_components.utils.async.src.rate_limit;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/simple_stream.dart b/lib/src/utils/async/src/simple_stream.dart
index 849d4d6e..fe77a079 100644
--- a/lib/src/utils/async/src/simple_stream.dart
+++ b/lib/src/utils/async/src/simple_stream.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 angular2_components.utils.async.src.simple_stream;
+library angular_components.utils.async.src.simple_stream;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/async/src/zoned_async.dart b/lib/src/utils/async/src/zoned_async.dart
index f7dc54bb..729b118e 100644
--- a/lib/src/utils/async/src/zoned_async.dart
+++ b/lib/src/utils/async/src/zoned_async.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 angular2_components.utils.async.src.zoned_async;
+library angular_components.utils.async.src.zoned_async;
 
 import 'dart:async';
 
diff --git a/lib/src/utils/browser/dom_iterator/dom_iterator.dart b/lib/src/utils/browser/dom_iterator/dom_iterator.dart
index be976eff..254e5438 100644
--- a/lib/src/utils/browser/dom_iterator/dom_iterator.dart
+++ b/lib/src/utils/browser/dom_iterator/dom_iterator.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 angular2_components.utils.browser.dom_iterator.dom_iterator;
+library angular_components.utils.browser.dom_iterator.dom_iterator;
 
 import 'dart:collection';
 import 'dart:html';
diff --git a/lib/src/utils/browser/dom_service/angular_2.dart b/lib/src/utils/browser/dom_service/angular_2.dart
index 74813f4b..c01c9c8e 100644
--- a/lib/src/utils/browser/dom_service/angular_2.dart
+++ b/lib/src/utils/browser/dom_service/angular_2.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 angular2_components.utils.browser.dom_service.angular_2;
+library angular_components.utils.browser.dom_service.angular_2;
 
 import 'dart:html';
 
diff --git a/lib/src/utils/browser/dom_service/dom_service_webdriver_testability.dart b/lib/src/utils/browser/dom_service/dom_service_webdriver_testability.dart
index 87ffb0d8..c44cbe5a 100644
--- a/lib/src/utils/browser/dom_service/dom_service_webdriver_testability.dart
+++ b/lib/src/utils/browser/dom_service/dom_service_webdriver_testability.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 angular2_components.utils.browser.dom_service.dom_service_webdriver_testability;
+library angular_components.utils.browser.dom_service.dom_service_webdriver_testability;
 
 import '../../../framework_stabilizers/testability.dart';
 import './dom_service.dart';
diff --git a/lib/src/utils/browser/events/events.dart b/lib/src/utils/browser/events/events.dart
index 8d1c650a..f1a527a9 100644
--- a/lib/src/utils/browser/events/events.dart
+++ b/lib/src/utils/browser/events/events.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 angular2_components.utils.browser.events.events;
+library angular_components.utils.browser.events.events;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/lib/src/utils/browser/window/module.dart b/lib/src/utils/browser/window/module.dart
index ee648589..9e5ceaac 100644
--- a/lib/src/utils/browser/window/module.dart
+++ b/lib/src/utils/browser/window/module.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 angular2_components.utils.browser.window.module;
+library angular_components.utils.browser.window.module;
 
 import 'dart:html';
 
diff --git a/lib/src/utils/disposer/disposable_callback.dart b/lib/src/utils/disposer/disposable_callback.dart
index c64f1a37..6170e76b 100644
--- a/lib/src/utils/disposer/disposable_callback.dart
+++ b/lib/src/utils/disposer/disposable_callback.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 angular2_components.utils.disposer.disposable_callback;
+library angular_components.utils.disposer.disposable_callback;
 
 import './disposer.dart';
 
diff --git a/lib/src/utils/id_generator/id_generator.dart b/lib/src/utils/id_generator/id_generator.dart
index 516643b4..ccd844ae 100644
--- a/lib/src/utils/id_generator/id_generator.dart
+++ b/lib/src/utils/id_generator/id_generator.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 angular2_components.utils.id_generator.id_generator;
+library angular_components.utils.id_generator.id_generator;
 
 import 'package:uuid/uuid.dart';
 
diff --git a/lib/src/utils/keyboard/keyboard.dart b/lib/src/utils/keyboard/keyboard.dart
index 44ea4406..84d6226b 100644
--- a/lib/src/utils/keyboard/keyboard.dart
+++ b/lib/src/utils/keyboard/keyboard.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 angular2_components.utils.keyboard.keyboard;
+library angular_components.utils.keyboard.keyboard;
 
 import 'dart:html';
 
diff --git a/lib/src/utils/numbers/denomination.dart b/lib/src/utils/numbers/denomination.dart
index c23df8f3..67cbec08 100644
--- a/lib/src/utils/numbers/denomination.dart
+++ b/lib/src/utils/numbers/denomination.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 angular2_components.utils.numbers.denomination;
+library angular_components.utils.numbers.denomination;
 
 import 'package:fixnum/fixnum.dart';
 
diff --git a/lib/src/utils/strings/string_utils.dart b/lib/src/utils/strings/string_utils.dart
index 96a4df0b..ebd998c4 100644
--- a/lib/src/utils/strings/string_utils.dart
+++ b/lib/src/utils/strings/string_utils.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 angular2_components.utils.strings.string_utils;
+library angular_components.utils.strings.string_utils;
 
 final RegExp _camelCaseSplitter = new RegExp('([a-z])([A-Z])');
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 09b3d6b9..2422b163 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
-name: angular2_components
-version: 0.4.1-beta
+name: angular_components
+version: 0.5.0-beta
 description: >
   The official Material Design components for AngularDart. Used at Google
   in production apps.