diff --git a/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs b/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs
index abc5c4fe..82a94e21 100644
--- a/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs
+++ b/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs
@@ -12,7 +12,7 @@ public static class EncodingExtensions
     /// </summary>
     /// <param name="readOnlyId"></param>
     /// <returns></returns>
-    public static string EncodeEnvelopeReceiverId(this long readOnlyId)
+    public static string ToEnvelopeKey(this long readOnlyId)
     {
         //The random number is used as a salt to increase security but it is not saved in the database.
         string combinedString = $"{Random.Shared.Next()}::{readOnlyId}::{Random.Shared.Next()}";
@@ -27,7 +27,7 @@ public static class EncodingExtensions
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    public static string EncodeEnvelopeReceiverId(this (string envelopeUuid, string receiverSignature) input)
+    public static string ToEnvelopeKey(this (string envelopeUuid, string receiverSignature) input)
     {
         string combinedString = $"{input.envelopeUuid}::{input.receiverSignature}";
         byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
index 2c1bab9b..47bf6468 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
@@ -56,7 +56,7 @@ private async Task<Dictionary<string, string>> CreatePlaceholders(string? access
 
 	if(envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 	{
-		var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).EncodeEnvelopeReceiverId();
+		var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
 		var sigHost = await _configService.ReadDefaultSignatureHost();
 		var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 		_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -71,7 +71,7 @@ private async Task<Dictionary<string, string>> CreatePlaceholders(string? access
         if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
         {
             _placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMailAsync(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
-            var erReadOnlyId = (readOnlyDto.Id).EncodeEnvelopeReceiverId();
+            var erReadOnlyId = (readOnlyDto.Id).ToEnvelopeKey();
             var sigHost = await _configService.ReadDefaultSignatureHost();
             var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";
             _placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
diff --git a/EnvelopeGenerator.Tests.Application/HistoryTests.cs b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
index 020fd026..3d022b78 100644
--- a/EnvelopeGenerator.Tests.Application/HistoryTests.cs
+++ b/EnvelopeGenerator.Tests.Application/HistoryTests.cs
@@ -32,7 +32,7 @@ public class HistoryTests : TestBase
         var createReceiverCmd = this.CreateReceiverCommand();
         (var receiver, _) = await Mediator.Send(createReceiverCmd);
 
-        var key = (envelope.Uuid, receiver.Signature).EncodeEnvelopeReceiverId();
+        var key = (envelope.Uuid, receiver.Signature).ToEnvelopeKey();
 
         var createCmd = Fake.Provider.CreateHistoryCommand(key);
 
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index c3c9527d..09c17306 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -458,7 +458,7 @@ public class HomeController : ViewControllerBase
             return await _envRcvService.ReadByUuidSignatureAsync(uuid: erro.Envelope!.Uuid, erro.Receiver!.Signature).ThenAsync(
             SuccessAsync: async er =>
             {
-                var envelopeKey = (er.Envelope!.Uuid, er.Receiver!.Signature).EncodeEnvelopeReceiverId();
+                var envelopeKey = (er.Envelope!.Uuid, er.Receiver!.Signature).ToEnvelopeKey();
 
                 //TODO: implement multi-threading to history process (Task)
                 var hist_res = await _historyService.RecordAsync((int)erro.EnvelopeId, erro.AddedWho, EnvelopeStatus.EnvelopeViewed);
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
index ba8a0569..f0e205f1 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs
@@ -75,8 +75,8 @@ public class TestEnvelopeReceiverController : ControllerBase
     public IActionResult EncodeEnvelopeReceiverId(string? uuid = null, string? signature = null, long? readOnlyId = null)
     {
         if(readOnlyId is long readOnlyId_long)
-            return Ok(readOnlyId_long.EncodeEnvelopeReceiverId());
+            return Ok(readOnlyId_long.ToEnvelopeKey());
         else
-            return Ok((uuid ?? string.Empty, signature ?? string.Empty).EncodeEnvelopeReceiverId());
+            return Ok((uuid ?? string.Empty, signature ?? string.Empty).ToEnvelopeKey());
     }
 }
\ No newline at end of file