diff --git a/web/src/app/monitor/components/classification-report/classification-report.component.html b/web/src/app/monitor/components/classification-report/classification-report.component.html
index 92cddc7e3..d86acdac4 100644
--- a/web/src/app/monitor/components/classification-report/classification-report.component.html
+++ b/web/src/app/monitor/components/classification-report/classification-report.component.html
@@ -11,6 +11,6 @@
                 </div>
             </div>
         </div>
-        <taskana-report [reportData]="reportData"></taskana-report>
+        <taskana-monitor-report-table [reportData]="reportData"></taskana-monitor-report-table>
     </div>
 </div>
diff --git a/web/src/app/monitor/components/classification-report/classification-report.component.ts b/web/src/app/monitor/components/classification-report/classification-report.component.ts
index 26c35b4dc..8bf3993e8 100644
--- a/web/src/app/monitor/components/classification-report/classification-report.component.ts
+++ b/web/src/app/monitor/components/classification-report/classification-report.component.ts
@@ -6,7 +6,7 @@ import { ChartColorsDefinition } from '../../models/chart-colors';
 import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
 
 @Component({
-  selector: 'taskana-monitor-classification-tasks',
+  selector: 'taskana-monitor-classification-report',
   templateUrl: './classification-report.component.html',
   styleUrls: ['./classification-report.component.scss']
 })
diff --git a/web/src/app/monitor/components/monitor/monitor.component.html b/web/src/app/monitor/components/monitor/monitor.component.html
index bdeb0bbfb..37bd5fd87 100644
--- a/web/src/app/monitor/components/monitor/monitor.component.html
+++ b/web/src/app/monitor/components/monitor/monitor.component.html
@@ -22,16 +22,16 @@
     </ul>
     <div class="tab-content">
         <div class="tab-pane active" id="tasks-tab" role="tabpanel">
-            <taskana-monitor-tasks></taskana-monitor-tasks>
+            <taskana-monitor-task-report></taskana-monitor-task-report>
         </div>
         <div class="tab-pane" id="workbaskets-tab" role="tabpanel">
-            <taskana-monitor-workbaskets></taskana-monitor-workbaskets>
+            <taskana-monitor-workbasket-report></taskana-monitor-workbasket-report>
         </div>
         <div class="tab-pane" id="classifications-tab" role="tabpanel">
-            <taskana-monitor-classification-tasks></taskana-monitor-classification-tasks>
+            <taskana-monitor-classification-report></taskana-monitor-classification-report>
         </div>
         <div class="tab-pane" id="timestamp-tab" role="tabpanel">
-            <taskana-monitor-timestamp></taskana-monitor-timestamp>
+            <taskana-monitor-timestamp-report></taskana-monitor-timestamp-report>
         </div>
     </div>
 </div>
diff --git a/web/src/app/monitor/components/report-table/report-table.component.ts b/web/src/app/monitor/components/report-table/report-table.component.ts
index 111520602..9a175a22c 100644
--- a/web/src/app/monitor/components/report-table/report-table.component.ts
+++ b/web/src/app/monitor/components/report-table/report-table.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { ReportData } from 'app/monitor/models/report-data';
 
 @Component({
-  selector: 'taskana-report',
+  selector: 'taskana-monitor-report-table',
   templateUrl: './report-table.component.html',
   styleUrls: ['./report-table.component.scss']
 })
diff --git a/web/src/app/monitor/components/task-report/task-report.component.html b/web/src/app/monitor/components/task-report/task-report.component.html
index 2e30e9fed..a1d08c247 100644
--- a/web/src/app/monitor/components/task-report/task-report.component.html
+++ b/web/src/app/monitor/components/task-report/task-report.component.html
@@ -6,6 +6,6 @@
     <div style="display: block" class =" col-xs-12 col-md-7 col-md-offset-2">
       <canvas baseChart [data]="pieChartData" [labels]="pieChartLabels" [chartType]="pieChartType"></canvas>
     </div>
-    <taskana-report [reportData]="reportData"></taskana-report>
+    <taskana-monitor-report-table [reportData]="reportData"></taskana-monitor-report-table>
   </div>
 </div>
diff --git a/web/src/app/monitor/components/task-report/task-report.component.ts b/web/src/app/monitor/components/task-report/task-report.component.ts
index 5de773eaa..3c2b4b3e2 100644
--- a/web/src/app/monitor/components/task-report/task-report.component.ts
+++ b/web/src/app/monitor/components/task-report/task-report.component.ts
@@ -4,7 +4,7 @@ import { RestConnectorService } from '../../services/rest-connector.service';
 import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
 
 @Component({
-  selector: 'taskana-monitor-tasks',
+  selector: 'taskana-monitor-task-report',
   templateUrl: './task-report.component.html',
   styleUrls: ['./task-report.component.scss'],
 })
diff --git a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.html b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.html
index c7dc4d3a3..eb6c11da5 100644
--- a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.html
+++ b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.html
@@ -3,6 +3,6 @@
         <h4>{{reportData.meta.name}} ({{reportData.meta.date | dateTimeZone}})</h4>
     </div>
     <div class="panel-body blub">
-        <taskana-report [reportData]="reportData"></taskana-report>
+        <taskana-monitor-report-table [reportData]="reportData"></taskana-monitor-report-table>
     </div>
 </div>
diff --git a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
index c51b5c317..495075a49 100644
--- a/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
+++ b/web/src/app/monitor/components/timestamp-report/timestamp-report.component.ts
@@ -3,7 +3,7 @@ import { ReportData } from '../../models/report-data';
 import { RestConnectorService } from '../../services/rest-connector.service';
 
 @Component({
-  selector: 'taskana-monitor-timestamp',
+  selector: 'taskana-monitor-timestamp-report',
   templateUrl: './timestamp-report.component.html',
   styleUrls: ['./timestamp-report.component.scss']
 })
diff --git a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.html b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.html
index 4ad3e529d..2157ff3d8 100644
--- a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.html
+++ b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.html
@@ -6,4 +6,4 @@
     </div>
   </div>
 </div>
-<taskana-report [reportData]="reportData"></taskana-report>
+<taskana-monitor-report-table [reportData]="reportData"></taskana-monitor-report-table>
diff --git a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
index a7c51c9cf..a3cddb117 100644
--- a/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
+++ b/web/src/app/monitor/components/workbasket-report-due-date/workbasket-report-due-date.component.ts
@@ -7,7 +7,7 @@ import { MetaInfoData } from '../../models/meta-info-data';
 import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
 
 @Component({
-  selector: 'taskana-monitor-workbasket-due-date',
+  selector: 'taskana-monitor-workbasket-report-due-date',
   templateUrl: './workbasket-report-due-date.component.html',
   styleUrls: ['./workbasket-report-due-date.component.scss']
 })
diff --git a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.html b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.html
index 2d3f59fa2..8641180e7 100644
--- a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.html
+++ b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.html
@@ -6,4 +6,4 @@
     </div>
   </div>
 </div>
-<taskana-report [reportData]="reportData"></taskana-report>
+<taskana-monitor-report-table [reportData]="reportData"></taskana-monitor-report-table>
diff --git a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
index 857eca219..a830b015b 100644
--- a/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
+++ b/web/src/app/monitor/components/workbasket-report-planned-date/workbasket-report-planned-date.component.ts
@@ -7,7 +7,7 @@ import { MetaInfoData } from '../../models/meta-info-data';
 import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service';
 
 @Component({
-  selector: 'taskana-monitor-workbasket-planned-date',
+  selector: 'taskana-monitor-workbasket-report-planned-date',
   templateUrl: './workbasket-report-planned-date.component.html',
   styleUrls: ['./workbasket-report-planned-date.component.scss']
 })
diff --git a/web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.ts b/web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.ts
index 734a3ed5b..2a0a955b9 100644
--- a/web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.ts
+++ b/web/src/app/monitor/components/workbasket-report-query-switcher/workbasket-report-query-switcher.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { QueryType } from '../../models/query-type';
 
 @Component({
-  selector: 'taskana-monitor-workbasket-query-switcher',
+  selector: 'taskana-monitor-workbasket-report-query-switcher',
   templateUrl: './workbasket-report-query-switcher.component.html',
   styleUrls: ['./workbasket-report-query-switcher.component.scss']
 })
diff --git a/web/src/app/monitor/components/workbasket-report/workbasket-report.component.html b/web/src/app/monitor/components/workbasket-report/workbasket-report.component.html
index 2e89c88de..96ab9288d 100644
--- a/web/src/app/monitor/components/workbasket-report/workbasket-report.component.html
+++ b/web/src/app/monitor/components/workbasket-report/workbasket-report.component.html
@@ -1,13 +1,13 @@
 <div class="panel panel-default">
   <div class="panel-heading">
     <h4 *ngIf="metaInformation">{{getTitle()}} ({{metaInformation?.date | date : 'dd.MM.yyyy HH:mm:ss'}})</h4>
-    <taskana-monitor-workbasket-query-switcher
-      (queryChanged)="queryChanged($event)"></taskana-monitor-workbasket-query-switcher>
+    <taskana-monitor-workbasket-report-query-switcher
+      (queryChanged)="queryChanged($event)"></taskana-monitor-workbasket-report-query-switcher>
   </div>
   <div class="panel-body">
-    <taskana-monitor-workbasket-due-date [ngClass]="showMonitorQueryDueDate ? '' : 'hidden'"
-                                         (metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-due-date>
-    <taskana-monitor-workbasket-planned-date [ngClass]="showMonitorQueryPlannedDate ? '' : 'hidden'"
-                                             (metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-planned-date>
+    <taskana-monitor-workbasket-report-due-date [ngClass]="showMonitorQueryDueDate ? '' : 'hidden'"
+                                                (metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-report-due-date>
+    <taskana-monitor-workbasket-report-planned-date [ngClass]="showMonitorQueryPlannedDate ? '' : 'hidden'"
+                                                    (metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-report-planned-date>
   </div>
 </div>
diff --git a/web/src/app/monitor/components/workbasket-report/workbasket-report.component.ts b/web/src/app/monitor/components/workbasket-report/workbasket-report.component.ts
index 3f0e9eebe..4c9d33676 100644
--- a/web/src/app/monitor/components/workbasket-report/workbasket-report.component.ts
+++ b/web/src/app/monitor/components/workbasket-report/workbasket-report.component.ts
@@ -3,7 +3,7 @@ import { MetaInfoData } from '../../models/meta-info-data';
 import { QueryType } from '../../models/query-type';
 
 @Component({
-  selector: 'taskana-monitor-workbaskets',
+  selector: 'taskana-monitor-workbasket-report',
   templateUrl: './workbasket-report.component.html',
   styleUrls: ['./workbasket-report.component.scss']
 })
diff --git a/web/src/theme/_site.scss b/web/src/theme/_site.scss
index 67c28eef6..ee0de62c9 100644
--- a/web/src/theme/_site.scss
+++ b/web/src/theme/_site.scss
@@ -313,8 +313,8 @@ span.flip {
   }
 }
 
-taskana-workbasket-information, taskana-workbasket-access-items, taskana-workbaskets-distribution-targets, taskana-workbasket-details, taskana-monitor-tasks,
-taskana-monitor-workbaskets, taskana-monitor-classification-tasks, taskana-monitor-timestamp {
+taskana-workbasket-information, taskana-workbasket-access-items, taskana-workbaskets-distribution-targets, taskana-workbasket-details, taskana-monitor-task-report,
+taskana-monitor-workbasket-report, taskana-monitor-classification-report, taskana-monitor-timestamp-report {
   & .panel {
     border: none;
     box-shadow: none;
@@ -352,7 +352,7 @@ taskana-task-query {
 }
 
 
-taskana-monitor-tasks, taskana-monitor-workbaskets, taskana-monitor-classification-tasks, taskana-access-items-management {
+taskana-monitor-task-report, taskana-monitor-workbasket-report, taskana-monitor-classification-report, taskana-access-items-management {
   & .panel {
     & > .panel-heading {
       border-left: 1px solid #ddd;