Update with normalize

I've done it considering [@bmac comment](https://github.com/emberjs/data/pull/2096#issuecomment-49619854)
Done, see below