Updated naming conventions to latest ember-data.