diff --git a/Apis/api/Program.cs b/Apis/api/Program.cs
index 76f6c5c..286612d 100644
--- a/Apis/api/Program.cs
+++ b/Apis/api/Program.cs
@@ -5,8 +5,8 @@ using Email.Data;
 using Email.Data.Repositories;
 using Email.Data.Repositories.Contracts;
 using Email.Data.Services;
-using EmailApi.Models.Clients;
-using EmailApi.Models.Settings;
+using Email.Models.Clients;
+using Email.Models.Settings;
 using Microsoft.EntityFrameworkCore;
 using Models.Settings;
 using MyAi.Data;
diff --git a/Apis/api/Services/EmailApiEmailSender.cs b/Apis/api/Services/EmailApiEmailSender.cs
index 384515d..86a416f 100644
--- a/Apis/api/Services/EmailApiEmailSender.cs
+++ b/Apis/api/Services/EmailApiEmailSender.cs
@@ -1,8 +1,8 @@
 using Api.Services.Contracts;
 using CvMatcher.Models.Responses;
 using Email.Data.Services;
-using EmailApi.Models.Clients;
-using EmailApi.Models.Requests;
+using Email.Models.Clients;
+using Email.Models.Requests;
 using Microsoft.Extensions.Options;
 using Models.Requests;
 using Models.Settings;
diff --git a/Apis/email-api-models/Clients/IEmailApiClient.cs b/Apis/email-api-models/Clients/IEmailApiClient.cs
index 73aa438..c3a8ca2 100644
--- a/Apis/email-api-models/Clients/IEmailApiClient.cs
+++ b/Apis/email-api-models/Clients/IEmailApiClient.cs
@@ -1,7 +1,7 @@
-using EmailApi.Models.Requests;
+using Email.Models.Requests;
 using Refit;
 
-namespace EmailApi.Models.Clients;
+namespace Email.Models.Clients;
 
 public interface IEmailApiClient
 {
diff --git a/Apis/email-api-models/Requests/SendEmailRequest.cs b/Apis/email-api-models/Requests/SendEmailRequest.cs
index 5d2f021..b4930c5 100644
--- a/Apis/email-api-models/Requests/SendEmailRequest.cs
+++ b/Apis/email-api-models/Requests/SendEmailRequest.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Models.Requests;
+namespace Email.Models.Requests;
 
 public sealed class SendEmailRequest
 {
diff --git a/Apis/email-api-models/Settings/EmailApiSettings.cs b/Apis/email-api-models/Settings/EmailApiSettings.cs
index 1a27d41..d7f70dc 100644
--- a/Apis/email-api-models/Settings/EmailApiSettings.cs
+++ b/Apis/email-api-models/Settings/EmailApiSettings.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Models.Settings;
+namespace Email.Models.Settings;
 
 public sealed class EmailApiSettings
 {
diff --git a/Apis/email-api-models/Settings/SmtpSettings.cs b/Apis/email-api-models/Settings/SmtpSettings.cs
index 8f9fc14..74d42eb 100644
--- a/Apis/email-api-models/Settings/SmtpSettings.cs
+++ b/Apis/email-api-models/Settings/SmtpSettings.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Models.Settings;
+namespace Email.Models.Settings;
 
 public sealed class SmtpSettings
 {
diff --git a/Apis/email-api/Controllers/EmailController.cs b/Apis/email-api/Controllers/EmailController.cs
index 6b119b0..539fd20 100644
--- a/Apis/email-api/Controllers/EmailController.cs
+++ b/Apis/email-api/Controllers/EmailController.cs
@@ -1,5 +1,5 @@
 using Api.Services;
-using EmailApi.Models.Requests;
+using Email.Models.Requests;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 
diff --git a/Apis/email-api/Program.cs b/Apis/email-api/Program.cs
index 9177a6b..902fd7e 100644
--- a/Apis/email-api/Program.cs
+++ b/Apis/email-api/Program.cs
@@ -5,7 +5,7 @@ using Email.Data.Repositories.Contracts;
 using Email.Data.Services;
 using Api.Services;
 using Microsoft.EntityFrameworkCore;
-using EmailApi.Models.Settings;
+using Email.Models.Settings;
 using Models.Settings;
 using Serilog;
 using StartupHelpers;
diff --git a/Apis/email-api/Services/SmtpEmailDispatcher.cs b/Apis/email-api/Services/SmtpEmailDispatcher.cs
index 5e86ca5..d5fdc38 100644
--- a/Apis/email-api/Services/SmtpEmailDispatcher.cs
+++ b/Apis/email-api/Services/SmtpEmailDispatcher.cs
@@ -1,10 +1,10 @@
 using Email.Data.Services;
-using EmailApi.Models.Requests;
+using Email.Models.Requests;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.Extensions.Options;
 using MimeKit;
-using EmailApi.Models.Settings;
+using Email.Models.Settings;
 using Models.Settings;
 
 namespace Api.Services;
diff --git a/Jobs/cv-search-job/Program.cs b/Jobs/cv-search-job/Program.cs
index d555d63..094d1f9 100644
--- a/Jobs/cv-search-job/Program.cs
+++ b/Jobs/cv-search-job/Program.cs
@@ -7,7 +7,7 @@ using Email.Data;
 using Email.Data.Repositories;
 using Email.Data.Repositories.Contracts;
 using Email.Data.Services;
-using EmailApi.Models.Clients;
+using Email.Models.Clients;
 using CvSearchJob.Tasks;
 using JobScheduler.Scheduling;
 using JobScheduler.Tasks;
diff --git a/Jobs/cv-search-job/Services/CvSearchEmailSender.cs b/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
index c665354..9ecefc6 100644
--- a/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
+++ b/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
@@ -1,8 +1,8 @@
 using CvMatcher.Models.Responses;
 using CvSearch.Data.Entities;
 using Email.Data.Services;
-using EmailApi.Models.Clients;
-using EmailApi.Models.Requests;
+using Email.Models.Clients;
+using Email.Models.Requests;
 using Microsoft.Extensions.Logging;
 
 namespace CvSearchJob.Services;