diff --git a/.eslintrc b/.eslintrc
index daaed5c31..e69780855 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -41,10 +41,10 @@ rules:
   # Angular Plugin Customization
   #############################################################################
 
-  angular/ng_controller_as_vm:
+  angular/controller-as-vm:
     - 1
     - "ctrl"
 
   # Remove after migrating to angular 1.4 or later.
-  angular/ng_no_cookiestore:
+  angular/no-cookiestore:
     - 1
diff --git a/horizon/static/framework/util/bind-scope/bind-scope.spec.js b/horizon/static/framework/util/bind-scope/bind-scope.spec.js
index fc5d8d58d..a01cc622b 100644
--- a/horizon/static/framework/util/bind-scope/bind-scope.spec.js
+++ b/horizon/static/framework/util/bind-scope/bind-scope.spec.js
@@ -13,9 +13,9 @@
     beforeEach(module('horizon.framework'));
 
     beforeEach(module('horizon.framework.util.bind-scope', function ($compileProvider) {
-      /* eslint-disable angular/ng_module_getter */
+      /* eslint-disable angular/module-getter */
       $compileProvider.directive('testBindScope', testBindScope);
-      /* eslint-enable angular/ng_module_getter */
+      /* eslint-enable angular/module-getter */
 
       function testBindScope() {
         var directive = {
diff --git a/horizon/static/framework/util/http/http.js b/horizon/static/framework/util/http/http.js
index 0962182aa..36258fb92 100644
--- a/horizon/static/framework/util/http/http.js
+++ b/horizon/static/framework/util/http/http.js
@@ -17,18 +17,20 @@ limitations under the License.
 (function () {
   'use strict';
 
+  /* eslint-disable angular/no-service-method */
   angular
     .module('horizon.framework.util.http', [])
     .service('horizon.framework.util.http.service', ApiService);
+  /* eslint-enable angular/no-service-method */
 
   ApiService.$inject = ['$http', '$window'];
 
   function ApiService($http, $window) {
 
     var httpCall = function (method, url, data, config) {
-      /* eslint-disable angular/ng_window_service */
+      /* eslint-disable angular/window-service */
       url = $window.WEBROOT + url;
-      /* eslint-enable angular/ng_window_service */
+      /* eslint-enable angular/window-service */
 
       url = url.replace(/\/+/g, '/');
 
@@ -46,7 +48,7 @@ limitations under the License.
     };
 
     this.get = function(url, config) {
-      return httpCall('GET', url, undefined, config);
+      return httpCall('GET', url, null, config);
     };
 
     this.post = function(url, data, config) {
diff --git a/horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js b/horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js
index 52b7784ff..69eba0dc5 100644
--- a/horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js
+++ b/horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js
@@ -96,7 +96,7 @@
       terminal: true,
       restrict: 'A',
       compile: compile,
-      $$tlb: true
+      $$tlb: true //eslint-disable-line angular/no-private-call
     };
 
     return directive;
diff --git a/horizon/static/framework/widgets/action-list/button-tooltip.row-warning.service.js b/horizon/static/framework/widgets/action-list/button-tooltip.row-warning.service.js
index ba6f69b24..02516d697 100644
--- a/horizon/static/framework/widgets/action-list/button-tooltip.row-warning.service.js
+++ b/horizon/static/framework/widgets/action-list/button-tooltip.row-warning.service.js
@@ -48,10 +48,10 @@
     ///////////////
 
     function expandDetail() {
-      /*eslint-disable angular/ng_controller_as_vm */
+      /*eslint-disable angular/controller-as-vm */
       // 'this' referred here is the this for the function not the controller
       var row = this.element.closest('tr');
-      /*eslint-enable angular/ng_controller_as_vm */
+      /*eslint-enable angular/controller-as-vm */
       if (!row.hasClass('expanded')) {
         // Timeout needed to prevent
         // $apply already in progress error
diff --git a/horizon/static/framework/widgets/magic-search/magic-overrides.directive.spec.js b/horizon/static/framework/widgets/magic-search/magic-overrides.directive.spec.js
index 762a03b80..9c927df9b 100644
--- a/horizon/static/framework/widgets/magic-search/magic-overrides.directive.spec.js
+++ b/horizon/static/framework/widgets/magic-search/magic-overrides.directive.spec.js
@@ -79,20 +79,20 @@
         }
       ];
 
-      /* eslint-disable angular/ng_window_service */
+      /* eslint-disable angular/window-service */
       var markup =
         '<magic-search ' +
           'template="' + window.STATIC_URL + 'framework/widgets/magic-search/magic-search.html" ' +
           'strings="filterStrings" ' +
           'facets="{{ filterFacets }}">' +
         '</magic-search>';
-      /* eslint-enable angular/ng_window_service */
+      /* eslint-enable angular/window-service */
 
       $compile(angular.element(markup))($scope);
 
       $scope.$apply();
 
-      $magicScope = $scope.$$childTail; //eslint-disable-line angular/ng_no_private_call
+      $magicScope = $scope.$$childTail; //eslint-disable-line angular/no-private-call
 
       spyOn($magicScope, '$emit');
       spyOn($magicScope, 'emitQuery');
diff --git a/horizon/static/framework/widgets/magic-search/st-magic-search.directive.spec.js b/horizon/static/framework/widgets/magic-search/st-magic-search.directive.spec.js
index caee1464f..67b428f07 100644
--- a/horizon/static/framework/widgets/magic-search/st-magic-search.directive.spec.js
+++ b/horizon/static/framework/widgets/magic-search/st-magic-search.directive.spec.js
@@ -89,9 +89,9 @@
         }
       ];
 
-      /* eslint-disable angular/ng_window_service */
+      /* eslint-disable angular/window-service */
       var msTemplate = window.STATIC_URL + 'framework/widgets/magic-search/magic-search.html';
-      /* eslint-enable angular/ng_window_service */
+      /* eslint-enable angular/window-service */
       var stMagicSearch =
         '<st-magic-search>' +
         '  <magic-search ' +
diff --git a/horizon/static/framework/widgets/metadata/tree/tree.service.js b/horizon/static/framework/widgets/metadata/tree/tree.service.js
index eb5a083ed..26e0dd409 100644
--- a/horizon/static/framework/widgets/metadata/tree/tree.service.js
+++ b/horizon/static/framework/widgets/metadata/tree/tree.service.js
@@ -299,7 +299,7 @@
      * @returns {Item[]}
      */
     Item.prototype.path = function (path) {
-      path = typeof path !== 'undefined' ? path : [];
+      path = angular.isDefined(path) ? path : [];
       if (this.parent) {
         this.parent.path(path);
       }
@@ -387,7 +387,7 @@
      * @returns {Item[]}
      */
     Tree.prototype.flatten = function (branch, items) {
-      items = typeof items !== 'undefined' ? items : [];
+      items = angular.isDefined(items) ? items : [];
 
       angular.forEach(branch, function (item) {
         items.push(item);
@@ -415,7 +415,7 @@
 
       angular.forEach(existing, function (value, key) {
         var item = itemsMapping[key];
-        if (typeof item === 'undefined') {
+        if (angular.isUndefined(item)) {
           item = new Item().customProperty(key);
           this.flatTree.push(item);
         }
diff --git a/horizon/static/framework/widgets/table/table.controller.js b/horizon/static/framework/widgets/table/table.controller.js
index 60d182148..e1056ff0f 100644
--- a/horizon/static/framework/widgets/table/table.controller.js
+++ b/horizon/static/framework/widgets/table/table.controller.js
@@ -30,10 +30,10 @@
   function TableController($scope) {
     var ctrl = this;
 
-    /*eslint-disable angular/ng_controller_as */
+    /*eslint-disable angular/controller-as */
     $scope.selected = {};
     $scope.numSelected = 0;
-    /*eslint-enable angular/ng_controller_as */
+    /*eslint-enable angular/controller-as */
 
     ctrl.isSelected = isSelected;
     ctrl.select = select;
diff --git a/horizon/static/framework/widgets/table/table.spec.js b/horizon/static/framework/widgets/table/table.spec.js
index b9d4f64f5..f6d5cd0e0 100644
--- a/horizon/static/framework/widgets/table/table.spec.js
+++ b/horizon/static/framework/widgets/table/table.spec.js
@@ -234,14 +234,14 @@
         expandIcon.click();
         expandIcon.click();
 
-        /*eslint-disable angular/ng_timeout_service */
+        /*eslint-disable angular/timeout-service */
         // Wait for the slide down animation to complete before test
         setTimeout(function() {
           var summaryRow = expandIcon.closest('tr');
           expect(summaryRow.hasClass('expanded')).toBe(false);
           done();
         }, 2000);
-        /*eslint-enable angular/ng_timeout_service */
+        /*eslint-enable angular/timeout-service */
       });
     });
 
diff --git a/horizon/static/framework/widgets/wizard/modal-container.controller.js b/horizon/static/framework/widgets/wizard/modal-container.controller.js
index 9075108e1..174fc1901 100644
--- a/horizon/static/framework/widgets/wizard/modal-container.controller.js
+++ b/horizon/static/framework/widgets/wizard/modal-container.controller.js
@@ -32,7 +32,7 @@
   function ModalContainerController($scope, $modalInstance, launchContext) {
     // $scope is used because the methods are shared between
     // wizard and modal-container controller
-    /*eslint-disable angular/ng_controller_as */
+    /*eslint-disable angular/controller-as */
     $scope.launchContext = launchContext;
     $scope.close = function(args) {
       $modalInstance.close(args);
@@ -40,6 +40,6 @@
     $scope.cancel = function() {
       $modalInstance.dismiss();
     };
-    /*eslint-enable angular/ng_controller_as */
+    /*eslint-enable angular/controller-as */
   }
 })();
diff --git a/horizon/static/framework/widgets/wizard/wizard.controller.js b/horizon/static/framework/widgets/wizard/wizard.controller.js
index aff753786..379a6d284 100644
--- a/horizon/static/framework/widgets/wizard/wizard.controller.js
+++ b/horizon/static/framework/widgets/wizard/wizard.controller.js
@@ -40,7 +40,7 @@
     var viewModel = $scope.viewModel = {};
     var initTask = $q.defer();
 
-    /*eslint-disable angular/ng_controller_as */
+    /*eslint-disable angular/controller-as */
     $scope.initPromise = initTask.promise;
     $scope.currentIndex = -1;
     $scope.workflow = $scope.workflow || {};
@@ -52,7 +52,7 @@
 
     $scope.switchTo = switchTo;
     $scope.showError = showError;
-    /*eslint-enable angular/ng_controller_as */
+    /*eslint-enable angular/controller-as */
 
     viewModel.btnText = extend({}, wizardLabels, $scope.workflow.btnText);
     viewModel.btnIcon = $scope.workflow.btnIcon || {};
@@ -78,10 +78,10 @@
         from: $scope.currentIndex,
         to: index
       });
-      /*eslint-disable angular/ng_controller_as */
+      /*eslint-disable angular/controller-as */
       $scope.currentIndex = index;
       $scope.openHelp = false;
-      /*eslint-enable angular/ng_controller_as*/
+      /*eslint-enable angular/controller-as*/
     }
 
     function showError(errorMessage) {
@@ -97,9 +97,9 @@
 
     function afterSubmit(args) {
       $scope.$broadcast(wizardEvents.AFTER_SUBMIT);
-      /*eslint-disable angular/ng_controller_as */
+      /*eslint-disable angular/controller-as */
       $scope.close(args);
-      /*eslint-enable angular/ng_controller_as */
+      /*eslint-enable angular/controller-as */
     }
 
     function onClickFinishBtn() {
@@ -184,12 +184,12 @@
 
     function switchToFirstReadyStep() {
       forEach(steps, function (step, index) {
-        /*eslint-disable angular/ng_controller_as */
+        /*eslint-disable angular/controller-as */
         if ($scope.currentIndex < 0 && step.ready) {
           $scope.currentIndex = index;
           return;
         }
-        /*eslint-enable angular/ng_controller_as */
+        /*eslint-enable angular/controller-as */
       });
     }
 
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-wizard.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-wizard.controller.js
index 43018e55f..792fab824 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-wizard.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-wizard.controller.js
@@ -29,10 +29,10 @@
   function LaunchInstanceWizardController($scope, launchInstanceModel, launchInstanceWorkflow) {
     // Note: we set these attributes on the $scope so that the scope inheritance used all
     // through the launch instance wizard continues to work.
-    $scope.workflow = launchInstanceWorkflow;     // eslint-disable-line angular/ng_controller_as
-    $scope.model = launchInstanceModel;           // eslint-disable-line angular/ng_controller_as
+    $scope.workflow = launchInstanceWorkflow;     // eslint-disable-line angular/controller-as
+    $scope.model = launchInstanceModel;           // eslint-disable-line angular/controller-as
     $scope.model.initialize(true);
-    $scope.submit = $scope.model.createInstance;  // eslint-disable-line angular/ng_controller_as
+    $scope.submit = $scope.model.createInstance;  // eslint-disable-line angular/controller-as
   }
 
 })();
diff --git a/openstack_dashboard/static/app/core/images/table/images-table.controller.js b/openstack_dashboard/static/app/core/images/table/images-table.controller.js
index 8d3eea6a7..60b55e087 100644
--- a/openstack_dashboard/static/app/core/images/table/images-table.controller.js
+++ b/openstack_dashboard/static/app/core/images/table/images-table.controller.js
@@ -76,10 +76,10 @@
     function onDeleteSuccess(e, removedImageIds) {
       ctrl.imagesSrc = difference(ctrl.imagesSrc, removedImageIds, 'id');
 
-      /* eslint-disable angular/ng_controller_as */
+      /* eslint-disable angular/controller-as */
       $scope.selected = {};
       $scope.numSelected = 0;
-      /* eslint-enable angular/ng_controller_as */
+      /* eslint-enable angular/controller-as */
 
       e.stopPropagation();
     }
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/heat.service.js b/openstack_dashboard/static/app/core/openstack-service-api/heat.service.js
index 9c913870e..70cce39be 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/heat.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/heat.service.js
@@ -18,7 +18,7 @@
 
   angular
     .module('horizon.app.core.openstack-service-api')
-    .service('horizon.app.core.openstack-service-api.heat', heatAPI);
+    .factory('horizon.app.core.openstack-service-api.heat', heatAPI);
 
   heatAPI.$inject = [
     'horizon.framework.util.http.service',
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/policy.service.js b/openstack_dashboard/static/app/core/openstack-service-api/policy.service.js
index 79ee3398c..e1997c76f 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/policy.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/policy.service.js
@@ -17,7 +17,7 @@
 
   angular
     .module('horizon.app.core.openstack-service-api')
-    .service('horizon.app.core.openstack-service-api.policy', PolicyService);
+    .factory('horizon.app.core.openstack-service-api.policy', PolicyService);
 
   PolicyService.$inject = [
     '$q',
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/settings.service.js b/openstack_dashboard/static/app/core/openstack-service-api/settings.service.js
index 3cb27447e..ece07a28e 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/settings.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/settings.service.js
@@ -132,11 +132,10 @@
         // does not have the requested child object.
         settingAtRequestedPath = pathElements.reduce(
           function (setting, nextPathElement) {
-            return setting ? setting[nextPathElement] : undefined;
+            return setting ? setting[nextPathElement] : undefined;//eslint-disable-line no-undefined
           }, settings);
 
-        if (typeof settingAtRequestedPath === "undefined" &&
-          (typeof defaultSetting !== "undefined")) {
+        if (angular.isUndefined(settingAtRequestedPath) && angular.isDefined(defaultSetting)) {
           settingAtRequestedPath = defaultSetting;
         }
 
@@ -243,7 +242,7 @@
 
       // If expected is not defined, we default to expecting the setting
       // to be 'true' in order for it to be considered enabled.
-      expected = (typeof expected === "undefined") ? true : expected;
+      expected = angular.isUndefined(expected) ? true : expected;
 
       function onSettingLoaded(setting) {
         if (angular.equals(expected, setting)) {
diff --git a/package.json b/package.json
index b770f13a8..aa0219f8d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "eslint": "1.2.1",
     "eslint-config-openstack": "1.2.3",
-    "eslint-plugin-angular": "0.4.0",
+    "eslint-plugin-angular": "0.15.0",
     "jasmine-core": "2.2.0",
     "karma": "0.12.31",
     "karma-chrome-launcher": "0.1.8",