diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryCreateDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs
similarity index 96%
rename from EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryCreateDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs
index 98a8544d..fc58f98c 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryCreateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryCreateDto.cs
@@ -5,7 +5,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
 /// <summary>
 /// Data Transfer Object for creating a new envelope history record.
 /// </summary>
-public class EnvelopeHistoryCreateDto
+public class HistoryCreateDto
 {
     /// <summary>
     /// Gets or sets the identifier of the envelope.
diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs
similarity index 98%
rename from EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs
rename to EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs
index d2ba3dfc..2a22a4ea 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/EnvelopeHistoryDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeHistory/HistoryDto.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeHistory;
 /// <summary>
 /// Data Transfer Object representing the history of an envelope, including status, sender, receiver, and related metadata.
 /// </summary>
-public record EnvelopeHistoryDto
+public record HistoryDto
 {
     /// <summary>
     /// Unique identifier for the envelope history entry.
diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 82ca577a..7b0897e5 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -29,8 +29,8 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
         CreateMap<Document, DocumentDto>();
-        CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
-        CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
+        CreateMap<EnvelopeHistory, HistoryDto>();
+        CreateMap<EnvelopeHistory, HistoryCreateDto>();
         CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
         CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
@@ -45,8 +45,8 @@ public class MappingProfile : Profile
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
         CreateMap<DocumentDto, Document>();
-        CreateMap<EnvelopeHistoryDto, EnvelopeHistory>();
-        CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
+        CreateMap<HistoryDto, EnvelopeHistory>();
+        CreateMap<HistoryCreateDto, EnvelopeHistory>();
         CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
         CreateMap<ReceiverDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
diff --git a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
index f1489248..6dc12c0e 100644
--- a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
+++ b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
@@ -14,7 +14,7 @@ namespace EnvelopeGenerator.Application.Histories.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<EnvelopeHistoryDto?>
+public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<HistoryDto?>
 {
     /// <summary>
     /// 
@@ -50,7 +50,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<Envelop
 /// <summary>
 /// 
 /// </summary>
-public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, EnvelopeHistoryDto?>
+public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand, HistoryDto?>
 {
     private readonly IRepository<History> _repo;
 
@@ -77,7 +77,7 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
     /// <param name="request"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<EnvelopeHistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
+    public async Task<HistoryDto?> Handle(CreateHistoryCommand request, CancellationToken cancel)
     {
         if(request.UserReference is null)
         {
@@ -103,6 +103,6 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
         // create entitiy
         var hist = await _repo.CreateAsync(request, cancel);
         
-        return _mapper.Map<EnvelopeHistoryDto>(hist);
+        return _mapper.Map<HistoryDto>(hist);
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
index 9a68dd5c..585f41f9 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs
@@ -9,7 +9,7 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// <summary>
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
-public record ReadHistoryQuery : IRequest<IEnumerable<EnvelopeHistoryDto>>
+public record ReadHistoryQuery : IRequest<IEnumerable<HistoryDto>>
 {
     /// <summary>
     /// Die eindeutige Kennung des Umschlags.
diff --git a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
index 5919b00d..41709c3d 100644
--- a/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
+++ b/EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// <summary>
 /// 
 /// </summary>
-public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<EnvelopeHistoryDto>>
+public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
 {
     private readonly IRepository<History> _repo;
 
@@ -35,13 +35,13 @@ public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumer
     /// <param name="cancel"></param>
     /// <returns></returns>
     /// <exception cref="NotFoundException"></exception>
-    public async Task<IEnumerable<EnvelopeHistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
+    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
     {
         var query = _repo.ReadOnly().Where(h => h.EnvelopeId == request.EnvelopeId);
         if (request.Status is not null)
             query = query.Where(h => h.Status == request.Status);
 
         var hists = await query.ToListAsync(cancel);
-        return _mapper.Map<List<EnvelopeHistoryDto>>(hists);
+        return _mapper.Map<List<HistoryDto>>(hists);
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
index fb03958e..7f8a84c5 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeHistoryService.cs
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, History, long>
+public interface IEnvelopeHistoryService : ICRUDService<HistoryCreateDto, HistoryDto, History, long>
 {
     /// <summary>
     /// 
@@ -56,7 +56,7 @@ public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto
     /// <param name="withSender"></param>
     /// <param name="withReceiver"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<HistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
 
     /// <summary>
     /// 
@@ -64,7 +64,7 @@ public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto
     /// <param name="envelopeId"></param>
     /// <param name="userReference"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
+    Task<IEnumerable<HistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
index 54e34a08..ac38b5b6 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs
@@ -14,7 +14,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, History, long>, IEnvelopeHistoryService
+public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, HistoryCreateDto, HistoryDto, History, long>, IEnvelopeHistoryService
 {
     /// <summary>
     /// 
@@ -94,9 +94,9 @@ public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, En
     /// <param name="withSender"></param>
     /// <param name="withReceiver"></param>
     /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false)
+    public async Task<IEnumerable<HistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false)
     {
-        var histDTOs = _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(
+        var histDTOs = _mapper.Map<IEnumerable<HistoryDto>>(
                     await _repository.ReadAsync(
                                 envelopeId: envelopeId,
                                 userReference: userReference,
@@ -112,7 +112,7 @@ public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, En
     /// <param name="envelopeId"></param>
     /// <param name="userReference"></param>
     /// <returns></returns>
-    public async Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null) =>
+    public async Task<IEnumerable<HistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null) =>
         await ReadAsync(envelopeId: envelopeId, userReference: userReference, status: EnvelopeStatus.DocumentRejected, withReceiver:true);
 
 	//TODO: use IQueryable in repository to incerease the performance
diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
index 68ecf8eb..ab00072a 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
@@ -96,7 +96,7 @@ public class HistoryTests : TestBase
         
         // Assert
         Assert.That(result, Has.Exactly(1).Items);
-        Assert.That(result, Has.All.Matches<EnvelopeHistoryDto>(r => r.Status == EnvelopeStatus.EnvelopeCompletelySigned));
+        Assert.That(result, Has.All.Matches<HistoryDto>(r => r.Status == EnvelopeStatus.EnvelopeCompletelySigned));
     }
 
     [Test]