diff --git a/NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs b/NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs
index 2d33f39..8cb9d84 100644
--- a/NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs
+++ b/NetworkResurrector.Agent.Application/DependencyInjectionExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace NetworkResurrector.Agent.Application
+namespace NetworkResurrector.Api.Application
 {
     public static class DependencyInjectionExtensions
     {
diff --git a/NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs b/NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs
index 84b7586..673d5ff 100644
--- a/NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs
+++ b/NetworkResurrector.Agent.Application/Mappings/MappingProfile.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
-using NetworkResurrector.Agent.Application.Queries;
-using NetworkResurrector.Agent.Domain.Entities;
+using NetworkResurrector.Api.Application.Queries;
+using NetworkResurrector.Api.Domain.Entities;
 
-namespace NetworkResurrector.Agent.Application.Mappings
+namespace NetworkResurrector.Api.Application.Mappings
 {
     public class MappingProfile : Profile
     {
diff --git a/NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj b/NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj
similarity index 92%
rename from NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj
rename to NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj
index 38e9483..07117d3 100644
--- a/NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj
+++ b/NetworkResurrector.Agent.Application/NetworkResurrector.Api.Application.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -14,6 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj" />
   </ItemGroup>
 </Project>
diff --git a/NetworkResurrector.Agent.Application/Queries/GetMachines.cs b/NetworkResurrector.Agent.Application/Queries/GetMachines.cs
index e453685..a85be62 100644
--- a/NetworkResurrector.Agent.Application/Queries/GetMachines.cs
+++ b/NetworkResurrector.Agent.Application/Queries/GetMachines.cs
@@ -1,11 +1,11 @@
 using AutoMapper;
 using MediatR;
 using NDB.Application.DataContracts;
-using NetworkResurrector.Agent.Domain.Repositories;
+using NetworkResurrector.Api.Domain.Repositories;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace NetworkResurrector.Agent.Application.Queries
+namespace NetworkResurrector.Api.Application.Queries
 {
     public class GetMachines
     {
diff --git a/NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs b/NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs
index 8acca05..60669c1 100644
--- a/NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs
+++ b/NetworkResurrector.Agent.Domain.Data/DbContexts/AgentDbContext.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
-using NetworkResurrector.Agent.Domain.Data.EntityTypeConfiguration;
-using NetworkResurrector.Agent.Domain.Entities;
+using NetworkResurrector.Api.Domain.Data.EntityTypeConfiguration;
+using NetworkResurrector.Api.Domain.Entities;
 
-namespace NetworkResurrector.Agent.Domain.Data.DbContexts
+namespace NetworkResurrector.Api.Domain.Data.DbContexts
 {
     public class AgentDbContext : DbContext
     {
diff --git a/NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs b/NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs
index f98a0e8..00380bf 100644
--- a/NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs
+++ b/NetworkResurrector.Agent.Domain.Data/DependencyInjectionExtensions.cs
@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using NetworkResurrector.Agent.Domain.Data.DbContexts;
-using NetworkResurrector.Agent.Domain.Data.Repositories;
-using NetworkResurrector.Agent.Domain.Repositories;
+using NetworkResurrector.Api.Domain.Data.DbContexts;
+using NetworkResurrector.Api.Domain.Data.Repositories;
+using NetworkResurrector.Api.Domain.Repositories;
 
-namespace NetworkResurrector.Agent.Domain.Data
+namespace NetworkResurrector.Api.Domain.Data
 {
     public static class DependencyInjectionExtensions
     {
diff --git a/NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs b/NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
index a0d9264..3c5b9e1 100644
--- a/NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
+++ b/NetworkResurrector.Agent.Domain.Data/EntityTypeConfiguration/MachineConfiguration.cs
@@ -1,8 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using NetworkResurrector.Agent.Domain.Entities;
+using NetworkResurrector.Api.Domain.Entities;
 
-namespace NetworkResurrector.Agent.Domain.Data.EntityTypeConfiguration
+namespace NetworkResurrector.Api.Domain.Data.EntityTypeConfiguration
 {
     class MachineConfiguration : IEntityTypeConfiguration<Machine>
     {
diff --git a/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj b/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
similarity index 89%
rename from NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj
rename to NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
index fec7df8..5429189 100644
--- a/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj
+++ b/NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs b/NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs
index f54ebd9..ec48da7 100644
--- a/NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs
+++ b/NetworkResurrector.Agent.Domain.Data/Repositories/AgentRepository.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using NetworkResurrector.Agent.Domain.Data.DbContexts;
-using NetworkResurrector.Agent.Domain.Entities;
-using NetworkResurrector.Agent.Domain.Repositories;
+using NetworkResurrector.Api.Domain.Data.DbContexts;
+using NetworkResurrector.Api.Domain.Entities;
+using NetworkResurrector.Api.Domain.Repositories;
 using System.Threading.Tasks;
 
-namespace NetworkResurrector.Agent.Domain.Data.Repositories
+namespace NetworkResurrector.Api.Domain.Data.Repositories
 {
     class AgentRepository : IAgentRepository
     {
diff --git a/NetworkResurrector.Agent.Domain/Entities/Machine.cs b/NetworkResurrector.Agent.Domain/Entities/Machine.cs
index a0e3afa..29e4fa7 100644
--- a/NetworkResurrector.Agent.Domain/Entities/Machine.cs
+++ b/NetworkResurrector.Agent.Domain/Entities/Machine.cs
@@ -1,4 +1,4 @@
-namespace NetworkResurrector.Agent.Domain.Entities
+namespace NetworkResurrector.Api.Domain.Entities
 {
     public class Machine
     {
diff --git a/NetworkResurrector.Agent.Domain/NetworkResurrector.Agent.Domain.csproj b/NetworkResurrector.Agent.Domain/NetworkResurrector.Api.Domain.csproj
similarity index 100%
rename from NetworkResurrector.Agent.Domain/NetworkResurrector.Agent.Domain.csproj
rename to NetworkResurrector.Agent.Domain/NetworkResurrector.Api.Domain.csproj
diff --git a/NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs b/NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs
index 804c4a7..b4fa21d 100644
--- a/NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs
+++ b/NetworkResurrector.Agent.Domain/Repositories/IAgentRepository.cs
@@ -1,7 +1,7 @@
-using NetworkResurrector.Agent.Domain.Entities;
+using NetworkResurrector.Api.Domain.Entities;
 using System.Threading.Tasks;
 
-namespace NetworkResurrector.Agent.Domain.Repositories
+namespace NetworkResurrector.Api.Domain.Repositories
 {
     public interface IAgentRepository
     {
diff --git a/NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs b/NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs
index c38b2b3..039531c 100644
--- a/NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs
+++ b/NetworkResurrector.Agent/Controllers/ResurrectorAgentController.cs
@@ -1,9 +1,9 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
-using NetworkResurrector.Agent.Application.Queries;
+using NetworkResurrector.Api.Application.Queries;
 using System.Threading.Tasks;
 
-namespace NetworkResurrector.Agent.Controllers
+namespace NetworkResurrector.Api.Controllers
 {
     [ApiController]
     [Route("resurrector-agent")]
diff --git a/NetworkResurrector.Agent/Dockerfile b/NetworkResurrector.Agent/Dockerfile
index c532790..8c78897 100644
--- a/NetworkResurrector.Agent/Dockerfile
+++ b/NetworkResurrector.Agent/Dockerfile
@@ -9,17 +9,17 @@ WORKDIR /src
 COPY dependencies.props .
 COPY Directory.Build.props .
 COPY NuGet.config .
-COPY ["NetworkResurrector.Agent/NetworkResurrector.Agent.csproj", "NetworkResurrector.Agent/"]
-COPY ["NetworkResurrector.Agent.Application/NetworkResurrector.Agent.Application.csproj", "NetworkResurrector.Agent.Application/"]
-COPY ["NetworkResurrector.Agent.Domain/NetworkResurrector.Agent.Domain.csproj", "NetworkResurrector.Agent.Domain/"]
-COPY ["NetworkResurrector.Agent.Domain.Data/NetworkResurrector.Agent.Domain.Data.csproj", "NetworkResurrector.Agent.Domain.Data/"]
-RUN dotnet restore "NetworkResurrector.Agent/NetworkResurrector.Agent.csproj"
+COPY ["NetworkResurrector.Api/NetworkResurrector.Api.csproj", "NetworkResurrector.Api/"]
+COPY ["NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj", "NetworkResurrector.Api.Application/"]
+COPY ["NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj", "NetworkResurrector.Api.Domain/"]
+COPY ["NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj", "NetworkResurrector.Api.Domain.Data/"]
+RUN dotnet restore "NetworkResurrector.Api/NetworkResurrector.Api.csproj"
 COPY . .
-WORKDIR "/src/NetworkResurrector.Agent"
-RUN dotnet build "NetworkResurrector.Agent.csproj" -c Release -o /app/build
+WORKDIR "/src/NetworkResurrector.Api"
+RUN dotnet build "NetworkResurrector.Api.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "NetworkResurrector.Agent.csproj" -c Release -o /app/publish
+RUN dotnet publish "NetworkResurrector.Api.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
@@ -31,4 +31,4 @@ ENV ConnectionStrings__DatabaseConnection="***REMOVED***"
 #Workaround to lower the TLS level in container for old sql server version
 RUN sed -i 's/TLSv1.2/TLSv1.0/g' /etc/ssl/openssl.cnf
 
-ENTRYPOINT ["dotnet", "NetworkResurrector.Agent.dll", "--console"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "NetworkResurrector.Api.dll", "--console"]
\ No newline at end of file
diff --git a/NetworkResurrector.Agent/NetworkResurrector.Agent.csproj b/NetworkResurrector.Agent/NetworkResurrector.Api.csproj
similarity index 94%
rename from NetworkResurrector.Agent/NetworkResurrector.Agent.csproj
rename to NetworkResurrector.Agent/NetworkResurrector.Api.csproj
index 46a7ae4..e9c582f 100644
--- a/NetworkResurrector.Agent/NetworkResurrector.Agent.csproj
+++ b/NetworkResurrector.Agent/NetworkResurrector.Api.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetworkResurrector.Agent.Application\NetworkResurrector.Agent.Application.csproj" />
-    <ProjectReference Include="..\NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Agent.Domain.Data.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Agent.Application\NetworkResurrector.Api.Application.csproj" />
+    <ProjectReference Include="..\NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NetworkResurrector.Agent/Program.cs b/NetworkResurrector.Agent/Program.cs
index 066127f..797c8b9 100644
--- a/NetworkResurrector.Agent/Program.cs
+++ b/NetworkResurrector.Agent/Program.cs
@@ -10,7 +10,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
-namespace NetworkResurrector.Agent
+namespace NetworkResurrector.Api
 {
     public class Program
     {
diff --git a/NetworkResurrector.Agent/Properties/launchSettings.json b/NetworkResurrector.Agent/Properties/launchSettings.json
index 6c62a80..a87629b 100644
--- a/NetworkResurrector.Agent/Properties/launchSettings.json
+++ b/NetworkResurrector.Agent/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "NetworkResurrector.Agent": {
+    "NetworkResurrector.Api": {
       "commandName": "Project",
       "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
diff --git a/NetworkResurrector.Agent/Startup.cs b/NetworkResurrector.Agent/Startup.cs
index 48e088e..5e4a700 100644
--- a/NetworkResurrector.Agent/Startup.cs
+++ b/NetworkResurrector.Agent/Startup.cs
@@ -8,12 +8,12 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NDB.Extensions.Swagger;
 using NDB.Security.Authentication.Identity;
-using NetworkResurrector.Agent.Application;
-using NetworkResurrector.Agent.Domain.Data;
+using NetworkResurrector.Api.Application;
+using NetworkResurrector.Api.Domain.Data;
 using Newtonsoft.Json;
 using System.Reflection;
 
-namespace NetworkResurrector.Agent
+namespace NetworkResurrector.Api
 {
     public class Startup
     {
diff --git a/NetworkResurrector.sln b/NetworkResurrector.sln
index faa8bf9..10af40e 100644
--- a/NetworkResurrector.sln
+++ b/NetworkResurrector.sln
@@ -31,15 +31,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B0C5F0C1-0BF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{6889D39C-D8DA-4B99-AFC1-F0B6355E73C0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agent", "agent", "{43C78941-52E6-4AB8-9170-CC7C006E4784}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{43C78941-52E6-4AB8-9170-CC7C006E4784}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent", "NetworkResurrector.Agent\NetworkResurrector.Agent.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api", "NetworkResurrector.Agent\NetworkResurrector.Api.csproj", "{E10CEE53-8167-446F-BFF3-B80725BB6C90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Application", "NetworkResurrector.Agent.Application\NetworkResurrector.Agent.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Application", "NetworkResurrector.Agent.Application\NetworkResurrector.Api.Application.csproj", "{EE31B126-12EC-46B3-8FB4-AD5BCF14C029}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Domain", "NetworkResurrector.Agent.Domain\NetworkResurrector.Agent.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain", "NetworkResurrector.Agent.Domain\NetworkResurrector.Api.Domain.csproj", "{885D5625-028A-4B35-8C89-7EF718BC6E34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Agent.Domain.Data", "NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Agent.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetworkResurrector.Api.Domain.Data", "NetworkResurrector.Agent.Domain.Data\NetworkResurrector.Api.Domain.Data.csproj", "{509767A7-D11C-4143-8D45-01E62DFC2C74}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Notes.txt b/Notes.txt
index 825cf12..2383d70 100644
--- a/Notes.txt
+++ b/Notes.txt
@@ -21,7 +21,7 @@ Agent:
 
 Create image:
 --from solution folder:
-docker image build -t "network-resurrector-agent:1.0.0" -f "NetworkResurrector.Agent/Dockerfile" .
+docker image build -t "network-resurrector-agent:1.0.0" -f "NetworkResurrector.Api/Dockerfile" .
 
 Run image:
 docker run -p 5053:80 -it network-resurrector-agent:1.0.0