diff --git a/EncryptionTests/SenderEncryptionWithSelfSignedCertificateTest.cs b/EncryptionTests/SenderEncryptionWithSelfSignedCertificateTest.cs
index 0746fc64faeca09209ad22aad827d363d17de4b9..6c81f27c5ea2784335a3aee06fd15ba198f8699f 100644
--- a/EncryptionTests/SenderEncryptionWithSelfSignedCertificateTest.cs
+++ b/EncryptionTests/SenderEncryptionWithSelfSignedCertificateTest.cs
@@ -24,7 +24,7 @@ public class SenderEncryptionWithSelfSignedCertificateTest {
 
     [OneTimeSetUp]
     public void OneTimeSetup() {
-        _certificate = EncryptionBaseClass.CreateSelfSignedCertificate("./");
+        _certificate = RsaEncryption.CreateSelfSignedCertificate("./");
     }
 
     [OneTimeTearDown]
diff --git a/FitConnect/FitConnect.csproj b/FitConnect/FitConnect.csproj
index 868bb140cfca11f9b644d363bfcc3a64ee5a8878..fa839cf281b8d60182b6c71db6f86ba79cb71e77 100644
--- a/FitConnect/FitConnect.csproj
+++ b/FitConnect/FitConnect.csproj
@@ -11,19 +11,19 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1"/>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
-        <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14"/>
-        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="metadata.schema.json"/>
-        <EmbeddedResource Include="metadata.schema.json"/>
+        <None Remove="metadata.schema.json" />
+        <EmbeddedResource Include="metadata.schema.json" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Interfaces"/>
+        <Folder Include="Interfaces" />
     </ItemGroup>
 
 </Project>
diff --git a/FitConnect/FunctionalBaseClass.cs b/FitConnect/FunctionalBaseClass.cs
index a8dd49b7f16b13b3469fd7453d7e505b9a487ca1..41fa5dea09e7578fb24c7381ec73a16172069f9b 100644
--- a/FitConnect/FunctionalBaseClass.cs
+++ b/FitConnect/FunctionalBaseClass.cs
@@ -9,20 +9,24 @@ namespace FitConnect;
 
 public class FunctionalBaseClass {
     protected readonly ILogger? Logger;
-    public IEncryptionBaseClass Encryption;
+    public readonly IEncryption Encryption;
 
     /// <summary>
     ///     Constructor for the FunctionalBaseClass
     /// </summary>
     /// <param name="logger">ILogger implementation</param>
     /// <param name="endpoints">FitConnect endpoints</param>
+    /// <param name="certificate">The Encryption certificate</param>
+    /// <example>
+    /// new Sender(logger, FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development))
+    /// </example>
     protected FunctionalBaseClass(ILogger? logger, FitConnectEndpoints? endpoints,
         X509Certificate2? certificate) {
         Endpoints = endpoints ??
                     FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development);
 
         Logger = logger;
-        Encryption = new EncryptionBaseClass(logger, certificate);
+        Encryption = new RsaEncryption(logger, certificate);
     }
 
     public FitConnectEndpoints Endpoints { get; }
@@ -30,13 +34,14 @@ public class FunctionalBaseClass {
 
     /// <summary>
     ///     Requesting an OAuth token from the FitConnect API.
-    ///     You can get the Client ID and Client Secret from the FitConnect Self Service portal
-    ///     under https://portal.auth-testing.fit-connect.fitko.dev
+    ///     <para>You can get the Client ID and Client Secret from the FitConnect Self Service portal
+    ///     under <br/>
+    ///     https://portal.auth-testing.fit-connect.fitko.dev</para>
     /// </summary>
     /// <param name="clientId">Your client Id</param>
     /// <param name="clientSecret">Your client Secret</param>
     /// <param name="scope">Scope if needed</param>
-    /// <returns></returns>
+    /// <returns>The received token or null</returns>
     public async Task<OAuthAccessToken?> GetTokenAsync(string clientId, string clientSecret,
         string? scope = null) {
         var client = new HttpClient();
diff --git a/FitConnect/IEncryptionBaseClass.cs b/FitConnect/IEncryption.cs
similarity index 95%
rename from FitConnect/IEncryptionBaseClass.cs
rename to FitConnect/IEncryption.cs
index ce031972b66af287f8db82cf8b362886c9542532..5798a77cb6996c51425378270a6c05abcba856f7 100644
--- a/FitConnect/IEncryptionBaseClass.cs
+++ b/FitConnect/IEncryption.cs
@@ -2,7 +2,7 @@ using System.Security.Cryptography.X509Certificates;
 
 namespace FitConnect;
 
-public interface IEncryptionBaseClass {
+public interface IEncryption {
     /// <summary>
     ///     Just for Proof of Concept
     /// </summary>
diff --git a/FitConnect/EncryptionBaseClass.cs b/FitConnect/RsaEncryption.cs
similarity index 97%
rename from FitConnect/EncryptionBaseClass.cs
rename to FitConnect/RsaEncryption.cs
index f244489f4cd9461acb71138c76aec5d094f9f34a..0a46a1e47ea970d7d48cf5f80849eeec4f73d02a 100644
--- a/FitConnect/EncryptionBaseClass.cs
+++ b/FitConnect/RsaEncryption.cs
@@ -7,7 +7,7 @@ using Microsoft.IdentityModel.Tokens;
 
 namespace FitConnect;
 
-public class EncryptionBaseClass : IEncryptionBaseClass {
+public class RsaEncryption : IEncryption {
     private readonly ILogger? _logger;
     private readonly RSA _rsa;
     private readonly X509Certificate2? certificate;
@@ -15,7 +15,7 @@ public class EncryptionBaseClass : IEncryptionBaseClass {
     private RSA? _publicKey;
 
 
-    internal EncryptionBaseClass(ILogger? logger, X509Certificate2? certificate) {
+    internal RsaEncryption(ILogger? logger, X509Certificate2? certificate) {
         _logger = logger;
         _rsa = RSA.Create(4096);