diff --git a/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts b/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts
index 93f403d18c..ba54dcde2a 100644
--- a/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts
+++ b/App/FeatureSet/Workers/Jobs/ServerMonitor/CheckOnlineStatus.ts
@@ -56,10 +56,7 @@ RunCron(
           hostname: "",
         };
 
-        await MonitorResourceUtil.monitorResource(
-          serverMonitorResponse,
-        );
-        
+        await MonitorResourceUtil.monitorResource(serverMonitorResponse);
       } catch (error) {
         logger.error(
           `Error in ServerMonitor:CheckOnlineStatus for monitorId: ${monitor.id}`,
diff --git a/Common/Types/Probe/ProbeMonitorResponse.ts b/Common/Types/Probe/ProbeMonitorResponse.ts
index 59e6d44129..6315e46680 100644
--- a/Common/Types/Probe/ProbeMonitorResponse.ts
+++ b/Common/Types/Probe/ProbeMonitorResponse.ts
@@ -21,7 +21,7 @@ export default interface ProbeMonitorResponse {
   monitorId: ObjectID;
   probeId: ObjectID;
   failureCause: string;
-  sslResponse?: SslMonitorResponse| undefined;
+  sslResponse?: SslMonitorResponse | undefined;
   syntheticMonitorResponse?: Array<SyntheticMonitorResponse> | undefined;
   customCodeMonitorResponse?: CustomCodeMonitorResponse | undefined;
   monitoredAt: Date;
diff --git a/CommonServer/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts b/CommonServer/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts
index fad60b398c..9c6f48fe37 100644
--- a/CommonServer/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts
+++ b/CommonServer/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts
@@ -19,7 +19,7 @@ export default class CustomCodeMonitoringCriteria {
       threshold = CompareCriteria.convertToNumber(threshold);
 
       const currentExecutionTime: number =
-      syntheticMonitorResponse.executionTimeInMS || 0;
+        syntheticMonitorResponse.executionTimeInMS || 0;
 
       return CompareCriteria.compareCriteriaNumbers({
         value: currentExecutionTime,
diff --git a/CommonServer/Utils/Monitor/MonitorResource.ts b/CommonServer/Utils/Monitor/MonitorResource.ts
index e869a05551..ed10c3b964 100644
--- a/CommonServer/Utils/Monitor/MonitorResource.ts
+++ b/CommonServer/Utils/Monitor/MonitorResource.ts
@@ -534,7 +534,7 @@ export default class MonitorResourceUtil {
     }
 
     if ((data.dataToProcess as ProbeMonitorResponse).syntheticMonitorResponse) {
-      for (const syntheticMonitor of (
+      for (const syntheticMonitorResponse of (
         data.dataToProcess as ProbeMonitorResponse
       ).syntheticMonitorResponse || []) {
         const monitorMetricsByMinute: MonitorMetricsByMinute =
@@ -543,13 +543,13 @@ export default class MonitorResourceUtil {
         monitorMetricsByMinute.projectId = data.projectId;
         monitorMetricsByMinute.metricType = CheckOn.ExecutionTime;
         monitorMetricsByMinute.metricValue =
-          syntheticMonitor.executionTimeInMS;
+          syntheticMonitorResponse.executionTimeInMS;
         monitorMetricsByMinute.miscData = {
           probeId: (
             data.dataToProcess as ProbeMonitorResponse
           ).probeId.toString(),
-          browserType: syntheticMonitor.browserType,
-          screenSizeType: syntheticMonitor.screenSizeType,
+          browserType: syntheticMonitorResponse.browserType,
+          screenSizeType: syntheticMonitorResponse.screenSizeType,
         };
 
         itemsToSave.push(monitorMetricsByMinute);
@@ -559,7 +559,7 @@ export default class MonitorResourceUtil {
     if (
       (data.dataToProcess as ProbeMonitorResponse).customCodeMonitorResponse
     ) {
-      const customCodeMonitor: CustomCodeMonitorResponse = (
+      const customCodeMonitorResponse: CustomCodeMonitorResponse = (
         data.dataToProcess as ProbeMonitorResponse
       ).customCodeMonitorResponse!;
 
@@ -569,7 +569,7 @@ export default class MonitorResourceUtil {
       monitorMetricsByMinute.projectId = data.projectId;
       monitorMetricsByMinute.metricType = CheckOn.ExecutionTime;
       monitorMetricsByMinute.metricValue =
-        customCodeMonitor.executionTimeInMS;
+        customCodeMonitorResponse.executionTimeInMS;
       monitorMetricsByMinute.miscData = {
         probeId: (
           data.dataToProcess as ProbeMonitorResponse
diff --git a/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx b/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx
index 38cb4ff8da..0c07ccf664 100644
--- a/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/CustomMonitorSummaryView.tsx
@@ -28,7 +28,8 @@ const CustomCodeMonitorSummaryView: FunctionComponent<ComponentProps> = (
   const customCodeMonitorResponse: CustomCodeMonitorResponse =
     props.customCodeMonitorResponse;
 
-  let executionTimeInMS: number = customCodeMonitorResponse.executionTimeInMS || 0;
+  let executionTimeInMS: number =
+    customCodeMonitorResponse.executionTimeInMS || 0;
 
   if (executionTimeInMS > 0) {
     executionTimeInMS = Math.round(executionTimeInMS);
diff --git a/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx b/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx
index 090e170c2f..271cd3877b 100644
--- a/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SummaryInfo.tsx
@@ -118,8 +118,8 @@ const SummaryInfo: FunctionComponent<ComponentProps> = (
     <div>
       {props.probeMonitorResponses &&
         props.probeMonitorResponses.map(
-          (probeMonitorResponses: ProbeMonitorResponse, index: number) => {
-            return getProbableMonitorSummarysInfo(probeMonitorResponses, index);
+          (probeMonitorResponse: ProbeMonitorResponse, index: number) => {
+            return getProbableMonitorSummarysInfo(probeMonitorResponse, index);
           },
         )}
 
@@ -135,7 +135,7 @@ const SummaryInfo: FunctionComponent<ComponentProps> = (
       {props.monitorType === MonitorType.Server &&
       props.serverMonitorResponse ? (
         <ServerMonitorSummaryView
-        serverMonitorResponse={props.serverMonitorResponse}
+          serverMonitorResponse={props.serverMonitorResponse}
         />
       ) : (
         <></>
diff --git a/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx b/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx
index 326db919b3..b67de8a1d9 100644
--- a/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx
+++ b/Dashboard/src/Components/Monitor/SummaryView/SyntheticMonitorView.tsx
@@ -21,13 +21,13 @@ const SyntheticMonitorView: FunctionComponent<ComponentProps> = (
     );
   }
 
-  const syntheticMonitors: Array<SyntheticMonitorResponse> =
+  const syntheticMonitorResponses: Array<SyntheticMonitorResponse> =
     props.probeMonitorResponse.syntheticMonitorResponse;
 
   return (
     <div>
-      {syntheticMonitors &&
-        syntheticMonitors.map(
+      {syntheticMonitorResponses &&
+        syntheticMonitorResponses.map(
           (
             syntheticMonitorResponse: SyntheticMonitorResponse,
             index: number,
@@ -39,7 +39,7 @@ const SyntheticMonitorView: FunctionComponent<ComponentProps> = (
                   syntheticMonitorResponse={syntheticMonitorResponse}
                   monitoredAt={props.probeMonitorResponse.monitoredAt}
                 />
-                {index !== syntheticMonitors.length - 1 && (
+                {index !== syntheticMonitorResponses.length - 1 && (
                   <HorizontalRule />
                 )}
               </div>
diff --git a/Dashboard/src/Pages/Monitor/View/Index.tsx b/Dashboard/src/Pages/Monitor/View/Index.tsx
index c487bed882..cc0568a0e5 100644
--- a/Dashboard/src/Pages/Monitor/View/Index.tsx
+++ b/Dashboard/src/Pages/Monitor/View/Index.tsx
@@ -294,7 +294,7 @@ const MonitorView: FunctionComponent<PageComponentProps> = (): ReactElement => {
           },
         });
 
-        const probeMonitors: Array<MonitorStepProbeResponse> = [];
+        const probeMonitorResponses: Array<MonitorStepProbeResponse> = [];
 
         for (let i: number = 0; i < monitorProbes.data.length; i++) {
           const monitorProbe: MonitorProbe | undefined = monitorProbes.data[i];
@@ -311,10 +311,10 @@ const MonitorView: FunctionComponent<PageComponentProps> = (): ReactElement => {
             continue;
           }
 
-          probeMonitors.push(monitorProbe?.lastMonitoringLog);
+          probeMonitorResponses.push(monitorProbe?.lastMonitoringLog);
         }
 
-        setProbeResponses(probeMonitors);
+        setProbeResponses(probeMonitorResponses);
       }
     } catch (err) {
       setError(API.getFriendlyMessage(err));
diff --git a/Ingestor/API/ServerMonitor.ts b/Ingestor/API/ServerMonitor.ts
index c3ec4705de..ef20838898 100644
--- a/Ingestor/API/ServerMonitor.ts
+++ b/Ingestor/API/ServerMonitor.ts
@@ -109,9 +109,7 @@ router.post(
 
       // process probe response here.
       const probeApiIngestResponse: ProbeApiIngestResponse =
-        await MonitorResourceUtil.monitorResource(
-          serverMonitorResponse,
-        );
+        await MonitorResourceUtil.monitorResource(serverMonitorResponse);
 
       return Response.sendJsonObjectResponse(req, res, {
         probeApiIngestResponse: probeApiIngestResponse,
diff --git a/Probe/Utils/Monitors/Monitor.ts b/Probe/Utils/Monitors/Monitor.ts
index f5a249f1ab..3cba8be650 100644
--- a/Probe/Utils/Monitors/Monitor.ts
+++ b/Probe/Utils/Monitors/Monitor.ts
@@ -2,11 +2,11 @@ import { INGESTOR_URL } from "../../Config";
 import ProbeUtil from "../Probe";
 import ProbeAPIRequest from "../ProbeAPIRequest";
 import ApiMonitor, { APIResponse } from "./MonitorTypes/ApiMonitor";
-import CustomCodeMonitorResponse from "./MonitorTypes/CustomCodeMonitorResponse";
+import CustomCodeMonitor from "./MonitorTypes/CustomCodeMonitor";
 import PingMonitor, { PingResponse } from "./MonitorTypes/PingMonitor";
-import PortMonitorResponse, { PortMonitorResponse } from "./MonitorTypes/PortMonitorResponse";
+import PortMonitor, { PortMonitorResponse } from "./MonitorTypes/PortMonitor";
 import SSLMonitor, { SslResponse } from "./MonitorTypes/SslMonitor";
-import SyntheticMonitorResponse from "./MonitorTypes/SyntheticMonitorResponse";
+import SyntheticMonitor from "./MonitorTypes/SyntheticMonitor";
 import WebsiteMonitor, {
   ProbeWebsiteResponse,
 } from "./MonitorTypes/WebsiteMonitor";
@@ -16,7 +16,7 @@ import OneUptimeDate from "Common/Types/Date";
 import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter";
-import CustomCodeMonitorResponse from "Common/Types/Monitor/CustomCodeMonitorResponse/CustomCodeMonitorResponse";
+import CustomCodeMonitorResponse from "Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse";
 import MonitorCriteriaInstance from "Common/Types/Monitor/MonitorCriteriaInstance";
 import MonitorStep from "Common/Types/Monitor/MonitorStep";
 import MonitorType from "Common/Types/Monitor/MonitorType";
@@ -31,7 +31,7 @@ import logger from "CommonServer/Utils/Logger";
 import Monitor from "Model/Models/Monitor";
 
 export default class MonitorUtil {
-  public static async probeMonitorResponse(
+  public static async probeMonitor(
     monitor: Monitor,
   ): Promise<Array<ProbeMonitorResponse | null>> {
     const results: Array<ProbeMonitorResponse | null> = [];
@@ -145,7 +145,7 @@ export default class MonitorUtil {
       if (LocalCache.getString("PROBE", "PING_MONITORING") === "PORT") {
         // probe is online but ping monitoring is blocked by the cloud provider. Fallback to port monitoring.
 
-        const response: PortMonitorResponse | null = await PortMonitorResponse.ping(
+        const response: PortMonitorResponse | null = await PortMonitor.ping(
           monitorStep.data?.monitorDestination,
           new Port(80), // use port 80 by default.
           {
@@ -197,7 +197,7 @@ export default class MonitorUtil {
 
       result.monitorDestinationPort = monitorStep.data.monitorDestinationPort;
 
-      const response: PortMonitorResponse | null = await PortMonitorResponse.ping(
+      const response: PortMonitorResponse | null = await PortMonitor.ping(
         monitorStep.data?.monitorDestination,
         monitorStep.data.monitorDestinationPort,
         {
@@ -223,7 +223,7 @@ export default class MonitorUtil {
       }
 
       const response: Array<SyntheticMonitorResponse> | null =
-        await SyntheticMonitorResponse.execute({
+        await SyntheticMonitor.execute({
           script: monitorStep.data.customCode,
           monitorId: monitor.id!,
           screenSizeTypes: monitorStep.data
@@ -246,7 +246,7 @@ export default class MonitorUtil {
       }
 
       const response: CustomCodeMonitorResponse | null =
-        await CustomCodeMonitorResponse.execute({
+        await CustomCodeMonitor.execute({
           script: monitorStep.data.customCode,
           monitorId: monitor.id!,
         });
diff --git a/Probe/Utils/Monitors/MonitorTypes/CustomCodeMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/CustomCodeMonitor.ts
index 4161732f1e..dcb8a928fe 100644
--- a/Probe/Utils/Monitors/MonitorTypes/CustomCodeMonitor.ts
+++ b/Probe/Utils/Monitors/MonitorTypes/CustomCodeMonitor.ts
@@ -13,7 +13,7 @@ export interface CustomCodeMonitorOptions {
 export default class CustomCodeMonitor {
   public static async execute(
     options: CustomCodeMonitorOptions,
-  ): Promise<CustomCodeMonitor | null> {
+  ): Promise<CustomCodeMonitorResponse | null> {
     if (!options) {
       // this should never happen
       options = {