diff --git a/packages/-ember-data/addon/-private/index.js b/packages/-ember-data/addon/-private/index.js
index 959b1e2781a..330b7802ee7 100644
--- a/packages/-ember-data/addon/-private/index.js
+++ b/packages/-ember-data/addon/-private/index.js
@@ -1,8 +1,9 @@
 // public
-export { Errors, Snapshot } from '@ember-data/store/-private';
 export { default as Store } from '@ember-data/store';
 export { default as DS } from './core';
 export { default as isEnabled } from './features';
+export { Errors } from '@ember-data/model/-private';
+export { Snapshot } from '@ember-data/store/-private';
 
 // `ember-data-model-fragments` relies on `RootState` and `InternalModel`
 // `ember-data-model-fragments' and `ember-data-change-tracker` rely on `normalizeModelName`
diff --git a/packages/store/addon/-private/system/model/errors.js b/packages/model/addon/-private/errors.js
similarity index 98%
rename from packages/store/addon/-private/system/model/errors.js
rename to packages/model/addon/-private/errors.js
index 4fa216bdc62..1e11a3a757d 100644
--- a/packages/store/addon/-private/system/model/errors.js
+++ b/packages/model/addon/-private/errors.js
@@ -1,5 +1,5 @@
 import { mapBy, not } from '@ember/object/computed';
-import DeprecatedEvent from '../deprecated-evented';
+import { DeprecatedEvented } from '@ember-data/store/-private';
 import ArrayProxy from '@ember/array/proxy';
 import { get, computed } from '@ember/object';
 import { makeArray, A } from '@ember/array';
@@ -82,7 +82,7 @@ import { DEBUG } from '@glimmer/env';
   @extends Ember.ArrayProxy
   @uses Ember.Evented
  */
-export default ArrayProxy.extend(DeprecatedEvent, {
+export default ArrayProxy.extend(DeprecatedEvented, {
   /**
     Register with target handler
 
diff --git a/packages/model/addon/-private/index.ts b/packages/model/addon/-private/index.ts
index 161b31d72d5..b4a458de87d 100644
--- a/packages/model/addon/-private/index.ts
+++ b/packages/model/addon/-private/index.ts
@@ -2,3 +2,4 @@ export { default as attr } from './attr';
 export { default as belongsTo } from './belongs-to';
 export { default as hasMany } from './has-many';
 export { default as Model } from './model';
+export { default as Errors } from './errors';
diff --git a/packages/model/addon/-private/model.js b/packages/model/addon/-private/model.js
index 4b18dffc8da..8f98ebc26fa 100644
--- a/packages/model/addon/-private/model.js
+++ b/packages/model/addon/-private/model.js
@@ -9,7 +9,6 @@ import {
   coerceId,
   DeprecatedEvented,
   errorsArrayToHash,
-  Errors,
   InternalModel,
   PromiseObject,
   recordDataFor,
@@ -20,6 +19,7 @@ import {
   relationshipsDescriptor,
   RootState,
 } from '@ember-data/store/-private';
+import Errors from './errors';
 
 const { changeProperties } = Ember;
 
diff --git a/packages/store/addon/-private/index.ts b/packages/store/addon/-private/index.ts
index fa9d2d42b25..91243f2f036 100644
--- a/packages/store/addon/-private/index.ts
+++ b/packages/store/addon/-private/index.ts
@@ -2,8 +2,6 @@
   @module @ember-data/store
 */
 
-// // public
-export { default as Errors } from './system/model/errors';
 export { default as Store } from './system/ds-model-store';
 
 export { recordIdentifierFor } from './system/store/internal-model-factory';