From 691ffc38e5e479782a72ef1a56685a602ae5e98c Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Thu, 10 Jan 2019 16:44:35 -0700
Subject: [PATCH] Switch to @rancher/ember-api-store

---
 app/initializers/cluster-store.js                           | 2 +-
 app/initializers/extend-resource.js                         | 2 +-
 app/initializers/global-store.js                            | 2 +-
 app/initializers/session.js                                 | 2 +-
 app/initializers/webhook-store.js                           | 2 +-
 app/models/activedirectoryconfig.js                         | 2 +-
 app/models/app.js                                           | 4 ++--
 app/models/azurekubernetesserviceconfig.js                  | 2 +-
 app/models/catalog.js                                       | 2 +-
 app/models/catalogtemplate.js                               | 2 +-
 app/models/certificate.js                                   | 2 +-
 app/models/cluster.js                                       | 4 ++--
 app/models/clusteralertgroup.js                             | 2 +-
 app/models/clusteralertrule.js                              | 2 +-
 app/models/clustercatalog.js                                | 2 +-
 app/models/clusterlogging.js                                | 2 +-
 app/models/clusterroletemplatebinding.js                    | 4 ++--
 app/models/configmap.js                                     | 4 ++--
 app/models/container.js                                     | 6 +++---
 app/models/credential.js                                    | 2 +-
 app/models/dockercredential.js                              | 2 +-
 app/models/fluentServers.js                                 | 2 +-
 app/models/githubconfig.js                                  | 2 +-
 app/models/globalrole.js                                    | 2 +-
 app/models/globalrolebinding.js                             | 4 ++--
 app/models/googlekubernetesengineconfig.js                  | 2 +-
 app/models/httpingresspath.js                               | 4 ++--
 app/models/image.js                                         | 2 +-
 app/models/ingress.js                                       | 4 ++--
 app/models/kontainerdriver.js                               | 2 +-
 app/models/launchconfig.js                                  | 2 +-
 app/models/localauthconfig.js                               | 2 +-
 app/models/mountentry.js                                    | 4 ++--
 app/models/namespace.js                                     | 4 ++--
 app/models/namespacedcertificate.js                         | 2 +-
 app/models/namespaceddockercredential.js                    | 2 +-
 app/models/namespacedsecret.js                              | 2 +-
 app/models/node.js                                          | 4 ++--
 app/models/nodedriver.js                                    | 2 +-
 app/models/nodepool.js                                      | 4 ++--
 app/models/nodetemplate.js                                  | 2 +-
 app/models/notifier.js                                      | 2 +-
 app/models/openldapconfig.js                                | 2 +-
 app/models/persistentvolume.js                              | 2 +-
 app/models/persistentvolumeclaim.js                         | 4 ++--
 app/models/pipeline.js                                      | 2 +-
 app/models/pipelineexecution.js                             | 4 ++--
 app/models/pod.js                                           | 4 ++--
 app/models/podsecuritypolicytemplate.js                     | 2 +-
 app/models/port.js                                          | 2 +-
 app/models/preference.js                                    | 2 +-
 app/models/principal.js                                     | 2 +-
 app/models/probe.js                                         | 2 +-
 app/models/project.js                                       | 5 ++---
 app/models/projectalertgroup.js                             | 2 +-
 app/models/projectalertrule.js                              | 2 +-
 app/models/projectcatalog.js                                | 2 +-
 app/models/projectlogging.js                                | 2 +-
 app/models/projectroletemplatebinding.js                    | 4 ++--
 app/models/publicendpoint.js                                | 2 +-
 app/models/rancherkubernetesengineconfig.js                 | 2 +-
 app/models/roletemplate.js                                  | 2 +-
 app/models/scalehost.js                                     | 2 +-
 app/models/secret.js                                        | 2 +-
 app/models/secretreference.js                               | 2 +-
 app/models/service.js                                       | 5 ++---
 app/models/setting.js                                       | 2 +-
 app/models/sourcecodecredential.js                          | 2 +-
 app/models/storageclass.js                                  | 2 +-
 app/models/template.js                                      | 4 ++--
 app/models/templateversion.js                               | 4 ++--
 app/models/token.js                                         | 2 +-
 app/models/typedocumentation.js                             | 4 ++--
 app/models/user.js                                          | 4 ++--
 app/models/volume.js                                        | 2 +-
 app/models/workload.js                                      | 4 ++--
 app/signup/controller.js                                    | 2 +-
 app/verify-reset-password/controller.js                     | 2 +-
 app/verify-reset-password/route.js                          | 2 +-
 app/verify/controller.js                                    | 2 +-
 app/verify/route.js                                         | 2 +-
 blueprints/model/files/app/__path__/__name__.js             | 2 +-
 lib/nodes/addon/components/driver-digitalocean/component.js | 2 +-
 lib/nodes/addon/components/driver-exoscale/component.js     | 2 +-
 lib/nodes/addon/components/driver-packet/component.js       | 2 +-
 lib/shared/addon/components/api-field/component.js          | 2 +-
 .../addon/components/cluster-driver/driver-rke/component.js | 2 +-
 lib/shared/addon/mixins/new-or-edit.js                      | 2 +-
 lib/shared/addon/user-language/service.js                   | 2 +-
 lib/shared/addon/utils/errors.js                            | 2 +-
 lib/shared/addon/utils/fetch-yaml.js                        | 4 ++--
 lib/shared/addon/utils/parse-label.js                       | 2 +-
 lib/shared/package.json                                     | 2 +-
 package.json                                                | 2 +-
 94 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/app/initializers/cluster-store.js b/app/initializers/cluster-store.js
index 9bd2c32c9..522be317f 100644
--- a/app/initializers/cluster-store.js
+++ b/app/initializers/cluster-store.js
@@ -1,4 +1,4 @@
-import initializer from 'ember-api-store/initializers/store';
+import initializer from '@rancher/ember-api-store/initializers/store';
 
 export default {
   name:       'cluster-store',
diff --git a/app/initializers/extend-resource.js b/app/initializers/extend-resource.js
index 160accbd7..06fd9d8ec 100644
--- a/app/initializers/extend-resource.js
+++ b/app/initializers/extend-resource.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import CattleTransitioningResource from 'ui/mixins/cattle-transitioning-resource';
 
 export function initialize(/* application */) {
diff --git a/app/initializers/global-store.js b/app/initializers/global-store.js
index 821c31f2d..fc687595f 100644
--- a/app/initializers/global-store.js
+++ b/app/initializers/global-store.js
@@ -1,4 +1,4 @@
-import initializer from 'ember-api-store/initializers/store';
+import initializer from '@rancher/ember-api-store/initializers/store';
 
 export default {
   name:       'global-store',
diff --git a/app/initializers/session.js b/app/initializers/session.js
index 28f8b51be..ffa9c7f14 100644
--- a/app/initializers/session.js
+++ b/app/initializers/session.js
@@ -1,4 +1,4 @@
-import Serializable from 'ember-api-store/mixins/serializable';
+import Serializable from '@rancher/ember-api-store/mixins/serializable';
 
 // Don't serialize the injected session
 Serializable.reopen({ reservedKeys: ['session'], });
diff --git a/app/initializers/webhook-store.js b/app/initializers/webhook-store.js
index 2d25e7547..f9d49d7e8 100644
--- a/app/initializers/webhook-store.js
+++ b/app/initializers/webhook-store.js
@@ -1,4 +1,4 @@
-import initializer from 'ember-api-store/initializers/store';
+import initializer from '@rancher/ember-api-store/initializers/store';
 
 export default {
   name:       'webhook-store',
diff --git a/app/models/activedirectoryconfig.js b/app/models/activedirectoryconfig.js
index 17ef0f86d..dd9d09f32 100644
--- a/app/models/activedirectoryconfig.js
+++ b/app/models/activedirectoryconfig.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var ActiveDirectoryConfig = Resource.extend({ type: 'activeDirectoryConfig', });
 
diff --git a/app/models/app.js b/app/models/app.js
index cc00f1311..92bcb0a29 100644
--- a/app/models/app.js
+++ b/app/models/app.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { computed, get } from '@ember/object';
 import { parseHelmExternalId } from 'ui/utils/parse-externalid';
 import StateCounts from 'ui/mixins/state-counts';
diff --git a/app/models/azurekubernetesserviceconfig.js b/app/models/azurekubernetesserviceconfig.js
index f99df2f3a..87ec512e6 100644
--- a/app/models/azurekubernetesserviceconfig.js
+++ b/app/models/azurekubernetesserviceconfig.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({ type: 'azureKubernetesServiceConfig', });
diff --git a/app/models/catalog.js b/app/models/catalog.js
index 1940444bf..27f748162 100644
--- a/app/models/catalog.js
+++ b/app/models/catalog.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 import { computed, get } from '@ember/object';
 import { ucFirst } from 'shared/utils/util';
diff --git a/app/models/catalogtemplate.js b/app/models/catalogtemplate.js
index a4cf548cd..c58e45e37 100644
--- a/app/models/catalogtemplate.js
+++ b/app/models/catalogtemplate.js
@@ -1,5 +1,5 @@
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 import C from 'ui/utils/constants';
 
diff --git a/app/models/certificate.js b/app/models/certificate.js
index b28a1bf14..6fdba1160 100644
--- a/app/models/certificate.js
+++ b/app/models/certificate.js
@@ -1,7 +1,7 @@
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 import { computed } from '@ember/object'
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   router:     service(),
diff --git a/app/models/cluster.js b/app/models/cluster.js
index 1ff4d0ede..5054922b6 100644
--- a/app/models/cluster.js
+++ b/app/models/cluster.js
@@ -1,7 +1,7 @@
 import { get, set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
-import { hasMany } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { hasMany } from '@rancher/ember-api-store/utils/denormalize';
 import ResourceUsage from 'shared/mixins/resource-usage';
 import Grafana from 'shared/mixins/grafana';
 import { equal, alias } from '@ember/object/computed';
diff --git a/app/models/clusteralertgroup.js b/app/models/clusteralertgroup.js
index b02cf20d4..a5746bc60 100644
--- a/app/models/clusteralertgroup.js
+++ b/app/models/clusteralertgroup.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import Alert from 'ui/mixins/model-alert';
 
 export default Resource.extend(Alert, { type: 'clusteralertgroup', });
diff --git a/app/models/clusteralertrule.js b/app/models/clusteralertrule.js
index 81a5e23ca..e063315a0 100644
--- a/app/models/clusteralertrule.js
+++ b/app/models/clusteralertrule.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Alert from 'ui/mixins/model-alert';
diff --git a/app/models/clustercatalog.js b/app/models/clustercatalog.js
index 9d0ccfaec..4badba808 100644
--- a/app/models/clustercatalog.js
+++ b/app/models/clustercatalog.js
@@ -1,5 +1,5 @@
 import Catalog from 'ui/models/catalog';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 export default Catalog.extend({
   level:        'cluster',
diff --git a/app/models/clusterlogging.js b/app/models/clusterlogging.js
index da8fcbe5b..b64dae03d 100644
--- a/app/models/clusterlogging.js
+++ b/app/models/clusterlogging.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import modelMixin from 'ui/mixins/logging-model';
 
 export default Resource.extend(modelMixin, { type: 'clusterlogging', });
diff --git a/app/models/clusterroletemplatebinding.js b/app/models/clusterroletemplatebinding.js
index c2df34f78..b94715bc4 100644
--- a/app/models/clusterroletemplatebinding.js
+++ b/app/models/clusterroletemplatebinding.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { get, computed } from '@ember/object';
 import C from 'ui/utils/constants';
 import PrincipalReference from 'ui/mixins/principal-reference';
diff --git a/app/models/configmap.js b/app/models/configmap.js
index a1990a42d..83f95a256 100644
--- a/app/models/configmap.js
+++ b/app/models/configmap.js
@@ -1,8 +1,8 @@
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { computed, get } from '@ember/object';
-import { reference } from 'ember-api-store/utils/denormalize';
-import Resource from 'ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   router:       service(),
diff --git a/app/models/container.js b/app/models/container.js
index 5ab17f600..7ead11705 100644
--- a/app/models/container.js
+++ b/app/models/container.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import DisplayImage from 'shared/mixins/display-image';
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -134,4 +134,4 @@ var Container = Resource.extend(Grafana, DisplayImage, {
 
 });
 
-export default Container;
\ No newline at end of file
+export default Container;
diff --git a/app/models/credential.js b/app/models/credential.js
index 2db476c90..5990a8a60 100644
--- a/app/models/credential.js
+++ b/app/models/credential.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
diff --git a/app/models/dockercredential.js b/app/models/dockercredential.js
index b7791516a..bfcb99617 100644
--- a/app/models/dockercredential.js
+++ b/app/models/dockercredential.js
@@ -1,7 +1,7 @@
 import EmberObject, { get, computed } from '@ember/object';
 import { alias } from '@ember/object/computed'
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export const PRESETS = {
   'index.docker.io': 'dockerhub',
diff --git a/app/models/fluentServers.js b/app/models/fluentServers.js
index 242039637..98dc4b51c 100644
--- a/app/models/fluentServers.js
+++ b/app/models/fluentServers.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({ type: 'fluentServer', });
diff --git a/app/models/githubconfig.js b/app/models/githubconfig.js
index 36ffa73fa..b48c2f042 100644
--- a/app/models/githubconfig.js
+++ b/app/models/githubconfig.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 
 var GithubConfig = Resource.extend({
diff --git a/app/models/globalrole.js b/app/models/globalrole.js
index 7b5c24dce..6b1cf6e6c 100644
--- a/app/models/globalrole.js
+++ b/app/models/globalrole.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
diff --git a/app/models/globalrolebinding.js b/app/models/globalrolebinding.js
index a250cf0b2..722f9eb49 100644
--- a/app/models/globalrolebinding.js
+++ b/app/models/globalrolebinding.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 export default Resource.extend({
   canRemove:  false,
diff --git a/app/models/googlekubernetesengineconfig.js b/app/models/googlekubernetesengineconfig.js
index 26389f046..b46265b62 100644
--- a/app/models/googlekubernetesengineconfig.js
+++ b/app/models/googlekubernetesengineconfig.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   type: 'googleKubernetesEngineConfig',
diff --git a/app/models/httpingresspath.js b/app/models/httpingresspath.js
index a064d377c..0b95d329d 100644
--- a/app/models/httpingresspath.js
+++ b/app/models/httpingresspath.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 var HttpIngressPath = Resource.extend({ service: reference('serviceId'), });
 
diff --git a/app/models/image.js b/app/models/image.js
index 73bc85dfd..8a616f6e7 100644
--- a/app/models/image.js
+++ b/app/models/image.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({ type: 'image' });
diff --git a/app/models/ingress.js b/app/models/ingress.js
index bc4fe72d5..0541dcdac 100644
--- a/app/models/ingress.js
+++ b/app/models/ingress.js
@@ -1,6 +1,6 @@
 import { computed, get } from '@ember/object';
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 
 export default Resource.extend({
diff --git a/app/models/kontainerdriver.js b/app/models/kontainerdriver.js
index 1b0aa59ee..331b063b1 100644
--- a/app/models/kontainerdriver.js
+++ b/app/models/kontainerdriver.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { computed, get } from '@ember/object';
 
 var KontainerDriver = Resource.extend({
diff --git a/app/models/launchconfig.js b/app/models/launchconfig.js
index cb6d1deec..0caa31f9c 100644
--- a/app/models/launchconfig.js
+++ b/app/models/launchconfig.js
@@ -1,5 +1,5 @@
 import { computed } from '@ember/object';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var LaunchConfig = Resource.extend({
   displayEnvironmentVars: computed('launchConfig.environment', function() {
diff --git a/app/models/localauthconfig.js b/app/models/localauthconfig.js
index 4b43885b8..456c44ab2 100644
--- a/app/models/localauthconfig.js
+++ b/app/models/localauthconfig.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var LocalAuthConfig = Resource.extend({ type: 'localauthConfig', });
 
diff --git a/app/models/mountentry.js b/app/models/mountentry.js
index d7ab61a39..ae5dcc3af 100644
--- a/app/models/mountentry.js
+++ b/app/models/mountentry.js
@@ -1,8 +1,8 @@
 import { computed } from '@ember/object';
 import { equal } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 export default Resource.extend({
   intl:        service(),
diff --git a/app/models/namespace.js b/app/models/namespace.js
index 87e6432fd..38ab5db6b 100644
--- a/app/models/namespace.js
+++ b/app/models/namespace.js
@@ -1,11 +1,11 @@
 import { computed, get } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 import { convertToMillis } from 'shared/utils/util';
 import { parseSi } from 'shared/utils/parse-unit';
 import C from 'ui/utils/constants';
-import { hasMany, reference } from 'ember-api-store/utils/denormalize';
+import { hasMany, reference } from '@rancher/ember-api-store/utils/denormalize';
 import StateCounts from 'ui/mixins/state-counts';
 
 export function convertResourceQuota(key, value) {
diff --git a/app/models/namespacedcertificate.js b/app/models/namespacedcertificate.js
index 2de3ac5fa..96c154a5e 100644
--- a/app/models/namespacedcertificate.js
+++ b/app/models/namespacedcertificate.js
@@ -1,5 +1,5 @@
 import Certificate from './certificate';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 
 export default Certificate.extend({
diff --git a/app/models/namespaceddockercredential.js b/app/models/namespaceddockercredential.js
index e45a8132e..54e8cc9ec 100644
--- a/app/models/namespaceddockercredential.js
+++ b/app/models/namespaceddockercredential.js
@@ -1,5 +1,5 @@
 import DockerCredential from './dockercredential';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
diff --git a/app/models/namespacedsecret.js b/app/models/namespacedsecret.js
index c2d747dd6..7b5128cba 100644
--- a/app/models/namespacedsecret.js
+++ b/app/models/namespacedsecret.js
@@ -1,5 +1,5 @@
 import Secret from './secret';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
diff --git a/app/models/node.js b/app/models/node.js
index 7e7bd8533..1a89f1023 100644
--- a/app/models/node.js
+++ b/app/models/node.js
@@ -1,11 +1,11 @@
 import { computed, get } from '@ember/object';
 import { or, alias } from '@ember/object/computed';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { download } from 'shared/utils/util';
 import C from 'ui/utils/constants';
 import StateCounts from 'ui/mixins/state-counts';
 import { inject as service } from '@ember/service';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import ResourceUsage from 'shared/mixins/resource-usage';
 import Grafana from 'shared/mixins/grafana';
 
diff --git a/app/models/nodedriver.js b/app/models/nodedriver.js
index b5d514fc4..8fdd618df 100644
--- a/app/models/nodedriver.js
+++ b/app/models/nodedriver.js
@@ -1,6 +1,6 @@
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 
diff --git a/app/models/nodepool.js b/app/models/nodepool.js
index e9903673a..a8501213e 100644
--- a/app/models/nodepool.js
+++ b/app/models/nodepool.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { cancel, later } from '@ember/runloop'
 import { get, set } from '@ember/object';
 import { alias } from '@ember/object/computed';
diff --git a/app/models/nodetemplate.js b/app/models/nodetemplate.js
index ad06ee7b7..8744b4728 100644
--- a/app/models/nodetemplate.js
+++ b/app/models/nodetemplate.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { ucFirst } from 'shared/utils/util';
diff --git a/app/models/notifier.js b/app/models/notifier.js
index ab23d8314..412e86754 100644
--- a/app/models/notifier.js
+++ b/app/models/notifier.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 import {  setProperties, get, computed } from '@ember/object';
 import { hash } from 'rsvp';
diff --git a/app/models/openldapconfig.js b/app/models/openldapconfig.js
index 2e4cef215..84e2c2a6c 100644
--- a/app/models/openldapconfig.js
+++ b/app/models/openldapconfig.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var OpenLdapConfig = Resource.extend({ type: 'openLdapConfig', });
 
diff --git a/app/models/persistentvolume.js b/app/models/persistentvolume.js
index 2bf59653f..8497dc82c 100644
--- a/app/models/persistentvolume.js
+++ b/app/models/persistentvolume.js
@@ -1,7 +1,7 @@
 import Volume from './volume';
 import { get, computed } from '@ember/object'
 import { inject as service } from '@ember/service';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 export default Volume.extend({
   router: service(),
diff --git a/app/models/persistentvolumeclaim.js b/app/models/persistentvolumeclaim.js
index 1e9c28fee..193d961b6 100644
--- a/app/models/persistentvolumeclaim.js
+++ b/app/models/persistentvolumeclaim.js
@@ -1,6 +1,6 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object'
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { parseSi, formatSi } from 'shared/utils/parse-unit';
 import { inject as service } from '@ember/service';
 
diff --git a/app/models/pipeline.js b/app/models/pipeline.js
index 1531ddadc..9dd9140ce 100644
--- a/app/models/pipeline.js
+++ b/app/models/pipeline.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 import { get, computed } from '@ember/object';
 import C from 'shared/utils/pipeline-constants';
diff --git a/app/models/pipelineexecution.js b/app/models/pipelineexecution.js
index 8c97084ef..034025012 100644
--- a/app/models/pipelineexecution.js
+++ b/app/models/pipelineexecution.js
@@ -1,9 +1,9 @@
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import C from 'shared/utils/pipeline-constants';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 let PipelineExecution = Resource.extend({
   router:   service(),
diff --git a/app/models/pod.js b/app/models/pod.js
index 26bb828df..f6827dd09 100644
--- a/app/models/pod.js
+++ b/app/models/pod.js
@@ -1,7 +1,7 @@
 import C from 'ui/utils/constants';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { alias } from '@ember/object/computed';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { strPad } from 'ui/utils/util';
diff --git a/app/models/podsecuritypolicytemplate.js b/app/models/podsecuritypolicytemplate.js
index eeb70374a..385b0cfdd 100644
--- a/app/models/podsecuritypolicytemplate.js
+++ b/app/models/podsecuritypolicytemplate.js
@@ -1,5 +1,5 @@
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   router: service(),
diff --git a/app/models/port.js b/app/models/port.js
index 1b052b216..38c2b24e5 100644
--- a/app/models/port.js
+++ b/app/models/port.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var Port = Resource.extend({
   _publicIp:       null,
diff --git a/app/models/preference.js b/app/models/preference.js
index 93ba47ecc..6f4cbe7ce 100644
--- a/app/models/preference.js
+++ b/app/models/preference.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend();
diff --git a/app/models/principal.js b/app/models/principal.js
index 12356c011..e87279c18 100644
--- a/app/models/principal.js
+++ b/app/models/principal.js
@@ -1,6 +1,6 @@
 import { equal } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
 import { get, computed } from '@ember/object'
 import Identicon from 'identicon.js';
diff --git a/app/models/probe.js b/app/models/probe.js
index 464d0c879..4632b9e86 100644
--- a/app/models/probe.js
+++ b/app/models/probe.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({});
diff --git a/app/models/project.js b/app/models/project.js
index 0c60c5dc4..5c46d0fb4 100644
--- a/app/models/project.js
+++ b/app/models/project.js
@@ -1,9 +1,8 @@
 import { get, set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { hasMany } from 'ember-api-store/utils/denormalize';
-import Resource from 'ember-api-store/models/resource';
+import { hasMany, reference } from '@rancher/ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
-import { reference } from 'ember-api-store/utils/denormalize';
 import { alias } from '@ember/object/computed';
 
 const SYSTEM_PROJECT_LABEL = 'authz.management.cattle.io/system-project';
diff --git a/app/models/projectalertgroup.js b/app/models/projectalertgroup.js
index d08974cb9..7b46a63b2 100644
--- a/app/models/projectalertgroup.js
+++ b/app/models/projectalertgroup.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import Alert from 'ui/mixins/model-alert';
 
 export default Resource.extend(Alert, { type: 'projectalertgroup', });
diff --git a/app/models/projectalertrule.js b/app/models/projectalertrule.js
index 833444fb5..5196c78d9 100644
--- a/app/models/projectalertrule.js
+++ b/app/models/projectalertrule.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Alert from 'ui/mixins/model-alert';
diff --git a/app/models/projectcatalog.js b/app/models/projectcatalog.js
index 33ffae20d..508fbbdb3 100644
--- a/app/models/projectcatalog.js
+++ b/app/models/projectcatalog.js
@@ -1,5 +1,5 @@
 import Catalog from 'ui/models/catalog';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 export default Catalog.extend({
   level:        'project',
diff --git a/app/models/projectlogging.js b/app/models/projectlogging.js
index eaf1b9dd6..e26b68094 100644
--- a/app/models/projectlogging.js
+++ b/app/models/projectlogging.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import modelMixin from 'ui/mixins/logging-model';
 
 const ProjectLogging =  Resource.extend(modelMixin, { type: 'projectlogging', });
diff --git a/app/models/projectroletemplatebinding.js b/app/models/projectroletemplatebinding.js
index faf5292c5..d2379b364 100644
--- a/app/models/projectroletemplatebinding.js
+++ b/app/models/projectroletemplatebinding.js
@@ -1,5 +1,5 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 import { get, computed } from '@ember/object';
 import C from 'ui/utils/constants';
 import PrincipalReference from 'ui/mixins/principal-reference';
diff --git a/app/models/publicendpoint.js b/app/models/publicendpoint.js
index e7a3b0ed5..da2c2f137 100644
--- a/app/models/publicendpoint.js
+++ b/app/models/publicendpoint.js
@@ -1,6 +1,6 @@
 import { isArray } from '@ember/array';
 import { get, computed } from '@ember/object';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { inject as service } from '@ember/service';
 import C from 'shared/utils/constants';
 
diff --git a/app/models/rancherkubernetesengineconfig.js b/app/models/rancherkubernetesengineconfig.js
index 8d87aa106..899119664 100644
--- a/app/models/rancherkubernetesengineconfig.js
+++ b/app/models/rancherkubernetesengineconfig.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({ type: 'rancherKubernetesEngineConfig', });
diff --git a/app/models/roletemplate.js b/app/models/roletemplate.js
index 5fbe7f312..0aad0fdf6 100644
--- a/app/models/roletemplate.js
+++ b/app/models/roletemplate.js
@@ -1,6 +1,6 @@
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
 
 export default Resource.extend({
diff --git a/app/models/scalehost.js b/app/models/scalehost.js
index ca488c035..2064590b9 100644
--- a/app/models/scalehost.js
+++ b/app/models/scalehost.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   hostSelectorStr: function() {
diff --git a/app/models/secret.js b/app/models/secret.js
index dcba0948d..0cf0da67c 100644
--- a/app/models/secret.js
+++ b/app/models/secret.js
@@ -1,7 +1,7 @@
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { computed, get } from '@ember/object';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({
   router:   service(),
diff --git a/app/models/secretreference.js b/app/models/secretreference.js
index 464d0c879..4632b9e86 100644
--- a/app/models/secretreference.js
+++ b/app/models/secretreference.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend({});
diff --git a/app/models/service.js b/app/models/service.js
index 4f3e779b3..cd2dd7b69 100644
--- a/app/models/service.js
+++ b/app/models/service.js
@@ -1,8 +1,7 @@
-import Resource from 'ember-api-store/models/resource';
-import { reference } from 'ember-api-store/utils/denormalize';
+import Resource from '@rancher/ember-api-store/models/resource';
+import { reference, arrayOfReferences } from '@rancher/ember-api-store/utils/denormalize';
 import { computed, get, set } from '@ember/object';
 import { equal } from '@ember/object/computed';
-import { arrayOfReferences } from 'ember-api-store/utils/denormalize';
 import { inject as service } from '@ember/service';
 import EndpointPorts from 'ui/mixins/endpoint-ports';
 
diff --git a/app/models/setting.js b/app/models/setting.js
index b2e164eec..936c94933 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -1,5 +1,5 @@
 import { later } from '@ember/runloop';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { computed, get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isEmpty } from '@ember/utils';
diff --git a/app/models/sourcecodecredential.js b/app/models/sourcecodecredential.js
index 7887c3a03..994c637d5 100644
--- a/app/models/sourcecodecredential.js
+++ b/app/models/sourcecodecredential.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get } from '@ember/object';
 
 export default Resource.extend({
diff --git a/app/models/storageclass.js b/app/models/storageclass.js
index 9d26ae9be..74f8f024f 100644
--- a/app/models/storageclass.js
+++ b/app/models/storageclass.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { all } from 'rsvp';
diff --git a/app/models/template.js b/app/models/template.js
index 8762f5d9a..1fde2f12d 100644
--- a/app/models/template.js
+++ b/app/models/template.js
@@ -1,9 +1,9 @@
 import { htmlSafe } from '@ember/string';
 import { computed, get } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
-import { reference } from 'ember-api-store/utils/denormalize';
+import { reference } from '@rancher/ember-api-store/utils/denormalize';
 
 const Template = Resource.extend({
   scope:    service(),
diff --git a/app/models/templateversion.js b/app/models/templateversion.js
index a88b09f24..8ed49c8d7 100644
--- a/app/models/templateversion.js
+++ b/app/models/templateversion.js
@@ -1,6 +1,6 @@
 import { inject as service } from '@ember/service';
-import { validateChars, validateLength } from 'ember-api-store/utils/validate';
-import Resource from 'ember-api-store/models/resource';
+import { validateChars, validateLength } from '@rancher/ember-api-store/utils/validate';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 import { evaluate } from 'shared/utils/evaluate';
 import C from 'ui/utils/constants';
diff --git a/app/models/token.js b/app/models/token.js
index 847f7424f..0ee150811 100644
--- a/app/models/token.js
+++ b/app/models/token.js
@@ -1,4 +1,4 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, computed } from '@ember/object';
 
 export default Resource.extend({
diff --git a/app/models/typedocumentation.js b/app/models/typedocumentation.js
index 148bac7d6..116044c3c 100644
--- a/app/models/typedocumentation.js
+++ b/app/models/typedocumentation.js
@@ -1,5 +1,5 @@
-import { normalizeType } from 'ember-api-store/utils/normalize';
-import Resource from 'ember-api-store/models/resource';
+import { normalizeType } from '@rancher/ember-api-store/utils/normalize';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 var TypeDocumentation = Resource.extend();
 
diff --git a/app/models/user.js b/app/models/user.js
index 660c58e3d..805e16376 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -1,8 +1,8 @@
 import { inject as service } from '@ember/service';
 import { get, set, computed } from '@ember/object';
-import { hasMany } from 'ember-api-store/utils/denormalize';
+import { hasMany } from '@rancher/ember-api-store/utils/denormalize';
 import { next } from '@ember/runloop'
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import Identicon from 'identicon.js';
 
 export default Resource.extend({
diff --git a/app/models/volume.js b/app/models/volume.js
index aae36813e..8c4a2beda 100644
--- a/app/models/volume.js
+++ b/app/models/volume.js
@@ -1,6 +1,6 @@
 import { get, set, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 const SOURCES = [];
 
diff --git a/app/models/workload.js b/app/models/workload.js
index b05c341c2..ef5a3a559 100644
--- a/app/models/workload.js
+++ b/app/models/workload.js
@@ -2,10 +2,10 @@ import { later, cancel } from '@ember/runloop';
 import { computed, get, set } from '@ember/object';
 import Grafana from 'shared/mixins/grafana';
 import { alias, gt, not } from '@ember/object/computed';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { sortableNumericSuffix } from 'shared/utils/util';
 import { formatSi } from 'shared/utils/parse-unit';
-import { reference, hasMany } from 'ember-api-store/utils/denormalize';
+import { reference, hasMany } from '@rancher/ember-api-store/utils/denormalize';
 import StateCounts from 'ui/mixins/state-counts';
 import EndpointPorts from 'ui/mixins/endpoint-ports';
 import { inject as service } from '@ember/service';
diff --git a/app/signup/controller.js b/app/signup/controller.js
index 8ca8c6f8e..062a08d6b 100644
--- a/app/signup/controller.js
+++ b/app/signup/controller.js
@@ -1,7 +1,7 @@
 import { observer } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 
 export default Controller.extend({
   settings: service(),
diff --git a/app/verify-reset-password/controller.js b/app/verify-reset-password/controller.js
index 737f849c9..8b82ff0af 100644
--- a/app/verify-reset-password/controller.js
+++ b/app/verify-reset-password/controller.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 
 export default Controller.extend({
   passwordRest: false,
diff --git a/app/verify-reset-password/route.js b/app/verify-reset-password/route.js
index 58848f7c7..95c07673c 100644
--- a/app/verify-reset-password/route.js
+++ b/app/verify-reset-password/route.js
@@ -1,6 +1,6 @@
 import { reject } from 'rsvp';
 import Route from '@ember/routing/route';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 
 export default Route.extend({
   model(params) {
diff --git a/app/verify/controller.js b/app/verify/controller.js
index 583b6c859..7a9c858f8 100644
--- a/app/verify/controller.js
+++ b/app/verify/controller.js
@@ -1,6 +1,6 @@
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 
 export default Controller.extend({
   access:         service(),
diff --git a/app/verify/route.js b/app/verify/route.js
index ff5aaf289..aa2556b1f 100644
--- a/app/verify/route.js
+++ b/app/verify/route.js
@@ -1,6 +1,6 @@
 import { reject } from 'rsvp';
 import Route from '@ember/routing/route';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 
 export default Route.extend({
 
diff --git a/blueprints/model/files/app/__path__/__name__.js b/blueprints/model/files/app/__path__/__name__.js
index 93ba47ecc..6f4cbe7ce 100644
--- a/blueprints/model/files/app/__path__/__name__.js
+++ b/blueprints/model/files/app/__path__/__name__.js
@@ -1,3 +1,3 @@
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 
 export default Resource.extend();
diff --git a/lib/nodes/addon/components/driver-digitalocean/component.js b/lib/nodes/addon/components/driver-digitalocean/component.js
index f9507c10a..9454d6238 100644
--- a/lib/nodes/addon/components/driver-digitalocean/component.js
+++ b/lib/nodes/addon/components/driver-digitalocean/component.js
@@ -5,7 +5,7 @@ import {
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import NodeDriver, { registerDisplayLocation, registerDisplaySize } from 'shared/mixins/node-driver';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 import { addQueryParam, addQueryParams } from 'shared/utils/util';
 import layout from './template';
 import { inject as service } from '@ember/service';
diff --git a/lib/nodes/addon/components/driver-exoscale/component.js b/lib/nodes/addon/components/driver-exoscale/component.js
index 77da53c39..1dede1550 100644
--- a/lib/nodes/addon/components/driver-exoscale/component.js
+++ b/lib/nodes/addon/components/driver-exoscale/component.js
@@ -1,7 +1,7 @@
 import { alias, equal } from '@ember/object/computed';
 import Driver from 'shared/mixins/node-driver';
 import { get, set } from '@ember/object';
-import { ajaxPromise } from 'ember-api-store/utils/ajax-promise';
+import { ajaxPromise } from '@rancher/ember-api-store/utils/ajax-promise';
 import Component from '@ember/component';
 import layout from './template';
 import { eachSeries } from 'async';
diff --git a/lib/nodes/addon/components/driver-packet/component.js b/lib/nodes/addon/components/driver-packet/component.js
index 9a0ce1e89..0b788bfce 100644
--- a/lib/nodes/addon/components/driver-packet/component.js
+++ b/lib/nodes/addon/components/driver-packet/component.js
@@ -7,7 +7,7 @@ import { isEmpty } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import NodeDriver from 'shared/mixins/node-driver';
-import fetch from 'ember-api-store/utils/fetch';
+import fetch from '@rancher/ember-api-store/utils/fetch';
 import layout from './template';
 
 const OS_WHITELIST = ['centos_7', 'coreos_stable', 'ubuntu_14_04', 'ubuntu_16_04', 'rancher'];
diff --git a/lib/shared/addon/components/api-field/component.js b/lib/shared/addon/components/api-field/component.js
index fae396706..bd2279fb7 100644
--- a/lib/shared/addon/components/api-field/component.js
+++ b/lib/shared/addon/components/api-field/component.js
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import layout from './template';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import { get, observer } from '@ember/object'
 import { run } from '@ember/runloop';
 
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index 081d70f0d..caecd2870 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -8,7 +8,7 @@ import { inject as service } from '@ember/service';
 import {
   underlineToCamel, removeEmpty, keysToCamel, validateEndpoint, randomStr
 } from 'shared/utils/util';
-import { validateHostname } from 'ember-api-store/utils/validate';
+import { validateHostname } from '@rancher/ember-api-store/utils/validate';
 
 import C from 'shared/utils/constants';
 import YAML from 'yamljs';
diff --git a/lib/shared/addon/mixins/new-or-edit.js b/lib/shared/addon/mixins/new-or-edit.js
index 346059c11..125304482 100644
--- a/lib/shared/addon/mixins/new-or-edit.js
+++ b/lib/shared/addon/mixins/new-or-edit.js
@@ -1,7 +1,7 @@
 import { resolve } from 'rsvp';
 import { alias } from '@ember/object/computed';
 import Mixin from '@ember/object/mixin';
-import Resource from 'ember-api-store/models/resource';
+import Resource from '@rancher/ember-api-store/models/resource';
 import Errors from 'ui/utils/errors';
 import { get, set } from '@ember/object';
 
diff --git a/lib/shared/addon/user-language/service.js b/lib/shared/addon/user-language/service.js
index 186d0aefe..1cb36d486 100644
--- a/lib/shared/addon/user-language/service.js
+++ b/lib/shared/addon/user-language/service.js
@@ -2,7 +2,7 @@ import { resolve } from 'rsvp';
 import { alias } from '@ember/object/computed';
 import Service, { inject as service } from '@ember/service';
 import C from 'shared/utils/constants';
-import { ajaxPromise } from 'ember-api-store/utils/ajax-promise';
+import { ajaxPromise } from '@rancher/ember-api-store/utils/ajax-promise';
 // @@TODO@@ - 10-27-17 - move to addon
 import { loadScript } from 'ui/utils/load-script';
 
diff --git a/lib/shared/addon/utils/errors.js b/lib/shared/addon/utils/errors.js
index 68e230ba3..cf682d502 100644
--- a/lib/shared/addon/utils/errors.js
+++ b/lib/shared/addon/utils/errors.js
@@ -1,4 +1,4 @@
-import ApiError from 'ember-api-store/models/error';
+import ApiError from '@rancher/ember-api-store/models/error';
 
 export default {
   stringify(err) {
diff --git a/lib/shared/addon/utils/fetch-yaml.js b/lib/shared/addon/utils/fetch-yaml.js
index e1dcce819..08c4358ed 100644
--- a/lib/shared/addon/utils/fetch-yaml.js
+++ b/lib/shared/addon/utils/fetch-yaml.js
@@ -1,4 +1,4 @@
-import { ajaxPromise } from 'ember-api-store/utils/ajax-promise';
+import { ajaxPromise } from '@rancher/ember-api-store/utils/ajax-promise';
 
 export default function fetchYaml(yamlLink){
   return ajaxPromise({
@@ -8,4 +8,4 @@ export default function fetchYaml(yamlLink){
   }).then((data) => {
     return data.xhr.responseText;
   })
-}
\ No newline at end of file
+}
diff --git a/lib/shared/addon/utils/parse-label.js b/lib/shared/addon/utils/parse-label.js
index 2d23788fd..4254da322 100644
--- a/lib/shared/addon/utils/parse-label.js
+++ b/lib/shared/addon/utils/parse-label.js
@@ -1,4 +1,4 @@
-import  { validateChars, validateHostname } from 'ember-api-store/utils/validate';
+import  { validateChars, validateHostname } from '@rancher/ember-api-store/utils/validate';
 
 export function parseKey(str) {
   str = str || '';
diff --git a/lib/shared/package.json b/lib/shared/package.json
index c3dd33acd..8d8ade693 100644
--- a/lib/shared/package.json
+++ b/lib/shared/package.json
@@ -7,7 +7,7 @@
     "async": "*",
     "d3": "*",
     "echarts": "*",
-    "ember-api-store": "*",
+    "@rancher/ember-api-store": "*",
     "ember-auto-import": "*",
     "ember-basic-dropdown": "*",
     "ember-cli-babel": "*",
diff --git a/package.json b/package.json
index b65286ceb..89cd2c276 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "d3": "3.5.17",
     "dot-object": "^1.7.0",
     "dotenv": "^6.0.0",
-    "ember-api-store": "2.7.2",
+    "@rancher/ember-api-store": "2.8.7",
     "ember-assign-helper": "^0.1.2",
     "ember-auto-import": "^1.2.13",
     "ember-basic-dropdown": "^1.0.0",