diff --git a/src/tcp/cl_apc_tcp_client_manager.clas.locals_imp.abap b/src/tcp/cl_apc_tcp_client_manager.clas.locals_imp.abap
index 3d1a9276..7b69bf16 100644
--- a/src/tcp/cl_apc_tcp_client_manager.clas.locals_imp.abap
+++ b/src/tcp/cl_apc_tcp_client_manager.clas.locals_imp.abap
@@ -78,11 +78,11 @@ CLASS lcl_client IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD if_apc_wsp_message_manager~create_message.
-    CREATE OBJECT ri_message TYPE lcl_message.
+    CREATE OBJECT r_message TYPE lcl_message.
   ENDMETHOD.
 
   METHOD if_apc_wsp_message_manager~send.
-    WRITE '@KERNEL const val = await ii_message.get().if_apc_wsp_message$get_binary();'.
+    WRITE '@KERNEL const val = await i_message.get().if_apc_wsp_message$get_binary();'.
     WRITE '@KERNEL this.client.write(Buffer.from(val.get(), "hex"), "binary");'.
   ENDMETHOD.
 ENDCLASS.
\ No newline at end of file
diff --git a/src/tcp/if_apc_wsp_message_manager.intf.abap b/src/tcp/if_apc_wsp_message_manager.intf.abap
index 70342509..602fdb01 100644
--- a/src/tcp/if_apc_wsp_message_manager.intf.abap
+++ b/src/tcp/if_apc_wsp_message_manager.intf.abap
@@ -1,13 +1,13 @@
 INTERFACE if_apc_wsp_message_manager PUBLIC.
   METHODS create_message
     RETURNING
-      VALUE(ri_message) TYPE REF TO if_apc_wsp_message
+      VALUE(r_message) TYPE REF TO if_apc_wsp_message
     RAISING
       cx_apc_error.
 
   METHODS send
     IMPORTING
-      ii_message TYPE REF TO if_apc_wsp_message
+      i_message TYPE REF TO if_apc_wsp_message
     RAISING
       cx_apc_error.
 ENDINTERFACE.
\ No newline at end of file