diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
index 7c8ea7e1c2e..ddfa4697584 100644
--- a/packages/ember-data/lib/system/store.js
+++ b/packages/ember-data/lib/system/store.js
@@ -9,7 +9,6 @@ import {
   InvalidError,
   Adapter
 } from "ember-data/system/adapter";
-import { singularize } from "ember-inflector/system/string";
 import {
   Map
 } from "ember-data/system/map";
@@ -97,8 +96,6 @@ var Promise = Ember.RSVP.Promise;
 var copy = Ember.copy;
 var Store;
 
-var camelize = Ember.String.camelize;
-
 // Implementors Note:
 //
 //   The variables in this file are consistently named according to the following
@@ -1850,7 +1847,11 @@ Store = Ember.Object.extend({
     @return {String} if the adapter can generate one, an ID
   */
   _normalizeTypeKey: function(key) {
-    return camelize(singularize(key));
+    // Delegate to the container for normalization. The container
+    // requires a ':' to normalize so we add `model:` then slice off
+    // the first 6 characters to remove the `model:` in the return
+    // value
+    return this.container.normalize('model:' + key).slice(6);
   }
 });
 
diff --git a/packages/ember-data/tests/integration/adapter/rest_adapter_test.js b/packages/ember-data/tests/integration/adapter/rest_adapter_test.js
index 420db4308c4..b2864992ac2 100644
--- a/packages/ember-data/tests/integration/adapter/rest_adapter_test.js
+++ b/packages/ember-data/tests/integration/adapter/rest_adapter_test.js
@@ -1,4 +1,4 @@
-var env, store, adapter, Post, Comment, SuperUser;
+var env, store, adapter, Post, Comment, SuperUser, EmberCliUser;
 var passedUrl, passedVerb, passedHash;
 var run = Ember.run;
 
@@ -16,12 +16,17 @@ module("integration/adapter/rest_adapter - REST Adapter", {
       name: DS.attr("string")
     });
 
+    EmberCliUser = DS.Model.extend({
+      name: DS.attr("string")
+    });
+
     SuperUser = DS.Model.extend();
 
     env = setupStore({
       post: Post,
       comment: Comment,
       superUser: SuperUser,
+      'ember-cli-user': EmberCliUser,
       adapter: DS.RESTAdapter
     });
 
@@ -169,6 +174,22 @@ test("create - an empty payload is a basic success if an id was specified", func
   });
 });
 
+test("create dasherized model name is a basic success", function() {
+  ajaxResponse();
+  var emberCliUser;
+
+  run(function() {
+    emberCliUser = store.createRecord('ember-cli-user', { name: "The Parley Letter" });
+    emberCliUser.save().then(async(function(post) {
+      equal(passedUrl, "/emberCliUsers");
+      equal(passedVerb, "POST");
+
+      equal(post.get('isDirty'), false, "the ember-cli-user isn't dirty anymore");
+      equal(post.get('name'), "The Parley Letter", "the ember-cli-user was updated");
+    }));
+  });
+});
+
 test("create - a payload with a new ID and data applies the updates", function() {
   ajaxResponse({ posts: [{ id: "1", name: "Dat Parley Letter" }] });
   run(function() {
diff --git a/packages/ember-data/tests/integration/serializers/rest_serializer_test.js b/packages/ember-data/tests/integration/serializers/rest_serializer_test.js
index ed3b5ec8013..a9b0fbd6acf 100644
--- a/packages/ember-data/tests/integration/serializers/rest_serializer_test.js
+++ b/packages/ember-data/tests/integration/serializers/rest_serializer_test.js
@@ -284,19 +284,6 @@ test("serialize polymorphicType", function() {
   });
 });
 
-test("serialize polymorphicType with decamelized typeKey", function() {
-  YellowMinion.typeKey = 'yellow-minion';
-  var tom, ray;
-  run(function() {
-    tom = env.store.createRecord(YellowMinion, { name: "Alex", id: "124" });
-    ray = env.store.createRecord(DoomsdayDevice, { evilMinion: tom, name: "DeathRay" });
-  });
-
-  var json = env.restSerializer.serialize(ray._createSnapshot());
-
-  deepEqual(json["evilMinionType"], "yellowMinion");
-});
-
 test("normalizePayload is called during extractSingle", function() {
   env.registry.register('serializer:application', DS.RESTSerializer.extend({
     normalizePayload: function(payload) {
diff --git a/packages/ember-data/tests/unit/store/create_record_test.js b/packages/ember-data/tests/unit/store/create_record_test.js
index 0141f561e73..e54895a8fa5 100644
--- a/packages/ember-data/tests/unit/store/create_record_test.js
+++ b/packages/ember-data/tests/unit/store/create_record_test.js
@@ -42,7 +42,7 @@ test("creating a record by camel-case string finds the model", function() {
   });
 
   equal(record.get('foo'), attributes.foo, "The record is created");
-  equal(store.modelFor('someThing').typeKey, 'someThing');
+  equal(store.modelFor('someThing').typeKey, 'some-thing');
 });
 
 test("creating a record by dasherize string finds the model", function() {
@@ -54,7 +54,7 @@ test("creating a record by dasherize string finds the model", function() {
   });
 
   equal(record.get('foo'), attributes.foo, "The record is created");
-  equal(store.modelFor('some-thing').typeKey, 'someThing');
+  equal(store.modelFor('some-thing').typeKey, 'some-thing');
 });
 
 module("unit/store/createRecord - Store with models by camelCase", {
diff --git a/packages/ember-data/tests/unit/store/model_for_test.js b/packages/ember-data/tests/unit/store/model_for_test.js
index c6af8ded27b..1f982340561 100644
--- a/packages/ember-data/tests/unit/store/model_for_test.js
+++ b/packages/ember-data/tests/unit/store/model_for_test.js
@@ -1,16 +1,22 @@
 var container, store;
 
 var camelize  = Ember.String.camelize;
-var dasherize = Ember.String.dasherize;
+var capitalize = Ember.String.capitalize;
 
 var run = Ember.run;
 var env;
 
+function containerNormalize(string) {
+  return container.normalize('model:'+string).slice(6);
+}
+
 module("unit/store/model_for - DS.Store#modelFor", {
   setup: function() {
     env = setupStore({
-      blogPost: DS.Model.extend(),
-      "blog-post": DS.Model.extend()
+      "blog.post": DS.Model.extend(),
+      "blog_post": DS.Model.extend(),
+      "blogPost": DS.Model.extend(),
+      "BlogPost": DS.Model.extend()
     });
     store = env.store;
     container = store.container;
@@ -24,25 +30,37 @@ module("unit/store/model_for - DS.Store#modelFor", {
   }
 });
 
+// In this test, the normalizer is nothing at all. This is the default for
+// containers, most notably in unit tests. Note that the Ember application
+// container *does* have normalization logic, and that is tested in the next
+// test.
 test("when fetching factory from string, sets a normalized key as typeKey", function() {
-  env.replaceContainerNormalize(camelize);
-
-  equal(container.normalize('some.post'), 'somePost', 'precond - container camelizes');
-  equal(store.modelFor("blog.post").typeKey, "blogPost", "typeKey is normalized to camelCase");
+  equal(containerNormalize('some.post'), 'some.post', 'precond - container does nothing to dots');
+  equal(store.modelFor("blog.post").typeKey, "blog.post", "typeKey is normalized");
+  equal(store.modelFor("blog_post").typeKey, "blog_post", "typeKey is normalized");
+  equal(store.modelFor("blogPost").typeKey, "blogPost", "typeKey is normalized");
 });
 
-test("when fetching factory from string and dashing normalizer, sets a normalized key as typeKey", function() {
+// Test a container similar to the Ember application container- one with
+// normalization.
+test("when fetching factory from string and non-default normalizer, sets a normalized key as typeKey", function() {
   env.replaceContainerNormalize(function(fullName) {
-    return dasherize(camelize(fullName));
+    return 'model:'+capitalize(camelize(fullName.slice(6)));
   });
 
-  equal(container.normalize('some.post'), 'some-post', 'precond - container dasherizes');
-  equal(store.modelFor("blog.post").typeKey, "blogPost", "typeKey is normalized to camelCase");
+  equal(containerNormalize('some.post'), 'SomePost', 'precond - container titlizes');
+  equal(store.modelFor("blog.post").typeKey, "BlogPost", "typeKey is normalized");
+  equal(store.modelFor("blog_post").typeKey, "BlogPost", "typeKey is normalized");
+  equal(store.modelFor("blog-post").typeKey, "BlogPost", "typeKey is normalized");
 });
 
 test("when returning passed factory, sets a normalized key as typeKey", function() {
+  env.replaceContainerNormalize(function(fullName) {
+    return 'model:'+capitalize(camelize(fullName.slice(6)));
+  });
+
   var factory = { typeKey: 'some-thing' };
-  equal(store.modelFor(factory).typeKey, "someThing", "typeKey is normalized to camelCase");
+  equal(store.modelFor(factory).typeKey, "SomeThing", "typeKey is normalized");
 });
 
 test("when returning passed factory without typeKey, allows it", function() {