diff --git a/src/CleanArchitecture.Application/Api/Sitecore/Handlers/GetSitecoreShowcaseQueryHandler.cs b/src/CleanArchitecture.Application/Api/Sitecore/Handlers/GetSitecoreShowcaseQueryHandler.cs
index 57bcfd4..082fb56 100644
--- a/src/CleanArchitecture.Application/Api/Sitecore/Handlers/GetSitecoreShowcaseQueryHandler.cs
+++ b/src/CleanArchitecture.Application/Api/Sitecore/Handlers/GetSitecoreShowcaseQueryHandler.cs
@@ -1,5 +1,5 @@
 using Ardalis.Result;
-using Axlis.Services;
+using Axlis.ORM.Services;
 using CleanArchitecture.Application.Api.Sitecore.Queries;
 using CleanArchitecture.Application.Api.Sitecore.Responses;
 using CleanArchitecture.Application.Common.Handlers;
diff --git a/src/CleanArchitecture.Application/CleanArchitecture.Application.csproj b/src/CleanArchitecture.Application/CleanArchitecture.Application.csproj
index 12f09a8..26f14ea 100644
--- a/src/CleanArchitecture.Application/CleanArchitecture.Application.csproj
+++ b/src/CleanArchitecture.Application/CleanArchitecture.Application.csproj
@@ -7,9 +7,10 @@
 
   <!-- Axlis NuGet packages -->
   <ItemGroup>
-    <PackageReference Include="Axlis.Core" Version="0.1.0" />
+    <PackageReference Include="Axlis.ORM" Version="0.1.0" />
+    <PackageReference Include="Axlis.ORM.Abstractions" Version="0.1.0" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Ardalis.Result" Version="10.1.0" />
     <PackageReference Include="Ardalis.Result.FluentValidation" Version="10.1.0" />
diff --git a/src/CleanArchitecture.Application/Sitecore/Templates/Sample/SampleItem.cs b/src/CleanArchitecture.Application/Sitecore/Templates/Sample/SampleItem.cs
index 0f2c0ea..9d111bc 100644
--- a/src/CleanArchitecture.Application/Sitecore/Templates/Sample/SampleItem.cs
+++ b/src/CleanArchitecture.Application/Sitecore/Templates/Sample/SampleItem.cs
@@ -1,6 +1,6 @@
-using Axlis.Attributes;
-using Axlis.Core;
-using Axlis.Core.FieldTypes;
+using Axlis.ORM.Attributes;
+using Axlis.ORM.Core;
+using Axlis.ORM.Core.FieldTypes;
 
 namespace CleanArchitecture.Application.Sitecore.Templates.Sample;
 
diff --git a/src/CleanArchitecture.Application/Sitecore/Templates/System/Language.cs b/src/CleanArchitecture.Application/Sitecore/Templates/System/Language.cs
index e1e8d81..0e3bc01 100644
--- a/src/CleanArchitecture.Application/Sitecore/Templates/System/Language.cs
+++ b/src/CleanArchitecture.Application/Sitecore/Templates/System/Language.cs
@@ -1,6 +1,6 @@
-using Axlis.Attributes;
-using Axlis.Core;
-using Axlis.Core.FieldTypes;
+using Axlis.ORM.Attributes;
+using Axlis.ORM.Core;
+using Axlis.ORM.Core.FieldTypes;
 
 namespace CleanArchitecture.Application.Sitecore.Templates.System;
 
diff --git a/src/CleanArchitecture.Application/Sitecore/Templates/System/MainSection.cs b/src/CleanArchitecture.Application/Sitecore/Templates/System/MainSection.cs
index 4422f9b..1fd9904 100644
--- a/src/CleanArchitecture.Application/Sitecore/Templates/System/MainSection.cs
+++ b/src/CleanArchitecture.Application/Sitecore/Templates/System/MainSection.cs
@@ -1,5 +1,5 @@
-using Axlis.Attributes;
-using Axlis.Core;
+using Axlis.ORM.Attributes;
+using Axlis.ORM.Core;
 
 namespace CleanArchitecture.Application.Sitecore.Templates.System;
 
diff --git a/src/CleanArchitecture.Application/Sitecore/Templates/System/Node.cs b/src/CleanArchitecture.Application/Sitecore/Templates/System/Node.cs
index 870869e..5373492 100644
--- a/src/CleanArchitecture.Application/Sitecore/Templates/System/Node.cs
+++ b/src/CleanArchitecture.Application/Sitecore/Templates/System/Node.cs
@@ -1,5 +1,5 @@
-using Axlis.Attributes;
-using Axlis.Core;
+using Axlis.ORM.Attributes;
+using Axlis.ORM.Core;
 
 namespace CleanArchitecture.Application.Sitecore.Templates.System;
 
diff --git a/src/CleanArchitecture.Application/Sitecore/Templates/System/PublishingTarget.cs b/src/CleanArchitecture.Application/Sitecore/Templates/System/PublishingTarget.cs
index 7bdab7c..df063f7 100644
--- a/src/CleanArchitecture.Application/Sitecore/Templates/System/PublishingTarget.cs
+++ b/src/CleanArchitecture.Application/Sitecore/Templates/System/PublishingTarget.cs
@@ -1,6 +1,6 @@
-using Axlis.Attributes;
-using Axlis.Core;
-using Axlis.Core.FieldTypes;
+using Axlis.ORM.Attributes;
+using Axlis.ORM.Core;
+using Axlis.ORM.Core.FieldTypes;
 
 namespace CleanArchitecture.Application.Sitecore.Templates.System;
 
diff --git a/src/CleanArchitecture.WebApi/CleanArchitecture.WebApi.csproj b/src/CleanArchitecture.WebApi/CleanArchitecture.WebApi.csproj
index 60d674e..71c0727 100644
--- a/src/CleanArchitecture.WebApi/CleanArchitecture.WebApi.csproj
+++ b/src/CleanArchitecture.WebApi/CleanArchitecture.WebApi.csproj
@@ -25,8 +25,8 @@
 
   <!-- Axlis NuGet packages -->
   <ItemGroup>
-    <PackageReference Include="Axlis" Version="0.1.0" />
-    <PackageReference Include="Axlis.GraphQL" Version="0.1.0" />
+    <PackageReference Include="Axlis.ORM.GraphQL" Version="0.1.0" />
+    <PackageReference Include="Axlis.ORM" Version="0.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CleanArchitecture.WebApi/Program.cs b/src/CleanArchitecture.WebApi/Program.cs
index 6ad58e4..7edca1a 100644
--- a/src/CleanArchitecture.WebApi/Program.cs
+++ b/src/CleanArchitecture.WebApi/Program.cs
@@ -1,4 +1,4 @@
-using Axlis.Extensions;
+using Axlis.ORM.Extensions;
 using CleanArchitecture.Application;
 using CleanArchitecture.Infrastructure;
 using CleanArchitecture.Presentation;
@@ -31,11 +31,11 @@
 // --- Axlis: Sitecore Headless GraphQL ORM ---
 // Note: Endpoint and ApiKey must be set in user-secrets for development
 builder.Services
-    .AddAxlis(o =>
+    .AddAxlisORM(o =>
     {
         builder.Configuration.GetSection("Axlis").Bind(o);
     })
-    .AddAxlisGraphQL(o =>
+    .AddAxlisORMGraphQL(o =>
     {
         o.Endpoint = builder.Configuration["AxlisGraphQL:Endpoint"] ?? string.Empty;
         o.ApiKey   = builder.Configuration["AxlisGraphQL:ApiKey"];