diff -u b/core/modules/file/src/Plugin/Field/FieldFormatter/FileAudioFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/FileAudioFormatter.php
--- b/core/modules/file/src/Plugin/Field/FieldFormatter/FileAudioFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/FileAudioFormatter.php
@@ -44,26 +44,26 @@
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['controls'] = array(
-      '#title' => t('Show audio controls'),
+      '#title' => $this->t('Show audio controls'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('controls'),
     );
     $element['autoplay'] = array(
-      '#title' => t('Autoplay'),
+      '#title' => $this->t('Autoplay'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('autoplay'),
     );
     $element['loop'] = array(
-      '#title' => t('Loop'),
+      '#title' => $this->t('Loop'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('loop'),
     );
     $element['multiple_file_behavior'] = array(
-      '#title' => t('Display of multiple files'),
+      '#title' => $this->t('Display of multiple files'),
       '#type' => 'radios',
       '#options' => array(
-        'tags' => t('Use multiple @tag tags, each with a single source.', array('@tag' => '<audio>')),
-        'sources' => t('Use multiple sources within a single @tag tag.', array('@tag' => '<audio>')),
+        'tags' => $this->t('Use multiple @tag tags, each with a single source.', array('@tag' => '<audio>')),
+        'sources' => $this->t('Use multiple sources within a single @tag tag.', array('@tag' => '<audio>')),
       ),
       '#default_value' => $this->getSetting('multiple_file_behavior'),
     );
@@ -76,10 +76,10 @@
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('Controls: %controls', array('%controls' => $this->getSetting('controls') ? 'visible' : 'hidden'));
-    $summary[] = t('Autoplay: %autoplay', array('%autoplay' => $this->getSetting('autoplay') ? t('yes') : t('no')));
-    $summary[] = t('Loop: %loop', array('%loop' => $this->getSetting('loop') ? t('yes') : t('no')));
-    $summary[] = t('Multiple files: %multiple', array('%multiple' => $this->getSetting('multiple_file_behavior')));
+    $summary[] = $this->t('Controls: %controls', array('%controls' => $this->getSetting('controls') ? $this->t('visible') : $this->t('hidden')));
+    $summary[] = $this->t('Autoplay: %autoplay', array('%autoplay' => $this->getSetting('autoplay') ? $this->t('yes') : $this->t('no')));
+    $summary[] = $this->t('Loop: %loop', array('%loop' => $this->getSetting('loop') ? $this->t('yes') : $this->t('no')));
+    $summary[] = $this->t('Multiple files: %multiple', array('%multiple' => $this->getSetting('multiple_file_behavior')));
     return $summary;
   }
 
diff -u b/core/modules/file/src/Plugin/Field/FieldFormatter/FileMediaFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/FileMediaFormatter.php
--- b/core/modules/file/src/Plugin/Field/FieldFormatter/FileMediaFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/FileMediaFormatter.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\file\Plugin\Field\FieldFormatter;
 
-
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Render\RendererInterface;
@@ -29,7 +28,7 @@
   protected $renderer;
 
   /**
-   * Constructs a FileAudioFormatter instance.
+   * Constructs a FileMediaFormatter instance.
    *
    * @param string $plugin_id
    *   The plugin_id for the formatter.
diff -u b/core/modules/file/src/Plugin/Field/FieldFormatter/FileVideoFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/FileVideoFormatter.php
--- b/core/modules/file/src/Plugin/Field/FieldFormatter/FileVideoFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/FileVideoFormatter.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\file\Plugin\Field\FieldFormatter;
 
-
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -48,47 +47,47 @@
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['controls'] = array(
-      '#title' => t('Show video controls'),
+      '#title' => $this->t('Show video controls'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('controls'),
     );
     $element['autoplay'] = array(
-      '#title' => t('Autoplay'),
+      '#title' => $this->t('Autoplay'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('autoplay'),
     );
     $element['loop'] = array(
-      '#title' => t('Loop'),
+      '#title' => $this->t('Loop'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('loop'),
     );
     $element['muted'] = array(
-      '#title' => t('Muted'),
+      '#title' => $this->t('Muted'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('muted'),
     );
     $element['width'] = array(
       '#type' => 'textfield',
-      '#title' => t('Width'),
+      '#title' => $this->t('Width'),
       '#default_value' => $this->getSetting('width'),
       '#size' => 5,
       '#maxlength' => 5,
-      '#field_suffix' => t('pixels'),
+      '#field_suffix' => $this->t('pixels'),
     );
     $element['height'] = array(
       '#type' => 'textfield',
-      '#title' => t('Height'),
+      '#title' => $this->t('Height'),
       '#default_value' => $this->getSetting('height'),
       '#size' => 5,
       '#maxlength' => 5,
-      '#field_suffix' => t('pixels'),
+      '#field_suffix' => $this->t('pixels'),
     );
     $element['multiple_file_behavior'] = array(
-      '#title' => t('Display of multiple files'),
+      '#title' => $this->t('Display of multiple files'),
       '#type' => 'radios',
       '#options' => array(
-        'tags' => t('Use multiple @tag tags, each with a single source.', array('@tag' => '<video>')),
-        'sources' => t('Use multiple sources within a single @tag tag.', array('@tag' => '<video>')),
+        'tags' => $this->t('Use multiple @tag tags, each with a single source.', array('@tag' => '<video>')),
+        'sources' => $this->t('Use multiple sources within a single @tag tag.', array('@tag' => '<video>')),
       ),
       '#default_value' => $this->getSetting('multiple_file_behavior'),
     );
@@ -101,19 +100,19 @@
    */
   public function settingsSummary() {
     $summary = array();
-    $summary[] = t('Controls: %controls', array('%controls' => $this->getSetting('controls') ? 'visible' : 'hidden'));
-    $summary[] = t('Autoplay: %autoplay', array('%autoplay' => $this->getSetting('autoplay') ? t('yes') : t('no')));
-    $summary[] = t('Loop: %loop', array('%loop' => $this->getSetting('loop') ? t('yes') : t('no')));
-    $summary[] = t('Muted: %muted', array('%muted' => $this->getSetting('muted') ? t('yes') : t('no')));
+    $summary[] = $this->t('Controls: %controls', array('%controls' => $this->getSetting('controls') ? $this->t('visible') : $this->t('hidden')));
+    $summary[] = $this->t('Autoplay: %autoplay', array('%autoplay' => $this->getSetting('autoplay') ? $this->t('yes') : $this->t('no')));
+    $summary[] = $this->t('Loop: %loop', array('%loop' => $this->getSetting('loop') ? $this->t('yes') : $this->t('no')));
+    $summary[] = $this->t('Muted: %muted', array('%muted' => $this->getSetting('muted') ? $this->t('yes') : $this->t('no')));
     $width = $this->getSetting('width');
     $height = $this->getSetting('height');
     if ($width && $height) {
-      $summary[] = t('Size: %width x %height pixels', array(
+      $summary[] = $this->t('Size: %width x %height pixels', array(
         '%width' => $this->getSetting('width'),
         '%height' => $this->getSetting('height'),
       ));
     }
-    $summary[] = t('Multiple files: %multiple', array('%multiple' => $this->getSetting('multiple_file_behavior')));
+    $summary[] = $this->t('Multiple files: %multiple', array('%multiple' => $this->getSetting('multiple_file_behavior')));
     return $summary;
   }
 
diff -u b/core/modules/file/templates/file-audio.html.twig b/core/modules/file/templates/file-audio.html.twig
--- b/core/modules/file/templates/file-audio.html.twig
+++ b/core/modules/file/templates/file-audio.html.twig
@@ -19,4 +19,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</audio>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</audio>
diff -u b/core/modules/file/templates/file-video.html.twig b/core/modules/file/templates/file-video.html.twig
--- b/core/modules/file/templates/file-video.html.twig
+++ b/core/modules/file/templates/file-video.html.twig
@@ -19,4 +19,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</video>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</video>
diff -u b/core/modules/file/tests/src/Kernel/Formatter/FileAudioFormatterTest.php b/core/modules/file/tests/src/Kernel/Formatter/FileAudioFormatterTest.php
--- b/core/modules/file/tests/src/Kernel/Formatter/FileAudioFormatterTest.php
+++ b/core/modules/file/tests/src/Kernel/Formatter/FileAudioFormatterTest.php
@@ -13,7 +13,7 @@
 
 /**
  * @coversDefaultClass \Drupal\file\Plugin\Field\FieldFormatter\FileAudioFormatter
- * @group field
+ * @group file
  */
 class FileAudioFormatterTest extends KernelTestBase {
 
diff -u b/core/modules/file/tests/src/Kernel/Formatter/FileVideoFormatterTest.php b/core/modules/file/tests/src/Kernel/Formatter/FileVideoFormatterTest.php
--- b/core/modules/file/tests/src/Kernel/Formatter/FileVideoFormatterTest.php
+++ b/core/modules/file/tests/src/Kernel/Formatter/FileVideoFormatterTest.php
@@ -13,7 +13,7 @@
 
 /**
  * @coversDefaultClass \Drupal\file\Plugin\Field\FieldFormatter\FileVideoFormatter
- * @group field
+ * @group file
  */
 class FileVideoFormatterTest extends KernelTestBase {
 
diff -u b/core/themes/classy/templates/field/file-audio.html.twig b/core/themes/classy/templates/field/file-audio.html.twig
--- b/core/themes/classy/templates/field/file-audio.html.twig
+++ b/core/themes/classy/templates/field/file-audio.html.twig
@@ -20,4 +20,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</audio>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</audio>
diff -u b/core/themes/classy/templates/field/file-video.html.twig b/core/themes/classy/templates/field/file-video.html.twig
--- b/core/themes/classy/templates/field/file-video.html.twig
+++ b/core/themes/classy/templates/field/file-video.html.twig
@@ -20,4 +20,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</video>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</video>
diff -u b/core/themes/stable/templates/field/file-audio.html.twig b/core/themes/stable/templates/field/file-audio.html.twig
--- b/core/themes/stable/templates/field/file-audio.html.twig
+++ b/core/themes/stable/templates/field/file-audio.html.twig
@@ -19,4 +19,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</audio>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</audio>
diff -u b/core/themes/stable/templates/field/file-video.html.twig b/core/themes/stable/templates/field/file-video.html.twig
--- b/core/themes/stable/templates/field/file-video.html.twig
+++ b/core/themes/stable/templates/field/file-video.html.twig
@@ -19,4 +19,4 @@
-    {% for file in files %}
-        <source {{ file.source_attributes }} />
-    {% endfor %}
-</video>
\ No newline at end of file
+  {% for file in files %}
+    <source {{ file.source_attributes }} />
+  {% endfor %}
+</video>