diff --git a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
index 54b2c7b4087dbdf97bfa48cbcbc8ba4fcc82920a..d6e006c06aa6369bf7eed632144c1512ff65fe81 100644
--- a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
@@ -38,7 +38,7 @@ So that I will be able to manage files, see where they have been used in content
      When I go to "admin/content/media"
       And I wait
      Then I should see "Add media"
-     When I fill in "Flag Earth" for "name[0][value]"
+     When I fill in "Flag Earth" for "edit-name"
       And I press the "Apply" button
       And I wait
      Then I should see "Flag Earth"
@@ -58,7 +58,7 @@ So that I will be able to manage files, see where they have been used in content
      When I go to "admin/content/media"
       And I wait
      Then I should see "Add media"
-     When I fill in "Flag Earth after edit" for "name[0][value]"
+     When I fill in "Flag Earth after edit" for "edit-name"
       And I press the "Apply" button
       And I wait
       And I wait
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
index fc50779ef6f33b780e233df1220480ec8ef5639b..34cf8722f618ce43e2833dbb36e992ce5fc5b075 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
@@ -48,7 +48,7 @@ I want to be able to add and remove entities to any allowed entityqueue.
       And I wait for AJAX to finish
      Then the image media browser should be open
      When I switch to iframe "entity_browser_iframe_heroslider_media_browser"
-      And I fill in "Flag Earth" for "Search"
+      And I fill in "Flag Earth" for "edit-name"
       And I press the "Search" button
       And wait max of 5s
      Then I should see image with the "Flag Earth all earth in space" title text
@@ -80,7 +80,7 @@ I want to be able to add and remove entities to any allowed entityqueue.
       And I wait for AJAX to finish
      Then the image media browser should be open
      When I switch to iframe "entity_browser_iframe_heroslider_media_browser"
-      And I fill in "Flag Earth" for "Search"
+      And I fill in "Flag Earth" for "edit-name"
       And I press the "Search" button
       And wait max of 5s
      Then I should see image with the "Flag Earth all earth in space" title text
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
index a4a92263d621f9a5598317b4b4788b282057e267..dd117a617c56469b2acb3864acfe8182a75dd6f7 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
@@ -63,7 +63,7 @@ So that it will show up under that rich text field without having to upload the
       And I wait for AJAX to finish
      Then the editor media browser should be open
      When I switch to iframe "entity_browser_iframe_editor_media_browser"
-      And I fill in "Embed Flag Earth" for "Search keywords"
+      And I fill in "Embed Flag Earth" for "edit-name"
       And I press the "Search" button
       And I wait for AJAX to finish
      Then I should see image with the "Embed Flag Earth all earth in space" title text