diff --git a/addon/-private/system/model/errors.js b/addon/-private/system/model/errors.js
index a04ddde200a..f85f8895c3a 100644
--- a/addon/-private/system/model/errors.js
+++ b/addon/-private/system/model/errors.js
@@ -25,8 +25,8 @@ const MapWithDefault = Ember.MapWithDefault;
   import DS from 'ember-data';
 
   export default DS.Model.extend({
-    username: attr('string'),
-    email: attr('string')
+    username: DS.attr('string'),
+    email: DS.attr('string')
   });
   ```
   And you attempted to save a record that did not validate on the backend:
diff --git a/addon/-private/system/model/model.js b/addon/-private/system/model/model.js
index d066ba0620e..3c8f7087319 100644
--- a/addon/-private/system/model/model.js
+++ b/addon/-private/system/model/model.js
@@ -653,8 +653,8 @@ const Model = Ember.Object.extend(Ember.Evented, {
     import DS from 'ember-data';
 
     export default DS.Model.extend({
-      name: attr('string'),
-      isAdmin: attr('boolean', {
+      name: DS.attr('string'),
+      isAdmin: DS.attr('boolean', {
         defaultValue: false
       })
     });
@@ -1669,9 +1669,9 @@ Model.reopenClass({
    import DS from 'ember-data';
 
    export default DS.Model.extend({
-      firstName: attr('string'),
-      lastName: attr('string'),
-      birthday: attr('date')
+      firstName: DS.attr('string'),
+      lastName: DS.attr('string'),
+      birthday: DS.attr('date')
     });
    ```
 
@@ -1723,9 +1723,9 @@ Model.reopenClass({
    import DS from 'ember-data';
 
    export default DS.Model.extend({
-      firstName: attr(),
-      lastName: attr('string'),
-      birthday: attr('date')
+      firstName: DS.attr(),
+      lastName: DS.attr('string'),
+      birthday: DS.attr('date')
     });
    ```
 
@@ -1784,9 +1784,9 @@ Model.reopenClass({
    import DS from 'ember-data';
 
    let Person = DS.Model.extend({
-      firstName: attr('string'),
-      lastName: attr('string'),
-      birthday: attr('date')
+      firstName: DS.attr('string'),
+      lastName: DS.attr('string'),
+      birthday: DS.attr('date')
     });
 
    Person.eachAttribute(function(name, meta) {
@@ -1835,9 +1835,9 @@ Model.reopenClass({
    import DS from 'ember-data';
 
    let Person = DS.Model.extend({
-      firstName: attr(),
-      lastName: attr('string'),
-      birthday: attr('date')
+      firstName: DS.attr(),
+      lastName: DS.attr('string'),
+      birthday: DS.attr('date')
     });
 
    Person.eachTransformedAttribute(function(name, type) {
diff --git a/addon/attr.js b/addon/attr.js
index 9b5a094f422..2c232aac2f7 100644
--- a/addon/attr.js
+++ b/addon/attr.js
@@ -70,9 +70,9 @@ function getValue(record, key) {
   import DS from 'ember-data';
 
   export default DS.Model.extend({
-    username: attr('string'),
-    email: attr('string'),
-    settings: attr({
+    username: DS.attr('string'),
+    email: DS.attr('string'),
+    settings: DS.attr({
       defaultValue() {
         return {};
       }