diff --git a/modules/backend/formwidgets/fileupload/partials/_file_multi.htm b/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
index 905d7af07..7e4027d27 100644
--- a/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_file_multi.htm
@@ -2,7 +2,7 @@
     id="<?= $this->getId() ?>"
     class="field-fileupload is-multi <?= count($fileList) ? 'has-attachments' : '' ?> is-sortable"
     data-control="fileupload"
-    data-upload-input="#<?= $this->getId('upload-input') ?>"
+    data-upload-input="#<?= $this->getId('uploadInput') ?>"
     data-unique-id="<?= $this->getId() ?>"
     data-sort-handler="<?= $this->getEventHandler('onSortAttachments') ?>"
     data-item-template="<?= $this->getId('template') ?>">
@@ -27,7 +27,7 @@
 
     <!-- Upload form -->
     <input
-        id="<?= $this->getId('upload-input') ?>"
+        id="<?= $this->getId('uploadInput') ?>"
         type="file"
         multiple="true"
         name="file_data"
diff --git a/modules/backend/formwidgets/fileupload/partials/_file_single.htm b/modules/backend/formwidgets/fileupload/partials/_file_single.htm
index 8df4e71d6..b7e05f793 100644
--- a/modules/backend/formwidgets/fileupload/partials/_file_single.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_file_single.htm
@@ -2,7 +2,7 @@
     id="<?= $this->getId() ?>"
     class="field-fileupload <?= $singleFile ? 'has-attachments' : '' ?>"
     data-control="fileupload"
-    data-upload-input="#<?= $this->getId('upload-input') ?>"
+    data-upload-input="#<?= $this->getId('uploadInput') ?>"
     data-unique-id="<?= $this->getId() ?>"
     data-item-template="<?= $this->getId('template') ?>">
 
@@ -23,7 +23,7 @@
 
     <!-- Upload form -->
     <input
-        id="<?= $this->getId('upload-input') ?>"
+        id="<?= $this->getId('uploadInput') ?>"
         type="file"
         name="file_data"
         class="attachment-input" />
diff --git a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
index c1eaab83e..2bae4ad9f 100644
--- a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm
@@ -2,7 +2,7 @@
     id="<?= $this->getId() ?>"
     class="field-fileupload is-multi <?= count($fileList) ? 'has-attachments' : '' ?> is-sortable"
     data-control="fileupload"
-    data-upload-input="#<?= $this->getId('upload-input') ?>"
+    data-upload-input="#<?= $this->getId('uploadInput') ?>"
     data-unique-id="<?= $this->getId() ?>"
     data-sort-handler="<?= $this->getEventHandler('onSortAttachments') ?>"
     data-image-width="<?= $imageWidth ?>"
@@ -30,7 +30,7 @@
 
     <!-- Upload form -->
     <input
-        id="<?= $this->getId('upload-input') ?>"
+        id="<?= $this->getId('uploadInput') ?>"
         type="file"
         multiple="true"
         name="file_data"
diff --git a/modules/backend/formwidgets/fileupload/partials/_image_single.htm b/modules/backend/formwidgets/fileupload/partials/_image_single.htm
index 8e3c6d7f5..3d99a0add 100644
--- a/modules/backend/formwidgets/fileupload/partials/_image_single.htm
+++ b/modules/backend/formwidgets/fileupload/partials/_image_single.htm
@@ -2,7 +2,7 @@
     id="<?= $this->getId() ?>"
     class="field-fileupload <?= $singleFile ? 'has-attachments' : '' ?>"
     data-control="fileupload"
-    data-upload-input="#<?= $this->getId('upload-input') ?>"
+    data-upload-input="#<?= $this->getId('uploadInput') ?>"
     data-unique-id="<?= $this->getId() ?>"
     data-image-width="<?= $imageWidth ?>"
     data-image-height="<?= $imageHeight ?>"
@@ -29,7 +29,7 @@
 
     <!-- Upload form -->
     <input
-        id="<?= $this->getId('upload-input') ?>"
+        id="<?= $this->getId('uploadInput') ?>"
         type="file"
         name="file_data"
         class="attachment-input" />
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index d7d285831..5c4c153e1 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -168,7 +168,7 @@ class Lists extends WidgetBase
     public function render()
     {
         $this->prepareVars();
-        return $this->makePartial('list_container');
+        return $this->makePartial('list-container');
     }
 
     /**
diff --git a/modules/backend/widgets/lists/partials/_list_container.htm b/modules/backend/widgets/lists/partials/_list-container.htm
similarity index 100%
rename from modules/backend/widgets/lists/partials/_list_container.htm
rename to modules/backend/widgets/lists/partials/_list-container.htm