diff --git a/migrations/d7_paragraphs_type.yml b/migrations/d7_paragraphs_type.yml
index 2d385f7..47146ef 100644
--- a/migrations/d7_paragraphs_type.yml
+++ b/migrations/d7_paragraphs_type.yml
@@ -8,7 +8,22 @@ source:
   add_description: true
 process:
   id: bundle
-  label: name
+  label_from_bundle:
+    -
+      plugin: explode
+      delimiter: '_'
+      source: bundle
+    -
+      plugin: concat
+      delimiter: ' '
+    -
+      plugin: callback
+      callable: ucwords
+  label:
+    - plugin: null_coalesce
+      source:
+        - 'name'
+        - '@label_from_bundle'
   description: description
 destination:
   plugin: 'entity:paragraphs_type'
diff --git a/src/Plugin/migrate/source/d7/ParagraphsType.php b/src/Plugin/migrate/source/d7/ParagraphsType.php
index 0528d95..f429e44 100644
--- a/src/Plugin/migrate/source/d7/ParagraphsType.php
+++ b/src/Plugin/migrate/source/d7/ParagraphsType.php
@@ -32,9 +32,11 @@ class ParagraphsType extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function query() {
-    $query = $this->select('paragraphs_bundle', 'pb')
-      ->fields('pb');
-
+    $query = $this->select('paragraphs_item', 'pi')
+      ->distinct()
+      ->fields('pi', ['bundle']);
+    $query->leftJoin('paragraphs_bundle', 'pb', 'pb.bundle = pi.bundle');
+    $query->fields('pb', ['name']);
     return $query;
   }
 
@@ -71,6 +73,7 @@ class ParagraphsType extends DrupalSqlBase {
    */
   public function getIds() {
     $ids['bundle']['type'] = 'string';
+    $ids['bundle']['alias'] = 'pi';
 
     return $ids;
   }
diff --git a/tests/src/Kernel/migrate/ParagraphsTypeRemoveBundleTest.php b/tests/src/Kernel/migrate/ParagraphsTypeRemoveBundleTest.php
new file mode 100644
index 0000000..f0e4626
--- /dev/null
+++ b/tests/src/Kernel/migrate/ParagraphsTypeRemoveBundleTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Tests\paragraphs\Kernel\migrate;
+
+/**
+ * Test missing bundle migration.
+ *
+ * @group paragraphs
+ * @require entity_reference_revisions
+ */
+class ParagraphsTypeRemoveBundleTest extends ParagraphContentMigrationTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->sourceDatabase->delete('paragraphs_bundle')->condition('bundle', 'paragraph_bundle_one')->execute();
+  }
+
+}