diff --git a/config/schema/flag.schema.yml b/config/schema/flag.schema.yml
index 522a7d2..53ecbc8 100644
--- a/config/schema/flag.schema.yml
+++ b/config/schema/flag.schema.yml
@@ -82,7 +82,7 @@ flag.flag.*:
       type: integer
       label: 'Show contextual link'
 
-flag.flag_type.plugin.flagtype_comment:
+flag.flag_type.plugin.flagtype_entity:comment:
   type: "flag.flag_type.plugin.flagtype_entity:*"
   label: 'Flag type for comments'
   mapping:
@@ -90,7 +90,7 @@ flag.flag_type.plugin.flagtype_comment:
       type: string
       label: 'Access author'
 
-flag.flag_type.plugin.flagtype_node:
+flag.flag_type.plugin.flagtype_entity:node:
   type: "flag.flag_type.plugin.flagtype_entity:*"
   label: 'Flag type for all content entities'
   mapping:
@@ -101,7 +101,7 @@ flag.flag_type.plugin.flagtype_node:
       type: string
       label: 'i18n'
 
-flag.flag_type.plugin.flagtype_user:
+flag.flag_type.plugin.flagtype_entity:user:
   type: "flag.flag_type.plugin.flagtype_entity:*"
   label: 'Flag type for  for user entities'
   mapping:
diff --git a/flag_bookmark/config/install/flag.flag.bookmark.yml b/flag_bookmark/config/install/flag.flag.bookmark.yml
index 6e16e55..2208beb 100644
--- a/flag_bookmark/config/install/flag.flag.bookmark.yml
+++ b/flag_bookmark/config/install/flag.flag.bookmark.yml
@@ -16,7 +16,7 @@ status: true
 langcode: en
 dependencies: {  }
 roles: null
-flag_type: flagtype_node
+flag_type: flagtype_entity:node
 link_type: reload
 flagTypeConfig:
   show_in_links:
diff --git a/src/Form/FlagAddPageForm.php b/src/Form/FlagAddPageForm.php
index 74880f4..ec57f90 100644
--- a/src/Form/FlagAddPageForm.php
+++ b/src/Form/FlagAddPageForm.php
@@ -38,7 +38,7 @@ class FlagAddPageForm extends FormBase {
       '#title' => t('Flag Type'),
       '#required' => TRUE,
       '#description' => t('The type of object this flag will affect. This cannot be changed once the flag is created.'),
-      '#default_value' => 'flagtype_node',
+      '#default_value' => 'flagtype_entity:node',
       '#options' => \Drupal::service('plugin.manager.flag.flagtype')->getAllFlagTypes(),
     ];
 
diff --git a/src/Plugin/Derivative/EntityFlagTypeDeriver.php b/src/Plugin/Derivative/EntityFlagTypeDeriver.php
index 77dba1e..24b9ec4 100644
--- a/src/Plugin/Derivative/EntityFlagTypeDeriver.php
+++ b/src/Plugin/Derivative/EntityFlagTypeDeriver.php
@@ -13,11 +13,6 @@ use Drupal\Core\Entity\ContentEntityTypeInterface;
  * Derivative class for entity flag subtypes plugin.
  */
 class EntityFlagTypeDeriver extends DeriverBase {
-  /*
-  public function __construct($base_plugin_id,
-  EntityStorageControllerInterface $storageController) {
-  }
-  */
 
   /**
    * Ignored types to prevent duplicate occurrences.
@@ -26,9 +21,6 @@ class EntityFlagTypeDeriver extends DeriverBase {
    */
   protected $ignoredEntities = [
     'flagging',
-    'node',
-    'user',
-    'comment',
   ];
 
   /**
diff --git a/src/Plugin/Flag/CommentFlagType.php b/src/Plugin/Flag/CommentFlagType.php
index 9530037..e90e364 100644
--- a/src/Plugin/Flag/CommentFlagType.php
+++ b/src/Plugin/Flag/CommentFlagType.php
@@ -13,7 +13,7 @@ use Drupal\Core\Session\AccountInterface;
  * Provides a flag type for comments.
  *
  * @FlagType(
- *   id = "flagtype_comment",
+ *   id = "flagtype_entity:comment",
  *   title = @Translation("Comment"),
  *   entity_type = "comment",
  *   provider = "comment"
diff --git a/src/Plugin/Flag/NodeFlagType.php b/src/Plugin/Flag/NodeFlagType.php
index fe3a256..a1a8ac7 100644
--- a/src/Plugin/Flag/NodeFlagType.php
+++ b/src/Plugin/Flag/NodeFlagType.php
@@ -14,7 +14,7 @@ use Drupal\Core\Form\FormStateInterface;
  * Provides a flag type for all content entities.
  *
  * @FlagType(
- *   id = "flagtype_node",
+ *   id = "flagtype_entity:node",
  *   title = @Translation("Content"),
  *   entity_type = "node",
  *   provider = "node"
diff --git a/src/Plugin/Flag/UserFlagType.php b/src/Plugin/Flag/UserFlagType.php
index dc307ac..9ab588c 100644
--- a/src/Plugin/Flag/UserFlagType.php
+++ b/src/Plugin/Flag/UserFlagType.php
@@ -14,7 +14,7 @@ use Drupal\Core\Form\FormStateInterface;
  * Provides a flag type for user entities.
  *
  * @FlagType(
- *   id = "flagtype_user",
+ *   id = "flagtype_entity:user",
  *   title = @Translation("User"),
  *   entity_type = "user",
  *   provider = "user"
diff --git a/src/Tests/FlagConfirmFormTest.php b/src/Tests/FlagConfirmFormTest.php
index 99cf360..82ee2f5 100644
--- a/src/Tests/FlagConfirmFormTest.php
+++ b/src/Tests/FlagConfirmFormTest.php
@@ -87,7 +87,7 @@ class FlagConfirmFormTest extends WebTestBase {
 
     // Test with minimal value requirement.
     $edit = [
-      'flag_entity_type' => 'flagtype_node',
+      'flag_entity_type' => 'flagtype_entity:node',
     ];
     $this->drupalPostForm('admin/structure/flags/add', $edit, t('Continue'));
 
diff --git a/src/Tests/FlagCountsTest.php b/src/Tests/FlagCountsTest.php
index 9fc7b20..86fb940 100644
--- a/src/Tests/FlagCountsTest.php
+++ b/src/Tests/FlagCountsTest.php
@@ -73,7 +73,7 @@ class FlagCountsTest extends WebTestBase {
       'types' => [
         'article',
       ],
-      'flag_type' => 'flagtype_node',
+      'flag_type' => 'flagtype_entity:node',
       'link_type' => 'reload',
       'flagTypeConfig' => [],
       'linkTypeConfig' => [],
diff --git a/src/Tests/FlagEnableDisableTest.php b/src/Tests/FlagEnableDisableTest.php
index f975f31..aca2b1a 100644
--- a/src/Tests/FlagEnableDisableTest.php
+++ b/src/Tests/FlagEnableDisableTest.php
@@ -92,7 +92,7 @@ class FlagEnableDisableTest extends WebTestBase {
 
     // Test with minimal value requirement.
     $edit = [
-      'flag_entity_type' => 'flagtype_node',
+      'flag_entity_type' => 'flagtype_entity:node',
     ];
     $this->drupalPostForm('admin/structure/flags/add', $edit, t('Continue'));
 
diff --git a/src/Tests/FlagFieldEntryTest.php b/src/Tests/FlagFieldEntryTest.php
index 9d24cbc..673ef1b 100644
--- a/src/Tests/FlagFieldEntryTest.php
+++ b/src/Tests/FlagFieldEntryTest.php
@@ -109,7 +109,7 @@ class FlagFieldEntryTest extends WebTestBase {
 
     // Test with minimal value requirement.
     $edit = [
-      'flag_entity_type' => 'flagtype_node',
+      'flag_entity_type' => 'flagtype_entity:node',
     ];
     $this->drupalPostForm('admin/structure/flags/add', $edit, t('Continue'));
 
diff --git a/src/Tests/FlagServiceTest.php b/src/Tests/FlagServiceTest.php
index 38b3bcb..da23a34 100644
--- a/src/Tests/FlagServiceTest.php
+++ b/src/Tests/FlagServiceTest.php
@@ -57,7 +57,7 @@ class FlagServiceTest extends WebTestBase {
       'types' => [
         'article',
       ],
-      'flag_type' => 'flagtype_node',
+      'flag_type' => 'flagtype_entity:node',
       'link_type' => 'reload',
       'flagTypeConfig' => [],
       'linkTypeConfig' => [],
@@ -82,7 +82,7 @@ class FlagServiceTest extends WebTestBase {
       'types' => [
         'article',
       ],
-      'flag_type' => 'flagtype_node',
+      'flag_type' => 'flagtype_entity:node',
       'link_type' => 'reload',
       'flagTypeConfig' => [],
       'linkTypeConfig' => [],