diff --git a/docs/swagger/swagger-spec.json b/docs/swagger/swagger-spec.json
index 0aed214..f089187 100644
--- a/docs/swagger/swagger-spec.json
+++ b/docs/swagger/swagger-spec.json
@@ -2119,6 +2119,10 @@
     "contact": {}
   },
   "tags": [
+    {
+      "name": "Users",
+      "description": ""
+    },
     {
       "name": "Employees",
       "description": ""
@@ -2138,6 +2142,18 @@
     {
       "name": "Leave Requests",
       "description": ""
+    },
+    {
+      "name": "Shift Codes",
+      "description": ""
+    },
+    {
+      "name": "OAuth Access Tokens",
+      "description": ""
+    },
+    {
+      "name": "Authorization",
+      "description": ""
     }
   ],
   "servers": [],
diff --git a/src/modules/expenses/controllers/expenses.controller.ts b/src/modules/expenses/controllers/expenses.controller.ts
index d999718..458dc72 100644
--- a/src/modules/expenses/controllers/expenses.controller.ts
+++ b/src/modules/expenses/controllers/expenses.controller.ts
@@ -6,7 +6,7 @@ import { Roles as RoleEnum } from '.prisma/client';
 import { UpdateExpenseDto } from "../dtos/update-expense.dto";
 import { ApiBearerAuth, ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
 import { RolesAllowed } from "src/common/decorators/roles.decorators";
-import { ExpensesApprovalService } from "../services/expenses-approval.service";
+import { ExpensesApprovalService } from "../services/expenses-command.service";
 import { SearchExpensesDto } from "../dtos/search-expense.dto";
 
 @ApiTags('Expenses')
diff --git a/src/modules/expenses/expenses.module.ts b/src/modules/expenses/expenses.module.ts
index e18e154..489109a 100644
--- a/src/modules/expenses/expenses.module.ts
+++ b/src/modules/expenses/expenses.module.ts
@@ -2,7 +2,7 @@ import { ExpensesController } from "./controllers/expenses.controller";
 import { Module } from "@nestjs/common";
 import { ExpensesService } from "./services/expenses.service";
 import { BusinessLogicsModule } from "src/modules/business-logics/business-logics.module";
-import { ExpensesApprovalService } from "./services/expenses-approval.service";
+import { ExpensesApprovalService } from "./services/expenses-command.service";
 
 @Module({
     imports: [BusinessLogicsModule],
diff --git a/src/modules/expenses/services/expenses-approval.service.ts b/src/modules/expenses/services/expenses-command.service.ts
similarity index 100%
rename from src/modules/expenses/services/expenses-approval.service.ts
rename to src/modules/expenses/services/expenses-command.service.ts
diff --git a/src/modules/pay-periods/pay-periods.module.ts b/src/modules/pay-periods/pay-periods.module.ts
index 1cc4745..af3157c 100644
--- a/src/modules/pay-periods/pay-periods.module.ts
+++ b/src/modules/pay-periods/pay-periods.module.ts
@@ -6,8 +6,8 @@ import { PayPeriodsCommandService } from "./services/pay-periods-command.service
 import { PayPeriodsQueryService } from "./services/pay-periods-query.service";
 import { TimesheetsModule } from "../timesheets/timesheets.module";
 import { TimesheetsCommandService } from "../timesheets/services/timesheets-command.service";
-import { ExpensesApprovalService } from "../expenses/services/expenses-approval.service";
-import { ShiftsApprovalService } from "../shifts/services/shifts-approval.service";
+import { ExpensesApprovalService } from "../expenses/services/expenses-command.service";
+import { ShiftsApprovalService } from "../shifts/services/shifts-command.service";
 
 @Module({
     imports: [PrismaModule, TimesheetsModule],
diff --git a/src/modules/shifts/controllers/shifts-overview.controller.ts b/src/modules/shifts/controllers/shifts-overview.controller.ts
index d1ef6d4..7a56602 100644
--- a/src/modules/shifts/controllers/shifts-overview.controller.ts
+++ b/src/modules/shifts/controllers/shifts-overview.controller.ts
@@ -1,5 +1,5 @@
 import { Controller, Get, Header, Query } from "@nestjs/common";
-import { OverviewRow, ShiftsOverviewService } from "../services/shifts-overview.service";
+import { OverviewRow, ShiftsOverviewService } from "../services/shifts-query.service";
 import { GetShiftsOverviewDto } from "../dtos/get-shifts-overview.dto";
 
 @Controller()
diff --git a/src/modules/shifts/controllers/shifts.controller.ts b/src/modules/shifts/controllers/shifts.controller.ts
index e821c97..0a3bc5f 100644
--- a/src/modules/shifts/controllers/shifts.controller.ts
+++ b/src/modules/shifts/controllers/shifts.controller.ts
@@ -6,7 +6,7 @@ import { UpdateShiftsDto } from "../dtos/update-shift.dto";
 import { RolesAllowed } from "src/common/decorators/roles.decorators";
 import { Roles as RoleEnum } from '.prisma/client';
 import { ApiBearerAuth, ApiOperation, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { ShiftsApprovalService } from "../services/shifts-approval.service";
+import { ShiftsApprovalService } from "../services/shifts-command.service";
 import { SearchShiftsDto } from "../dtos/search-shifts.dto";
 
 @ApiTags('Shifts')
diff --git a/src/modules/shifts/services/shifts-approval.service.ts b/src/modules/shifts/services/shifts-command.service.ts
similarity index 100%
rename from src/modules/shifts/services/shifts-approval.service.ts
rename to src/modules/shifts/services/shifts-command.service.ts
diff --git a/src/modules/shifts/services/shifts-overview.service.ts b/src/modules/shifts/services/shifts-query.service.ts
similarity index 100%
rename from src/modules/shifts/services/shifts-overview.service.ts
rename to src/modules/shifts/services/shifts-query.service.ts
diff --git a/src/modules/shifts/shifts.module.ts b/src/modules/shifts/shifts.module.ts
index f4bf24e..eb3ad29 100644
--- a/src/modules/shifts/shifts.module.ts
+++ b/src/modules/shifts/shifts.module.ts
@@ -3,8 +3,8 @@ import { ShiftsController } from './controllers/shifts.controller';
 import { ShiftsService } from './services/shifts.service';
 import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
 import { ShiftsOverviewController } from './controllers/shifts-overview.controller';
-import { ShiftsOverviewService } from './services/shifts-overview.service';
-import { ShiftsApprovalService } from './services/shifts-approval.service';
+import { ShiftsOverviewService } from './services/shifts-query.service';
+import { ShiftsApprovalService } from './services/shifts-command.service';
 import { NotificationsModule } from '../notifications/notifications.module';
 
 @Module({
diff --git a/src/modules/timesheets/timesheets.module.ts b/src/modules/timesheets/timesheets.module.ts
index 1b5a7e3..5f3ca84 100644
--- a/src/modules/timesheets/timesheets.module.ts
+++ b/src/modules/timesheets/timesheets.module.ts
@@ -3,8 +3,8 @@ import { TimesheetsController } from './controllers/timesheets.controller';
 import { TimesheetsService } from './services/timesheets.service';
 import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
 import { TimesheetsCommandService } from './services/timesheets-command.service';
-import { ShiftsApprovalService } from '../shifts/services/shifts-approval.service';
-import { ExpensesApprovalService } from '../expenses/services/expenses-approval.service';
+import { ShiftsApprovalService } from '../shifts/services/shifts-command.service';
+import { ExpensesApprovalService } from '../expenses/services/expenses-command.service';
 
 @Module({
   imports: [BusinessLogicsModule],