diff --git a/modules/webform_examples/config/install/webform.webform.example_elements.yml b/modules/webform_examples/config/install/webform.webform.example_elements.yml
index e7cf0ca1..6a119847 100644
--- a/modules/webform_examples/config/install/webform.webform.example_elements.yml
+++ b/modules/webform_examples/config/install/webform.webform.example_elements.yml
@@ -118,7 +118,7 @@ elements: |
       '#title': 'Image file'
     managed_file:
       '#type': managed_file
-      '#title': 'Managed file'
+      '#title': 'File'
       '#description': '<b>Known Issues:</b><br/><a href="https://www.drupal.org/node/2705471">Issue #2705471: Webform states managed file fields</a><br/><a href="https://www.drupal.org/node/2113931">Issue #2113931: File Field design update</a>'
     webform_video_file:
       '#type': video_file
diff --git a/src/Form/WebformAdminSettingsForm.php b/src/Form/WebformAdminSettingsForm.php
index f7124c1b..242b3006 100644
--- a/src/Form/WebformAdminSettingsForm.php
+++ b/src/Form/WebformAdminSettingsForm.php
@@ -463,7 +463,7 @@ class WebformAdminSettingsForm extends ConfigFormBase {
       '#default_value' => $config->get('file.default_max_filesize'),
     ];
     $file_types = [
-      'managed_file' => 'managed file',
+      'managed_file' => 'file',
       'audio_file' => 'audio file',
       'document_file' => 'document file',
       'image_file' => 'image file',
diff --git a/src/Plugin/WebformElement/ManagedFile.php b/src/Plugin/WebformElement/ManagedFile.php
index bcfe1730..42264e23 100644
--- a/src/Plugin/WebformElement/ManagedFile.php
+++ b/src/Plugin/WebformElement/ManagedFile.php
@@ -8,7 +8,7 @@ namespace Drupal\webform\Plugin\WebformElement;
  * @WebformElement(
  *   id = "managed_file",
  *   api = "https://api.drupal.org/api/drupal/core!modules!file!src!Element!ManagedFile.php/class/ManagedFile",
- *   label = @Translation("Managed file"),
+ *   label = @Translation("File"),
  *   description = @Translation("Provides a form element for uploading and saving a file."),
  *   category = @Translation("File upload elements"),
  *   states_wrapper = TRUE,
diff --git a/src/Plugin/WebformElement/WebformManagedFileBase.php b/src/Plugin/WebformElement/WebformManagedFileBase.php
index 0aa68e7e..d9e4bdf2 100644
--- a/src/Plugin/WebformElement/WebformManagedFileBase.php
+++ b/src/Plugin/WebformElement/WebformManagedFileBase.php
@@ -65,7 +65,7 @@ abstract class WebformManagedFileBase extends WebformElementBase {
       return FALSE;
     }
 
-    // Disable managed file element is there are no visible stream wrappers.
+    // Disable File element is there are no visible stream wrappers.
     $scheme_options = self::getVisibleStreamWrappers();
     return (empty($scheme_options)) ? FALSE : TRUE;
   }
@@ -83,11 +83,11 @@ abstract class WebformManagedFileBase extends WebformElementBase {
       $scheme_options = self::getVisibleStreamWrappers();
       $uri_scheme = $this->getUriScheme($element);
       if (!isset($scheme_options[$uri_scheme]) && $this->currentUser->hasPermission('administer webform')) {
-        drupal_set_message($this->t('The \'Managed file\' element is unavailable because a <a href="https://www.drupal.org/documentation/modules/file">private files directory</a> has not been configured and public file uploads have not been enabled. For more information see: <a href="https://www.drupal.org/psa-2016-003">DRUPAL-PSA-2016-003</a>'), 'warning');
+        drupal_set_message($this->t('The \'File\' element is unavailable because a <a href="https://www.drupal.org/documentation/modules/file">private files directory</a> has not been configured and public file uploads have not been enabled. For more information see: <a href="https://www.drupal.org/psa-2016-003">DRUPAL-PSA-2016-003</a>'), 'warning');
         $context = [
           'link' => Link::fromTextAndUrl($this->t('Edit'), \Drupal\Core\Url::fromRoute('<current>'))->toString(),
         ];
-        $this->logger->notice("The 'Managed file' element is unavailable because no stream wrappers are available", $context);
+        $this->logger->notice("The 'File' element is unavailable because no stream wrappers are available", $context);
       }
     }
   }
@@ -133,7 +133,7 @@ abstract class WebformManagedFileBase extends WebformElementBase {
   protected function prepareWrapper(array &$element) {
     parent::prepareWrapper($element);
 
-    // Issue #2705471: Webform states managed file fields.
+    // Issue #2705471: Webform states File fields.
     // Workaround: Wrap the 'managed_file' element in a basic container.
     if (!empty($element['#fixed_wrapper']) || empty($element['#prefix'])) {
       return;
@@ -209,7 +209,7 @@ abstract class WebformManagedFileBase extends WebformElementBase {
   }
 
   /**
-   * Format a managed files as array of strings.
+   * Format a Files as array of strings.
    *
    * @param array $element
    *   An element.
@@ -219,7 +219,7 @@ abstract class WebformManagedFileBase extends WebformElementBase {
    *   An array of options.
    *
    * @return array
-   *   Managed files as array of strings.
+   *   Files as array of strings.
    */
   protected function formatItems(array &$element, $value, array $options) {
     $fids = (is_array($value)) ? $value : [$value];
@@ -356,7 +356,7 @@ abstract class WebformManagedFileBase extends WebformElementBase {
     $value = isset($data[$key]) ? $data[$key] : [];
     $fids = (is_array($value)) ? $value : [$value];
 
-    // Delete managed file record.
+    // Delete File record.
     foreach ($fids as $fid) {
       file_delete($fid);
     }
diff --git a/src/Tests/WebformElementManagedFilePublicTest.php b/src/Tests/WebformElementManagedFilePublicTest.php
index 227c4022..cdda54e6 100644
--- a/src/Tests/WebformElementManagedFilePublicTest.php
+++ b/src/Tests/WebformElementManagedFilePublicTest.php
@@ -58,7 +58,7 @@ class WebformElementManagedFilePublicTest extends WebformTestBase {
 
     // Check managed_file element is enabled.
     $this->drupalGet('admin/structure/webform/manage/test_element_managed_file/element/add');
-    $this->assertRaw('>Managed file<');
+    $this->assertRaw('>File<');
 
     // Disable managed file element.
     \Drupal::configFactory()->getEditable('webform.settings')
@@ -67,12 +67,12 @@ class WebformElementManagedFilePublicTest extends WebformTestBase {
 
     // Check disabled managed_file element remove from add element dialog.
     $this->drupalGet('admin/structure/webform/manage/test_element_managed_file/element/add');
-    $this->assertNoRaw('>Managed file<');
+    $this->assertNoRaw('>File<');
 
     // Check disabled managed_file element warning.
     $this->drupalGet('admin/structure/webform/manage/test_element_managed_file');
-    $this->assertRaw('<em class="placeholder">managed_file (single)</em> is a <em class="placeholder">Managed file</em> element, which has been disabled and will not be rendered.');
-    $this->assertRaw('<em class="placeholder">managed_file (multiple)</em> is a <em class="placeholder">Managed file</em> element, which has been disabled and will not be rendered.');
+    $this->assertRaw('<em class="placeholder">managed_file (single)</em> is a <em class="placeholder">File</em> element, which has been disabled and will not be rendered.');
+    $this->assertRaw('<em class="placeholder">managed_file (multiple)</em> is a <em class="placeholder">File</em> element, which has been disabled and will not be rendered.');
   }
 
 }
diff --git a/tests/modules/webform_test/config/install/webform.webform.test_element_html_markup.yml b/tests/modules/webform_test/config/install/webform.webform.test_element_html_markup.yml
index 99fda675..88f65661 100644
--- a/tests/modules/webform_test/config/install/webform.webform.test_element_html_markup.yml
+++ b/tests/modules/webform_test/config/install/webform.webform.test_element_html_markup.yml
@@ -118,7 +118,7 @@ elements: |
       '#title': '<u>Image file</u>'
     managed_file:
       '#type': managed_file
-      '#title': '<u>Managed file</u>'
+      '#title': '<u>File</u>'
       '#description': '<b>Known Issues:</b><br/><a href="https://www.drupal.org/node/2705471">Issue #2705471: Webform states managed file fields</a><br/><a href="https://www.drupal.org/node/2113931">Issue #2113931: File Field design update</a>'
     webform_video_file:
       '#type': video_file