diff --git a/test/spec/features/modeling/behavior/CreateDataObjectBehavior.create-data-association.bpmn b/test/spec/features/modeling/behavior/DataObjectBehavior.create-data-association.bpmn
similarity index 100%
rename from test/spec/features/modeling/behavior/CreateDataObjectBehavior.create-data-association.bpmn
rename to test/spec/features/modeling/behavior/DataObjectBehavior.create-data-association.bpmn
diff --git a/test/spec/features/modeling/behavior/CreateDataObjectBehavior.data-object-reference.bpmn b/test/spec/features/modeling/behavior/DataObjectBehavior.data-object-reference.bpmn
similarity index 100%
rename from test/spec/features/modeling/behavior/CreateDataObjectBehavior.data-object-reference.bpmn
rename to test/spec/features/modeling/behavior/DataObjectBehavior.data-object-reference.bpmn
diff --git a/test/spec/features/modeling/behavior/CreateDataObjectBehavior.remove-data-association.bpmn b/test/spec/features/modeling/behavior/DataObjectBehavior.remove-data-association.bpmn
similarity index 100%
rename from test/spec/features/modeling/behavior/CreateDataObjectBehavior.remove-data-association.bpmn
rename to test/spec/features/modeling/behavior/DataObjectBehavior.remove-data-association.bpmn
diff --git a/test/spec/features/modeling/behavior/CreateDataObjectBehaviorSpec.js b/test/spec/features/modeling/behavior/DataObjectBehaviorSpec.js
similarity index 95%
rename from test/spec/features/modeling/behavior/CreateDataObjectBehaviorSpec.js
rename to test/spec/features/modeling/behavior/DataObjectBehaviorSpec.js
index b3c87cd9..dee427b5 100644
--- a/test/spec/features/modeling/behavior/CreateDataObjectBehaviorSpec.js
+++ b/test/spec/features/modeling/behavior/DataObjectBehaviorSpec.js
@@ -9,7 +9,7 @@ var modelingModule = require('../../../../../lib/features/modeling'),
     coreModule = require('../../../../../lib/core');
 
 
-describe('features/modeling/behavior - data objects -', function() {
+describe('features/modeling/behavior - data object', function() {
 
   var testModules = [ coreModule, modelingModule ];
 
@@ -18,7 +18,7 @@ describe('features/modeling/behavior - data objects -', function() {
 
   describe('DataObjectReference', function() {
 
-    var processDiagramXML = require('./CreateDataObjectBehavior.data-object-reference.bpmn');
+    var processDiagramXML = require('./DataObjectBehavior.data-object-reference.bpmn');
 
     beforeEach(bootstrapModeler(processDiagramXML, { modules: testModules }));
 
@@ -45,6 +45,9 @@ describe('features/modeling/behavior - data objects -', function() {
     }));
 
 
+    it('should create the corresponding DataObject / undo');
+
+
     it('should have the right parents', inject(function(modeling) {
 
       // when
@@ -69,7 +72,7 @@ describe('features/modeling/behavior - data objects -', function() {
 
   describe('create', function() {
 
-    var processDiagramXML = require('./CreateDataObjectBehavior.create-data-association.bpmn');
+    var processDiagramXML = require('./DataObjectBehavior.create-data-association.bpmn');
 
     beforeEach(bootstrapModeler(processDiagramXML, { modules: testModules }));
 
@@ -128,6 +131,7 @@ describe('features/modeling/behavior - data objects -', function() {
 
     });
 
+
     describe('dataInputAssociation', function() {
 
       it('should execute', inject(function(modeling) {
@@ -178,7 +182,7 @@ describe('features/modeling/behavior - data objects -', function() {
 
   describe('remove', function() {
 
-    var processDiagramXML = require('./CreateDataObjectBehavior.remove-data-association.bpmn');
+    var processDiagramXML = require('./DataObjectBehavior.remove-data-association.bpmn');
 
     beforeEach(bootstrapModeler(processDiagramXML, { modules: testModules }));