diff --git a/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore b/src/dotnet/.idea/.idea.Suspectus/.idea/.gitignore
similarity index 100%
rename from src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/.gitignore
rename to src/dotnet/.idea/.idea.Suspectus/.idea/.gitignore
diff --git a/src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml b/src/dotnet/.idea/.idea.Suspectus/.idea/indexLayout.xml
similarity index 100%
rename from src/dotnet/.idea/.idea.Suspectus.GandalfReborn/.idea/indexLayout.xml
rename to src/dotnet/.idea/.idea.Suspectus/.idea/indexLayout.xml
diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs b/src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs
similarity index 97%
rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs
rename to src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs
index c8f6d61..9f233d1 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Invoker.cs
+++ b/src/dotnet/Suspectus.Gandalf.Abstractions/Invoker.cs
@@ -2,7 +2,7 @@ using System.Collections.Immutable;
using System.Security.Claims;
using System.Text.RegularExpressions;
-namespace Suspectus.GandalfReborn.Abstractions;
+namespace Suspectus.Gandalf.Abstractions;
public partial class Invoker
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs b/src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs
similarity index 60%
rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs
rename to src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs
index 658f59d..b7f4e82 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/InvokerContext.cs
+++ b/src/dotnet/Suspectus.Gandalf.Abstractions/InvokerContext.cs
@@ -1,4 +1,4 @@
-namespace Suspectus.GandalfReborn.Abstractions;
+namespace Suspectus.Gandalf.Abstractions;
public class InvokerContext
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj b/src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj
similarity index 74%
rename from src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj
rename to src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj
index 9cea2c7..25a728f 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Abstractions/Suspectus.GandalfReborn.Abstractions.csproj
+++ b/src/dotnet/Suspectus.Gandalf.Abstractions/Suspectus.Gandalf.Abstractions.csproj
@@ -4,7 +4,7 @@
net9.0
enable
enable
- Suspectus.GandalfReborn.Abstractions
+ Suspectus.Gandalf.Abstractions
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs
similarity index 85%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs
index ca5c3a9..2c6540a 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/AuthCodeRequestCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/AuthCodeRequestCommand.cs
@@ -1,7 +1,7 @@
using LanguageExt.Common;
-using Suspectus.GandalfReborn.Data.Dto;
+using Suspectus.Gandalf.Data.Dto;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public class AuthCodeRequestCommand : IGrCommand>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs
similarity index 75%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs
index 562c251..71645f8 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateAuthCodeCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateAuthCodeCommand.cs
@@ -1,7 +1,7 @@
using LanguageExt.Common;
-using Suspectus.GandalfReborn.Data.Dto;
+using Suspectus.Gandalf.Data.Dto;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public class CreateAuthCodeCommand : IGrCommand>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs
similarity index 63%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs
index 775a4dc..e97d0db 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/CreateTokensCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/CreateTokensCommand.cs
@@ -1,7 +1,7 @@
using LanguageExt.Common;
-using Suspectus.GandalfReborn.Data.Dto;
+using Suspectus.Gandalf.Data.Dto;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public class CreateTokensCommand : IGrCommand>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs
similarity index 76%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs
index 3262406..5054df6 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/HashPasswordCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/HashPasswordCommand.cs
@@ -1,6 +1,6 @@
using LanguageExt.Common;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public class HashPasswordCommand : IGrCommand>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs
similarity index 60%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs
index 76fa3ca..5ec3b0c 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/IGrCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/IGrCommand.cs
@@ -1,5 +1,5 @@
using MediatR;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public interface IGrCommand : IRequest;
\ No newline at end of file
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs b/src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs
similarity index 71%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs
index 618e991..cd640d2 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Commands/RegisterCommand.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Commands/RegisterCommand.cs
@@ -1,7 +1,7 @@
using LanguageExt.Common;
-using Suspectus.GandalfReborn.Data.Entities.Subject;
+using Suspectus.Gandalf.Data.Entities.Subject;
-namespace Suspectus.GandalfReborn.Commands;
+namespace Suspectus.Gandalf.Api.Commands;
public class RegisterCommand : IGrCommand>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs b/src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs
similarity index 92%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs
index 64cc4cb..80ab3c9 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Controllers/AuthController.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Controllers/AuthController.cs
@@ -1,8 +1,8 @@
using MediatR;
using Microsoft.AspNetCore.Mvc;
-using Suspectus.GandalfReborn.Commands;
+using Suspectus.Gandalf.Api.Commands;
-namespace Suspectus.GandalfReborn.Controllers;
+namespace Suspectus.Gandalf.Api.Controllers;
[ApiController]
[Route("api/[controller]")]
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs b/src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs
similarity index 94%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs
index c4d432e..ce524d9 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Extensions/ResultExtentions.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Extensions/ResultExtentions.cs
@@ -1,6 +1,6 @@
using LanguageExt.Common;
-namespace Suspectus.GandalfReborn.Extensions;
+namespace Suspectus.Gandalf.Api.Extensions;
public static class ResultExtensions
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs
similarity index 61%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs
index 3856f27..1c90f6f 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/IGrCommandHandler.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/IGrCommandHandler.cs
@@ -1,6 +1,6 @@
using MediatR;
-using Suspectus.GandalfReborn.Commands;
+using Suspectus.Gandalf.Api.Commands;
-namespace Suspectus.GandalfReborn.Handlers.Commands;
+namespace Suspectus.Gandalf.Api.Handlers.Commands;
public interface IGrCommandHandler : IRequestHandler where TCommand : IGrCommand;
\ No newline at end of file
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs
similarity index 78%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs
index 8eb1e5f..100f715 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Commands/RegisterCommandHandler.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Commands/RegisterCommandHandler.cs
@@ -1,13 +1,13 @@
using LanguageExt.Common;
using MediatR;
-using Suspectus.GandalfReborn.Commands;
-using Suspectus.GandalfReborn.Data.Database.Repositories;
-using Suspectus.GandalfReborn.Data.Entities.Base;
-using Suspectus.GandalfReborn.Data.Entities.Subject;
-using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn;
-using Suspectus.GandalfReborn.Extensions;
+using Suspectus.Gandalf.Api.Commands;
+using Suspectus.Gandalf.Api.Extensions;
+using Suspectus.Gandalf.Data.Database.Repositories;
+using Suspectus.Gandalf.Data.Entities.Base;
+using Suspectus.Gandalf.Data.Entities.Subject;
+using Suspectus.Gandalf.Data.Entities.Subject.SignIn;
-namespace Suspectus.GandalfReborn.Handlers.Commands;
+namespace Suspectus.Gandalf.Api.Handlers.Commands;
public class RegisterCommandHandler(ISubjectRepository subjectRepository, IMediator mediator) : IGrCommandHandler>
{
diff --git a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs
similarity index 89%
rename from src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs
rename to src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs
index 5ab5ec0..3a9bb6f 100644
--- a/src/dotnet/Suspectus.GandalfReborn.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs
+++ b/src/dotnet/Suspectus.Gandalf.Api/Handlers/Security/AuthCodeRequestCommandHandler.cs
@@ -2,14 +2,14 @@ using LanguageExt.Common;
using MediatR;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
-using Suspectus.GandalfReborn.Commands;
-using Suspectus.GandalfReborn.Data.Database.Repositories;
-using Suspectus.GandalfReborn.Data.Dto;
-using Suspectus.GandalfReborn.Data.Entities.Subject.SignIn;
-using Suspectus.GandalfReborn.Extensions;
-using Suspectus.GandalfReborn.Handlers.Commands;
+using Suspectus.Gandalf.Api.Commands;
+using Suspectus.Gandalf.Api.Extensions;
+using Suspectus.Gandalf.Api.Handlers.Commands;
+using Suspectus.Gandalf.Data.Database.Repositories;
+using Suspectus.Gandalf.Data.Dto;
+using Suspectus.Gandalf.Data.Entities.Subject.SignIn;
-namespace Suspectus.GandalfReborn.Handlers.Security;
+namespace Suspectus.Gandalf.Api.Handlers.Security;
public class AuthCodeRequestCommandHandler(IPasswordHasher