diff --git a/plug.proto b/plug.proto
index f26f5f1..207ec65 100644
--- a/plug.proto
+++ b/plug.proto
@@ -47,9 +47,9 @@ message PlugTaskCreation {
 }
 
 message SendMessageRequest {
-  string user_id = 1;
+  string user_source_id = 1;
   string message = 2;
-  string user_name = 3;
+  string user_source_name = 3;
 }
 
 message SendMessageResponse {
@@ -57,8 +57,8 @@ message SendMessageResponse {
 }
 
 message GetMessagesRequest {
-  string user_id = 1;
-  string user_name = 2;
+  string user_source_id = 1;
+  string user_source_name = 2;
 }
 
 message GetMessagesResponse {
@@ -66,8 +66,8 @@ message GetMessagesResponse {
 }
 
 message Message {
-  string from_user_id = 1;
-  string from_user_name = 2;
+  string from_user_source_id = 1;
+  string from_user_source_name = 2;
   google.protobuf.Timestamp created_at = 3;
   string body = 4;
   string title = 5;