diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 12df877bc4..b8ad4ba4be 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -262,6 +262,7 @@
 ##################
 # Fabric MCP
 ##################
-/core/Microsoft.Fabric.Mcp.Core/      @microsoft/fabric-mcp
+/core/Fabric.Mcp.Core/      @microsoft/fabric-mcp
 /servers/Fabric.Mcp.Server/           @microsoft/fabric-mcp
 /tools/Fabric.Mcp.Tools.PublicApi/    @microsoft/fabric-mcp
+/tools/Fabric.Mcp.Tools.OneLake/      @microsoft/fabric-mcp
diff --git a/AzureMcp.sln b/AzureMcp.sln
index 62c4a14fe1..76eccff797 100644
--- a/AzureMcp.sln
+++ b/AzureMcp.sln
@@ -281,11 +281,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Mcp.Tools.Workbooks",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Mcp.Core.UnitTests", "core\Azure.Mcp.Core\tests\Azure.Mcp.Core.UnitTests\Azure.Mcp.Core.UnitTests.csproj", "{AE9E8273-2844-41A7-AE84-36E2F8B1B3DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Fabric.Mcp.Core", "Microsoft.Fabric.Mcp.Core", "{4BBEE4C4-18FC-AB55-A8B3-4C6BF70DF9AD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fabric.Mcp.Core", "Fabric.Mcp.Core", "{4BBEE4C4-18FC-AB55-A8B3-4C6BF70DF9AD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44C29C35-3F02-ECB8-1C42-1E60EABFA6B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Fabric.Mcp.Core", "core\Microsoft.Fabric.Mcp.Core\src\Microsoft.Fabric.Mcp.Core.csproj", "{B7418A46-E05D-4605-9BAE-8308BEF25641}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fabric.Mcp.Core", "core\Fabric.Mcp.Core\src\Fabric.Mcp.Core.csproj", "{B7418A46-E05D-4605-9BAE-8308BEF25641}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Template.Mcp.Core", "Template.Mcp.Core", "{1D0F574F-F118-FD2E-5A10-1304F36167C2}"
 EndProject
diff --git a/core/Microsoft.Fabric.Mcp.Core/src/Microsoft.Fabric.Mcp.Core.csproj b/core/Fabric.Mcp.Core/src/Fabric.Mcp.Core.csproj
similarity index 100%
rename from core/Microsoft.Fabric.Mcp.Core/src/Microsoft.Fabric.Mcp.Core.csproj
rename to core/Fabric.Mcp.Core/src/Fabric.Mcp.Core.csproj
diff --git a/servers/Fabric.Mcp.Server/src/Fabric.Mcp.Server.csproj b/servers/Fabric.Mcp.Server/src/Fabric.Mcp.Server.csproj
index dfddf5495f..d416ba250e 100644
--- a/servers/Fabric.Mcp.Server/src/Fabric.Mcp.Server.csproj
+++ b/servers/Fabric.Mcp.Server/src/Fabric.Mcp.Server.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\core\Microsoft.Fabric.Mcp.Core\src\Microsoft.Fabric.Mcp.Core.csproj" />
+    <ProjectReference Include="$(RepoRoot)\core\Fabric.Mcp.Core\src\Fabric.Mcp.Core.csproj" />
     <ProjectReference Include="$(RepoRoot)\tools\Fabric.*\src\*.csproj" />
   </ItemGroup>
 
diff --git a/tools/Fabric.Mcp.Tools.OneLake/src/Fabric.Mcp.Tools.OneLake.csproj b/tools/Fabric.Mcp.Tools.OneLake/src/Fabric.Mcp.Tools.OneLake.csproj
index d40ed2923e..df0c470dd5 100644
--- a/tools/Fabric.Mcp.Tools.OneLake/src/Fabric.Mcp.Tools.OneLake.csproj
+++ b/tools/Fabric.Mcp.Tools.OneLake/src/Fabric.Mcp.Tools.OneLake.csproj
@@ -14,7 +14,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Azure.Mcp.Core\src\Azure.Mcp.Core.csproj" />
+    <ProjectReference Include="..\..\..\core\Fabric.Mcp.Core\src\Fabric.Mcp.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
diff --git a/tools/Fabric.Mcp.Tools.PublicApi/src/Fabric.Mcp.Tools.PublicApi.csproj b/tools/Fabric.Mcp.Tools.PublicApi/src/Fabric.Mcp.Tools.PublicApi.csproj
index ea7cf956d8..9a20566a0f 100644
--- a/tools/Fabric.Mcp.Tools.PublicApi/src/Fabric.Mcp.Tools.PublicApi.csproj
+++ b/tools/Fabric.Mcp.Tools.PublicApi/src/Fabric.Mcp.Tools.PublicApi.csproj
@@ -14,7 +14,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Microsoft.Fabric.Mcp.Core\src\Microsoft.Fabric.Mcp.Core.csproj" />
+    <ProjectReference Include="..\..\..\core\Fabric.Mcp.Core\src\Fabric.Mcp.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />