diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
index 40c1b33cd..ec90b625f 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
@@ -2,8 +2,8 @@ import React from 'react';
 import {Button, Col} from 'react-bootstrap';
 import AuthComponent from '../AuthComponent';
 import ReportHeader, { ReportTypes } from "../report-components/common/ReportHeader";
-import ZeroTrustReportPillarGrades from "../report-components/zerotrust/ZeroTrustReportPillarGrades";
-import ZeroTrustReportFindingsTable from "../report-components/zerotrust/ZeroTrustReportFindingsTable";
+import PillarGrades from "../report-components/zerotrust/PillarGrades";
+import FindingsTable from "../report-components/zerotrust/FindingsTable";
 
 class ZeroTrustReportPageComponent extends AuthComponent {
 
@@ -43,9 +43,9 @@ class ZeroTrustReportPageComponent extends AuthComponent {
     } else {
       content = <div>
         <h2>Pillars Overview</h2>
-        <ZeroTrustReportPillarGrades findings={this.state.report.findings} />
+        <PillarGrades findings={this.state.report.findings} />
         <h2>Findings</h2>
-        <ZeroTrustReportFindingsTable findings={this.state.report.findings} />
+        <FindingsTable findings={this.state.report.findings} />
       </div>;
     }
 
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportFindingsTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
similarity index 95%
rename from monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportFindingsTable.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
index 9088c5571..573a70bf0 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportFindingsTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
@@ -67,7 +67,7 @@ const columns = [
 
 const pageSize = 10;
 
-class ZeroTrustReportFindingsTable extends Component {
+class FindingsTable extends Component {
   render() {
     let defaultPageSize = this.props.findings.length > pageSize ? pageSize : this.props.findings.length;
     let showPagination = this.props.findings.length > pageSize;
@@ -86,4 +86,4 @@ class ZeroTrustReportFindingsTable extends Component {
 }
 
 
-export default ZeroTrustReportFindingsTable;
+export default FindingsTable;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportPillarGrades.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
similarity index 85%
rename from monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportPillarGrades.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
index 20d97a90d..6afe2dd52 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ZeroTrustReportPillarGrades.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
@@ -1,8 +1,7 @@
 import React, {Component} from "react";
 import ZeroTrustPillars from "./ZeroTrustPillars";
-import ZeroTrustReportFindingsTable from "./ZeroTrustReportFindingsTable";
 
-export class ZeroTrustReportPillarGrades extends Component {
+export class PillarGrades extends Component {
   render() {
     let pillarsCounters = {};
     for(const pillar in ZeroTrustPillars) {
@@ -41,4 +40,4 @@ export class ZeroTrustReportPillarGrades extends Component {
   }
 }
 
-export default ZeroTrustReportPillarGrades;
+export default PillarGrades;