diff --git a/config/install/core.entity_form_display.paragraph.paragraphs_container.default.yml b/config/install/core.entity_form_display.paragraph.container.default.yml
similarity index 73%
rename from config/install/core.entity_form_display.paragraph.paragraphs_container.default.yml
rename to config/install/core.entity_form_display.paragraph.container.default.yml
index 3d58845..68eaf22 100644
--- a/config/install/core.entity_form_display.paragraph.paragraphs_container.default.yml
+++ b/config/install/core.entity_form_display.paragraph.container.default.yml
@@ -2,8 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs
-    - paragraphs.paragraphs_type.paragraphs_container
+    - field.field.paragraph.container.paragraphs_container_paragraphs
+    - paragraphs.paragraphs_type.container
     - image.style.thumbnail
   module:
     - image
@@ -11,9 +11,9 @@ dependencies:
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.paragraphs_container.default
+id: paragraph.container.default
 targetEntityType: paragraph
-bundle: paragraphs_container
+bundle: container
 mode: default
 content:
   paragraphs_container_paragraphs:
diff --git a/config/install/core.entity_form_display.paragraph.footer.default.yml b/config/install/core.entity_form_display.paragraph.footer.default.yml
index 8f41ba7..3d3da76 100644
--- a/config/install/core.entity_form_display.paragraph.footer.default.yml
+++ b/config/install/core.entity_form_display.paragraph.footer.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.footer.paragraphs_footer
+    - field.field.paragraph.footer.paragraphs_text
     - paragraphs.paragraphs_type.footer
   module:
     - text
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: footer
 mode: default
 content:
-  paragraphs_footer:
+  paragraphs_text:
     weight: 1
     settings:
       rows: 3
diff --git a/config/install/core.entity_form_display.paragraph.intro.default.yml b/config/install/core.entity_form_display.paragraph.intro.default.yml
index 2d08b84..25c04c3 100644
--- a/config/install/core.entity_form_display.paragraph.intro.default.yml
+++ b/config/install/core.entity_form_display.paragraph.intro.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.intro.paragraphs_intro
+    - field.field.paragraph.intro.paragraphs_text
     - paragraphs.paragraphs_type.intro
   module:
     - text
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: intro
 mode: default
 content:
-  paragraphs_intro:
+  paragraphs_text:
     weight: 1
     settings:
       rows: 3
diff --git a/config/install/core.entity_form_display.paragraph.link.default.yml b/config/install/core.entity_form_display.paragraph.link.default.yml
index 415eb6d..f835850 100644
--- a/config/install/core.entity_form_display.paragraph.link.default.yml
+++ b/config/install/core.entity_form_display.paragraph.link.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.link.field_link
+    - field.field.paragraph.link.paragraphs_link
     - paragraphs.paragraphs_type.link
   module:
     - link
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: link
 mode: default
 content:
-  field_link:
+  paragraphs_link:
     weight: 0
     settings:
       placeholder_url: ''
diff --git a/config/install/core.entity_view_display.paragraph.paragraphs_container.default.yml b/config/install/core.entity_view_display.paragraph.container.default.yml
similarity index 68%
rename from config/install/core.entity_view_display.paragraph.paragraphs_container.default.yml
rename to config/install/core.entity_view_display.paragraph.container.default.yml
index f77144e..71be1e2 100644
--- a/config/install/core.entity_view_display.paragraph.paragraphs_container.default.yml
+++ b/config/install/core.entity_view_display.paragraph.container.default.yml
@@ -2,17 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs
-    - paragraphs.paragraphs_type.paragraphs_container
+    - field.field.paragraph.container.paragraphs_container_paragraphs
+    - paragraphs.paragraphs_type.container
   module:
     - entity_reference_revisions
     - image
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.paragraphs_container.default
+id: paragraph.container.default
 targetEntityType: paragraph
-bundle: paragraphs_container
+bundle: container
 mode: default
 content:
   paragraphs_container_paragraphs:
diff --git a/config/install/core.entity_view_display.paragraph.footer.default.yml b/config/install/core.entity_view_display.paragraph.footer.default.yml
index cd43bb7..515ddcd 100644
--- a/config/install/core.entity_view_display.paragraph.footer.default.yml
+++ b/config/install/core.entity_view_display.paragraph.footer.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.footer.paragraphs_footer
+    - field.field.paragraph.footer.paragraphs_text
     - paragraphs.paragraphs_type.footer
   module:
     - text
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: footer
 mode: default
 content:
-  paragraphs_footer:
+  paragraphs_text:
     weight: 0
     label: hidden
     settings: {  }
diff --git a/config/install/core.entity_view_display.paragraph.intro.default.yml b/config/install/core.entity_view_display.paragraph.intro.default.yml
index af9ba21..6851ea5 100644
--- a/config/install/core.entity_view_display.paragraph.intro.default.yml
+++ b/config/install/core.entity_view_display.paragraph.intro.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.intro.paragraphs_intro
+    - field.field.paragraph.intro.paragraphs_text
     - paragraphs.paragraphs_type.intro
   module:
     - text
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: intro
 mode: default
 content:
-  paragraphs_intro:
+  paragraphs_text:
     weight: 0
     label: hidden
     settings: {  }
diff --git a/config/install/core.entity_view_display.paragraph.link.default.yml b/config/install/core.entity_view_display.paragraph.link.default.yml
index 8d965ac..4c456da 100644
--- a/config/install/core.entity_view_display.paragraph.link.default.yml
+++ b/config/install/core.entity_view_display.paragraph.link.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.link.field_link
+    - field.field.paragraph.link.paragraphs_link
     - paragraphs.paragraphs_type.link
   module:
     - link
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: link
 mode: default
 content:
-  field_link:
+  paragraphs_link:
     weight: 0
     label: hidden
     settings:
diff --git a/config/install/field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs.yml b/config/install/field.field.paragraph.container.paragraphs_container_paragraphs.yml
similarity index 78%
rename from config/install/field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs.yml
rename to config/install/field.field.paragraph.container.paragraphs_container_paragraphs.yml
index ef1ea91..acf99c3 100644
--- a/config/install/field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs.yml
+++ b/config/install/field.field.paragraph.container.paragraphs_container_paragraphs.yml
@@ -3,16 +3,16 @@ status: true
 dependencies:
   config:
     - field.storage.paragraph.paragraphs_container_paragraphs
-    - paragraphs.paragraphs_type.paragraphs_container
+    - paragraphs.paragraphs_type.container
   module:
     - entity_reference_revisions
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.paragraphs_container.paragraphs_container_paragraphs
+id: paragraph.container.paragraphs_container_paragraphs
 field_name: paragraphs_container_paragraphs
 entity_type: paragraph
-bundle: paragraphs_container
+bundle: container
 label: 'Paragraphs'
 description: ''
 required: false
diff --git a/config/install/field.field.paragraph.footer.paragraphs_footer.yml b/config/install/field.field.paragraph.footer.paragraphs_text.yml
similarity index 75%
rename from config/install/field.field.paragraph.footer.paragraphs_footer.yml
rename to config/install/field.field.paragraph.footer.paragraphs_text.yml
index 818e0c4..df3591b 100644
--- a/config/install/field.field.paragraph.footer.paragraphs_footer.yml
+++ b/config/install/field.field.paragraph.footer.paragraphs_text.yml
@@ -2,15 +2,15 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.paragraph.paragraphs_footer
+    - field.storage.paragraph.paragraphs_text
     - paragraphs.paragraphs_type.footer
   module:
     - text
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.footer.paragraphs_footer
-field_name: paragraphs_footer
+id: paragraph.footer.paragraphs_text
+field_name: paragraphs_text
 entity_type: paragraph
 bundle: footer
 label: Footer
diff --git a/config/install/field.field.paragraph.intro.paragraphs_intro.yml b/config/install/field.field.paragraph.intro.paragraphs_text.yml
similarity index 75%
rename from config/install/field.field.paragraph.intro.paragraphs_intro.yml
rename to config/install/field.field.paragraph.intro.paragraphs_text.yml
index 2260793..d725075 100644
--- a/config/install/field.field.paragraph.intro.paragraphs_intro.yml
+++ b/config/install/field.field.paragraph.intro.paragraphs_text.yml
@@ -2,15 +2,15 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.paragraph.paragraphs_intro
+    - field.storage.paragraph.paragraphs_text
     - paragraphs.paragraphs_type.intro
   module:
     - text
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.intro.paragraphs_intro
-field_name: paragraphs_intro
+id: paragraph.intro.paragraphs_text
+field_name: paragraphs_text
 entity_type: paragraph
 bundle: intro
 label: Intro
diff --git a/config/install/field.field.paragraph.link.field_link.yml b/config/install/field.field.paragraph.link.paragraphs_link.yml
similarity index 76%
rename from config/install/field.field.paragraph.link.field_link.yml
rename to config/install/field.field.paragraph.link.paragraphs_link.yml
index 402adfa..e25b63d 100644
--- a/config/install/field.field.paragraph.link.field_link.yml
+++ b/config/install/field.field.paragraph.link.paragraphs_link.yml
@@ -2,15 +2,15 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.paragraph.field_link
+    - field.storage.paragraph.paragraphs_link
     - paragraphs.paragraphs_type.link
   module:
     - link
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.link.field_link
-field_name: field_link
+id: paragraph.link.paragraphs_link
+field_name: paragraphs_link
 entity_type: paragraph
 bundle: link
 label: Link
diff --git a/config/install/field.storage.paragraph.paragraphs_footer.yml b/config/install/field.storage.paragraph.paragraphs_footer.yml
deleted file mode 100644
index 96aa40d..0000000
--- a/config/install/field.storage.paragraph.paragraphs_footer.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-    - text
-  enforced:
-    module:
-      - paragraphs_collection
-id: paragraph.paragraphs_footer
-field_name: paragraphs_footer
-entity_type: paragraph
-type: text_long
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.paragraph.paragraphs_intro.yml b/config/install/field.storage.paragraph.paragraphs_intro.yml
deleted file mode 100644
index 5f74fa7..0000000
--- a/config/install/field.storage.paragraph.paragraphs_intro.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - paragraphs
-    - text
-  enforced:
-    module:
-      - paragraphs_collection
-id: paragraph.paragraphs_intro
-field_name: paragraphs_intro
-entity_type: paragraph
-type: text_long
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.paragraph.field_link.yml b/config/install/field.storage.paragraph.paragraphs_link.yml
similarity index 84%
rename from config/install/field.storage.paragraph.field_link.yml
rename to config/install/field.storage.paragraph.paragraphs_link.yml
index 157c927..6729b42 100644
--- a/config/install/field.storage.paragraph.field_link.yml
+++ b/config/install/field.storage.paragraph.paragraphs_link.yml
@@ -7,8 +7,8 @@ dependencies:
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.field_link
-field_name: field_link
+id: paragraph.paragraphs_link
+field_name: paragraphs_link
 entity_type: paragraph
 type: link
 settings: {  }
diff --git a/config/install/paragraphs.paragraphs_type.paragraphs_container.yml b/config/install/paragraphs.paragraphs_type.container.yml
similarity index 91%
rename from config/install/paragraphs.paragraphs_type.paragraphs_container.yml
rename to config/install/paragraphs.paragraphs_type.container.yml
index 6d50107..16bce23 100644
--- a/config/install/paragraphs.paragraphs_type.paragraphs_container.yml
+++ b/config/install/paragraphs.paragraphs_type.container.yml
@@ -6,7 +6,7 @@ dependencies:
   enforced:
     module:
       - paragraphs_collection
-id: paragraphs_container
+id: container
 label: 'Container'
 description: 'Use <em>Container</em> to group paragraphs to apply a common style.'
 behavior_plugins:
diff --git a/modules/paragraphs_collection_demo/config/install/field.field.node.paragraphed_content_demo.field_paragraphs_demo.yml b/modules/paragraphs_collection_demo/config/install/field.field.node.paragraphed_content_demo.field_paragraphs_demo.yml
index 749330b..7d80ec1 100644
--- a/modules/paragraphs_collection_demo/config/install/field.field.node.paragraphed_content_demo.field_paragraphs_demo.yml
+++ b/modules/paragraphs_collection_demo/config/install/field.field.node.paragraphed_content_demo.field_paragraphs_demo.yml
@@ -39,7 +39,7 @@ settings:
       link:
         weight: 19
         enabled: false
-      paragraphs_container:
+      container:
         weight: 20
         enabled: false
       quote:
diff --git a/modules/paragraphs_collection_demo/config/install/field.field.paragraph.paragraphs_container.paragraphs_background_image.yml b/modules/paragraphs_collection_demo/config/install/field.field.paragraph.paragraphs_container.paragraphs_background_image.yml
index 1781298..84fd1b3 100644
--- a/modules/paragraphs_collection_demo/config/install/field.field.paragraph.paragraphs_container.paragraphs_background_image.yml
+++ b/modules/paragraphs_collection_demo/config/install/field.field.paragraph.paragraphs_container.paragraphs_background_image.yml
@@ -3,16 +3,16 @@ status: true
 dependencies:
   config:
     - field.storage.paragraph.paragraphs_background_image
-    - paragraphs.paragraphs_type.paragraphs_container
+    - paragraphs.paragraphs_type.container
   module:
     - image
   enforced:
     module:
       - paragraphs_collection_demo
-id: paragraph.paragraphs_container.paragraphs_background_image
+id: paragraph.container.paragraphs_background_image
 field_name: paragraphs_background_image
 entity_type: paragraph
-bundle: paragraphs_container
+bundle: container
 label: Background image
 description: ''
 required: false
diff --git a/modules/paragraphs_collection_demo/paragraphs_collection_demo.install b/modules/paragraphs_collection_demo/paragraphs_collection_demo.install
index fc874b2..1d3f65a 100644
--- a/modules/paragraphs_collection_demo/paragraphs_collection_demo.install
+++ b/modules/paragraphs_collection_demo/paragraphs_collection_demo.install
@@ -34,7 +34,7 @@ function paragraphs_collection_demo_install() {
  */
 function _paragraphs_collection_demo_add_background_plugin_field() {
   // Add the background field to the container form display.
-  $container_form_display = EntityFormDisplay::load('paragraph.paragraphs_container.default');
+  $container_form_display = EntityFormDisplay::load('paragraph.container.default');
   $content = $container_form_display->get('content');
   $content['paragraphs_background_image'] = [
     'weight' => 1,
@@ -48,14 +48,14 @@ function _paragraphs_collection_demo_add_background_plugin_field() {
   ];
   $container_form_display->set('content', $content);
   $dependencies = $container_form_display->get('dependencies');
-  $dependencies['config'][] = 'field.field.paragraph.paragraphs_container.paragraphs_background_image';
+  $dependencies['config'][] = 'field.field.paragraph.container.paragraphs_background_image';
   $dependencies['config'][] = 'image.style.thumbnail';
   $dependencies['module'][] = 'image';
   $container_form_display->set('dependencies', $dependencies);
   $container_form_display->save();
 
   // Add the background field to the container view display.
-  $container_view_display = EntityViewDisplay::load('paragraph.paragraphs_container.default');
+  $container_view_display = EntityViewDisplay::load('paragraph.container.default');
   $content = $container_view_display->get('content');
   $content['paragraphs_background_image'] = [
     'weight' => 1,
@@ -70,11 +70,11 @@ function _paragraphs_collection_demo_add_background_plugin_field() {
   ];
   $container_view_display->set('content', $content);
   $dependencies = $container_form_display->get('dependencies');
-  $dependencies['config'][] = 'field.field.paragraph.paragraphs_container.paragraphs_background_image';
+  $dependencies['config'][] = 'field.field.paragraph.container.paragraphs_background_image';
   $dependencies['module'][] = 'image';
   $container_form_display->set('dependencies', $dependencies);
   $container_view_display->save();
-  $container = ParagraphsType::load('paragraphs_container');
+  $container = ParagraphsType::load('container');
   $container->set('behavior_plugins', [
     'background' => [
       'enabled' => TRUE,
@@ -105,7 +105,7 @@ function _paragraphs_collection_demo_create_demo_article() {
   // Style paragraph.
   $style_paragraph = Paragraph::create([
     'title' => 'Style demo paragraph',
-    'type' => 'paragraphs_container',
+    'type' => 'container',
     'paragraphs_container_paragraphs' => [$style_text_paragraph],
   ]);
   $style_paragraph->setBehaviorSettings('style', ['style' => 'paragraphs-green']);
@@ -128,7 +128,7 @@ function _paragraphs_collection_demo_create_demo_article() {
   // Background image paragraph.
   $background_image_paragraph = Paragraph::create([
     'title' => 'Background image demo paragraph',
-    'type' => 'paragraphs_container',
+    'type' => 'container',
     'paragraphs_container_paragraphs' => [$background_image_text_paragraph],
     'paragraphs_background_image' => [
       'target_id' => $image->id(),
diff --git a/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php b/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
index 0f98849..7369a90 100644
--- a/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
+++ b/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
@@ -40,19 +40,19 @@ class ParagraphsBackgroundPluginTest extends ParagraphsExperimentalTestBase {
     $bundle_path = 'admin/structure/paragraphs_type/text_test';
     $this->fieldUIAddExistingField($bundle_path, 'paragraphs_text');
 
-    $bundle_path = 'admin/structure/paragraphs_type/paragraphs_container';
+    $bundle_path = 'admin/structure/paragraphs_type/container';
     // Add a second image field to test the correct usage of background image.
     $this->fieldUIAddNewField($bundle_path, 'second_background_image', 'Second BG image', 'image', [], []);
     // Uncheck the Alt field checkbox.
     $edit = [
       'settings[alt_field_required]' => FALSE,
     ];
-    $edit_path = 'admin/structure/paragraphs_type/paragraphs_container/fields/paragraph.paragraphs_container.field_second_background_image';
+    $edit_path = 'admin/structure/paragraphs_type/container/fields/paragraph.paragraphs_container.field_second_background_image';
     $this->drupalPostForm($edit_path, $edit, 'Save settings');
 
     // Create a paragraphed content.
     $this->drupalGet('node/add/article');
-    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_add_more');
     // Create image files to be used and upload them.
     $background_image = $this->drupalGetTestFiles('image')[0];
     $edit = [
@@ -81,7 +81,7 @@ class ParagraphsBackgroundPluginTest extends ParagraphsExperimentalTestBase {
     $edit = [
       'behavior_plugins[background][settings][background_image_field]' => 'paragraphs_background_image',
     ];
-    $this->drupalPostForm('admin/structure/paragraphs_type/paragraphs_container', $edit, 'Save');
+    $this->drupalPostForm('admin/structure/paragraphs_type/container', $edit, 'Save');
     // Check the Background image output.
     $this->drupalGet($save_url);
     $this->assertRaw('paragraphs-behavior-background--image field field--name-paragraphs-background-image');
@@ -90,7 +90,7 @@ class ParagraphsBackgroundPluginTest extends ParagraphsExperimentalTestBase {
     $edit = [
       'behavior_plugins[background][settings][background_image_field]' => 'field_second_background_image',
     ];
-    $this->drupalPostForm('admin/structure/paragraphs_type/paragraphs_container', $edit, 'Save');
+    $this->drupalPostForm('admin/structure/paragraphs_type/container', $edit, 'Save');
     // Check the Background image output.
     $this->drupalGet($save_url);
     $this->assertRaw('paragraphs-behavior-background--image field field--name-field-second-background-image');
@@ -98,7 +98,7 @@ class ParagraphsBackgroundPluginTest extends ParagraphsExperimentalTestBase {
 
     // Save paragraph with no image uploaded.
     $this->drupalGet('node/add/article');
-    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_add_more');
     $edit = [
       'title[0][value]' => 'Test article',
     ];
diff --git a/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php b/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
index f541219..6fb2287 100644
--- a/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
+++ b/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
@@ -34,7 +34,7 @@ class ParagraphsCollectionDemoTest extends ParagraphsExperimentalTestBase {
     ]);
 
     // Check for pre-configured paragraph type.
-    $this->drupalGet('admin/structure/paragraphs_type/paragraphs_container');
+    $this->drupalGet('admin/structure/paragraphs_type/container');
     $this->assertText('Container');
     $this->assertFieldChecked('edit-behavior-plugins-style-enabled');
     $this->assertFieldById('edit-behavior-plugins-style-settings-group', '');
@@ -77,7 +77,7 @@ class ParagraphsCollectionDemoTest extends ParagraphsExperimentalTestBase {
     // Create container that contains the text paragraph.
     $paragraph = Paragraph::create([
       'title' => 'Styled paragraph',
-      'type' => 'paragraphs_container',
+      'type' => 'container',
       'paragraphs_container_paragraphs' => [$text_paragraph],
     ]);
 
diff --git a/src/Tests/ParagraphsCollectionOverviewTest.php b/src/Tests/ParagraphsCollectionOverviewTest.php
index 25df3d7..c68cce2 100644
--- a/src/Tests/ParagraphsCollectionOverviewTest.php
+++ b/src/Tests/ParagraphsCollectionOverviewTest.php
@@ -79,7 +79,7 @@ class ParagraphsCollectionOverviewTest extends ParagraphsExperimentalTestBase {
     $this->assertText('paragraphs-blue');
     $this->assertText('General Group');
     $this->assertLink('Container');
-    $this->assertLinkByHref('/admin/structure/paragraphs_type/paragraphs_container');
+    $this->assertLinkByHref('/admin/structure/paragraphs_type/container');
 
     // Check the tabs.
     $this->assertLink('Layouts');
@@ -117,7 +117,7 @@ class ParagraphsCollectionOverviewTest extends ParagraphsExperimentalTestBase {
     $this->assertText('paragraphs-blue');
     $this->assertText('General Group');
     $this->assertNoLink('Container');
-    $this->assertNoLinkByHref('/admin/structure/paragraphs_type/paragraphs_container');
+    $this->assertNoLinkByHref('/admin/structure/paragraphs_type/container');
   }
 
 }
diff --git a/src/Tests/ParagraphsCollectionTranslationTest.php b/src/Tests/ParagraphsCollectionTranslationTest.php
index ca4fc7f..f28d07b 100644
--- a/src/Tests/ParagraphsCollectionTranslationTest.php
+++ b/src/Tests/ParagraphsCollectionTranslationTest.php
@@ -77,7 +77,7 @@ class ParagraphsCollectionTranslationTest extends ParagraphsExperimentalTestBase
     $this->assertText('Definiert ein Zweispaltenlayout mit 8-4 Breiten.');
 
     // Check the style description in English.
-    $this->drupalPostAjaxForm('node/add/paragraphed_node', [], 'paragraph_field_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm('node/add/paragraphed_node', [], 'paragraph_field_container_add_more');
     $edit = [
       'paragraph_field[0][behavior_plugins][style][style_wrapper][style]' => 'bold',
     ];
@@ -85,7 +85,7 @@ class ParagraphsCollectionTranslationTest extends ParagraphsExperimentalTestBase
     $this->assertText('Bold text');
 
     // Check the style description in the second language.
-    $this->drupalPostAjaxForm($this->langcode . '/node/add/paragraphed_node', [], 'paragraph_field_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm($this->langcode . '/node/add/paragraphed_node', [], 'paragraph_field_container_add_more');
     $edit = [
       'paragraph_field[0][behavior_plugins][style][style_wrapper][style]' => 'bold',
     ];
diff --git a/src/Tests/ParagraphsGridLayoutPluginTest.php b/src/Tests/ParagraphsGridLayoutPluginTest.php
index a1a286b..c593965 100644
--- a/src/Tests/ParagraphsGridLayoutPluginTest.php
+++ b/src/Tests/ParagraphsGridLayoutPluginTest.php
@@ -43,9 +43,9 @@ class ParagraphsGridLayoutPluginTest extends ParagraphsExperimentalTestBase {
     $this->addParagraphedContentType('paragraphed_test', 'paragraphs_container');
     $this->drupalGet('node/add/paragraphed_test');
     $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_grid_add_more');
-    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_paragraphs_container_add_more');
-    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_paragraphs_container_add_more');
-    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_container_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_container_add_more');
     $edit = [
       'title[0][value]' => 'Grid',
       'paragraphs_container[0][behavior_plugins][grid_layout][layout_wrapper][layout]' => 'paragraphs_collection_test_two_column',
diff --git a/src/Tests/ParagraphsStylePluginTest.php b/src/Tests/ParagraphsStylePluginTest.php
index 73469d5..3124942 100644
--- a/src/Tests/ParagraphsStylePluginTest.php
+++ b/src/Tests/ParagraphsStylePluginTest.php
@@ -142,7 +142,7 @@ class ParagraphsStylePluginTest extends ParagraphsExperimentalTestBase {
     // Create a container paragraph for the text paragraph.
     $paragraph = Paragraph::create([
       'title' => 'Demo Paragraph',
-      'type' => 'paragraphs_container',
+      'type' => 'container',
       'paragraphs_container_paragraphs' => [$text_paragraph],
     ]);
     $paragraph->save();
diff --git a/src/Tests/ParagraphsTypesTest.php b/src/Tests/ParagraphsTypesTest.php
index 990d6be..c8ca036 100644
--- a/src/Tests/ParagraphsTypesTest.php
+++ b/src/Tests/ParagraphsTypesTest.php
@@ -70,8 +70,8 @@ class ParagraphsTypesTest extends ParagraphsExperimentalTestBase {
     $this->drupalPostAjaxForm(NULL, [], 'paragraphs_field_link_add_more');
     $edit = [
       'title[0][value]' => 'Link example',
-      'paragraphs_field[0][subform][field_link][0][uri]' => 'Paragraph types example (1)',
-      'paragraphs_field[0][subform][field_link][0][title]' => 'Link test',
+      'paragraphs_field[0][subform][paragraphs_link][0][uri]' => 'Paragraph types example (1)',
+      'paragraphs_field[0][subform][paragraphs_link][0][title]' => 'Link test',
     ];
     $this->drupalPostForm(NULL, $edit, 'Save and publish');