diff --git a/core/modules/media/js/media_form.es6.js b/core/modules/media/js/form.es6.js
similarity index 100%
rename from core/modules/media/js/media_form.es6.js
rename to core/modules/media/js/form.es6.js
diff --git a/core/modules/media/js/media_form.js b/core/modules/media/js/form.js
similarity index 100%
rename from core/modules/media/js/media_form.js
rename to core/modules/media/js/form.js
diff --git a/core/modules/media/js/media_type_form.es6.js b/core/modules/media/js/type_form.es6.js
similarity index 100%
rename from core/modules/media/js/media_type_form.es6.js
rename to core/modules/media/js/type_form.es6.js
diff --git a/core/modules/media/js/media_type_form.js b/core/modules/media/js/type_form.js
similarity index 100%
rename from core/modules/media/js/media_type_form.js
rename to core/modules/media/js/type_form.js
diff --git a/core/modules/media/media.libraries.yml b/core/modules/media/media.libraries.yml
index eecaf8e..72496a3 100644
--- a/core/modules/media/media.libraries.yml
+++ b/core/modules/media/media.libraries.yml
@@ -1,13 +1,13 @@
-media_form:
+form:
   version: VERSION
   js:
-    js/media_form.js: {}
+    js/form.js: {}
   dependencies:
     - core/drupal.form
 
-media_type_form:
+type_form:
   version: VERSION
   js:
-    js/media_type_form.js: {}
+    js/type_form.js: {}
   dependencies:
     - core/drupal.form
diff --git a/core/modules/media/src/MediaForm.php b/core/modules/media/src/MediaForm.php
index 1e91e9f..f98889f 100644
--- a/core/modules/media/src/MediaForm.php
+++ b/core/modules/media/src/MediaForm.php
@@ -47,7 +47,7 @@ public function form(array $form, FormStateInterface $form_state) {
       $form['created']['#group'] = 'author';
     }
 
-    $form['#attached']['library'][] = 'media/media_form';
+    $form['#attached']['library'][] = 'media/form';
 
     $form['#entity_builders']['update_status'] = [$this, 'updateStatus'];
 
diff --git a/core/modules/media/src/MediaTypeForm.php b/core/modules/media/src/MediaTypeForm.php
index 9ae84e9..3a96291 100644
--- a/core/modules/media/src/MediaTypeForm.php
+++ b/core/modules/media/src/MediaTypeForm.php
@@ -176,7 +176,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['additional_settings'] = [
       '#type' => 'vertical_tabs',
       '#attached' => [
-        'library' => ['media/media_type_form'],
+        'library' => ['media/type_form'],
       ],
     ];