diff --git a/tests/modules/inline_entity_form_test/inline_entity_form_test.module b/tests/modules/inline_entity_form_test/inline_entity_form_test.module
index 72fbafa..5261970 100644
--- a/tests/modules/inline_entity_form_test/inline_entity_form_test.module
+++ b/tests/modules/inline_entity_form_test/inline_entity_form_test.module
@@ -32,10 +32,10 @@ function inline_entity_form_test_install() {
       'locked' => 0,
     ),
     array(
-      'type' => 'ief_test_complex',
-      'name' => t('IEF test complex'),
+      'type' => 'ief_test_multiple',
+      'name' => t('IEF test multiple'),
       'base' => 'node_content',
-      'description' => t('Content type for IEF complex widget testing.'),
+      'description' => t('Content type for IEF multiple widget testing.'),
       'custom' => 1,
       'modified' => 1,
       'locked' => 0,
@@ -251,7 +251,7 @@ function inline_entity_form_test_install() {
   field_create_instance($instance);
 
   $instance = array(
-    'bundle' => 'ief_test_complex',
+    'bundle' => 'ief_test_multiple',
     'entity_type' => 'node',
     'field_name' => 'field_all_bundles',
     'label' => 'All bundles',
@@ -275,7 +275,7 @@ function inline_entity_form_test_install() {
   field_create_instance($instance);
 
   $instance = array(
-    'bundle' => 'ief_test_complex',
+    'bundle' => 'ief_test_multiple',
     'entity_type' => 'node',
     'field_name' => 'field_unrelatedimage',
     'label' => 'Image',
@@ -284,7 +284,7 @@ function inline_entity_form_test_install() {
   field_create_instance($instance);
 
   $instance = array(
-    'bundle' => 'ief_test_complex',
+    'bundle' => 'ief_test_multiple',
     'entity_type' => 'node',
     'field_name' => 'field_multiple_nodes',
     'label' => 'Multiple nodes',
diff --git a/tests/multiple_values_widget.test b/tests/multiple_values_widget.test
index 8df3823..c9456bf 100644
--- a/tests/multiple_values_widget.test
+++ b/tests/multiple_values_widget.test
@@ -44,9 +44,9 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
       'create ief_reference_type content',
       'edit any ief_reference_type content',
       'delete any ief_reference_type content',
-      'create ief_test_complex content',
-      'edit any ief_test_complex content',
-      'delete any ief_test_complex content',
+      'create ief_test_multiple content',
+      'edit any ief_test_multiple content',
+      'delete any ief_test_multiple content',
       'edit any ief_test_nested1 content',
       'edit any ief_test_nested2 content',
       'edit any ief_test_nested3 content',
@@ -56,7 +56,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     ));
     $this->drupalLogin($this->administrator_user);
 
-    $this->formContentAddUrl = 'node/add/ief-test-complex';
+    $this->formContentAddUrl = 'node/add/ief-test-multiple';
 
   }
 
@@ -153,7 +153,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $node = $this->drupalGetNodeByTitle('Some changed reference');
     $this->assertFalse($node, 'Referenced node was not saved during unrelated AJAX submit.');
 
-    // Create ief_test_complex node.
+    // Create ief_test_multiple node.
     $edit = array('title' => 'Some title');
     $this->drupalPost(NULL, $edit, t('Save'));
     $this->assertResponse(200, 'Saving parent entity was successful.');
@@ -165,7 +165,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $this->assertTrue($node->field_last_name[LANGUAGE_NONE][0]['value'] == 'Doe', 'Last name in reference node set to Doe');
 
     $parent_node = $this->drupalGetNodeByTitle('Some title');
-    $this->assertTrue($parent_node, 'Created ief_test_complex node ' . $parent_node->title);
+    $this->assertTrue($parent_node, 'Created ief_test_multiple node ' . $parent_node->title);
     $this->assertTrue($parent_node->field_multiple_nodes[LANGUAGE_NONE][0]['target_id'] == $node->nid, 'Refererence node id set to ' . $node->nid);
   }
 
@@ -180,7 +180,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
       TRUE,
     );
     foreach ($required_possibilities as $required) {
-      $this->setupNestedComplexForm($required);
+      $this->setupNestedMultipleForm($required);
 
 
       $nested3_title = 'nested3 title steps ' . ($required ? 'required' : 'not required');
@@ -267,7 +267,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     );
 
     foreach ($required_possibilities as $required) {
-      $this->setupNestedComplexForm($required);
+      $this->setupNestedMultipleForm($required);
 
       $nested3_title = 'nested3 title single ' . ($required ? 'required' : 'not required');
       $nested2_title = 'nested2 title single ' . ($required ? 'required' : 'not required');
@@ -306,7 +306,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
       $field_multiple_nodes[LANGUAGE_NONE][] = array('target_id' => $nid);
     }
     $this->drupalCreateNode(array(
-      'type' => 'ief_test_complex',
+      'type' => 'ief_test_multiple',
       'title' => 'Some title',
       'field_multiple_nodes' => $field_multiple_nodes,
     ));
@@ -327,7 +327,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $this->drupalPostAjax(NULL, $edit, $this->getButtonName('//input[@type="submit" and @id="edit-field-multiple-nodes-und-entities-1-form-actions-ief-edit-save"]'));
     $this->assertResponse(200, 'Saving inline edit form was successful.');
 
-    // Save the ief_test_complex node.
+    // Save the ief_test_multiple node.
     $this->drupalPost(NULL, array(), t('Save'));
     $this->assertResponse(200, 'Saving parent entity was successful.');
 
@@ -349,7 +349,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $this->assertResponse(200, 'Removing inline entity was successful.');
     $this->assertNoText($title, 'Deleted inline entity is not present on the page.');
 
-    // Save the ief_test_complex node.
+    // Save the ief_test_multiple node.
     $this->drupalPost(NULL, array(), t('Save'));
     $this->assertResponse(200, 'Saving parent node was successful.');
 
@@ -373,7 +373,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $this->drupalPostAjax(NULL, array(), $this->getButtonName('//input[@type="submit" and @id="edit-field-multiple-nodes-und-entities-1-form-actions-ief-remove-confirm"]'));
     $this->assertResponse(200, 'Removing inline entity was successful.');
 
-    // Save the ief_test_complex node.
+    // Save the ief_test_multiple node.
     $this->drupalPost(NULL, array(), t('Save'));
     $this->assertResponse(200, 'Saving parent node was successful.');
 
@@ -399,10 +399,10 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     // Create a node for every bundle available.
     $bundle_nodes = $this->createNodeForEveryBundle();
 
-    // Create ief_test_complex node with first ief_reference_type node and first
+    // Create ief_test_multiple node with first ief_reference_type node and first
     // node from bundle nodes.
     $this->drupalCreateNode(array(
-      'type' => 'ief_test_complex',
+      'type' => 'ief_test_multiple',
       'title' => 'Some title',
       'multi' => array(1),
       'all_bundles' => key($bundle_nodes),
@@ -469,7 +469,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
 
     // Create first referencing node.
     $this->drupalCreateNode(array(
-      'type' => 'ief_test_complex',
+      'type' => 'ief_test_multiple',
       'title' => 'First referencing node',
       'field_multiple_nodes' => $field_multiple_nodes,
     ));
@@ -477,7 +477,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
 
     // Create second referencing node.
     $this->drupalCreateNode(array(
-      'type' => 'ief_test_complex',
+      'type' => 'ief_test_multiple',
       'title' => 'Second referencing node',
       'field_multiple_nodes' => $field_multiple_nodes,
     ));
@@ -552,8 +552,8 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
     $edit = array(
       'instance[widget][settings][type_settings][allow_existing]' => $flag,
     );
-    $this->drupalPost('admin/structure/types/manage/ief-test-complex/fields/field_multiple_nodes', $edit, t('Save settings'));
-    $this->drupalGet('admin/structure/types/manage/ief-test-complex/fields/field_multiple_nodes');
+    $this->drupalPost('admin/structure/types/manage/ief-test-multiple/fields/field_multiple_nodes', $edit, t('Save settings'));
+    $this->drupalGet('admin/structure/types/manage/ief-test-multiple/fields/field_multiple_nodes');
   }
 
   /**
@@ -588,7 +588,7 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
    *   empty array (default) to use the all the permissions necessary create and
    *   edit nodes on the form.
    */
-  protected function setupNestedComplexForm($required, $permissions = array()) {
+  protected function setupNestedMultipleForm($required, $permissions = array()) {
 
     $this->drupalLogin($this->administrator_user);
     $edit = array(
@@ -667,38 +667,38 @@ class MultipleValuesWidgetTest extends InlineEntityFormTestBase {
       'create ief_test_nested1 content',
       'create ief_test_nested2 content',
     );
-    $this->setupNestedComplexForm(TRUE, $permissions);
+    $this->setupNestedMultipleForm(TRUE, $permissions);
     $this->assertFieldByName('title');
     $this->assertFieldByName('field_test_ref_nested1[und][form][title]');
     $this->assertNoFieldByName('field_test_ref_nested1[und][form][field_test_ref_nested2][und][form][title]', NULL);
 
-    $this->setupNestedComplexForm(FALSE, $permissions);
+    $this->setupNestedMultipleForm(FALSE, $permissions);
     $this->assertNoFieldByXPath('//input[@type="submit" and @value="Create node 3"]');
   }
 
   /**
-   * Tests create access on IEF Complex content type.
+   * Tests create access on IEF Multiple content type.
    */
-  public function testComplexEntityCreate() {
+  public function testMultipleEntityCreate() {
     $user = $this->drupalCreateUser(array(
-      'create ief_test_complex content',
+      'create ief_test_multiple content',
     ));
     $this->drupalLogin($user);
 
-    $this->drupalGet('node/add/ief-test-complex');
+    $this->drupalGet('node/add/ief-test-multiple');
     $this->assertNoFieldByName('field_all_bundles[und][actions][bundle]', NULL, 'Bundle select is not shown when only one bundle is available.');
     $this->assertNoFieldByName('field_multiple_nodes[und][form][title]', NULL);
 
     $user = $this->drupalCreateUser(array(
-      'create ief_test_complex content',
+      'create ief_test_multiple content',
       'create ief_reference_type content'
     ));
     $this->drupalLogin($user);
 
-    $this->drupalGet('node/add/ief-test-complex');
+    $this->drupalGet('node/add/ief-test-multiple');
     $this->assertFieldByName('field_all_bundles[und][actions][bundle]', NULL, 'Bundle select is shown when more than one bundle is available.');
     $this->assertTrue((bool) $this->xpath('//select[@id="edit-field-all-bundles-und-actions-bundle"]//option[@value="ief_reference_type"]'), 'IEF Reference type is available');
-    $this->assertTrue((bool) $this->xpath('//select[@id="edit-field-all-bundles-und-actions-bundle"]//option[@value="ief_test_complex"]'), 'IEF test complex is available');
+    $this->assertTrue((bool) $this->xpath('//select[@id="edit-field-all-bundles-und-actions-bundle"]//option[@value="ief_test_multiple"]'), 'IEF test multiple is available');
     $this->assertFieldByName('field_multiple_nodes[und][form][title]');
   }