diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index 8840ad3d7..1c9148047 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@ -337,7 +337,7 @@ public abstract class AbstractMultiPartRequest<T> implements MultiPartRequest {
      */
     public String[] getFileNames(String fieldName) {
         return uploadedFiles.getOrDefault(fieldName, Collections.emptyList()).stream()
-                .map(file -> getCanonicalName(file.getName()))
+                .map(file -> getCanonicalName(file.getOriginalName()))
                 .toArray(String[]::new);
     }