diff --git a/controller/index.js b/controller/index.js
index 6d8897d61..0c9a53d87 100644
--- a/controller/index.js
+++ b/controller/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/controller') });
   }
diff --git a/decorator/index.js b/decorator/index.js
index ae8193eb7..578427ae2 100644
--- a/decorator/index.js
+++ b/decorator/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/decorator') });
   }
diff --git a/directive/index.js b/directive/index.js
index 257a4b19a..5ac3c7c0e 100644
--- a/directive/index.js
+++ b/directive/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/directive') });
   }
diff --git a/filter/index.js b/filter/index.js
index d1119b27d..badbe02a1 100644
--- a/filter/index.js
+++ b/filter/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/filter') });
   }
diff --git a/heroku/index.js b/heroku/index.js
index dd3670473..3ba8bbed8 100644
--- a/heroku/index.js
+++ b/heroku/index.js
@@ -7,7 +7,7 @@ var path = require('path');
 var s = require('underscore.string');
 
 var Generator = module.exports = function Generator() {
-  yeoman.generators.Base.apply(this, arguments);
+  yeoman.Base.apply(this, arguments);
   this.sourceRoot(path.join(__dirname, './templates'));
 
   try {
@@ -19,7 +19,7 @@ var Generator = module.exports = function Generator() {
   this.filters = this.config.get('filters') || {};
 };
 
-util.inherits(Generator, yeoman.generators.NamedBase);
+util.inherits(Generator, yeoman.NamedBase);
 
 Generator.prototype.askForName = function askForName() {
   var done = this.async();
diff --git a/openshift/index.js b/openshift/index.js
index c0f8f171f..98617d868 100644
--- a/openshift/index.js
+++ b/openshift/index.js
@@ -9,7 +9,7 @@ var exec = childProcess.exec;
 var spawn = childProcess.spawn;
 
 var Generator = module.exports = function Generator() {
-  yeoman.generators.Base.apply(this, arguments);
+  yeoman.Base.apply(this, arguments);
   this.sourceRoot(path.join(__dirname, './templates'));
 
   try {
@@ -21,7 +21,7 @@ var Generator = module.exports = function Generator() {
   this.filters = this.config.get('filters') || {};
 };
 
-util.inherits(Generator, yeoman.generators.NamedBase);
+util.inherits(Generator, yeoman.NamedBase);
 
 Generator.prototype.askForName = function askForName() {
   var done = this.async();
diff --git a/provider/index.js b/provider/index.js
index 5e3ac882e..8e0213799 100644
--- a/provider/index.js
+++ b/provider/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/provider') });
   }
diff --git a/route/index.js b/route/index.js
index cc8569854..9f6f1f12d 100644
--- a/route/index.js
+++ b/route/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/route') });
   }
diff --git a/service/index.js b/service/index.js
index 9aa5f48b0..7ef1e214a 100644
--- a/service/index.js
+++ b/service/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var yeoman = require('yeoman-generator');
 
-var Generator = yeoman.generators.Base.extend({
+var Generator = yeoman.Base.extend({
   compose: function() {
     this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/service') });
   }