diff --git a/packages/file-handling/src/demo.js b/packages/file-handling/src/demo.js
index 816e72eadc142acf92a20102e65b9f9b689c90d8..207aed30a5b1a9c436cf1bacba9b6578f5a063c7 100644
--- a/packages/file-handling/src/demo.js
+++ b/packages/file-handling/src/demo.js
@@ -1,9 +1,8 @@
 import {createInstance} from './i18n';
 import {html, LitElement} from 'lit';
-import {unsafeHTML} from 'lit/directives/unsafe-html.js';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {FileSource} from './file-source.js';
-import {FileSink} from './file-sink.js';
+import {FileSource} from './file-source';
+import {FileSink} from './file-sink';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 
 export class FileSourceDemo extends ScopedElementsMixin(LitElement) {
@@ -102,7 +101,6 @@ export class FileSourceDemo extends ScopedElementsMixin(LitElement) {
             <section class="section">
                 <div class="content">
                     <h1 class="title">${i18n.t('demo-title')}</h1>
-                    <!-- <p>${unsafeHTML(i18n.t('required-server', {url: this.url}))}</p> -->
                 </div>
                 <div class="content">
                     <h2 class="subtitle">Selected files</h2>
diff --git a/toolkit-showcase/src/dbp-file-handling-demo-activity.js b/toolkit-showcase/src/dbp-file-handling-demo-activity.js
index b50d9b9c5f30280efb67b9b62f509ec09da79f28..a1e88d8e06c67dd5cc83ca89471f70dd9831db7a 100644
--- a/toolkit-showcase/src/dbp-file-handling-demo-activity.js
+++ b/toolkit-showcase/src/dbp-file-handling-demo-activity.js
@@ -1,14 +1,14 @@
 import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import {FileSourceDemo} from '@dbp-toolkit/file-handling/src/demo';
-import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
+import * as commonUtils from '@dbp-toolkit/common/utils';
 import {unsafeHTML} from 'lit/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/file-handling/README.md';
 import * as demoStyles from './styles';
 import {AdapterLitElement} from '@dbp-toolkit/provider/src/adapter-lit-element';
 
-class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
+export class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
     constructor() {
         super();
         this.lang = 'en';
@@ -17,7 +17,7 @@ class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement)
 
     static get scopedElements() {
         return {
-            'dbp-file-handling-demo': FileSourceDemo,
+            'dbp-file-source-demo': FileSourceDemo,
         };
     }
 
@@ -60,10 +60,10 @@ class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement)
     render() {
         return html`
             ${unsafeHTML(readme)}
-            <dbp-file-handling-demo
+            <dbp-file-source-demo
                 id="demo"
                 lang="${this.lang}"
-                entry-point-url="${this.entryPointUrl}"></dbp-file-handling-demo>
+                entry-point-url="${this.entryPointUrl}"></dbp-file-source-demo>
         `;
     }
 }