diff --git a/blueprints/adapter/index.js b/blueprints/adapter/index.js
index f277c3111a6..64dbb294461 100644
--- a/blueprints/adapter/index.js
+++ b/blueprints/adapter/index.js
@@ -13,7 +13,7 @@ module.exports = {
 
   locals: function(options) {
     var adapterName     = options.entity.name;
-    var baseClass       = 'DS.RESTAdapter';
+    var baseClass       = 'DS.JSONAPIAdapter';
     var importStatement = 'import DS from \'ember-data\';';
     var isAddon         = options.inRepoAddon || options.project.isEmberCLIAddon();
     var relativePath    = pathUtil.getRelativePath(options.entity.name);
diff --git a/blueprints/serializer/files/__root__/__path__/__name__.js b/blueprints/serializer/files/__root__/__path__/__name__.js
index d698ab7a750..74689dcb59a 100644
--- a/blueprints/serializer/files/__root__/__path__/__name__.js
+++ b/blueprints/serializer/files/__root__/__path__/__name__.js
@@ -1,4 +1,4 @@
 import DS from 'ember-data';
 
-export default DS.RESTSerializer.extend({
+export default DS.JSONAPISerializer.extend({
 });
diff --git a/node-tests/blueprints/serializer-test.js b/node-tests/blueprints/serializer-test.js
index cdea2670704..a3d8cd199c1 100644
--- a/node-tests/blueprints/serializer-test.js
+++ b/node-tests/blueprints/serializer-test.js
@@ -12,7 +12,7 @@ describe('Acceptance: generate and destroy serializer blueprints', function() {
           file: 'app/serializers/foo.js',
           contains: [
             'import DS from \'ember-data\';',
-            'export default DS.RESTSerializer.extend('
+            'export default DS.JSONAPISerializer.extend('
           ]
         },
         {