diff --git a/packages/ember-data/lib/system/model/states.js b/packages/ember-data/lib/system/model/states.js
diff --git a/packages/ember-data/tests/integration/record_persistence_test.js b/packages/ember-data/tests/integration/record_persistence_test.js
@@ -329,8 +329,8 @@ test("An error is raised when attempting to set a property while a record is bei
     tom.set('name', "Tommy Bahama");
   } catch(e) {
     var expectedMessage = "Attempted to handle event `willSetProperty` on <Person:" + Ember.guidFor(tom) + ":1> ";
-    expectedMessage +=    "while in state rootState.loaded.updated.inFlight. Called with ";
-    expectedMessage +=    "{reference: [object Object], store: <DS.Store:" + Ember.guidFor(store) + ">, name: name}";
+    expectedMessage +=    "while in state root.loaded.updated.inFlight. Called with ";
+    expectedMessage +=    "{reference: [object Object], store: <DS.Store:" + Ember.guidFor(store) + ">, name: name}.";
     equal(e.message, expectedMessage);
   }
   finishSaving();

diff --git a/packages/ember-data/tests/unit/model_test.js b/packages/ember-data/tests/unit/model_test.js
@@ -371,17 +371,17 @@ test("ensure model exits loading state, materializes data and fulfills promise o
 
   var person = store.find(Person, 1);
 
-  equal(get(person, 'stateManager.currentState.path'), 'rootState.loading', 'model is in loading state');
+  equal(get(person, 'currentState.stateName'), 'root.loading', 'model is in loading state');
   equal(get(person, 'isLoaded'), false, 'model is not loaded');
   equal(get(person, '_deferred.promise.isFulfilled'), undefined, 'model is not fulfilled');
 
   get(person, 'name'); //trigger data setup
 
-  equal(get(person, 'stateManager.currentState.path'), 'rootState.loading', 'model is still in loading state');
+  equal(get(person, 'currentState.stateName'), 'root.loading', 'model is still in loading state');
 
   store.load(Person, { id: 1, name: "John", isDrugAddict: false });
 
-  equal(get(person, 'stateManager.currentState.path'), 'rootState.loaded.saved', 'model is in loaded state');
+  equal(get(person, 'currentState.stateName'), 'root.loaded.saved', 'model is in loaded state');
   equal(get(person, 'isLoaded'), true, 'model is loaded');
   equal(get(person, '_deferred.promise.isFulfilled'), true, 'model is fulfilled');
 });
diff --git a/packages/ember-data/tests/unit/rest_adapter_test.js b/packages/ember-data/tests/unit/rest_adapter_test.js
@@ -9,9 +9,9 @@ manyArrayFlags = ['isLoaded'];
 
 // Used for testing the adapter state path on a single entity
 function stateEquals(entity, expectedState) {
-  var actualState = get(entity, 'stateManager.currentPath');
+  var actualState = get(entity, 'currentState.stateName');
 
-  actualState = actualState && actualState.replace(/^rootState\./,'');
+  actualState = actualState && actualState.replace(/^root\./,'');
   equal(actualState, expectedState, 'Expected state should have been: ' + expectedState+ ' but was: ' +  actualState + ' on: ' + entity);
 }
 

diff --git a/packages/ember-data/tests/unit/store_test.js b/packages/ember-data/tests/unit/store_test.js
@@ -45,18 +45,16 @@ var stateManager, stateName;
 
 module("DS.StateManager", {
   setup: function() {
-    stateManager = DS.StateManager.create();
+    stateManager = DS.RootState;
   }
 });
 
 var isTrue = function(flag) {
-  var state = stateName.split('.').join('.states.');
-  equal(get(stateManager, 'states.rootState.states.'+ state + "." + flag), true, stateName + "." + flag + " should be true");
+  equal(get(stateManager, stateName + "." + flag), true, stateName + "." + flag + " should be true");
 };
 
 var isFalse = function(flag) {
-  var state = stateName.split('.').join('.states.');
-  equal(get(stateManager, 'states.rootState.states.'+ state + "." + flag), false, stateName + "." + flag + " should be false");
+  equal(get(stateManager, stateName + "." + flag), false, stateName + "." + flag + " should be false");
 };
 
 test("the empty state", function() {