diff --git a/core/lib/Drupal/Core/Render/Element/RenderElement.php b/core/lib/Drupal/Core/Render/Element/RenderElement.php
index d4c7ab383c..2add3dbd98 100644
--- a/core/lib/Drupal/Core/Render/Element/RenderElement.php
+++ b/core/lib/Drupal/Core/Render/Element/RenderElement.php
@@ -330,7 +330,7 @@ public static function preRenderAjaxForm($element) {
 
       // @todo Remove support for 'wrapper' and solely use 'wrapper_selector'.
       if (isset($settings['wrapper'])) {
-        @trigger_error('Use of "wrapper" is deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use "wrapper_selector" instead and prefix the value with either "#" for IDs or "." for classes.', E_USER_DEPRECATED);
+        @trigger_error('Use of "wrapper" is deprecated in drupal:9.1.0 and will be removed before drupal:10.0.0. Use "wrapper_selector" instead and prefix the value with either "#" for IDs or "." for classes.', E_USER_DEPRECATED);
         $settings['wrapper_selector'] = '#' . $settings['wrapper'];
         unset($settings['wrapper']);
       }
diff --git a/core/modules/layout_builder/src/Form/MoveBlockForm.php b/core/modules/layout_builder/src/Form/MoveBlockForm.php
index b3fd9dcbf8..eade17207a 100644
--- a/core/modules/layout_builder/src/Form/MoveBlockForm.php
+++ b/core/modules/layout_builder/src/Form/MoveBlockForm.php
@@ -146,7 +146,7 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
       '#title' => $this->t('Region'),
       '#default_value' => "$selected_delta:$selected_region",
       '#ajax' => [
-        'wrapper' => 'layout-builder-components-table',
+        'wrapper_selector' => '#layout-builder-components-table',
         'callback' => '::getComponentsWrapper',
       ],
     ];
diff --git a/core/modules/media_library/src/Form/AddFormBase.php b/core/modules/media_library/src/Form/AddFormBase.php
index 4e0eff6a99..ee388f212b 100644
--- a/core/modules/media_library/src/Form/AddFormBase.php
+++ b/core/modules/media_library/src/Form/AddFormBase.php
@@ -292,7 +292,7 @@ protected function buildEntityFormElement(MediaInterface $media, array $form, Fo
         ],
         '#ajax' => [
           'callback' => '::updateFormCallback',
-          'wrapper' => 'media-library-add-form-wrapper',
+          'wrapper_selector' => '#media-library-add-form-wrapper',
           'message' => $this->t('Removing @label.', ['@label' => $media->getName()]),
         ],
         '#submit' => ['::removeButtonSubmit'],
@@ -476,7 +476,7 @@ protected function buildActions(array $form, FormStateInterface $form_state) {
         '#value' => $this->t('Save and insert'),
         '#ajax' => [
           'callback' => '::updateWidget',
-          'wrapper' => 'media-library-add-form-wrapper',
+          'wrapper_selector' => '#media-library-add-form-wrapper',
         ],
       ];
     }
@@ -587,7 +587,7 @@ public function removeButtonSubmit(array $form, FormStateInterface $form_state)
    */
   public function updateFormCallback(array &$form, FormStateInterface $form_state) {
     $triggering_element = $form_state->getTriggeringElement();
-    $wrapper_id = $triggering_element['#ajax']['wrapper'];
+    $wrapper_selector = $triggering_element['#ajax']['wrapper_selector'];
     $added_media = $form_state->get('media');
 
     $response = new AjaxResponse();
@@ -614,7 +614,7 @@ public function updateFormCallback(array &$form, FormStateInterface $form_state)
       // the next media item. If the last list item is removed, shift focus to
       // the previous item.
       else {
-        $response->addCommand(new ReplaceCommand("#$wrapper_id", $form));
+        $response->addCommand(new ReplaceCommand($wrapper_selector, $form));
 
         // Find the delta of the next media item. If there is no item with a
         // bigger delta, we automatically use the delta of the previous item and
@@ -632,7 +632,7 @@ public function updateFormCallback(array &$form, FormStateInterface $form_state)
     }
     // Update the form and shift focus to the added media items.
     else {
-      $response->addCommand(new ReplaceCommand("#$wrapper_id", $form));
+      $response->addCommand(new ReplaceCommand($wrapper_selector, $form));
       $response->addCommand(new InvokeCommand('.js-media-library-add-form-added-media', 'focus'));
     }