diff --git a/core/modules/image/image.install b/core/modules/image/image.install
index 7e82f62..9154c4c 100644
--- a/core/modules/image/image.install
+++ b/core/modules/image/image.install
@@ -69,7 +69,7 @@ function image_update_8001() {
   $config_factory = \Drupal::configFactory();
   foreach ($config_factory->listAll('filter.format') as $name) {
     $config = $config_factory->getEditable($name);
-    if (!$config->get('filters.image_style.status')) {
+    if (!$config->get('filters.filter_image_style.status')) {
       continue;
     }
     $allowed_html = $config->get('filters.filter_html.settings.allowed_html');
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 7ec9c3f..888e696 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -510,7 +510,7 @@ function image_form_editor_image_dialog_alter(&$form, FormStateInterface $form_s
 
   // Alter the editor image dialog when image style functionality is available,
   // unless the responsive image style filter is also in use.
-  if ((isset($filters['filter_imagestyle']) && $filters['filter_imagestyle']->status)) {
+  if ((isset($filters['filter_image_style']) && $filters['filter_image_style']->status)) {
     $filter_image_style_status = TRUE;
   }
   else {
diff --git a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php b/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
index a2e0652..30ea87c 100644
--- a/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
+++ b/core/modules/image/src/Plugin/CKEditorPlugin/DrupalImageStyle.php
@@ -62,10 +62,10 @@ public function isEnabled(Editor $editor) {
     }
 
     // Automatically enable this plugin if the text format associated with this
-    // text editor uses the filter_imagestyle filter and the DrupalImage button
+    // text editor uses the filter_image_style filter and the DrupalImage button
     // is enabled.
     $format = $editor->getFilterFormat();
-    if ($format->filters('filter_imagestyle')->status) {
+    if ($format->filters('filter_image_style')->status) {
       $enabled = FALSE;
       $settings = $editor->getSettings();
       foreach ($settings['toolbar']['rows'] as $row) {
diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
index fac9f80..8c6a008 100644
--- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
+++ b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
@@ -20,7 +20,7 @@
  * Provides a filter to render inline images as image styles.
  *
  * @Filter(
- *   id = "image_style",
+ *   id = "filter_image_style",
  *   module = "image",
  *   title = @Translation("Display image styles"),
  *   description = @Translation("Uses the data-image-style attribute on <img> tags to display image styles."),
diff --git a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
index 9592b97..9b9d7dc 100644
--- a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
+++ b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
@@ -61,7 +61,7 @@ protected function setUp() {
       'name' => 'Filtered HTML',
       'weight' => 0,
       'filters' => [
-        'filter_imagestyle' => ['status' => TRUE]
+        'filter_image_style' => ['status' => TRUE]
       ],
     ]);
     $this->format->save();
diff --git a/core/modules/responsive_image/responsive_image.install b/core/modules/responsive_image/responsive_image.install
index 062c45c..1a64048 100644
--- a/core/modules/responsive_image/responsive_image.install
+++ b/core/modules/responsive_image/responsive_image.install
@@ -11,7 +11,7 @@ function responsive_image_update_8001() {
   $config_factory = \Drupal::configFactory();
   foreach ($config_factory->listAll('filter.format') as $name) {
     $config = $config_factory->getEditable($name);
-    if (!$config->get('filters.responsive_image_style.status')) {
+    if (!$config->get('filters.filter_responsive_image_style.status')) {
       continue;
     }
     $allowed_html = $config->get('filters.filter_html.settings.allowed_html');
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index e213c4d..3d6e1bc 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -645,7 +645,7 @@ function responsive_image_form_editor_image_dialog_validate(array &$form, FormSt
     $attributes = &$form_state->getValue('attributes');
 
     // Remove data-image-style if present.
-    if ($attributes['data-image-style']) {
+    if (array_key_exists('data-image-style', $attributes)) {
       unset($attributes['data-image-style']);
     }
 
diff --git a/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php b/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
index 6f0f5cb..ab187ca 100644
--- a/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Plugin/Filter/FilterResponsiveImageStyle.php
@@ -20,7 +20,7 @@
  * Provides a filter to render inline images as responsive images.
  *
  * @Filter(
- *   id = "responsive_image_style",
+ *   id = "filter_responsive_image_style",
  *   module = "responsive_image",
  *   title = @Translation("Display responsive image styles"),
  *   description = @Translation("Uses the data-responsive-image-style attribute on <img> tags to display responsive images."),
diff --git a/core/modules/responsive_image/tests/src/Kernel/EditorResponsiveImageStyleDialogTest.php b/core/modules/responsive_image/tests/src/Kernel/EditorResponsiveImageStyleDialogTest.php
index e49128d..21c693a 100644
--- a/core/modules/responsive_image/tests/src/Kernel/EditorResponsiveImageStyleDialogTest.php
+++ b/core/modules/responsive_image/tests/src/Kernel/EditorResponsiveImageStyleDialogTest.php
@@ -62,7 +62,7 @@ protected function setUp() {
       'name' => 'Filtered HTML',
       'weight' => 0,
       'filters' => [
-        'filter_imagestyle' => ['status' => TRUE],
+        'filter_image_style' => ['status' => TRUE],
         'filter_responsive_image_style' => ['status' => TRUE]
       ],
     ]);
diff --git a/core/profiles/standard/config/install/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml
index 8281a53..ece1a15 100644
--- a/core/profiles/standard/config/install/filter.format.basic_html.yml
+++ b/core/profiles/standard/config/install/filter.format.basic_html.yml
@@ -36,8 +36,8 @@ filters:
     status: true
     weight: 9
     settings: {  }
-  filter_imagestyle:
-    id: filter_imagestyle
+  filter_image_style:
+    id: filter_image_style
     provider: image
     status: true
     weight: 10
diff --git a/core/profiles/standard/config/install/filter.format.full_html.yml b/core/profiles/standard/config/install/filter.format.full_html.yml
index 115891d..c23da46 100644
--- a/core/profiles/standard/config/install/filter.format.full_html.yml
+++ b/core/profiles/standard/config/install/filter.format.full_html.yml
@@ -9,8 +9,8 @@ weight: 1
 roles:
   - administrator
 filters:
-  filter_imagestyle:
-    id: filter_imagestyle
+  filter_image_style:
+    id: filter_image_style
     provider: image
     status: true
     weight: 7