diff --git a/AgentRegistry.slnx b/AgentRegistry.slnx
deleted file mode 100644
index 671097c..0000000
--- a/AgentRegistry.slnx
+++ /dev/null
@@ -1,13 +0,0 @@
-<Solution>
-  <Folder Name="/src/">
-    <Project Path="src/AgentRegistry.Api/AgentRegistry.Api.csproj" />
-    <Project Path="src/AgentRegistry.Application/AgentRegistry.Application.csproj" />
-    <Project Path="src/AgentRegistry.Domain/AgentRegistry.Domain.csproj" />
-    <Project Path="src/AgentRegistry.Infrastructure/AgentRegistry.Infrastructure.csproj" />
-  </Folder>
-  <Folder Name="/tests/">
-    <Project Path="tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj" />
-    <Project Path="tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj" />
-    <Project Path="tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj" />
-  </Folder>
-</Solution>
diff --git a/CLAUDE.md b/CLAUDE.md
index 6071927..436dfd1 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -18,13 +18,13 @@ dotnet test tests/AgentRegistry.Api.Tests/
 dotnet test --filter "FullyQualifiedName~RegistrationTests.Register_WithValidRequest"
 
 # Run the API (requires Postgres + Redis via user secrets)
-dotnet run --project src/AgentRegistry.Api
+dotnet run --project src/MarimerLLC.AgentRegistry.Api
 
 # Add a migration after domain/EF model changes
-dotnet ef migrations add <Name> -p src/AgentRegistry.Infrastructure -s src/AgentRegistry.Api
+dotnet ef migrations add <Name> -p src/MarimerLLC.AgentRegistry.Infrastructure -s src/MarimerLLC.AgentRegistry.Api
 
 # Apply migrations
-dotnet ef database update -p src/AgentRegistry.Infrastructure -s src/AgentRegistry.Api
+dotnet ef database update -p src/MarimerLLC.AgentRegistry.Infrastructure -s src/MarimerLLC.AgentRegistry.Api
 ```
 
 ## Architecture
@@ -66,7 +66,7 @@ Application-layer tests use `Rocks` (source-generator mocks) to mock `IAgentRepo
 
 ## Adding a new protocol adapter
 
-1. Add a `Protocols/<Name>/` folder under `AgentRegistry.Api` with:
+1. Add a `Protocols/<Name>/` folder under `MarimerLLC.AgentRegistry.Api` with:
    - `Models/` — request/response records matching the protocol's wire format
    - `<Name>AgentManifestMapper.cs` (or equivalent) — bidirectional mapping to/from domain types using `Endpoint.ProtocolMetadata` for protocol-specific fields
    - `<Name>Endpoints.cs` — minimal API route registrations with `.WithTags()`, `.WithSummary()`, `.WithDescription()`, `.Produces<T>()`, and `.ProducesProblem()` on every route
diff --git a/Dockerfile b/Dockerfile
index bc89c17..c7fd28d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,24 +2,24 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 
 # Copy solution and package management files first for layer caching.
-COPY AgentRegistry.slnx .
+COPY MarimerLLC.AgentRegistry.slnx .
 COPY Directory.Build.props .
 COPY Directory.Packages.props .
 
 # Copy project files for restore (src + test csproj stubs — no test source needed).
-COPY src/AgentRegistry.Domain/AgentRegistry.Domain.csproj                    src/AgentRegistry.Domain/
-COPY src/AgentRegistry.Application/AgentRegistry.Application.csproj          src/AgentRegistry.Application/
-COPY src/AgentRegistry.Infrastructure/AgentRegistry.Infrastructure.csproj     src/AgentRegistry.Infrastructure/
-COPY src/AgentRegistry.Api/AgentRegistry.Api.csproj                          src/AgentRegistry.Api/
+COPY src/MarimerLLC.AgentRegistry.Domain/MarimerLLC.AgentRegistry.Domain.csproj                    src/MarimerLLC.AgentRegistry.Domain/
+COPY src/MarimerLLC.AgentRegistry.Application/MarimerLLC.AgentRegistry.Application.csproj          src/MarimerLLC.AgentRegistry.Application/
+COPY src/MarimerLLC.AgentRegistry.Infrastructure/MarimerLLC.AgentRegistry.Infrastructure.csproj     src/MarimerLLC.AgentRegistry.Infrastructure/
+COPY src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj                          src/MarimerLLC.AgentRegistry.Api/
 COPY tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj      tests/AgentRegistry.Domain.Tests/
 COPY tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj tests/AgentRegistry.Application.Tests/
 COPY tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj            tests/AgentRegistry.Api.Tests/
 
-RUN dotnet restore AgentRegistry.slnx
+RUN dotnet restore MarimerLLC.AgentRegistry.slnx
 
 # Copy source and publish.
 COPY src/ src/
-RUN dotnet publish src/AgentRegistry.Api/AgentRegistry.Api.csproj \
+RUN dotnet publish src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj \
     --configuration Release \
     --output /app/publish
 
@@ -40,4 +40,4 @@ EXPOSE 8080
 
 ENV ASPNETCORE_URLS=http://+:8080
 
-ENTRYPOINT ["dotnet", "AgentRegistry.Api.dll"]
+ENTRYPOINT ["dotnet", "MarimerLLC.AgentRegistry.Api.dll"]
diff --git a/MarimerLLC.AgentRegistry.slnx b/MarimerLLC.AgentRegistry.slnx
new file mode 100644
index 0000000..545e765
--- /dev/null
+++ b/MarimerLLC.AgentRegistry.slnx
@@ -0,0 +1,13 @@
+<Solution>
+  <Folder Name="/src/">
+    <Project Path="src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj" />
+    <Project Path="src/MarimerLLC.AgentRegistry.Application/MarimerLLC.AgentRegistry.Application.csproj" />
+    <Project Path="src/MarimerLLC.AgentRegistry.Domain/MarimerLLC.AgentRegistry.Domain.csproj" />
+    <Project Path="src/MarimerLLC.AgentRegistry.Infrastructure/MarimerLLC.AgentRegistry.Infrastructure.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj" />
+    <Project Path="tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj" />
+    <Project Path="tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/src/AgentRegistry.Api/AgentRegistry.Api.http b/src/MarimerLLC.AgentRegistry.Api/AgentRegistry.Api.http
similarity index 100%
rename from src/AgentRegistry.Api/AgentRegistry.Api.http
rename to src/MarimerLLC.AgentRegistry.Api/AgentRegistry.Api.http
diff --git a/src/AgentRegistry.Api/Agents/AgentEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/Agents/AgentEndpoints.cs
similarity index 97%
rename from src/AgentRegistry.Api/Agents/AgentEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/Agents/AgentEndpoints.cs
index e8ecb86..96f28c4 100644
--- a/src/AgentRegistry.Api/Agents/AgentEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Agents/AgentEndpoints.cs
@@ -1,11 +1,11 @@
 using System.Security.Claims;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Application;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Application;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Agents;
+namespace MarimerLLC.AgentRegistry.Api.Agents;
 
 public static class AgentEndpoints
 {
diff --git a/src/AgentRegistry.Api/Agents/DiscoveryEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/Agents/DiscoveryEndpoints.cs
similarity index 93%
rename from src/AgentRegistry.Api/Agents/DiscoveryEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/Agents/DiscoveryEndpoints.cs
index 17a7d22..7fa3fe9 100644
--- a/src/AgentRegistry.Api/Agents/DiscoveryEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Agents/DiscoveryEndpoints.cs
@@ -1,8 +1,8 @@
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Agents;
+namespace MarimerLLC.AgentRegistry.Api.Agents;
 
 public static class DiscoveryEndpoints
 {
diff --git a/src/AgentRegistry.Api/Agents/Models/AgentResponse.cs b/src/MarimerLLC.AgentRegistry.Api/Agents/Models/AgentResponse.cs
similarity index 91%
rename from src/AgentRegistry.Api/Agents/Models/AgentResponse.cs
rename to src/MarimerLLC.AgentRegistry.Api/Agents/Models/AgentResponse.cs
index 2886a72..e4d020b 100644
--- a/src/AgentRegistry.Api/Agents/Models/AgentResponse.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Agents/Models/AgentResponse.cs
@@ -1,8 +1,8 @@
-using AgentRegistry.Application.Agents;
-using DomainEndpoint = AgentRegistry.Domain.Agents.Endpoint;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using DomainEndpoint = MarimerLLC.AgentRegistry.Domain.Agents.Endpoint;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Agents.Models;
+namespace MarimerLLC.AgentRegistry.Api.Agents.Models;
 
 public record AgentResponse(
     string Id,
diff --git a/src/AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs b/src/MarimerLLC.AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs
similarity index 86%
rename from src/AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs
rename to src/MarimerLLC.AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs
index c24ad2d..e3dc760 100644
--- a/src/AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Agents/Models/RegisterAgentRequest.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Agents.Models;
+namespace MarimerLLC.AgentRegistry.Api.Agents.Models;
 
 public record RegisterAgentRequest(
     string Name,
diff --git a/src/AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs
similarity index 95%
rename from src/AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs
index 07f6112..ea1439d 100644
--- a/src/AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/ApiKeys/ApiKeyEndpoints.cs
@@ -1,12 +1,12 @@
 using System.Security.Claims;
-using AgentRegistry.Api.ApiKeys.Models;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Application;
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Api.ApiKeys.Models;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Application;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AgentRegistry.Api.ApiKeys;
+namespace MarimerLLC.AgentRegistry.Api.ApiKeys;
 
 public static class ApiKeyEndpoints
 {
diff --git a/src/AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs b/src/MarimerLLC.AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs
similarity index 87%
rename from src/AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs
rename to src/MarimerLLC.AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs
index 826eddd..bbcb566 100644
--- a/src/AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/ApiKeys/Models/ApiKeyModels.cs
@@ -1,7 +1,7 @@
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Api.ApiKeys.Models;
+namespace MarimerLLC.AgentRegistry.Api.ApiKeys.Models;
 
 public record IssueApiKeyRequest(string? Description, ApiKeyScope Scope = ApiKeyScope.Agent);
 
diff --git a/src/AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs b/src/MarimerLLC.AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs
similarity index 94%
rename from src/AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs
rename to src/MarimerLLC.AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs
index 93d81e9..563daf7 100644
--- a/src/AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Auth/ApiKeyAuthenticationHandler.cs
@@ -1,10 +1,10 @@
 using System.Security.Claims;
 using System.Text.Encodings.Web;
-using AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Application.Auth;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Options;
 
-namespace AgentRegistry.Api.Auth;
+namespace MarimerLLC.AgentRegistry.Api.Auth;
 
 public class ApiKeyAuthenticationOptions : AuthenticationSchemeOptions
 {
diff --git a/src/AgentRegistry.Api/Auth/RegistryClaims.cs b/src/MarimerLLC.AgentRegistry.Api/Auth/RegistryClaims.cs
similarity index 83%
rename from src/AgentRegistry.Api/Auth/RegistryClaims.cs
rename to src/MarimerLLC.AgentRegistry.Api/Auth/RegistryClaims.cs
index 7e064f3..7d226e6 100644
--- a/src/AgentRegistry.Api/Auth/RegistryClaims.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Auth/RegistryClaims.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Api.Auth;
+namespace MarimerLLC.AgentRegistry.Api.Auth;
 
 /// <summary>Claim type and value constants used across the registry's authorization policies.</summary>
 public static class RegistryClaims
diff --git a/src/AgentRegistry.Api/Auth/RegistryPolicies.cs b/src/MarimerLLC.AgentRegistry.Api/Auth/RegistryPolicies.cs
similarity index 96%
rename from src/AgentRegistry.Api/Auth/RegistryPolicies.cs
rename to src/MarimerLLC.AgentRegistry.Api/Auth/RegistryPolicies.cs
index 96c6a30..c16c475 100644
--- a/src/AgentRegistry.Api/Auth/RegistryPolicies.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Auth/RegistryPolicies.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 
-namespace AgentRegistry.Api.Auth;
+namespace MarimerLLC.AgentRegistry.Api.Auth;
 
 public static class RegistryPolicies
 {
diff --git a/src/AgentRegistry.Api/AgentRegistry.Api.csproj b/src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj
similarity index 79%
rename from src/AgentRegistry.Api/AgentRegistry.Api.csproj
rename to src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj
index 1d531d2..4855b8e 100644
--- a/src/AgentRegistry.Api/AgentRegistry.Api.csproj
+++ b/src/MarimerLLC.AgentRegistry.Api/MarimerLLC.AgentRegistry.Api.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <UserSecretsId>agentregistry-api-dev</UserSecretsId>
+    <RootNamespace>MarimerLLC.AgentRegistry.Api</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AgentRegistry.Application\AgentRegistry.Application.csproj" />
-    <ProjectReference Include="..\AgentRegistry.Infrastructure\AgentRegistry.Infrastructure.csproj" />
+    <ProjectReference Include="..\MarimerLLC.AgentRegistry.Application\MarimerLLC.AgentRegistry.Application.csproj" />
+    <ProjectReference Include="..\MarimerLLC.AgentRegistry.Infrastructure\MarimerLLC.AgentRegistry.Infrastructure.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AgentRegistry.Api/Program.cs b/src/MarimerLLC.AgentRegistry.Api/Program.cs
similarity index 94%
rename from src/AgentRegistry.Api/Program.cs
rename to src/MarimerLLC.AgentRegistry.Api/Program.cs
index 502fb9b..8d080cd 100644
--- a/src/AgentRegistry.Api/Program.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Program.cs
@@ -1,13 +1,13 @@
-using AgentRegistry.Api.ApiKeys;
-using AgentRegistry.Api.Agents;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Api.Protocols.A2A;
-using AgentRegistry.Api.Protocols.ACP;
-using AgentRegistry.Api.Protocols.MCP;
+using MarimerLLC.AgentRegistry.Api.ApiKeys;
+using MarimerLLC.AgentRegistry.Api.Agents;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Api.Protocols.A2A;
+using MarimerLLC.AgentRegistry.Api.Protocols.ACP;
+using MarimerLLC.AgentRegistry.Api.Protocols.MCP;
 using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Infrastructure;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Infrastructure;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using OpenTelemetry.Exporter;
diff --git a/src/AgentRegistry.Api/Properties/launchSettings.json b/src/MarimerLLC.AgentRegistry.Api/Properties/launchSettings.json
similarity index 100%
rename from src/AgentRegistry.Api/Properties/launchSettings.json
rename to src/MarimerLLC.AgentRegistry.Api/Properties/launchSettings.json
diff --git a/src/AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs
similarity index 97%
rename from src/AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs
index 8e3920b..90bca8b 100644
--- a/src/AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AAgentCardMapper.cs
@@ -1,11 +1,11 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using AgentRegistry.Api.Protocols.A2A.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
-using DomainEndpoint = AgentRegistry.Domain.Agents.Endpoint;
+using MarimerLLC.AgentRegistry.Api.Protocols.A2A.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
+using DomainEndpoint = MarimerLLC.AgentRegistry.Domain.Agents.Endpoint;
 
-namespace AgentRegistry.Api.Protocols.A2A;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.A2A;
 
 public static class A2AAgentCardMapper
 {
diff --git a/src/AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs
similarity index 93%
rename from src/AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs
index ac7c6a0..082406d 100644
--- a/src/AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/A2AEndpoints.cs
@@ -1,10 +1,10 @@
 using System.Security.Claims;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Api.Protocols.A2A.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Api.Protocols.A2A.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Protocols.A2A;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.A2A;
 
 public static class A2AEndpoints
 {
diff --git a/src/AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs
similarity index 98%
rename from src/AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs
index 81dc107..2e5ad7b 100644
--- a/src/AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/A2A/Models/AgentCard.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace AgentRegistry.Api.Protocols.A2A.Models;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.A2A.Models;
 
 /// <summary>
 /// A2A Agent Card — v1.0 RC.
diff --git a/src/AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs
similarity index 96%
rename from src/AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs
index ea9019f..926e60f 100644
--- a/src/AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpAgentManifestMapper.cs
@@ -1,10 +1,10 @@
 using System.Text.Json;
-using AgentRegistry.Api.Protocols.ACP.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
-using DomainEndpoint = AgentRegistry.Domain.Agents.Endpoint;
+using MarimerLLC.AgentRegistry.Api.Protocols.ACP.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
+using DomainEndpoint = MarimerLLC.AgentRegistry.Domain.Agents.Endpoint;
 
-namespace AgentRegistry.Api.Protocols.ACP;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.ACP;
 
 public static class AcpAgentManifestMapper
 {
diff --git a/src/AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs
similarity index 95%
rename from src/AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs
index 96e46a7..259eed6 100644
--- a/src/AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/AcpEndpoints.cs
@@ -1,10 +1,10 @@
 using System.Security.Claims;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Api.Protocols.ACP.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Api.Protocols.ACP.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Protocols.ACP;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.ACP;
 
 public static class AcpEndpoints
 {
diff --git a/src/AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs
similarity index 98%
rename from src/AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs
index 54dd13e..e299393 100644
--- a/src/AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/ACP/Models/AcpAgentManifest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace AgentRegistry.Api.Protocols.ACP.Models;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.ACP.Models;
 
 /// <summary>
 /// ACP Agent Manifest — spec 0.2.0 (i-am-bee/acp).
diff --git a/src/AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs
similarity index 95%
rename from src/AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs
index 4533d32..cde4fc8 100644
--- a/src/AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpEndpoints.cs
@@ -1,10 +1,10 @@
 using System.Security.Claims;
-using AgentRegistry.Api.Auth;
-using AgentRegistry.Api.Protocols.MCP.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Auth;
+using MarimerLLC.AgentRegistry.Api.Protocols.MCP.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Protocols.MCP;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.MCP;
 
 public static class McpEndpoints
 {
diff --git a/src/AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs
similarity index 96%
rename from src/AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs
index 345687e..bc9560b 100644
--- a/src/AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpServerCardMapper.cs
@@ -1,10 +1,10 @@
 using System.Text.Json;
-using AgentRegistry.Api.Protocols.MCP.Models;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
-using DomainEndpoint = AgentRegistry.Domain.Agents.Endpoint;
+using MarimerLLC.AgentRegistry.Api.Protocols.MCP.Models;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
+using DomainEndpoint = MarimerLLC.AgentRegistry.Domain.Agents.Endpoint;
 
-namespace AgentRegistry.Api.Protocols.MCP;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.MCP;
 
 public static class McpServerCardMapper
 {
diff --git a/src/AgentRegistry.Api/Protocols/MCP/McpTools.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpTools.cs
similarity index 97%
rename from src/AgentRegistry.Api/Protocols/MCP/McpTools.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpTools.cs
index e755dc8..a9bcb74 100644
--- a/src/AgentRegistry.Api/Protocols/MCP/McpTools.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/McpTools.cs
@@ -1,12 +1,12 @@
 using System.ComponentModel;
 using System.Text.Json;
-using AgentRegistry.Api.Protocols.A2A;
-using AgentRegistry.Api.Protocols.ACP;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Protocols.A2A;
+using MarimerLLC.AgentRegistry.Api.Protocols.ACP;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 using ModelContextProtocol.Server;
 
-namespace AgentRegistry.Api.Protocols.MCP;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.MCP;
 
 /// <summary>
 /// MCP tools that expose the registry's discovery capabilities to MCP clients.
diff --git a/src/AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs
similarity index 99%
rename from src/AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs
rename to src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs
index d16d8ec..486e7e2 100644
--- a/src/AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs
+++ b/src/MarimerLLC.AgentRegistry.Api/Protocols/MCP/Models/McpServerCard.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace AgentRegistry.Api.Protocols.MCP.Models;
+namespace MarimerLLC.AgentRegistry.Api.Protocols.MCP.Models;
 
 /// <summary>
 /// Registry representation of a registered MCP server.
diff --git a/src/AgentRegistry.Api/appsettings.Development.json b/src/MarimerLLC.AgentRegistry.Api/appsettings.Development.json
similarity index 100%
rename from src/AgentRegistry.Api/appsettings.Development.json
rename to src/MarimerLLC.AgentRegistry.Api/appsettings.Development.json
diff --git a/src/AgentRegistry.Api/appsettings.json b/src/MarimerLLC.AgentRegistry.Api/appsettings.json
similarity index 100%
rename from src/AgentRegistry.Api/appsettings.json
rename to src/MarimerLLC.AgentRegistry.Api/appsettings.json
diff --git a/src/AgentRegistry.Application/Agents/AgentSearchFilter.cs b/src/MarimerLLC.AgentRegistry.Application/Agents/AgentSearchFilter.cs
similarity index 73%
rename from src/AgentRegistry.Application/Agents/AgentSearchFilter.cs
rename to src/MarimerLLC.AgentRegistry.Application/Agents/AgentSearchFilter.cs
index d39ce6f..7c876df 100644
--- a/src/AgentRegistry.Application/Agents/AgentSearchFilter.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Agents/AgentSearchFilter.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Application.Agents;
+namespace MarimerLLC.AgentRegistry.Application.Agents;
 
 public record AgentSearchFilter(
     string? CapabilityName = null,
diff --git a/src/AgentRegistry.Application/Agents/AgentService.cs b/src/MarimerLLC.AgentRegistry.Application/Agents/AgentService.cs
similarity index 98%
rename from src/AgentRegistry.Application/Agents/AgentService.cs
rename to src/MarimerLLC.AgentRegistry.Application/Agents/AgentService.cs
index 1113e5d..e146a0a 100644
--- a/src/AgentRegistry.Application/Agents/AgentService.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Agents/AgentService.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Application.Agents;
+namespace MarimerLLC.AgentRegistry.Application.Agents;
 
 /// <summary>
 /// Orchestrates agent registration, liveness, and discovery use cases.
diff --git a/src/AgentRegistry.Application/Agents/IAgentRepository.cs b/src/MarimerLLC.AgentRegistry.Application/Agents/IAgentRepository.cs
similarity index 80%
rename from src/AgentRegistry.Application/Agents/IAgentRepository.cs
rename to src/MarimerLLC.AgentRegistry.Application/Agents/IAgentRepository.cs
index 6e38571..2a4046f 100644
--- a/src/AgentRegistry.Application/Agents/IAgentRepository.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Agents/IAgentRepository.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Application.Agents;
+namespace MarimerLLC.AgentRegistry.Application.Agents;
 
 public interface IAgentRepository
 {
diff --git a/src/AgentRegistry.Application/Agents/ILivenessStore.cs b/src/MarimerLLC.AgentRegistry.Application/Agents/ILivenessStore.cs
similarity index 91%
rename from src/AgentRegistry.Application/Agents/ILivenessStore.cs
rename to src/MarimerLLC.AgentRegistry.Application/Agents/ILivenessStore.cs
index e90d3e2..4d4d886 100644
--- a/src/AgentRegistry.Application/Agents/ILivenessStore.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Agents/ILivenessStore.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Application.Agents;
+namespace MarimerLLC.AgentRegistry.Application.Agents;
 
 /// <summary>
 /// Fast TTL-based store for endpoint liveness state.
diff --git a/src/AgentRegistry.Application/Agents/PagedResult.cs b/src/MarimerLLC.AgentRegistry.Application/Agents/PagedResult.cs
similarity index 83%
rename from src/AgentRegistry.Application/Agents/PagedResult.cs
rename to src/MarimerLLC.AgentRegistry.Application/Agents/PagedResult.cs
index 41d9a06..245e90e 100644
--- a/src/AgentRegistry.Application/Agents/PagedResult.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Agents/PagedResult.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Application.Agents;
+namespace MarimerLLC.AgentRegistry.Application.Agents;
 
 public record PagedResult<T>(IReadOnlyList<T> Items, int TotalCount, int Page, int PageSize)
 {
diff --git a/src/AgentRegistry.Application/Auth/IApiKeyService.cs b/src/MarimerLLC.AgentRegistry.Application/Auth/IApiKeyService.cs
similarity index 92%
rename from src/AgentRegistry.Application/Auth/IApiKeyService.cs
rename to src/MarimerLLC.AgentRegistry.Application/Auth/IApiKeyService.cs
index a8cdfcd..d624f3b 100644
--- a/src/AgentRegistry.Application/Auth/IApiKeyService.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Auth/IApiKeyService.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Application.Auth;
+namespace MarimerLLC.AgentRegistry.Application.Auth;
 
 public record ApiKeyValidationResult(bool IsValid, string? OwnerId, string? KeyId, ApiKeyScope? Scope);
 
diff --git a/src/AgentRegistry.Application/Exceptions.cs b/src/MarimerLLC.AgentRegistry.Application/Exceptions.cs
similarity index 81%
rename from src/AgentRegistry.Application/Exceptions.cs
rename to src/MarimerLLC.AgentRegistry.Application/Exceptions.cs
index 2e57687..ad5e4cb 100644
--- a/src/AgentRegistry.Application/Exceptions.cs
+++ b/src/MarimerLLC.AgentRegistry.Application/Exceptions.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Application;
+namespace MarimerLLC.AgentRegistry.Application;
 
 public class NotFoundException(string message) : Exception(message);
 public class ForbiddenException(string message) : Exception(message);
diff --git a/src/AgentRegistry.Application/AgentRegistry.Application.csproj b/src/MarimerLLC.AgentRegistry.Application/MarimerLLC.AgentRegistry.Application.csproj
similarity index 57%
rename from src/AgentRegistry.Application/AgentRegistry.Application.csproj
rename to src/MarimerLLC.AgentRegistry.Application/MarimerLLC.AgentRegistry.Application.csproj
index a189e5c..775761d 100644
--- a/src/AgentRegistry.Application/AgentRegistry.Application.csproj
+++ b/src/MarimerLLC.AgentRegistry.Application/MarimerLLC.AgentRegistry.Application.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\AgentRegistry.Domain\AgentRegistry.Domain.csproj" />
+    <ProjectReference Include="..\MarimerLLC.AgentRegistry.Domain\MarimerLLC.AgentRegistry.Domain.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>MarimerLLC.AgentRegistry.Application</RootNamespace>
   </PropertyGroup>
 
 </Project>
diff --git a/src/AgentRegistry.Domain/Agents/Agent.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/Agent.cs
similarity index 98%
rename from src/AgentRegistry.Domain/Agents/Agent.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/Agent.cs
index 5d7024b..f1b5807 100644
--- a/src/AgentRegistry.Domain/Agents/Agent.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/Agent.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 /// <summary>
 /// An agent registration — the aggregate root.
diff --git a/src/AgentRegistry.Domain/Agents/AgentId.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/AgentId.cs
similarity index 82%
rename from src/AgentRegistry.Domain/Agents/AgentId.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/AgentId.cs
index 07d538d..9dffeb6 100644
--- a/src/AgentRegistry.Domain/Agents/AgentId.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/AgentId.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 public readonly record struct AgentId(Guid Value)
 {
diff --git a/src/AgentRegistry.Domain/Agents/Capability.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/Capability.cs
similarity index 96%
rename from src/AgentRegistry.Domain/Agents/Capability.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/Capability.cs
index f8d3044..0546d1e 100644
--- a/src/AgentRegistry.Domain/Agents/Capability.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/Capability.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 /// <summary>
 /// A protocol-agnostic description of something an agent can do.
diff --git a/src/AgentRegistry.Domain/Agents/CapabilityId.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/CapabilityId.cs
similarity index 83%
rename from src/AgentRegistry.Domain/Agents/CapabilityId.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/CapabilityId.cs
index 5994b6f..a1d8e1d 100644
--- a/src/AgentRegistry.Domain/Agents/CapabilityId.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/CapabilityId.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 public readonly record struct CapabilityId(Guid Value)
 {
diff --git a/src/AgentRegistry.Domain/Agents/Endpoint.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/Endpoint.cs
similarity index 98%
rename from src/AgentRegistry.Domain/Agents/Endpoint.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/Endpoint.cs
index 5ad99f5..1d0a2ea 100644
--- a/src/AgentRegistry.Domain/Agents/Endpoint.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/Endpoint.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 /// <summary>
 /// A reachable address where an agent accepts work.
diff --git a/src/AgentRegistry.Domain/Agents/EndpointId.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/EndpointId.cs
similarity index 83%
rename from src/AgentRegistry.Domain/Agents/EndpointId.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/EndpointId.cs
index bbea56a..1bca03c 100644
--- a/src/AgentRegistry.Domain/Agents/EndpointId.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/EndpointId.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 public readonly record struct EndpointId(Guid Value)
 {
diff --git a/src/AgentRegistry.Domain/Agents/LivenessModel.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/LivenessModel.cs
similarity index 92%
rename from src/AgentRegistry.Domain/Agents/LivenessModel.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/LivenessModel.cs
index 717aeb4..18f278e 100644
--- a/src/AgentRegistry.Domain/Agents/LivenessModel.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/LivenessModel.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 /// <summary>
 /// How an endpoint signals that it is available.
diff --git a/src/AgentRegistry.Domain/Agents/ProtocolType.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/ProtocolType.cs
similarity index 58%
rename from src/AgentRegistry.Domain/Agents/ProtocolType.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/ProtocolType.cs
index ac84a0e..9a6724e 100644
--- a/src/AgentRegistry.Domain/Agents/ProtocolType.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/ProtocolType.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 public enum ProtocolType
 {
diff --git a/src/AgentRegistry.Domain/Agents/TransportType.cs b/src/MarimerLLC.AgentRegistry.Domain/Agents/TransportType.cs
similarity index 70%
rename from src/AgentRegistry.Domain/Agents/TransportType.cs
rename to src/MarimerLLC.AgentRegistry.Domain/Agents/TransportType.cs
index f273274..45667f7 100644
--- a/src/AgentRegistry.Domain/Agents/TransportType.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/Agents/TransportType.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.Agents;
+namespace MarimerLLC.AgentRegistry.Domain.Agents;
 
 public enum TransportType
 {
diff --git a/src/AgentRegistry.Domain/ApiKeys/ApiKey.cs b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKey.cs
similarity index 97%
rename from src/AgentRegistry.Domain/ApiKeys/ApiKey.cs
rename to src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKey.cs
index 2afd1b1..23fa8ca 100644
--- a/src/AgentRegistry.Domain/ApiKeys/ApiKey.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKey.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace AgentRegistry.Domain.ApiKeys;
+namespace MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
 public class ApiKey
 {
diff --git a/src/AgentRegistry.Domain/ApiKeys/ApiKeyId.cs b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyId.cs
similarity index 82%
rename from src/AgentRegistry.Domain/ApiKeys/ApiKeyId.cs
rename to src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyId.cs
index 857d437..a287f22 100644
--- a/src/AgentRegistry.Domain/ApiKeys/ApiKeyId.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyId.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.ApiKeys;
+namespace MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
 public readonly record struct ApiKeyId(Guid Value)
 {
diff --git a/src/AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs
similarity index 84%
rename from src/AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs
rename to src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs
index 0f5e685..5a4289e 100644
--- a/src/AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs
+++ b/src/MarimerLLC.AgentRegistry.Domain/ApiKeys/ApiKeyScope.cs
@@ -1,4 +1,4 @@
-namespace AgentRegistry.Domain.ApiKeys;
+namespace MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
 public enum ApiKeyScope
 {
diff --git a/src/AgentRegistry.Domain/AgentRegistry.Domain.csproj b/src/MarimerLLC.AgentRegistry.Domain/MarimerLLC.AgentRegistry.Domain.csproj
similarity index 75%
rename from src/AgentRegistry.Domain/AgentRegistry.Domain.csproj
rename to src/MarimerLLC.AgentRegistry.Domain/MarimerLLC.AgentRegistry.Domain.csproj
index b760144..a52770e 100644
--- a/src/AgentRegistry.Domain/AgentRegistry.Domain.csproj
+++ b/src/MarimerLLC.AgentRegistry.Domain/MarimerLLC.AgentRegistry.Domain.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>MarimerLLC.AgentRegistry.Domain</RootNamespace>
   </PropertyGroup>
 
 </Project>
diff --git a/src/AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs
similarity index 87%
rename from src/AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs
index 7d3f0bf..b03ff71 100644
--- a/src/AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Auth/NotImplementedApiKeyService.cs
@@ -1,7 +1,7 @@
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Infrastructure.Auth;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Auth;
 
 /// <summary>
 /// Placeholder registered until the API key persistence layer is implemented.
diff --git a/src/AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs
similarity index 89%
rename from src/AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs
index d2351e4..06ecfd6 100644
--- a/src/AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Auth/SqlApiKeyService.cs
@@ -1,10 +1,10 @@
-using AgentRegistry.Application;
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Domain.ApiKeys;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Application;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 
-namespace AgentRegistry.Infrastructure.Auth;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Auth;
 
 public class SqlApiKeyService(AgentRegistryDbContext db) : IApiKeyService
 {
diff --git a/src/AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs
similarity index 92%
rename from src/AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs
index 0b69a2a..f0a91a0 100644
--- a/src/AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/PostgresHealthCheck.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Npgsql;
 
-namespace AgentRegistry.Infrastructure.Liveness;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Liveness;
 
 public class PostgresHealthCheck(string connectionString) : IHealthCheck
 {
diff --git a/src/AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs
similarity index 90%
rename from src/AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs
index 413202a..7cd2ba6 100644
--- a/src/AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisHealthCheck.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using StackExchange.Redis;
 
-namespace AgentRegistry.Infrastructure.Liveness;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Liveness;
 
 public class RedisHealthCheck(IConnectionMultiplexer redis) : IHealthCheck
 {
diff --git a/src/AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs
similarity index 92%
rename from src/AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs
index 094faf5..ce30fe6 100644
--- a/src/AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/RedisLivenessStore.cs
@@ -1,8 +1,8 @@
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 using StackExchange.Redis;
 
-namespace AgentRegistry.Infrastructure.Liveness;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Liveness;
 
 public class RedisLivenessStore(IConnectionMultiplexer redis) : ILivenessStore
 {
diff --git a/src/AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs
similarity index 82%
rename from src/AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs
index fa44345..14b1015 100644
--- a/src/AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Liveness/StaticHealthCheck.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
-namespace AgentRegistry.Infrastructure.Liveness;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Liveness;
 
 internal sealed class StaticHealthCheck(HealthCheckResult result) : IHealthCheck
 {
diff --git a/src/AgentRegistry.Infrastructure/AgentRegistry.Infrastructure.csproj b/src/MarimerLLC.AgentRegistry.Infrastructure/MarimerLLC.AgentRegistry.Infrastructure.csproj
similarity index 64%
rename from src/AgentRegistry.Infrastructure/AgentRegistry.Infrastructure.csproj
rename to src/MarimerLLC.AgentRegistry.Infrastructure/MarimerLLC.AgentRegistry.Infrastructure.csproj
index 0bbc16a..735c58a 100644
--- a/src/AgentRegistry.Infrastructure/AgentRegistry.Infrastructure.csproj
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/MarimerLLC.AgentRegistry.Infrastructure.csproj
@@ -1,8 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <RootNamespace>MarimerLLC.AgentRegistry.Infrastructure</RootNamespace>
+  </PropertyGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\AgentRegistry.Domain\AgentRegistry.Domain.csproj" />
-    <ProjectReference Include="..\AgentRegistry.Application\AgentRegistry.Application.csproj" />
+    <ProjectReference Include="..\MarimerLLC.AgentRegistry.Domain\MarimerLLC.AgentRegistry.Domain.csproj" />
+    <ProjectReference Include="..\MarimerLLC.AgentRegistry.Application\MarimerLLC.AgentRegistry.Application.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs
similarity index 98%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs
index c9beaca..f17f467 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.Designer.cs
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
 using System.Collections.Generic;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -10,7 +10,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     [DbContext(typeof(AgentRegistryDbContext))]
     [Migration("20260226043115_Initial")]
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs
similarity index 98%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs
index 3028271..6a277fd 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226043115_Initial.cs
@@ -4,7 +4,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     /// <inheritdoc />
     public partial class Initial : Migration
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs
similarity index 98%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs
index d783e32..aeb4d61 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.Designer.cs
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
 using System.Collections.Generic;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -10,7 +10,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     [DbContext(typeof(AgentRegistryDbContext))]
     [Migration("20260226051014_AddApiKeys")]
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs
similarity index 97%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs
index d123815..b666646 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226051014_AddApiKeys.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     /// <inheritdoc />
     public partial class AddApiKeys : Migration
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs
similarity index 98%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs
index 71792a1..938c1e7 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.Designer.cs
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
 using System.Collections.Generic;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -10,7 +10,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     [DbContext(typeof(AgentRegistryDbContext))]
     [Migration("20260226053210_AddApiKeyScope")]
diff --git a/src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs
similarity index 92%
rename from src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs
index 3f98584..b182824 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/20260226053210_AddApiKeyScope.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     /// <inheritdoc />
     public partial class AddApiKeyScope : Migration
diff --git a/src/AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs
similarity index 98%
rename from src/AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs
index f651008..aa003d0 100644
--- a/src/AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Migrations/AgentRegistryDbContextModelSnapshot.cs
@@ -1,7 +1,7 @@
 // <auto-generated />
 using System;
 using System.Collections.Generic;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@@ -9,7 +9,7 @@
 
 #nullable disable
 
-namespace AgentRegistry.Infrastructure.Migrations
+namespace MarimerLLC.AgentRegistry.Infrastructure.Migrations
 {
     [DbContext(typeof(AgentRegistryDbContext))]
     partial class AgentRegistryDbContextModelSnapshot : ModelSnapshot
diff --git a/src/AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs
similarity index 97%
rename from src/AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs
index 3774199..4a89f31 100644
--- a/src/AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/AgentRegistryDbContext.cs
@@ -1,9 +1,9 @@
-using AgentRegistry.Domain.ApiKeys;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace AgentRegistry.Infrastructure.Persistence;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 
 public class AgentRegistryDbContext(DbContextOptions<AgentRegistryDbContext> options) : DbContext(options)
 {
diff --git a/src/AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs
similarity index 93%
rename from src/AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs
index 520daad..fdf7006 100644
--- a/src/AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/DesignTimeDbContextFactory.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 
-namespace AgentRegistry.Infrastructure.Persistence;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 
 /// <summary>
 /// Used by EF Core tooling (dotnet ef migrations add/remove, database update ...) at design time.
diff --git a/src/AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs
similarity index 93%
rename from src/AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs
index 41ccf0c..a41eb79 100644
--- a/src/AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/Persistence/SqlAgentRepository.cs
@@ -1,8 +1,8 @@
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 using Microsoft.EntityFrameworkCore;
 
-namespace AgentRegistry.Infrastructure.Persistence;
+namespace MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 
 public class SqlAgentRepository(AgentRegistryDbContext db) : IAgentRepository
 {
diff --git a/src/AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs b/src/MarimerLLC.AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs
similarity index 88%
rename from src/AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs
rename to src/MarimerLLC.AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs
index e319c39..5eb574b 100644
--- a/src/AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/MarimerLLC.AgentRegistry.Infrastructure/ServiceCollectionExtensions.cs
@@ -1,15 +1,15 @@
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Infrastructure.Auth;
-using AgentRegistry.Infrastructure.Liveness;
-using AgentRegistry.Infrastructure.Persistence;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Infrastructure.Auth;
+using MarimerLLC.AgentRegistry.Infrastructure.Liveness;
+using MarimerLLC.AgentRegistry.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Npgsql;
 using StackExchange.Redis;
 
-namespace AgentRegistry.Infrastructure;
+namespace MarimerLLC.AgentRegistry.Infrastructure;
 
 public static class ServiceCollectionExtensions
 {
diff --git a/tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj b/tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj
index f3ad56b..1b6c494 100644
--- a/tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj
+++ b/tests/AgentRegistry.Api.Tests/AgentRegistry.Api.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+    <RootNamespace>MarimerLLC.AgentRegistry.Api.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,9 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\AgentRegistry.Api\AgentRegistry.Api.csproj" />
-    <ProjectReference Include="..\..\src\AgentRegistry.Application\AgentRegistry.Application.csproj" />
-    <ProjectReference Include="..\..\src\AgentRegistry.Domain\AgentRegistry.Domain.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Api\MarimerLLC.AgentRegistry.Api.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Application\MarimerLLC.AgentRegistry.Application.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Domain\MarimerLLC.AgentRegistry.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/AgentRegistry.Api.Tests/Agents/DiscoveryTests.cs b/tests/AgentRegistry.Api.Tests/Agents/DiscoveryTests.cs
index ff96668..fd2037f 100644
--- a/tests/AgentRegistry.Api.Tests/Agents/DiscoveryTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Agents/DiscoveryTests.cs
@@ -1,10 +1,10 @@
 using System.Net;
 using System.Net.Http.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Agents;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Agents;
 
 public class DiscoveryTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/Agents/RegistrationTests.cs b/tests/AgentRegistry.Api.Tests/Agents/RegistrationTests.cs
index d280c0c..116771b 100644
--- a/tests/AgentRegistry.Api.Tests/Agents/RegistrationTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Agents/RegistrationTests.cs
@@ -1,10 +1,10 @@
 using System.Net;
 using System.Net.Http.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Agents;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Agents;
 
 public class RegistrationTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/ApiKeys/ApiKeyTests.cs b/tests/AgentRegistry.Api.Tests/ApiKeys/ApiKeyTests.cs
index 5edf74a..5e2bded 100644
--- a/tests/AgentRegistry.Api.Tests/ApiKeys/ApiKeyTests.cs
+++ b/tests/AgentRegistry.Api.Tests/ApiKeys/ApiKeyTests.cs
@@ -1,10 +1,10 @@
 using System.Net;
 using System.Net.Http.Json;
-using AgentRegistry.Api.ApiKeys.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Api.ApiKeys.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Api.Tests.ApiKeys;
+namespace MarimerLLC.AgentRegistry.Api.Tests.ApiKeys;
 
 public class ApiKeyTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/Infrastructure/AgentRegistryFactory.cs b/tests/AgentRegistry.Api.Tests/Infrastructure/AgentRegistryFactory.cs
index 380b313..0bfc7e6 100644
--- a/tests/AgentRegistry.Api.Tests/Infrastructure/AgentRegistryFactory.cs
+++ b/tests/AgentRegistry.Api.Tests/Infrastructure/AgentRegistryFactory.cs
@@ -1,12 +1,12 @@
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Application.Auth;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using StackExchange.Redis;
 
-namespace AgentRegistry.Api.Tests.Infrastructure;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
 
 public class AgentRegistryFactory : WebApplicationFactory<Program>
 {
diff --git a/tests/AgentRegistry.Api.Tests/Infrastructure/FakeApiKeyService.cs b/tests/AgentRegistry.Api.Tests/Infrastructure/FakeApiKeyService.cs
index e68b7c9..1682a70 100644
--- a/tests/AgentRegistry.Api.Tests/Infrastructure/FakeApiKeyService.cs
+++ b/tests/AgentRegistry.Api.Tests/Infrastructure/FakeApiKeyService.cs
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
-using AgentRegistry.Application.Auth;
-using AgentRegistry.Domain.ApiKeys;
+using MarimerLLC.AgentRegistry.Application.Auth;
+using MarimerLLC.AgentRegistry.Domain.ApiKeys;
 
-namespace AgentRegistry.Api.Tests.Infrastructure;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
 
 public class FakeApiKeyService : IApiKeyService
 {
diff --git a/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryAgentRepository.cs b/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryAgentRepository.cs
index 396afea..793ab70 100644
--- a/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryAgentRepository.cs
+++ b/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryAgentRepository.cs
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Infrastructure;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
 
 public class InMemoryAgentRepository : IAgentRepository
 {
diff --git a/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryLivenessStore.cs b/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryLivenessStore.cs
index 025707d..3abf4e6 100644
--- a/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryLivenessStore.cs
+++ b/tests/AgentRegistry.Api.Tests/Infrastructure/InMemoryLivenessStore.cs
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Infrastructure;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
 
 public class InMemoryLivenessStore : ILivenessStore
 {
diff --git a/tests/AgentRegistry.Api.Tests/Protocols/A2A/A2AEndpointTests.cs b/tests/AgentRegistry.Api.Tests/Protocols/A2A/A2AEndpointTests.cs
index e62b792..c3992aa 100644
--- a/tests/AgentRegistry.Api.Tests/Protocols/A2A/A2AEndpointTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Protocols/A2A/A2AEndpointTests.cs
@@ -1,11 +1,11 @@
 using System.Net;
 using System.Net.Http.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Protocols.A2A.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Protocols.A2A.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Protocols.A2A;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Protocols.A2A;
 
 public class A2AEndpointTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/Protocols/ACP/AcpEndpointTests.cs b/tests/AgentRegistry.Api.Tests/Protocols/ACP/AcpEndpointTests.cs
index f3f85c4..f5a61ec 100644
--- a/tests/AgentRegistry.Api.Tests/Protocols/ACP/AcpEndpointTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Protocols/ACP/AcpEndpointTests.cs
@@ -1,12 +1,12 @@
 using System.Net;
 using System.Net.Http.Json;
 using System.Text.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Protocols.ACP.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Protocols.ACP.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Protocols.ACP;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Protocols.ACP;
 
 public class AcpEndpointTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpEndpointTests.cs b/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpEndpointTests.cs
index 70c39c9..daaa6ba 100644
--- a/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpEndpointTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpEndpointTests.cs
@@ -1,12 +1,12 @@
 using System.Net;
 using System.Net.Http.Json;
 using System.Text.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Protocols.MCP.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Protocols.MCP.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Protocols.MCP;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Protocols.MCP;
 
 public class McpEndpointTests(AgentRegistryFactory factory) : IClassFixture<AgentRegistryFactory>, IDisposable
 {
diff --git a/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpServerTests.cs b/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpServerTests.cs
index 75c1297..5735f83 100644
--- a/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpServerTests.cs
+++ b/tests/AgentRegistry.Api.Tests/Protocols/MCP/McpServerTests.cs
@@ -1,11 +1,11 @@
 using System.Net;
 using System.Net.Http.Json;
 using System.Text.Json;
-using AgentRegistry.Api.Agents.Models;
-using AgentRegistry.Api.Tests.Infrastructure;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Api.Agents.Models;
+using MarimerLLC.AgentRegistry.Api.Tests.Infrastructure;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Api.Tests.Protocols.MCP;
+namespace MarimerLLC.AgentRegistry.Api.Tests.Protocols.MCP;
 
 /// <summary>
 /// Integration tests for the registry's own MCP server at POST /mcp (Streamable HTTP).
diff --git a/tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj b/tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj
index dde739c..29bfec8 100644
--- a/tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj
+++ b/tests/AgentRegistry.Application.Tests/AgentRegistry.Application.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+    <RootNamespace>MarimerLLC.AgentRegistry.Application.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\AgentRegistry.Application\AgentRegistry.Application.csproj" />
-    <ProjectReference Include="..\..\src\AgentRegistry.Domain\AgentRegistry.Domain.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Application\MarimerLLC.AgentRegistry.Application.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Domain\MarimerLLC.AgentRegistry.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/AgentRegistry.Application.Tests/AgentServiceTests.cs b/tests/AgentRegistry.Application.Tests/AgentServiceTests.cs
index 9f67731..5e8c661 100644
--- a/tests/AgentRegistry.Application.Tests/AgentServiceTests.cs
+++ b/tests/AgentRegistry.Application.Tests/AgentServiceTests.cs
@@ -1,12 +1,12 @@
-using AgentRegistry.Application;
-using AgentRegistry.Application.Agents;
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Application;
+using MarimerLLC.AgentRegistry.Application.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 using Rocks;
 
 [assembly: Rock(typeof(IAgentRepository), BuildType.Create)]
 [assembly: Rock(typeof(ILivenessStore), BuildType.Create)]
 
-namespace AgentRegistry.Application.Tests;
+namespace MarimerLLC.AgentRegistry.Application.Tests;
 
 public class AgentServiceTests
 {
diff --git a/tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj b/tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj
index b7f05de..d91c792 100644
--- a/tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj
+++ b/tests/AgentRegistry.Domain.Tests/AgentRegistry.Domain.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+    <RootNamespace>MarimerLLC.AgentRegistry.Domain.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\AgentRegistry.Domain\AgentRegistry.Domain.csproj" />
+    <ProjectReference Include="..\..\src\MarimerLLC.AgentRegistry.Domain\MarimerLLC.AgentRegistry.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/AgentRegistry.Domain.Tests/AgentTests.cs b/tests/AgentRegistry.Domain.Tests/AgentTests.cs
index cb69e4e..05c45f3 100644
--- a/tests/AgentRegistry.Domain.Tests/AgentTests.cs
+++ b/tests/AgentRegistry.Domain.Tests/AgentTests.cs
@@ -1,6 +1,6 @@
-using AgentRegistry.Domain.Agents;
+using MarimerLLC.AgentRegistry.Domain.Agents;
 
-namespace AgentRegistry.Domain.Tests;
+namespace MarimerLLC.AgentRegistry.Domain.Tests;
 
 public class AgentTests
 {