diff --git a/src/services/consumptionDataManagerService.ts b/src/services/consumptionDataManagerService.ts
index 016559461b920e55cf1d28870a808a15fdfd38ae..5070632302e5af19db6d6ca934c2c205fd350772 100644
--- a/src/services/consumptionDataManagerService.ts
+++ b/src/services/consumptionDataManagerService.ts
@@ -10,7 +10,7 @@ import {
 } from 'services/dataConsumptionContracts'
 import { FluidType } from 'enum/fluid.enum'
 import ConsumptionDataFormatter from 'services/consumptionDataFormatterService'
-import { QueryRunner } from 'services/queryRunnerService'
+import QueryRunnerService from 'services/queryRunner.service'
 import ConsumptionDataValidator from 'services/consumptionDataValidatorService'
 import ConverterService from 'services/converter.service'
 
@@ -23,13 +23,13 @@ export interface ISingleFluidChartData {
 export default class ConsumptionDataManager implements IConsumptionDataManager {
   private readonly _client: Client
   private readonly _consumptionDataFormatter: ConsumptionDataFormatter
-  private readonly _queryRunner: QueryRunner
+  private readonly _queryRunnerService: QueryRunnerService
   private readonly _consumptionDataValidator: ConsumptionDataValidator
 
   constructor(_client: Client) {
     this._client = _client
     this._consumptionDataFormatter = new ConsumptionDataFormatter()
-    this._queryRunner = new QueryRunner(this._client)
+    this._queryRunnerService = new QueryRunnerService(this._client)
     this._consumptionDataValidator = new ConsumptionDataValidator()
   }
 
@@ -136,7 +136,7 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
 
       return max
     } else {
-      const max = await this._queryRunner.fetchFluidMaxData(
+      const max = await this._queryRunnerService.fetchFluidMaxData(
         maxTimePeriod,
         timeStep,
         fluidTypes[0]
@@ -232,8 +232,12 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
 
     if (compareTimePeriod) {
       const result = await Promise.all([
-        this._queryRunner.fetchFluidData(timePeriod, timeStep, fluidType),
-        this._queryRunner.fetchFluidData(
+        this._queryRunnerService.fetchFluidData(
+          timePeriod,
+          timeStep,
+          fluidType
+        ),
+        this._queryRunnerService.fetchFluidData(
           compareTimePeriod,
           timeStep,
           fluidType
@@ -242,7 +246,7 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
       actualData = result[0]
       comparisonData = result[1]
     } else {
-      actualData = await this._queryRunner.fetchFluidData(
+      actualData = await this._queryRunnerService.fetchFluidData(
         timePeriod,
         timeStep,
         fluidType
@@ -294,11 +298,13 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
   ): Promise<DateTime | null> {
     let lastDay = null
     if (fluidTypes.length === 1) {
-      lastDay = (await this._queryRunner.getLastDateData(fluidTypes[0])) || null
+      lastDay =
+        (await this._queryRunnerService.getLastDateData(fluidTypes[0])) || null
     } else if (fluidTypes.length > 1) {
       const lastDays = []
       for (const fluidType of fluidTypes) {
-        lastDay = (await this._queryRunner.getLastDateData(fluidType)) || null
+        lastDay =
+          (await this._queryRunnerService.getLastDateData(fluidType)) || null
 
         if (lastDay) {
           lastDays.push(lastDay)
@@ -328,11 +334,13 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
     let lastDay = null
     const lastDays = []
     if (fluidTypes.length === 1) {
-      lastDay = (await this._queryRunner.getLastDateData(fluidTypes[0])) || null
+      lastDay =
+        (await this._queryRunnerService.getLastDateData(fluidTypes[0])) || null
       lastDays.push(lastDay)
     } else if (fluidTypes.length > 1) {
       for (const fluidType of fluidTypes) {
-        lastDay = (await this._queryRunner.getLastDateData(fluidType)) || null
+        lastDay =
+          (await this._queryRunnerService.getLastDateData(fluidType)) || null
         lastDays.push(lastDay)
       }
     }
@@ -343,7 +351,10 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
     fluideType: FluidType,
     timeStep: TimeStep
   ): Promise<boolean> {
-    const queryResult = await this._queryRunner.getEntries(fluideType, timeStep)
+    const queryResult = await this._queryRunnerService.getEntries(
+      fluideType,
+      timeStep
+    )
     if (queryResult.data.length > 0) {
       return true
     }
diff --git a/src/services/queryRunnerService.ts b/src/services/queryRunner.service.ts
similarity index 99%
rename from src/services/queryRunnerService.ts
rename to src/services/queryRunner.service.ts
index 1d2f16e6ca4fd4b039acba31791ebd4c4b77f4e8..17cfd4ebc19263239f55828b389a7cebe8c14b08 100644
--- a/src/services/queryRunnerService.ts
+++ b/src/services/queryRunner.service.ts
@@ -16,7 +16,7 @@ import {
 import { FluidType } from 'enum/fluid.enum'
 import { TimeStep, ITimePeriod, IDataload } from './dataConsumptionContracts'
 
-export class QueryRunner {
+export default class QueryRunner {
   // TODO to be clean up
   private readonly _max_limit = 1000
   private readonly _default_months = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]