diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 78a05770e1ed1fb0759895ec39c04b676de85628..12b0fae1405fb42c7acd7505890323d69c28dd58 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -31,7 +31,7 @@ function mimeTypesToAccept(mimeTypes) {
 /**
  * KnowledgeBaseWebPageElementView web component
  */
-export class FileUpload extends ScopedElementsMixin(VPULitElement) {
+export class FileSource extends ScopedElementsMixin(VPULitElement) {
     constructor() {
         super();
         this.lang = 'de';
@@ -92,7 +92,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
                     break;
                 case "queuedFilesCount":
                     const data = { "queuedFilesCount": this.queuedFilesCount, "queuedFiles": this.queuedFiles };
-                    const event = new CustomEvent("vpu-fileupload-queued-files-changed",
+                    const event = new CustomEvent("vpu-file-source-queued-files-changed",
                         { "detail": data, bubbles: true, composed: true });
                     this.dispatchEvent(event);
                     break;
@@ -173,7 +173,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
         console.log('handleFiles: files.length = ' + files.length);
         this.multipleUploadInProgress = true;
 
-        this.dispatchEvent(new CustomEvent("vpu-fileupload-all-start",
+        this.dispatchEvent(new CustomEvent("vpu-file-source-all-start",
             { "detail": {}, bubbles: true, composed: true }));
 
         // we need to copy the files to another array or else they will be gone in the setTimeout function!
@@ -206,7 +206,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
 
             this.multipleUploadInProgress = false;
 
-            this.dispatchEvent(new CustomEvent("vpu-fileupload-all-finished",
+            this.dispatchEvent(new CustomEvent("vpu-file-source-all-finished",
                 { "detail": {}, bubbles: true, composed: true }));
         }, 100);
     }
@@ -302,7 +302,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
             data.file = file;
         }
 
-        const event = new CustomEvent("vpu-fileupload-file-finished", { "detail": data, bubbles: true, composed: true });
+        const event = new CustomEvent("vpu-file-source-file-finished", { "detail": data, bubbles: true, composed: true });
         this.dispatchEvent(event);
     }
 
@@ -312,7 +312,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
             fileSize: file.size,
         };
 
-        this.dispatchEvent(new CustomEvent("vpu-fileupload-file-start",
+        this.dispatchEvent(new CustomEvent("vpu-file-source-file-start",
             { "detail": data, bubbles: true, composed: true }));
     }
 
@@ -327,7 +327,7 @@ export class FileUpload extends ScopedElementsMixin(VPULitElement) {
         this.updateQueuedFilesCount();
 
         const data = {"file": file};
-        const event = new CustomEvent("vpu-fileupload-file-queued", { "detail": data, bubbles: true, composed: true });
+        const event = new CustomEvent("vpu-file-source-file-queued", { "detail": data, bubbles: true, composed: true });
         this.dispatchEvent(event);
 
         return key;
diff --git a/packages/file-handling/src/index.js b/packages/file-handling/src/index.js
index a71fa7f91b6fd4f4a11d817a1741f80cf606fa2b..45db83f7a3f2a0f0ac2b3a30aa332be2a4d2ffd7 100644
--- a/packages/file-handling/src/index.js
+++ b/packages/file-handling/src/index.js
@@ -1,3 +1,5 @@
 import {FileUpload} from './fileupload';
+import {FileSource} from './file-source';
 
-export {FileUpload};
\ No newline at end of file
+export {FileUpload};
+export {FileSource};
\ No newline at end of file
diff --git a/packages/file-handling/src/vpu-file-source.js b/packages/file-handling/src/vpu-file-source.js
index d1b827890f4c80ee24ff83cefa7244f36e87918c..d5bdf5318a754cfc9ad3d1b44e1e67862a2c3f30 100644
--- a/packages/file-handling/src/vpu-file-source.js
+++ b/packages/file-handling/src/vpu-file-source.js
@@ -1,4 +1,4 @@
 import * as commonUtils from "vpu-common/utils";
-import {FileUpload} from './fileupload';
+import {FileSource} from './file-source';
 
-commonUtils.defineCustomElement('vpu-fileupload', FileUpload);
+commonUtils.defineCustomElement('vpu-file-source', FileSource);