diff --git a/components/lib/fileupload/FileUpload.d.ts b/components/lib/fileupload/FileUpload.d.ts
index b97942a7d..9e2f94b1f 100755
--- a/components/lib/fileupload/FileUpload.d.ts
+++ b/components/lib/fileupload/FileUpload.d.ts
@@ -168,17 +168,17 @@ export interface FileUploadPassThroughOptions {
      */
     buttonbar?: FileUploadPassThroughOptionType;
     /**
-     * Uses to pass attributes to the header' DOM element.
+     * Uses to pass attributes to the choose button's DOM element.
      */
-    header?: FileUploadPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the button's DOM element.
-     */
-    button?: FileUploadPassThroughOptionType;
+    chooseButton?: FileUploadPassThroughOptionType;
     /**
      * Uses to pass attributes to the choose icon's DOM element.
      */
     chooseIcon?: FileUploadPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the choose button label's DOM element.
+     */
+    chooseButtonLabel?: FileUploadPassThroughOptionType;
     /**
      * Uses to pass attributes to the upload button's DOM element.
      * @see {@link ButtonPassThroughOptions}
@@ -201,23 +201,7 @@ export interface FileUploadPassThroughOptions {
      * Uses to pass attributes to the messages' DOM element.
      * @see {@link MessagePassThroughOptions}
      */
-    messages?: MessagePassThroughOptions;
-    /**
-     * Uses to pass attributes to the empty's DOM element.
-     */
-    empty?: FileUploadPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the basic button's DOM element.
-     */
-    basicButton?: FileUploadPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the upload icon's DOM element.
-     */
-    uploadIcon?: FileUploadPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the label's DOM element.
-     */
-    label?: FileUploadPassThroughOptionType;
+    message?: MessagePassThroughOptions;
     /**
      * Uses to pass attributes to the file's DOM element.
      */
@@ -251,6 +235,22 @@ export interface FileUploadPassThroughOptions {
      * @see {@link ButtonPassThroughOptions}
      */
     removeButton?: ButtonPassThroughOptions;
+    /**
+     * Uses to pass attributes to the empty's DOM element.
+     */
+    empty?: FileUploadPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the label's DOM element.
+     */
+    label?: FileUploadPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the basic button's DOM element.
+     */
+    basicButton?: FileUploadPassThroughOptionType;
+    /**
+     * Uses to pass attributes to the upload icon's DOM element.
+     */
+    uploadIcon?: FileUploadPassThroughOptionType;
 }
 
 /**
diff --git a/components/lib/fileupload/FileUpload.vue b/components/lib/fileupload/FileUpload.vue
index 40d17999a..4a630dfb3 100755
--- a/components/lib/fileupload/FileUpload.vue
+++ b/components/lib/fileupload/FileUpload.vue
@@ -2,8 +2,8 @@
     <div v-if="isAdvanced" class="p-fileupload p-fileupload-advanced p-component" v-bind="ptm('root')">
         <input ref="fileInput" type="file" @change="onFileSelect" :multiple="multiple" :accept="accept" :disabled="chooseDisabled" v-bind="ptm('input')" />
         <div class="p-fileupload-buttonbar" v-bind="ptm('buttonbar')">
-            <slot name="header" :files="files" :uploadedFiles="uploadedFiles" :chooseCallback="choose" :uploadCallback="upload" :clearCallback="clear" v-bind="ptm('header')">
-                <span v-ripple :class="advancedChooseButtonClass" :style="style" @click="choose" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" tabindex="0" v-bind="ptm('button')">
+            <slot name="header" :files="files" :uploadedFiles="uploadedFiles" :chooseCallback="choose" :uploadCallback="upload" :clearCallback="clear">
+                <span v-ripple :class="advancedChooseButtonClass" :style="style" @click="choose" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" tabindex="0" v-bind="ptm('chooseButton')">
                     <slot name="chooseicon">
                         <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="['p-button-icon p-button-icon-left', chooseIcon]" aria-hidden="true" v-bind="ptm('chooseIcon')" />
                     </slot>
@@ -28,7 +28,7 @@
         <div ref="content" class="p-fileupload-content" @dragenter="onDragEnter" @dragover="onDragOver" @dragleave="onDragLeave" @drop="onDrop" v-bind="ptm('content')">
             <slot name="content" :files="files" :uploadedFiles="uploadedFiles" :removeUploadedFileCallback="removeUploadedFile" :removeFileCallback="remove" :progress="progress" :messages="messages">
                 <FileUploadProgressBar v-if="hasFiles" :value="progress" :showValue="false" :pt="ptm('progressbar')" />
-                <FileUploadMessage v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :pt="ptm('messages')">{{ msg }}</FileUploadMessage>
+                <FileUploadMessage v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :pt="ptm('message')">{{ msg }}</FileUploadMessage>
                 <FileContent v-if="hasFiles" :files="files" @remove="remove" :badgeValue="pendingLabel" :previewWidth="previewWidth" :templates="$slots" :pt="pt" />
                 <FileContent :files="uploadedFiles" @remove="removeUploadedFile" :badgeValue="completedLabel" badgeSeverity="success" :previewWidth="previewWidth" :templates="$slots" :pt="pt" />
             </slot>