diff --git a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts
index acd44f9..dce9479 100644
--- a/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts
+++ b/src/app/pages/recipe-page/recipe-page-content/recipe-page-content.ts
@@ -1,11 +1,11 @@
 import { Component, computed, inject, input } from '@angular/core';
 import { RecipeView } from '../../../shared/models/Recipe.model';
 import { injectMutation, injectQuery } from '@tanstack/angular-query-experimental';
-import { ImageService } from '../../../shared/services/image.service';
+import { ImageService } from '../../../shared/services/ImageService';
 import { faGlobe, faLock, faStar, faUser } from '@fortawesome/free-solid-svg-icons';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { RecipeService } from '../../../shared/services/recipe.service';
-import { AuthService } from '../../../shared/services/auth.service';
+import { RecipeService } from '../../../shared/services/RecipeService';
+import { AuthService } from '../../../shared/services/AuthService';
 import { RecipeCommentsList } from '../../../shared/components/recipe-comments-list/recipe-comments-list';
 
 @Component({
diff --git a/src/app/pages/recipe-page/recipe-page.ts b/src/app/pages/recipe-page/recipe-page.ts
index e217bf1..bad2305 100644
--- a/src/app/pages/recipe-page/recipe-page.ts
+++ b/src/app/pages/recipe-page/recipe-page.ts
@@ -1,6 +1,6 @@
 import { Component, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { RecipeService } from '../../shared/services/recipe.service';
+import { RecipeService } from '../../shared/services/RecipeService';
 import { RecipePageContent } from './recipe-page-content/recipe-page-content';
 import { injectQuery } from '@tanstack/angular-query-experimental';
 
diff --git a/src/app/pages/recipes-page/recipes-page.ts b/src/app/pages/recipes-page/recipes-page.ts
index b42007e..9fc2314 100644
--- a/src/app/pages/recipes-page/recipes-page.ts
+++ b/src/app/pages/recipes-page/recipes-page.ts
@@ -1,5 +1,5 @@
 import { Component, inject } from '@angular/core';
-import { RecipeService } from '../../shared/services/recipe.service';
+import { RecipeService } from '../../shared/services/RecipeService';
 import { injectQuery } from '@tanstack/angular-query-experimental';
 import { RecipeCardGrid } from '../../shared/components/recipe-card-grid/recipe-card-grid';
 
diff --git a/src/app/pages/recipes-search-page/recipes-search-page.ts b/src/app/pages/recipes-search-page/recipes-search-page.ts
index de66314..26b0477 100644
--- a/src/app/pages/recipes-search-page/recipes-search-page.ts
+++ b/src/app/pages/recipes-search-page/recipes-search-page.ts
@@ -1,7 +1,7 @@
 import { Component, inject, signal } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { injectQuery } from '@tanstack/angular-query-experimental';
-import { RecipeService } from '../../shared/services/recipe.service';
+import { RecipeService } from '../../shared/services/RecipeService';
 import { RecipeCardGrid } from '../../shared/components/recipe-card-grid/recipe-card-grid';
 import { ActivatedRoute, Router } from '@angular/router';
 
diff --git a/src/app/shared/components/header/header.ts b/src/app/shared/components/header/header.ts
index 29bfa4b..9913af9 100644
--- a/src/app/shared/components/header/header.ts
+++ b/src/app/shared/components/header/header.ts
@@ -1,5 +1,5 @@
 import { Component, computed, inject } from '@angular/core';
-import { AuthService } from '../../services/auth.service';
+import { AuthService } from '../../services/AuthService';
 
 @Component({
     selector: 'app-header',
diff --git a/src/app/shared/components/recipe-card-grid/recipe-card/recipe-card.ts b/src/app/shared/components/recipe-card-grid/recipe-card/recipe-card.ts
index 81c9668..9b48a27 100644
--- a/src/app/shared/components/recipe-card-grid/recipe-card/recipe-card.ts
+++ b/src/app/shared/components/recipe-card-grid/recipe-card/recipe-card.ts
@@ -2,7 +2,7 @@ import { Component, computed, inject, input } from '@angular/core';
 import { Recipe } from '../../../models/Recipe.model';
 import { RouterLink } from '@angular/router';
 import { injectQuery } from '@tanstack/angular-query-experimental';
-import { ImageService } from '../../../services/image.service';
+import { ImageService } from '../../../services/ImageService';
 import { faGlobe, faLock, faStar, faUser } from '@fortawesome/free-solid-svg-icons';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 
diff --git a/src/app/shared/components/recipe-comments-list/recipe-comments-list.ts b/src/app/shared/components/recipe-comments-list/recipe-comments-list.ts
index 66ac677..9f0dfbc 100644
--- a/src/app/shared/components/recipe-comments-list/recipe-comments-list.ts
+++ b/src/app/shared/components/recipe-comments-list/recipe-comments-list.ts
@@ -1,8 +1,8 @@
 import { Component, computed, inject, input } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { RecipeService } from '../../services/recipe.service';
+import { RecipeService } from '../../services/RecipeService';
 import { injectInfiniteQuery, injectMutation } from '@tanstack/angular-query-experimental';
-import { AuthService } from '../../services/auth.service';
+import { AuthService } from '../../services/AuthService';
 import { RecipeComments } from '../../models/RecipeComment.model';
 import { DateTimeFormatPipe } from '../../pipes/dateTimeFormat.pipe';
 
diff --git a/src/app/shared/interceptors/auth.interceptor.ts b/src/app/shared/interceptors/auth.interceptor.ts
index 6b27da8..0e63e91 100644
--- a/src/app/shared/interceptors/auth.interceptor.ts
+++ b/src/app/shared/interceptors/auth.interceptor.ts
@@ -1,6 +1,6 @@
 import { HttpErrorResponse, HttpInterceptorFn } from '@angular/common/http';
 import { inject } from '@angular/core';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../services/AuthService';
 import { catchError, from, switchMap, throwError } from 'rxjs';
 import { Router } from '@angular/router';
 
diff --git a/src/app/shared/pipes/dateTimeFormat.pipe.ts b/src/app/shared/pipes/dateTimeFormat.pipe.ts
index 42c2935..6e54d32 100644
--- a/src/app/shared/pipes/dateTimeFormat.pipe.ts
+++ b/src/app/shared/pipes/dateTimeFormat.pipe.ts
@@ -1,5 +1,5 @@
 import { inject, Pipe, PipeTransform } from '@angular/core';
-import { DateService } from '../services/date.service';
+import { DateService } from '../services/DateService';
 
 @Pipe({
     name: 'dateTimeFormat',
diff --git a/src/app/shared/services/auth.service.spec.ts b/src/app/shared/services/AuthService.spec.ts
similarity index 78%
rename from src/app/shared/services/auth.service.spec.ts
rename to src/app/shared/services/AuthService.spec.ts
index c8f820f..5d4e078 100644
--- a/src/app/shared/services/auth.service.spec.ts
+++ b/src/app/shared/services/AuthService.spec.ts
@@ -1,8 +1,8 @@
 import { TestBed } from '@angular/core/testing';
 
-import { AuthService } from './auth.service';
+import { AuthService } from './AuthService';
 
-describe('LoginService', () => {
+describe('AuthService', () => {
     let service: AuthService;
 
     beforeEach(() => {
diff --git a/src/app/shared/services/auth.service.ts b/src/app/shared/services/AuthService.ts
similarity index 100%
rename from src/app/shared/services/auth.service.ts
rename to src/app/shared/services/AuthService.ts
diff --git a/src/app/shared/services/date.service.ts b/src/app/shared/services/DateService.ts
similarity index 100%
rename from src/app/shared/services/date.service.ts
rename to src/app/shared/services/DateService.ts
diff --git a/src/app/shared/services/endpoint.service.ts b/src/app/shared/services/EndpointService.ts
similarity index 100%
rename from src/app/shared/services/endpoint.service.ts
rename to src/app/shared/services/EndpointService.ts
diff --git a/src/app/shared/services/image.service.ts b/src/app/shared/services/ImageService.ts
similarity index 100%
rename from src/app/shared/services/image.service.ts
rename to src/app/shared/services/ImageService.ts
diff --git a/src/app/shared/services/recipe.service.spec.ts b/src/app/shared/services/RecipeService.spec.ts
similarity index 78%
rename from src/app/shared/services/recipe.service.spec.ts
rename to src/app/shared/services/RecipeService.spec.ts
index ac627b4..4f61fd1 100644
--- a/src/app/shared/services/recipe.service.spec.ts
+++ b/src/app/shared/services/RecipeService.spec.ts
@@ -1,8 +1,8 @@
 import { TestBed } from '@angular/core/testing';
 
-import { RecipeService } from './recipe.service';
+import { RecipeService } from './RecipeService';
 
-describe('Recipe', () => {
+describe('RecipeService', () => {
     let service: RecipeService;
 
     beforeEach(() => {
diff --git a/src/app/shared/services/recipe.service.ts b/src/app/shared/services/RecipeService.ts
similarity index 97%
rename from src/app/shared/services/recipe.service.ts
rename to src/app/shared/services/RecipeService.ts
index f9e79f7..9d0c20c 100644
--- a/src/app/shared/services/recipe.service.ts
+++ b/src/app/shared/services/RecipeService.ts
@@ -2,11 +2,11 @@ import { inject, Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { firstValueFrom, lastValueFrom, map } from 'rxjs';
 import { Recipe, RecipeInfoViews, RecipeView } from '../models/Recipe.model';
-import { AuthService } from './auth.service';
+import { AuthService } from './AuthService';
 import { QueryClient } from '@tanstack/angular-query-experimental';
 import { RecipeComment, RecipeComments } from '../models/RecipeComment.model';
 import { QueryParams } from '../models/Query.model';
-import { EndpointService } from './endpoint.service';
+import { EndpointService } from './EndpointService';
 
 @Injectable({
     providedIn: 'root',