diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index 4bc0f2e4ba1ac44516cccf088f51e948dced6118..538499c71024cb567dbbfac05bfb6ea7e3cbafbe 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -18,7 +18,7 @@ import {send as notify} from '@dbp-toolkit/common/notification';
 import {OrganizationSelect} from "@dbp-toolkit/organization-select";
 import metadata from './dbp-official-signature-pdf-upload.metadata.json';
 import {Activity} from './activity.js';
-import {AnnotationView} from "./dbp-annotation-view";
+import {PdfAnnotationView} from "./dbp-pdf-annotation-view";
 
 const i18n = createI18nInstance();
 
@@ -67,7 +67,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
           'dbp-button': Button,
           'dbp-textswitch': TextSwitch,
           'dbp-organization-select': OrganizationSelect,
-          'dbp-annotation-view': AnnotationView,
+          'dbp-pdf-annotation-view': PdfAnnotationView,
         };
     }
 
@@ -966,9 +966,9 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                                 <button class="button is-cancel annotation"
                                     @click="${this.hideAnnotationView}"><dbp-icon name="close" id="close-icon"></dbp-icon></button>
                             </div>
-                            <dbp-annotation-view lang="${this.lang}"
+                            <dbp-pdf-annotation-view lang="${this.lang}"
                                              @dbp-pdf-annotations-save="${this.processAnnotationEvent}"
-                                             @dbp-pdf-annotations-cancel="${this.hideAnnotationView}"></dbp-annotation-view>
+                                             @dbp-pdf-annotations-cancel="${this.hideAnnotationView}"></dbp-pdf-annotation-view>
                         </div>
                         <!-- File upload progress -->
                         <div id="upload-progress" class="field notification is-info ${classMap({hidden: !this.uploadInProgress})}">
diff --git a/src/dbp-annotation-view.js b/src/dbp-pdf-annotation-view.js
similarity index 99%
rename from src/dbp-annotation-view.js
rename to src/dbp-pdf-annotation-view.js
index f18da6f64d572872db23d6e08432bef31c0472f3..06c1a940ab6aee37264144a5c862ea2bbce09b61 100644
--- a/src/dbp-annotation-view.js
+++ b/src/dbp-pdf-annotation-view.js
@@ -11,9 +11,9 @@ import * as utils from './utils';
 const i18n = createI18nInstance();
 
 /**
- * AnnotationView web component
+ * PdfAnnotationView web component
  */
-export class AnnotationView extends ScopedElementsMixin(DBPLitElement) {
+export class PdfAnnotationView extends ScopedElementsMixin(DBPLitElement) {
     constructor() {
         super();
         this.lang = 'de';
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index b3998bcdf5eebfc240f9bf1cf0277c6fe3db1a4a..cc7e3542309aeb2995fc4df73f56f1be9d89d0e4 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -18,7 +18,7 @@ import {getPDFSignatureCount} from './utils.js';
 import {send as notify} from '@dbp-toolkit/common/notification';
 import metadata from './dbp-qualified-signature-pdf-upload.metadata.json';
 import {Activity} from './activity.js';
-import {AnnotationView} from "./dbp-annotation-view";
+import {PdfAnnotationView} from "./dbp-pdf-annotation-view";
 
 const i18n = createI18nInstance();
 
@@ -71,7 +71,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
           'dbp-mini-spinner': MiniSpinner,
           'dbp-button': Button,
           'dbp-textswitch': TextSwitch,
-          'dbp-annotation-view': AnnotationView,
+          'dbp-pdf-annotation-view': PdfAnnotationView,
         };
     }
 
@@ -1130,9 +1130,9 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                                 <button class="button is-cancel annotation"
                                     @click="${this.hideAnnotationView}"><dbp-icon name="close" id="close-icon"></dbp-icon></button>
                             </div>
-                            <dbp-annotation-view lang="${this.lang}"
+                            <dbp-pdf-annotation-view lang="${this.lang}"
                                              @dbp-pdf-annotations-save="${this.processAnnotationEvent}"
-                                             @dbp-pdf-annotations-cancel="${this.hideAnnotationView}"></dbp-annotation-view>
+                                             @dbp-pdf-annotations-cancel="${this.hideAnnotationView}"></dbp-pdf-annotation-view>
                         </div>
                         <!-- File upload progress -->
                         <div id="upload-progress" class="field notification is-info ${classMap({hidden: !this.uploadInProgress})}">
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index 223a2ec7d2ecbda05132eb0e828e6416bc78cad5..a1d23e61da518de78052bc1a521e1fa8bb716eb2 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -116,7 +116,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement {
      * 
      * @param {*} key 
      * @param {*} name 
-     * @returns shows AnnotationView
+     * @returns shows PdfAnnotationView
      */
     async showAnnotationView(key, name) {
         if (this.signingProcessEnabled) {
@@ -129,7 +129,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement {
             this.currentPreviewQueueKey = key;
             console.log(file);
 
-            const viewTag = this.constructor.getScopedTagName('dbp-annotation-view');
+            const viewTag = this.constructor.getScopedTagName('dbp-pdf-annotation-view');
             this._(viewTag).setAttribute('key', key);
 
             this.isAnnotationViewVisible = true;
@@ -153,7 +153,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement {
     }
 
     /**
-     * Hides the AnnotationView
+     * Hides the PdfAnnotationView
      */
     hideAnnotationView() {
         this._("#annotation-switch").name = "no-text";