diff --git a/README.md b/README.md
index 99af213e..32ea8314 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ An EmberJS validation framework that is completely and utterly computed property
 - Support for Ember Data Models, Objects, Components, Services, etc.
 - Support for nested models and objects
 - Synchronous and asynchronous support
-- Easily integrated with Ember Data's [DS.Errors](http://emberjs.com/api/data/classes/DS.Errors.html)
+- Easily integrated with Ember Data
 - No observers. Seriously... there are none. Like absolutely zero....
 - Custom validators
 - I18n support
diff --git a/addon/index.js b/addon/index.js
index 2a71417e..47ba42cd 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -60,7 +60,7 @@ import Validator from './validations/validator';
  * ```javascript
  * // models/user.js
  *
- * export default DS.Model.extend(Validations, {
+ * export default Model.extend(Validations, {
  *   'username': attr('string'),
  *   'password': attr('string'),
  *   'email': attr('string')
diff --git a/addon/validators/base.js b/addon/validators/base.js
index 199ee1dd..33ce0a38 100644
--- a/addon/validators/base.js
+++ b/addon/validators/base.js
@@ -430,8 +430,8 @@ export default Base;
  *   }),
  * });
  *
- * export default DS.Model.extend(Validations, {
- *   'username': DS.attr('string'),
+ * export default Model.extend(Validations, {
+ *   'username': attr('string'),
  * });
  * ```
  *
diff --git a/addon/validators/belongs-to.js b/addon/validators/belongs-to.js
index 96e25336..a013f75d 100755
--- a/addon/validators/belongs-to.js
+++ b/addon/validators/belongs-to.js
@@ -18,8 +18,8 @@ import { isPromise } from 'ember-cp-validations/utils/utils';
  *    details: validator('belongs-to')
  *  });
  *
- *  export default DS.Model.extend(Validations, {
- *    'details': DS.belongsTo('user-detail')
+ *  export default Model.extend(Validations, {
+ *    'details': belongsTo('user-detail')
  *  });
  *  ```
  *
@@ -31,7 +31,7 @@ import { isPromise } from 'ember-cp-validations/utils/utils';
  *    lastName: validator('presence', true)
  *  });
  *
- *  export default DS.Model.extend(Validations, {
+ *  export default Model.extend(Validations, {
  *    "firstName": attr('string'),
  *    "lastName": attr('string'),
  *  });
diff --git a/addon/validators/ds-error.js b/addon/validators/ds-error.js
index f4dc673e..ae08f6d9 100755
--- a/addon/validators/ds-error.js
+++ b/addon/validators/ds-error.js
@@ -4,7 +4,7 @@ import { getPathAndKey } from 'ember-validators/ds-error';
 /**
  *  <i class="fa fa-hand-o-right" aria-hidden="true"></i> [See All Options](#method_validate)
  *
- *  Creates a link between this library and Ember-Data's [DS.Errors](http://emberjs.com/api/data/classes/DS.Errors.html)
+ *  Creates a link between this library and Ember-Data
  *  to fetch the latest message for the given attribute.
  *
  *  ## Examples
diff --git a/addon/validators/has-many.js b/addon/validators/has-many.js
index 53a3a577..c2c6386a 100755
--- a/addon/validators/has-many.js
+++ b/addon/validators/has-many.js
@@ -18,8 +18,8 @@ import { isPromise } from 'ember-cp-validations/utils/utils';
  *    friends: validator('has-many')
  *  });
  *
- *  export default DS.Model.extend(Validations, {
- *    friends: DS.hasMany('user')
+ *  export default Model.extend(Validations, {
+ *    friends: hasMany('user')
  *  });
  *  ```
  *
diff --git a/tests/unit/validations/ds-model-test.js b/tests/unit/validations/ds-model-test.js
index 6fcc6201..8d8c3cdd 100644
--- a/tests/unit/validations/ds-model-test.js
+++ b/tests/unit/validations/ds-model-test.js
@@ -2,7 +2,7 @@ import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Validations | DS.Model', function (hooks) {
+module('Unit | Validations | Model', function (hooks) {
   setupTest(hooks);
 
   test('create model with defaults', function (assert) {