diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index bbbd2ea7..b10ab1fb 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -265,9 +265,9 @@ namespace PARR.API.MappingProfiles
             //    .ForMember(d => d.TaskStatus, o => o.MapFrom(s => s.TaskStatus))
             //    .ForMember(d => d.RobotStatus, o => o.MapFrom(s => s.RobotStatus));
 
-            CreateMap<RobotDto, RobotResponse>();
-            CreateMap<RobotTaskStatusDto, TaskStatusResponse>();
-            CreateMap<RobotStatusDto, RobotStatusResponse>();
+            CreateMap<RobotResult, RobotResponse>();
+            CreateMap<RobotTaskStatusResult, TaskStatusResponse>();
+            CreateMap<RobotStatusResult, RobotStatusResponse>();
 
             CreateMap<RobotConfigurationResult, RobotConfigurationResponse>();
 
diff --git a/PARR.Core/Infrastructure/Mapping/Shared/RobotDtoMappingProfile.cs b/PARR.Core/Infrastructure/Mapping/Shared/RobotResultMappingProfile.cs
similarity index 56%
rename from PARR.Core/Infrastructure/Mapping/Shared/RobotDtoMappingProfile.cs
rename to PARR.Core/Infrastructure/Mapping/Shared/RobotResultMappingProfile.cs
index a52685d8..1cfc6b51 100644
--- a/PARR.Core/Infrastructure/Mapping/Shared/RobotDtoMappingProfile.cs
+++ b/PARR.Core/Infrastructure/Mapping/Shared/RobotResultMappingProfile.cs
@@ -4,11 +4,11 @@ using PARR.Domain.Entities.RobotEntities;
 
 namespace PARR.Core.Infrastructure.Mapping.Shared
 {
-    public class RobotDtoMappingProfile : Profile
+    public class RobotResultMappingProfile : Profile
     {
-        public RobotDtoMappingProfile()
+        public RobotResultMappingProfile()
         {
-            CreateMap<Robot, RobotDto>();
+            CreateMap<Robot, RobotResult>();
         }
     }
 }
diff --git a/PARR.Core/Infrastructure/Mapping/Shared/RobotStatusDtoMappingProfile.cs b/PARR.Core/Infrastructure/Mapping/Shared/RobotStatusResultMappingProfile.cs
similarity index 52%
rename from PARR.Core/Infrastructure/Mapping/Shared/RobotStatusDtoMappingProfile.cs
rename to PARR.Core/Infrastructure/Mapping/Shared/RobotStatusResultMappingProfile.cs
index a6112b4c..89fb4d26 100644
--- a/PARR.Core/Infrastructure/Mapping/Shared/RobotStatusDtoMappingProfile.cs
+++ b/PARR.Core/Infrastructure/Mapping/Shared/RobotStatusResultMappingProfile.cs
@@ -4,11 +4,11 @@ using PARR.Domain.Entities.RobotEntities;
 
 namespace PARR.Core.Infrastructure.Mapping.Shared
 {
-    public class RobotStatusDtoMappingProfile : Profile
+    public class RobotStatusResultMappingProfile : Profile
     {
-        public RobotStatusDtoMappingProfile()
+        public RobotStatusResultMappingProfile()
         {
-            CreateMap<RobotStatus, RobotStatusDto>();
+            CreateMap<RobotStatus, RobotStatusResult>();
         }
     }
 }
diff --git a/PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusDtoMappingProfile.cs b/PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusResultMappingProfile.cs
similarity index 58%
rename from PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusDtoMappingProfile.cs
rename to PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusResultMappingProfile.cs
index 0f002bdf..404a7f1b 100644
--- a/PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusDtoMappingProfile.cs
+++ b/PARR.Core/Infrastructure/Mapping/Shared/RobotTaskStatusResultMappingProfile.cs
@@ -3,11 +3,11 @@ using PARR.Domain.DTOs.Shared;
 
 namespace PARR.Core.Infrastructure.Mapping.Shared
 {
-    public class RobotTaskStatusDtoMappingProfile : Profile
+    public class RobotTaskStatusResultMappingProfile : Profile
     {
-        public RobotTaskStatusDtoMappingProfile()
+        public RobotTaskStatusResultMappingProfile()
         {
-            CreateMap<PARR.Domain.Entities.RobotEntities.TaskStatus, RobotTaskStatusDto>();
+            CreateMap<PARR.Domain.Entities.RobotEntities.TaskStatus, RobotTaskStatusResult>();
         }
     }
 }
diff --git a/PARR.Domain/DTOs/RobotTaskRobotStatus/RobotConfigurationResult.cs b/PARR.Domain/DTOs/RobotTaskRobotStatus/RobotConfigurationResult.cs
index 478a5ebe..535455ac 100644
--- a/PARR.Domain/DTOs/RobotTaskRobotStatus/RobotConfigurationResult.cs
+++ b/PARR.Domain/DTOs/RobotTaskRobotStatus/RobotConfigurationResult.cs
@@ -10,11 +10,11 @@ namespace PARR.Domain.DTOs.RobotTaskRobotStatus
 
         public Guid TemplateId { get; init; }
 
-        public RobotDto? Robot { get; init; }
+        public RobotResult? Robot { get; init; }
 
-        public RobotTaskStatusDto? TaskStatus { get; init; }
+        public RobotTaskStatusResult? TaskStatus { get; init; }
 
-        public RobotStatusDto? RobotStatus { get; init; }
+        public RobotStatusResult? RobotStatus { get; init; }
 
         public int AttemptsNumber { get; init; }
 
diff --git a/PARR.Domain/DTOs/Shared/RobotDto.cs b/PARR.Domain/DTOs/Shared/RobotResult.cs
similarity index 87%
rename from PARR.Domain/DTOs/Shared/RobotDto.cs
rename to PARR.Domain/DTOs/Shared/RobotResult.cs
index 32df50c6..f39761e7 100644
--- a/PARR.Domain/DTOs/Shared/RobotDto.cs
+++ b/PARR.Domain/DTOs/Shared/RobotResult.cs
@@ -1,6 +1,6 @@
 namespace PARR.Domain.DTOs.Shared
 {
-    public record RobotDto
+    public record RobotResult
     {
         public int Code { get; init; }
         public required string Name { get; init; }
diff --git a/PARR.Domain/DTOs/Shared/RobotStatusDto.cs b/PARR.Domain/DTOs/Shared/RobotStatusResult.cs
similarity index 83%
rename from PARR.Domain/DTOs/Shared/RobotStatusDto.cs
rename to PARR.Domain/DTOs/Shared/RobotStatusResult.cs
index deb6a64f..969a2d62 100644
--- a/PARR.Domain/DTOs/Shared/RobotStatusDto.cs
+++ b/PARR.Domain/DTOs/Shared/RobotStatusResult.cs
@@ -1,6 +1,6 @@
 namespace PARR.Domain.DTOs.Shared
 {
-    public record RobotStatusDto
+    public record RobotStatusResult
     {
         public int Code { get; init; }
         public string? Name { get; init; }
diff --git a/PARR.Domain/DTOs/Shared/RobotTaskStatusDto.cs b/PARR.Domain/DTOs/Shared/RobotTaskStatusResult.cs
similarity index 83%
rename from PARR.Domain/DTOs/Shared/RobotTaskStatusDto.cs
rename to PARR.Domain/DTOs/Shared/RobotTaskStatusResult.cs
index f0f768e6..9fb739bf 100644
--- a/PARR.Domain/DTOs/Shared/RobotTaskStatusDto.cs
+++ b/PARR.Domain/DTOs/Shared/RobotTaskStatusResult.cs
@@ -1,6 +1,6 @@
 namespace PARR.Domain.DTOs.Shared
 {
-    public record RobotTaskStatusDto
+    public record RobotTaskStatusResult
     {
         public int Code { get; init; }
         public required string Name { get; init; }