diff --git a/services/web/app/src/Features/Uploads/ProjectUploadController.js b/services/web/app/src/Features/Uploads/ProjectUploadController.js
index f64a422674..f61563c4ff 100644
--- a/services/web/app/src/Features/Uploads/ProjectUploadController.js
+++ b/services/web/app/src/Features/Uploads/ProjectUploadController.js
@@ -39,8 +39,8 @@ module.exports = ProjectUploadController = {
   uploadProject(req, res, next) {
     const timer = new metrics.Timer('project-upload')
     const userId = SessionManager.getLoggedInUserId(req.session)
-    const { originalname, path } = req.file
-    const name = Path.basename(originalname, '.zip')
+    const { path } = req.file
+    const name = Path.basename(req.body.name, '.zip')
     return ProjectUploadManager.createProjectFromZipArchive(
       userId,
       name,
@@ -73,7 +73,7 @@ module.exports = ProjectUploadController = {
 
   uploadFile(req, res, next) {
     const timer = new metrics.Timer('file-upload')
-    const name = req.file != null ? req.file.originalname : undefined
+    const name = req.body.name
     const path = req.file != null ? req.file.path : undefined
     const projectId = req.params.Project_id
     const { folder_id: folderId } = req.query
diff --git a/services/web/test/acceptance/src/ProjectDuplicateNameTests.js b/services/web/test/acceptance/src/ProjectDuplicateNameTests.js
index d19bbb097e..c5a3b16f68 100644
--- a/services/web/test/acceptance/src/ProjectDuplicateNameTests.js
+++ b/services/web/test/acceptance/src/ProjectDuplicateNameTests.js
@@ -189,6 +189,7 @@ describe('ProjectDuplicateNames', function () {
                 qqfilename: 'frog.jpg',
               },
               formData: {
+                name: 'frog.jpg',
                 qqfile: {
                   value: fs.createReadStream(
                     Path.join(__dirname, '/../files/1pixel.png')
diff --git a/services/web/test/acceptance/src/ProjectStructureTests.js b/services/web/test/acceptance/src/ProjectStructureTests.js
index 9222d251fa..be01252151 100644
--- a/services/web/test/acceptance/src/ProjectStructureTests.js
+++ b/services/web/test/acceptance/src/ProjectStructureTests.js
@@ -105,6 +105,7 @@ describe('ProjectStructureChanges', function () {
       {
         uri: 'project/new/upload',
         formData: {
+          name: zipFilename,
           qqfile: zipFile,
         },
       },
diff --git a/services/web/test/acceptance/src/helpers/User.js b/services/web/test/acceptance/src/helpers/User.js
index c3af73f1f8..0409669727 100644
--- a/services/web/test/acceptance/src/helpers/User.js
+++ b/services/web/test/acceptance/src/helpers/User.js
@@ -492,6 +492,7 @@ class User {
           folder_id: String(folderId),
         },
         formData: {
+          name,
           qqfile: {
             value: imageFile,
             options: {
diff --git a/services/web/test/unit/src/Uploads/ProjectUploadControllerTests.js b/services/web/test/unit/src/Uploads/ProjectUploadControllerTests.js
index 7b7f9dc37e..935882cce3 100644
--- a/services/web/test/unit/src/Uploads/ProjectUploadControllerTests.js
+++ b/services/web/test/unit/src/Uploads/ProjectUploadControllerTests.js
@@ -61,7 +61,9 @@ describe('ProjectUploadController', function () {
       this.name = 'filename.zip'
       this.req.file = {
         path: this.path,
-        originalname: this.name,
+      }
+      this.req.body = {
+        name: this.name,
       }
       this.req.session = {
         user: {
@@ -165,7 +167,9 @@ describe('ProjectUploadController', function () {
       this.name = 'filename.png'
       this.req.file = {
         path: this.path,
-        originalname: this.name,
+      }
+      this.req.body = {
+        name: this.name,
       }
       this.req.session = {
         user: {
@@ -257,7 +261,7 @@ describe('ProjectUploadController', function () {
 
     describe('with an invalid filename', function () {
       beforeEach(function () {
-        this.req.file.originalname = ''
+        this.req.body.name = ''
         return this.ProjectUploadController.uploadFile(this.req, this.res)
       })