diff --git a/app/index.js b/app/index.js
index b96e59bd7..871aa6520 100644
--- a/app/index.js
+++ b/app/index.js
@@ -30,7 +30,7 @@ var FIREBASE_PROMPTS = [
     }
   }, {
     name: 'loginModule',
-    message: 'Use FirebaseSimpleLogin?',
+    message: 'Include Firebase auth and account tools?',
     type: 'confirm'
   }, {
     type: 'checkbox',
diff --git a/constant/USAGE b/constant/USAGE
index 7fb0cd112..571cf0849 100644
--- a/constant/USAGE
+++ b/constant/USAGE
@@ -3,7 +3,7 @@ Description:
     Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services
 
 Example:
-    yo angular:constant thing [--coffee]
+    yo angularfire:constant thing [--coffee]
 
     This will create:
         app/scripts/services/thing.js
diff --git a/controller/USAGE b/controller/USAGE
index 640c81371..4e58fe907 100644
--- a/controller/USAGE
+++ b/controller/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new Angular controller
 
 Example:
-    yo angular:controller Thing [--coffee]
+    yo angularfire:controller Thing [--coffee]
 
     This will create:
         app/scripts/controllers/thing-ctrl.js
diff --git a/decorator/USAGE b/decorator/USAGE
index 025112ad8..79a3314f4 100644
--- a/decorator/USAGE
+++ b/decorator/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new AngularJS decorator for a specified service
 
 Example:
-    yo angular:decorator serviceName [--coffee]
+    yo angularfire:decorator serviceName [--coffee]
 
     This will create:
         app/scripts/decorators/serviceNameDecorator.js
diff --git a/directive/USAGE b/directive/USAGE
index 82769c4db..7432c224c 100644
--- a/directive/USAGE
+++ b/directive/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new Angular directive
 
 Example:
-    yo angular:directive thing [--coffee]
+    yo angularfire:directive thing [--coffee]
 
     This will create:
         app/scripts/directives/thing.js
diff --git a/factory/USAGE b/factory/USAGE
index 17123a7bc..384ef0bca 100644
--- a/factory/USAGE
+++ b/factory/USAGE
@@ -3,7 +3,7 @@ Description:
     Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services
 
 Example:
-    yo angular:factory thing [--coffee]
+    yo angularfire:factory thing [--coffee]
 
     This will create:
         app/scripts/services/thing.js
diff --git a/filter/USAGE b/filter/USAGE
index 02b62db7f..827b43774 100644
--- a/filter/USAGE
+++ b/filter/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new AngularJS filter
 
 Example:
-    yo angular:filter thing [--coffee]
+    yo angularfire:filter thing [--coffee]
 
     This will create:
         app/scripts/filters/thing.js
diff --git a/provider/USAGE b/provider/USAGE
index 2be1ca394..e93c39f96 100644
--- a/provider/USAGE
+++ b/provider/USAGE
@@ -3,7 +3,7 @@ Description:
     Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services
 
 Example:
-    yo angular:provider thing [--coffee]
+    yo angularfire:provider thing [--coffee]
 
     This will create:
         app/scripts/services/thing.js
diff --git a/route/USAGE b/route/USAGE
index 47609bb52..20744e5a0 100644
--- a/route/USAGE
+++ b/route/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new AngularJS route
 
 Example:
-    yo angular:route thing [--coffee] [--uri=path_to/thing]
+    yo angularfire:route thing [--coffee] [--uri=path_to/thing] [--auth-required]
 
     This will create:
         app/scripts/controllers/thing.js
diff --git a/route/index.js b/route/index.js
index 26247322d..570cf2b02 100644
--- a/route/index.js
+++ b/route/index.js
@@ -29,8 +29,8 @@ var Generator = module.exports = function Generator(name, skipFiles) {
   }
 
   if( !skipFiles ) {
-    this.hookFor('angular:controller');
-    this.hookFor('angular:view');
+    this.hookFor('angularfire:controller');
+    this.hookFor('angularfire:view');
   }
 };
 
diff --git a/service/USAGE b/service/USAGE
index f7e188947..a58f41e55 100644
--- a/service/USAGE
+++ b/service/USAGE
@@ -3,7 +3,7 @@ Description:
     Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services
 
 Example:
-    yo angular:service thing [--coffee]
+    yo angularfire:service thing [--coffee]
 
     This will create:
         app/scripts/services/thing.js
diff --git a/templates/common/app/index.html b/templates/common/app/index.html
index 0bb74aaa6..abd979548 100644
--- a/templates/common/app/index.html
+++ b/templates/common/app/index.html
@@ -51,7 +51,7 @@ <h3 class="text-muted"><%= appname %></h3>
       } %>
 
       <div class="footer">
-        <p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
+        <p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team, and from Firebase</p>
       </div>
     </div>
 
diff --git a/test/test-appname-substitution.js b/test/test-appname-substitution.js
index 00f9ce007..71bb7b11e 100644
--- a/test/test-appname-substitution.js
+++ b/test/test-appname-substitution.js
@@ -23,7 +23,7 @@ describe('Angular generator template mechanism', function () {
         done(err);
       }
 
-      angular = helpers.createGenerator('angular:app', deps, [appName], {
+      angular = helpers.createGenerator('angularfire:app', deps, [appName], {
         'appPath': 'app',
         'skip-welcome-message': true,
         'skip-install': true,
diff --git a/test/test-apppath.js b/test/test-apppath.js
index 4da54ad97..a14031e1d 100644
--- a/test/test-apppath.js
+++ b/test/test-apppath.js
@@ -44,7 +44,7 @@ describe('Angular generator appPath option', function () {
       }
 
       angular = helpers.createGenerator(
-        'angular:app',
+        'angularfire:app',
         [
           '../../app',
           '../../common',
@@ -100,7 +100,7 @@ describe('Angular generator appPath option', function () {
       var angularGenerator;
       var name = 'foo';
       var deps = [path.join('../..', generatorType)];
-      angularGenerator = helpers.createGenerator('angular:' + generatorType, deps, [name], genOptions);
+      angularGenerator = helpers.createGenerator('angularfire:' + generatorType, deps, [name], genOptions);
 
       angular.run([], function () {
         angularGenerator.run([], function () {
@@ -145,7 +145,7 @@ describe('Angular generator appPath option', function () {
     it('should generate a new view', function (done) {
       var angularView;
       var deps = ['../../view'];
-      angularView = helpers.createGenerator('angular:view', deps, ['foo'], genOptions);
+      angularView = helpers.createGenerator('angularfire:view', deps, ['foo'], genOptions);
 
       helpers.mockPrompt(angular, mockPrompts);
       angular.run([], function () {
@@ -159,7 +159,7 @@ describe('Angular generator appPath option', function () {
     it('should generate a new view in subdirectories', function (done) {
       var angularView;
       var deps = ['../../view'];
-      angularView = helpers.createGenerator('angular:view', deps, ['foo/bar'], genOptions);
+      angularView = helpers.createGenerator('angularfire:view', deps, ['foo/bar'], genOptions);
 
       helpers.mockPrompt(angular, mockPrompts);
       angular.run([], function () {
diff --git a/test/test-file-creation.js b/test/test-file-creation.js
index 9d2c12105..adf26113f 100644
--- a/test/test-file-creation.js
+++ b/test/test-file-creation.js
@@ -42,7 +42,7 @@ describe('Angular generator', function () {
         done(err);
       }
       angular = helpers.createGenerator(
-        'angular:app',
+        'angularfire:app',
         [
           '../../app',
           '../../common',
@@ -97,7 +97,7 @@ describe('Angular generator', function () {
     var generatorTest = function (generatorType, specType, targetDirectory, scriptNameFn, specNameFn, suffix, done) {
       var name = 'foo';
       var deps = [path.join('../..', generatorType)];
-      var genTester = helpers.createGenerator('angular:' + generatorType, deps, [name], genOptions);
+      var genTester = helpers.createGenerator('angularfire:' + generatorType, deps, [name], genOptions);
 
       angular.run([], function () {
         genTester.run([], function () {
@@ -149,7 +149,7 @@ describe('Angular generator', function () {
     it('should generate a new view', function (done) {
       var angularView;
       var deps = ['../../view'];
-      angularView = helpers.createGenerator('angular:view', deps, ['foo'], genOptions);
+      angularView = helpers.createGenerator('angularfire:view', deps, ['foo'], genOptions);
 
       helpers.mockPrompt(angularView, mockPrompts);
       angularView.run([], function () {
@@ -161,7 +161,7 @@ describe('Angular generator', function () {
     it('should generate a new view in subdirectories', function (done) {
       var angularView;
       var deps = ['../../view'];
-      angularView = helpers.createGenerator('angular:view', deps, ['foo/bar'], genOptions);
+      angularView = helpers.createGenerator('angularfire:view', deps, ['foo/bar'], genOptions);
 
       helpers.mockPrompt(angularView, mockPrompts);
       angularView.run([], function () {
diff --git a/test/test-route-creation.js b/test/test-route-creation.js
index 9c39065fa..14281e6db 100644
--- a/test/test-route-creation.js
+++ b/test/test-route-creation.js
@@ -31,7 +31,7 @@ describe('Angular generator route mechanism', function () {
         done(err);
       }
       angular = helpers.createGenerator(
-        'angular:app',
+        'angularfire:app',
         [
           '../../app',
           '../../common',
@@ -49,7 +49,7 @@ describe('Angular generator route mechanism', function () {
       helpers.mockPrompt(angular, mockPrompts);
       angular.run({}, function () {
         angular = helpers.createGenerator(
-          'angular:route',
+          'angularfire:route',
           [
             '../../controller',
             '../../route',
diff --git a/value/USAGE b/value/USAGE
index 5b7bc8217..8cf8d5e8b 100644
--- a/value/USAGE
+++ b/value/USAGE
@@ -3,7 +3,7 @@ Description:
     Docs: http://docs.angularjs.org/guide/dev_guide.services.creating_services
 
 Example:
-    yo angular:value thing [--coffee]
+    yo angularfire:value thing [--coffee]
 
     This will create:
         app/scripts/services/thing.js
diff --git a/view/USAGE b/view/USAGE
index ad73efad5..648cfb567 100644
--- a/view/USAGE
+++ b/view/USAGE
@@ -2,7 +2,7 @@ Description:
     Creates a new AngularJS view
 
 Example:
-    yo angular:view thing
+    yo angularfire:view thing
 
     This will create:
         app/views/thing.html