diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6ed785a3..495c93b7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,7 @@ A clear and concise description of what the bug is.
 <!-- Remove the items which don't apply from the following list. -->
 - Client
 - ManagedClient
-- RcpClient
+- RpcClient
 - Server
 
 ### To Reproduce
diff --git a/Samples/RpcClient/RcpClient_Samples.cs b/Samples/RpcClient/RpcClient_Samples.cs
similarity index 97%
rename from Samples/RpcClient/RcpClient_Samples.cs
rename to Samples/RpcClient/RpcClient_Samples.cs
index 21f2b952..c895014d 100644
--- a/Samples/RpcClient/RcpClient_Samples.cs
+++ b/Samples/RpcClient/RpcClient_Samples.cs
@@ -8,7 +8,7 @@ using MQTTnet.Protocol;
 
 namespace MQTTnet.Samples.RpcClient;
 
-public static class RcpClient_Samples
+public static class RpcClient_Samples
 {
     /*
      * The extension MQTTnet.Extensions.Rpc (available as nuget) allows sending a request and waiting for the matching reply.
@@ -33,7 +33,7 @@ public static class RcpClient_Samples
             
             using (var mqttRpcClient = mqttFactory.CreateMqttRpcClient(mqttClient))
             {
-                // Access to a fully featured application message is not supported for RCP calls!
+                // Access to a fully featured application message is not supported for RPC calls!
                 // The method will throw an exception when the response was not received in time.
                 await mqttRpcClient.ExecuteAsync(TimeSpan.FromSeconds(2), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
             }
@@ -81,4 +81,4 @@ public static class RcpClient_Samples
         // ! Do not send response message with the _retain_ flag set to true.
         // ! All required data for a RPC call and the result must be placed into the payload.
      */
-}
\ No newline at end of file
+}