diff --git a/Apis/api/Program.cs b/Apis/api/Program.cs
index 295c83f..1b45e17 100644
--- a/Apis/api/Program.cs
+++ b/Apis/api/Program.cs
@@ -1,10 +1,10 @@
 using System.Reflection;
 using Api.Services;
 using Api.Services.Contracts;
-using EmailApi.Data;
-using EmailApi.Data.Repositories;
-using EmailApi.Data.Repositories.Contracts;
-using EmailApi.Data.Services;
+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 Microsoft.EntityFrameworkCore;
@@ -57,7 +57,7 @@ try
         options.UseSqlServer(connectionString, sql =>
         {
             sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName);
-            sql.MigrationsAssembly("email-api-data");
+            sql.MigrationsAssembly("email-data");
         });
     });
 
diff --git a/Apis/api/Services/EmailApiEmailSender.cs b/Apis/api/Services/EmailApiEmailSender.cs
index c979431..cd51feb 100644
--- a/Apis/api/Services/EmailApiEmailSender.cs
+++ b/Apis/api/Services/EmailApiEmailSender.cs
@@ -1,6 +1,6 @@
 using Api.Services.Contracts;
 using CvMatcher.Models.Responses;
-using EmailApi.Data.Services;
+using Email.Data.Services;
 using EmailApi.Models.Clients;
 using EmailApi.Models.Requests;
 using Microsoft.Extensions.Options;
diff --git a/Apis/api/api.csproj b/Apis/api/api.csproj
index 96be1e8..b9953dc 100644
--- a/Apis/api/api.csproj
+++ b/Apis/api/api.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\api-models\api-models.csproj" />
-    <ProjectReference Include="..\email-api-data\email-api-data.csproj" />
+    <ProjectReference Include="..\email-data\email-data.csproj" />
     <ProjectReference Include="..\email-api-models\email-api-models.csproj" />
     <ProjectReference Include="..\cv-matcher-api-models\cv-matcher-api-models.csproj" />
     <ProjectReference Include="..\common\common.csproj" />
diff --git a/Apis/email-api/Program.cs b/Apis/email-api/Program.cs
index f954459..ac071a5 100644
--- a/Apis/email-api/Program.cs
+++ b/Apis/email-api/Program.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
-using EmailApi.Data;
-using EmailApi.Data.Repositories;
-using EmailApi.Data.Repositories.Contracts;
-using EmailApi.Data.Services;
+using Email.Data;
+using Email.Data.Repositories;
+using Email.Data.Repositories.Contracts;
+using Email.Data.Services;
 using EmailApi.Services;
 using Microsoft.EntityFrameworkCore;
 using Models.Settings;
@@ -35,7 +35,7 @@ try
         options.UseSqlServer(connectionString, sql =>
         {
             sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName);
-            sql.MigrationsAssembly("email-api-data");
+            sql.MigrationsAssembly("email-data");
         });
     });
 
diff --git a/Apis/email-api/Services/SmtpEmailDispatcher.cs b/Apis/email-api/Services/SmtpEmailDispatcher.cs
index 1c65007..cc66aed 100644
--- a/Apis/email-api/Services/SmtpEmailDispatcher.cs
+++ b/Apis/email-api/Services/SmtpEmailDispatcher.cs
@@ -1,4 +1,4 @@
-using EmailApi.Data.Services;
+using Email.Data.Services;
 using EmailApi.Models.Requests;
 using MailKit.Net.Smtp;
 using MailKit.Security;
diff --git a/Apis/email-api/email-api.csproj b/Apis/email-api/email-api.csproj
index 9717aac..ad71f39 100644
--- a/Apis/email-api/email-api.csproj
+++ b/Apis/email-api/email-api.csproj
@@ -23,7 +23,7 @@
     <ProjectReference Include="..\..\Helpers\startup-helpers\startup-helpers.csproj" />
     <ProjectReference Include="..\api-models\api-models.csproj" />
     <ProjectReference Include="..\common\common.csproj" />
-    <ProjectReference Include="..\email-api-data\email-api-data.csproj" />
+    <ProjectReference Include="..\email-data\email-data.csproj" />
     <ProjectReference Include="..\email-api-models\email-api-models.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Apis/email-api-data/EmailApiDbContext.cs b/Apis/email-data/EmailApiDbContext.cs
similarity index 96%
rename from Apis/email-api-data/EmailApiDbContext.cs
rename to Apis/email-data/EmailApiDbContext.cs
index 2d126be..2c28594 100644
--- a/Apis/email-api-data/EmailApiDbContext.cs
+++ b/Apis/email-data/EmailApiDbContext.cs
@@ -1,7 +1,7 @@
-using EmailApi.Data.Entities;
+using Email.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace EmailApi.Data;
+namespace Email.Data;
 
 public sealed class EmailApiDbContext : DbContext
 {
diff --git a/Apis/email-api-data/Entities/EmailTemplateEntity.cs b/Apis/email-data/Entities/EmailTemplateEntity.cs
similarity index 92%
rename from Apis/email-api-data/Entities/EmailTemplateEntity.cs
rename to Apis/email-data/Entities/EmailTemplateEntity.cs
index f26485c..8e0c8f4 100644
--- a/Apis/email-api-data/Entities/EmailTemplateEntity.cs
+++ b/Apis/email-data/Entities/EmailTemplateEntity.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Data.Entities;
+namespace Email.Data.Entities;
 
 // composite PK (Key + Language) — BaseEntity not applicable
 public sealed class EmailTemplateEntity
diff --git a/Apis/email-api-data/MigrationConstants.cs b/Apis/email-data/MigrationConstants.cs
similarity index 92%
rename from Apis/email-api-data/MigrationConstants.cs
rename to Apis/email-data/MigrationConstants.cs
index a388eaa..fffec51 100644
--- a/Apis/email-api-data/MigrationConstants.cs
+++ b/Apis/email-data/MigrationConstants.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Data;
+namespace Email.Data;
 
 /// <summary>
 /// Schema constants used by EmailApiDbContext and migrations.
diff --git a/Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs
similarity index 97%
rename from Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs
rename to Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs
index 240240f..0f80a6c 100644
--- a/Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs
+++ b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using EmailApi.Data;
+using Email.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace EmailApi.Data.Migrations
+namespace Email.Data.Migrations
 {
     [DbContext(typeof(EmailApiDbContext))]
     [Migration("20260528100000_CreateEmailTemplates")]
diff --git a/Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.cs b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.cs
similarity index 99%
rename from Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.cs
rename to Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.cs
index 3d77d09..ed96f21 100644
--- a/Apis/email-api-data/Migrations/20260528100000_CreateEmailTemplates.cs
+++ b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.cs
@@ -1,10 +1,10 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
-using EmailApi.Data;
+using Email.Data;
 
 #nullable disable
 
-namespace EmailApi.Data.Migrations
+namespace Email.Data.Migrations
 {
     /// <inheritdoc />
     public partial class CreateEmailTemplates : Migration
diff --git a/Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs
similarity index 97%
rename from Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs
rename to Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs
index 4438778..f9a445d 100644
--- a/Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs
+++ b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using EmailApi.Data;
+using Email.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace EmailApi.Data.Migrations
+namespace Email.Data.Migrations
 {
     [DbContext(typeof(EmailApiDbContext))]
     [Migration("20260528130652_SeedEmailTemplates")]
diff --git a/Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.cs b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.cs
similarity index 99%
rename from Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.cs
rename to Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.cs
index fd44df4..91d779d 100644
--- a/Apis/email-api-data/Migrations/20260528130652_SeedEmailTemplates.cs
+++ b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.cs
@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using EmailApi.Data;
+using Email.Data;
 
 #nullable disable
 
-namespace EmailApi.Data.Migrations
+namespace Email.Data.Migrations
 {
     /// <inheritdoc />
     public partial class SeedEmailTemplates : Migration
diff --git a/Apis/email-api-data/Migrations/EmailApiDbContextModelSnapshot.cs b/Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs
similarity index 97%
rename from Apis/email-api-data/Migrations/EmailApiDbContextModelSnapshot.cs
rename to Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs
index dfee958..5ed2e95 100644
--- a/Apis/email-api-data/Migrations/EmailApiDbContextModelSnapshot.cs
+++ b/Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using EmailApi.Data;
+using Email.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace EmailApi.Data.Migrations
+namespace Email.Data.Migrations
 {
     [DbContext(typeof(EmailApiDbContext))]
     partial class EmailApiDbContextModelSnapshot : ModelSnapshot
diff --git a/Apis/email-api-data/Repositories/Contracts/IEmailTemplateRepository.cs b/Apis/email-data/Repositories/Contracts/IEmailTemplateRepository.cs
similarity index 62%
rename from Apis/email-api-data/Repositories/Contracts/IEmailTemplateRepository.cs
rename to Apis/email-data/Repositories/Contracts/IEmailTemplateRepository.cs
index a4e189b..341a1ae 100644
--- a/Apis/email-api-data/Repositories/Contracts/IEmailTemplateRepository.cs
+++ b/Apis/email-data/Repositories/Contracts/IEmailTemplateRepository.cs
@@ -1,6 +1,6 @@
-using EmailApi.Data.Entities;
+using Email.Data.Entities;
 
-namespace EmailApi.Data.Repositories.Contracts;
+namespace Email.Data.Repositories.Contracts;
 
 public interface IEmailTemplateRepository
 {
diff --git a/Apis/email-api-data/Repositories/EfEmailTemplateRepository.cs b/Apis/email-data/Repositories/EfEmailTemplateRepository.cs
similarity index 78%
rename from Apis/email-api-data/Repositories/EfEmailTemplateRepository.cs
rename to Apis/email-data/Repositories/EfEmailTemplateRepository.cs
index 25c6efc..826041b 100644
--- a/Apis/email-api-data/Repositories/EfEmailTemplateRepository.cs
+++ b/Apis/email-data/Repositories/EfEmailTemplateRepository.cs
@@ -1,8 +1,8 @@
-using EmailApi.Data.Entities;
-using EmailApi.Data.Repositories.Contracts;
+using Email.Data.Entities;
+using Email.Data.Repositories.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace EmailApi.Data.Repositories;
+namespace Email.Data.Repositories;
 
 public sealed class EfEmailTemplateRepository : IEmailTemplateRepository
 {
diff --git a/Apis/email-api-data/Services/EmailTemplateService.cs b/Apis/email-data/Services/EmailTemplateService.cs
similarity index 98%
rename from Apis/email-api-data/Services/EmailTemplateService.cs
rename to Apis/email-data/Services/EmailTemplateService.cs
index 3cc4674..8cd338d 100644
--- a/Apis/email-api-data/Services/EmailTemplateService.cs
+++ b/Apis/email-data/Services/EmailTemplateService.cs
@@ -1,9 +1,9 @@
 using System.Collections.Concurrent;
-using EmailApi.Data.Repositories.Contracts;
+using Email.Data.Repositories.Contracts;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace EmailApi.Data.Services;
+namespace Email.Data.Services;
 
 /// <summary>
 /// Singleton implementation of <see cref="IEmailTemplateService"/> that caches all email templates
diff --git a/Apis/email-api-data/Services/IEmailTemplateService.cs b/Apis/email-data/Services/IEmailTemplateService.cs
similarity index 98%
rename from Apis/email-api-data/Services/IEmailTemplateService.cs
rename to Apis/email-data/Services/IEmailTemplateService.cs
index dfe0665..8787181 100644
--- a/Apis/email-api-data/Services/IEmailTemplateService.cs
+++ b/Apis/email-data/Services/IEmailTemplateService.cs
@@ -1,4 +1,4 @@
-namespace EmailApi.Data.Services;
+namespace Email.Data.Services;
 
 /// <summary>
 /// Provides access to localised email templates stored in the <c>emailApi.EmailTemplates</c> table.
diff --git a/Apis/email-api-data/email-api-data.csproj b/Apis/email-data/email-data.csproj
similarity index 67%
rename from Apis/email-api-data/email-api-data.csproj
rename to Apis/email-data/email-data.csproj
index 0596a74..a83b425 100644
--- a/Apis/email-api-data/email-api-data.csproj
+++ b/Apis/email-data/email-data.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-    <AssemblyName>email-api-data</AssemblyName>
-    <RootNamespace>EmailApi.Data</RootNamespace>
+    <AssemblyName>email-data</AssemblyName>
+    <RootNamespace>Email.Data</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -13,4 +13,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\shared-data\shared-data.csproj" />
+    <ProjectReference Include="..\email-api-models\email-api-models.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/Jobs/cv-search-job/Program.cs b/Jobs/cv-search-job/Program.cs
index c273d20..cd02110 100644
--- a/Jobs/cv-search-job/Program.cs
+++ b/Jobs/cv-search-job/Program.cs
@@ -3,10 +3,10 @@ using CvMatcher.Models.Settings;
 using CvSearch.Data;
 using CvSearchJob.Clients;
 using CvSearchJob.Services;
-using EmailApi.Data;
-using EmailApi.Data.Repositories;
-using EmailApi.Data.Repositories.Contracts;
-using EmailApi.Data.Services;
+using Email.Data;
+using Email.Data.Repositories;
+using Email.Data.Repositories.Contracts;
+using Email.Data.Services;
 using EmailApi.Models.Clients;
 using CvSearchJob.Tasks;
 using JobScheduler.Scheduling;
diff --git a/Jobs/cv-search-job/Services/CvSearchEmailSender.cs b/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
index 2394cb5..fd95104 100644
--- a/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
+++ b/Jobs/cv-search-job/Services/CvSearchEmailSender.cs
@@ -1,6 +1,6 @@
 using CvMatcher.Models.Responses;
 using CvSearch.Data.Entities;
-using EmailApi.Data.Services;
+using Email.Data.Services;
 using EmailApi.Models.Clients;
 using EmailApi.Models.Requests;
 using Microsoft.Extensions.Logging;
diff --git a/Jobs/cv-search-job/cv-search-job.csproj b/Jobs/cv-search-job/cv-search-job.csproj
index c0bd6ca..982a4a6 100644
--- a/Jobs/cv-search-job/cv-search-job.csproj
+++ b/Jobs/cv-search-job/cv-search-job.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Apis\cv-matcher-api-models\cv-matcher-api-models.csproj" />
-    <ProjectReference Include="..\..\Apis\email-api-data\email-api-data.csproj" />
+    <ProjectReference Include="..\..\Apis\email-data\email-data.csproj" />
     <ProjectReference Include="..\..\Apis\email-api-models\email-api-models.csproj" />
     <ProjectReference Include="..\..\Apis\cv-search-data\cv-search-data.csproj" />
     <ProjectReference Include="..\..\Apis\common\common.csproj" />
diff --git a/myAi.sln b/myAi.sln
index 62d9c91..8ee6a22 100644
--- a/myAi.sln
+++ b/myAi.sln
@@ -61,7 +61,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "email-api-models", "Apis\em
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "email-api", "Apis\email-api\email-api.csproj", "{434119EA-2FFC-4433-9B8E-1E6D94006413}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "email-api-data", "Apis\email-api-data\email-api-data.csproj", "{C1D2E3F4-A5B6-4789-CDEF-012345678ABC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "email-data", "Apis\email-data\email-data.csproj", "{C1D2E3F4-A5B6-4789-CDEF-012345678ABC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution