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 69%
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..7234467 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_type.container
     - image.style.thumbnail
   module:
     - image
@@ -11,12 +11,12 @@ 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:
+  paragraphs_container:
     type: paragraphs
     weight: 0
     settings:
diff --git a/config/install/core.entity_form_display.paragraph.grid.default.yml b/config/install/core.entity_form_display.paragraph.grid.default.yml
index e21b2ea..68adddb 100644
--- a/config/install/core.entity_form_display.paragraph.grid.default.yml
+++ b/config/install/core.entity_form_display.paragraph.grid.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.grid.paragraphs_container_paragraphs
+    - field.field.paragraph.grid.paragraphs_container
     - paragraphs.paragraphs_type.grid
   module:
     - paragraphs
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: grid
 mode: default
 content:
-  paragraphs_container_paragraphs:
+  paragraphs_container:
     weight: 0
     settings:
       title: Paragraph
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 62%
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..579b165 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,20 +2,20 @@ 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_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:
+  paragraphs_container:
     type: entity_reference_revisions_entity_view
     weight: 0
     label: hidden
diff --git a/config/install/core.entity_view_display.paragraph.grid.default.yml b/config/install/core.entity_view_display.paragraph.grid.default.yml
index dbb762e..83994dc 100644
--- a/config/install/core.entity_view_display.paragraph.grid.default.yml
+++ b/config/install/core.entity_view_display.paragraph.grid.default.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.grid.paragraphs_container_paragraphs
+    - field.field.paragraph.grid.paragraphs_container
     - paragraphs.paragraphs_type.grid
   module:
     - entity_reference_revisions
@@ -14,7 +14,7 @@ targetEntityType: paragraph
 bundle: grid
 mode: default
 content:
-  paragraphs_container_paragraphs:
+  paragraphs_container:
     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.yml
similarity index 63%
rename from config/install/field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs.yml
rename to config/install/field.field.paragraph.container.paragraphs_container.yml
index ef1ea91..5f3d4a2 100644
--- a/config/install/field.field.paragraph.paragraphs_container.paragraphs_container_paragraphs.yml
+++ b/config/install/field.field.paragraph.container.paragraphs_container.yml
@@ -2,17 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.paragraph.paragraphs_container_paragraphs
-    - paragraphs.paragraphs_type.paragraphs_container
+    - field.storage.paragraph.paragraphs_container
+    - paragraphs.paragraphs_type.container
   module:
     - entity_reference_revisions
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.paragraphs_container.paragraphs_container_paragraphs
-field_name: paragraphs_container_paragraphs
+id: paragraph.container.paragraphs_container
+field_name: paragraphs_container
 entity_type: paragraph
-bundle: paragraphs_container
+bundle: container
 label: 'Paragraphs'
 description: ''
 required: false
diff --git a/config/install/field.field.paragraph.grid.paragraphs_container_paragraphs.yml b/config/install/field.field.paragraph.grid.paragraphs_container.yml
similarity index 75%
rename from config/install/field.field.paragraph.grid.paragraphs_container_paragraphs.yml
rename to config/install/field.field.paragraph.grid.paragraphs_container.yml
index 5e2802a..9387c1e 100644
--- a/config/install/field.field.paragraph.grid.paragraphs_container_paragraphs.yml
+++ b/config/install/field.field.paragraph.grid.paragraphs_container.yml
@@ -2,15 +2,15 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.paragraph.paragraphs_container_paragraphs
+    - field.storage.paragraph.paragraphs_container
     - paragraphs.paragraphs_type.grid
   module:
     - entity_reference_revisions
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.grid.paragraphs_container_paragraphs
-field_name: paragraphs_container_paragraphs
+id: paragraph.grid.paragraphs_container
+field_name: paragraphs_container
 entity_type: paragraph
 bundle: grid
 label: Paragraphs
diff --git a/config/install/field.storage.paragraph.paragraphs_container_paragraphs.yml b/config/install/field.storage.paragraph.paragraphs_container.yml
similarity index 81%
rename from config/install/field.storage.paragraph.paragraphs_container_paragraphs.yml
rename to config/install/field.storage.paragraph.paragraphs_container.yml
index 5a8e5b1..8e227ea 100644
--- a/config/install/field.storage.paragraph.paragraphs_container_paragraphs.yml
+++ b/config/install/field.storage.paragraph.paragraphs_container.yml
@@ -7,8 +7,8 @@ dependencies:
   enforced:
     module:
       - paragraphs_collection
-id: paragraph.paragraphs_container_paragraphs
-field_name: paragraphs_container_paragraphs
+id: paragraph.paragraphs_container
+field_name: paragraphs_container
 entity_type: paragraph
 type: entity_reference_revisions
 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/config/install/paragraphs.paragraphs_type.grid.yml b/config/install/paragraphs.paragraphs_type.grid.yml
index 8ceb045..7b52a2b 100644
--- a/config/install/paragraphs.paragraphs_type.grid.yml
+++ b/config/install/paragraphs.paragraphs_type.grid.yml
@@ -11,6 +11,6 @@ label: Grid
 behavior_plugins:
   grid_layout:
     enabled: true
-    paragraph_reference_field: paragraphs_container_paragraphs
+    paragraph_reference_field: paragraphs_container
     available_grid_layouts: {  }
 description: 'Use <em>Grid</em> to add different paragraphs layouts.'
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.container.paragraphs_background_image.yml
similarity index 84%
rename from modules/paragraphs_collection_demo/config/install/field.field.paragraph.paragraphs_container.paragraphs_background_image.yml
rename to modules/paragraphs_collection_demo/config/install/field.field.paragraph.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.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..85b4213 100644
--- a/modules/paragraphs_collection_demo/paragraphs_collection_demo.install
+++ b/modules/paragraphs_collection_demo/paragraphs_collection_demo.install
@@ -106,7 +106,7 @@ function _paragraphs_collection_demo_create_demo_article() {
   $style_paragraph = Paragraph::create([
     'title' => 'Style demo paragraph',
     'type' => 'paragraphs_container',
-    'paragraphs_container_paragraphs' => [$style_text_paragraph],
+    'paragraphs_container' => [$style_text_paragraph],
   ]);
   $style_paragraph->setBehaviorSettings('style', ['style' => 'paragraphs-green']);
   $style_paragraph->save();
@@ -129,7 +129,7 @@ function _paragraphs_collection_demo_create_demo_article() {
   $background_image_paragraph = Paragraph::create([
     'title' => 'Background image demo paragraph',
     'type' => 'paragraphs_container',
-    'paragraphs_container_paragraphs' => [$background_image_text_paragraph],
+    'paragraphs_container' => [$background_image_text_paragraph],
     'paragraphs_background_image' => [
       'target_id' => $image->id(),
       'alt' => 'Druplicon',
@@ -518,7 +518,7 @@ function _paragraphs_collection_demo_create_text_paragraph($text, $format = 'bas
 function _paragraphs_collection_demo_create_grid_paragraph(array $items, $layout) {
   $grid_paragraph = Paragraph::create([
     'type' => 'grid',
-    'paragraphs_container_paragraphs' => $items,
+    'paragraphs_container' => $items,
   ]);
   $grid_paragraph->setBehaviorSettings('grid_layout', ['layout' => $layout]);
   $grid_paragraph->save();
diff --git a/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php b/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
index 0f98849..8d285ed 100644
--- a/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
+++ b/modules/paragraphs_collection_demo/src/Tests/ParagraphsBackgroundPluginTest.php
@@ -70,7 +70,7 @@ class ParagraphsBackgroundPluginTest extends ParagraphsExperimentalTestBase {
     // Add title and body text to the node and save it.
     $edit = [
       'title[0][value]' => 'Test article',
-      'paragraphs[0][subform][paragraphs_container_paragraphs][0][subform][paragraphs_text][0][value]' => "This is a non background element",
+      'paragraphs[0][subform][paragraphs_container][0][subform][paragraphs_text][0][value]' => "This is a non background element",
       'paragraphs[0][subform][paragraphs_background_image][0][alt]' => 'This is the alternative text',
     ];
     $this->drupalPostForm(NULL, $edit, t('Save and publish'));
diff --git a/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php b/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
index f541219..efea25f 100644
--- a/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
+++ b/modules/paragraphs_collection_demo/src/Tests/ParagraphsCollectionDemoTest.php
@@ -78,7 +78,7 @@ class ParagraphsCollectionDemoTest extends ParagraphsExperimentalTestBase {
     $paragraph = Paragraph::create([
       'title' => 'Styled paragraph',
       'type' => 'paragraphs_container',
-      'paragraphs_container_paragraphs' => [$text_paragraph],
+      'paragraphs_container' => [$text_paragraph],
     ]);
 
     // Add demo content with one 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/ParagraphsGridLayoutPluginTest.php b/src/Tests/ParagraphsGridLayoutPluginTest.php
index a1a286b..6cc3b94 100644
--- a/src/Tests/ParagraphsGridLayoutPluginTest.php
+++ b/src/Tests/ParagraphsGridLayoutPluginTest.php
@@ -35,7 +35,7 @@ class ParagraphsGridLayoutPluginTest extends ParagraphsExperimentalTestBase {
     $this->drupalGet('admin/structure/paragraphs_type/grid');
     $this->assertFieldChecked('edit-behavior-plugins-grid-layout-enabled');
     $this->assertText('Grid field');
-    $this->assertOptionSelected('edit-behavior-plugins-grid-layout-settings-paragraph-reference-field', 'paragraphs_container_paragraphs');
+    $this->assertOptionSelected('edit-behavior-plugins-grid-layout-settings-paragraph-reference-field', 'paragraphs_container');
     $this->assertText('Grid layouts');
     $this->assertText('Two columns');
 
@@ -64,7 +64,7 @@ class ParagraphsGridLayoutPluginTest extends ParagraphsExperimentalTestBase {
       $this->assertFieldByXPath($column, NULL, "Grid structure found for column {$key}");
     }
 
-    $this->drupalPostForm('admin/structure/paragraphs_type/grid/fields/paragraph.grid.paragraphs_container_paragraphs/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/structure/paragraphs_type/grid/fields/paragraph.grid.paragraphs_container/delete', [], t('Delete'));
     $this->assertText('The field Paragraphs has been deleted from the Grid content type.');
 
     $node = $this->getNodeByTitle('Grid');
@@ -103,9 +103,9 @@ class ParagraphsGridLayoutPluginTest extends ParagraphsExperimentalTestBase {
     $this->drupalPostAjaxForm(NULL, [], 'paragraphs_container_0_subform_paragraphs_container_paragraphs_text_paragraph_add_more');
     $edit = [
       'title[0][value]' => 'Grid plugin summary',
-      'paragraphs_container[0][subform][paragraphs_container_paragraphs][0][subform][paragraphs_text][0][value]' => 'Text 1',
-      'paragraphs_container[0][subform][paragraphs_container_paragraphs][1][subform][paragraphs_text][0][value]' => 'Text 2',
-      'paragraphs_container[0][subform][paragraphs_container_paragraphs][2][subform][paragraphs_text][0][value]' => 'Text 3',
+      'paragraphs_container[0][subform][paragraphs_container][0][subform][paragraphs_text][0][value]' => 'Text 1',
+      'paragraphs_container[0][subform][paragraphs_container][1][subform][paragraphs_text][0][value]' => 'Text 2',
+      'paragraphs_container[0][subform][paragraphs_container][2][subform][paragraphs_text][0][value]' => 'Text 3',
       'paragraphs_container[0][behavior_plugins][grid_layout][layout_wrapper][layout]' => 'paragraphs_collection_test_two_column',
     ];
     $this->drupalPostForm(NULL, $edit, t('Save and publish'));
diff --git a/src/Tests/ParagraphsStylePluginTest.php b/src/Tests/ParagraphsStylePluginTest.php
index 73469d5..21c4a08 100644
--- a/src/Tests/ParagraphsStylePluginTest.php
+++ b/src/Tests/ParagraphsStylePluginTest.php
@@ -142,8 +142,8 @@ class ParagraphsStylePluginTest extends ParagraphsExperimentalTestBase {
     // Create a container paragraph for the text paragraph.
     $paragraph = Paragraph::create([
       'title' => 'Demo Paragraph',
-      'type' => 'paragraphs_container',
-      'paragraphs_container_paragraphs' => [$text_paragraph],
+      'type' => 'container',
+      'paragraphs_container' => [$text_paragraph],
     ]);
     $paragraph->save();