diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java
index 01f93f1..901b43c 100644
--- a/app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java
+++ b/app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java
@@ -97,9 +97,9 @@
 
     // 2. メッセージ送信（リアルタイム風）送る側
     //自分のchatはmychatmesaageに変更するかも
-    public void sendMessage(String chatroomId, String senderId, String message, String token) {
+    public void sendMessage(String chatroomId, String senderId, String content, String token) {
         //このメソッドは 指定したチャットルーム (chatroomId) に、あるユーザー (senderId) が、入力したメッセージ (message) を、認証トークン (token) を使って送信する役割です。
-        Call<ChatMessage> call = chatroomResource.sendMessage(token, chatroomId, senderId, message);
+        Call<ChatMessage> call = chatroomResource.sendMessage(token, chatroomId, senderId, content);
         //Retrofit を使って 「サーバーのAPIにメッセージ送信リクエストを作る」 メソッド。
         call.enqueue(new Callback<ChatMessage>() {
             @Override
diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
index b221b3a..c88c250 100644
--- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
@@ -17,7 +17,7 @@
 
 public class ChatActivity extends AppCompatActivity {
 
-  private ChatroomViewModel chatViewModel;
+  private ChatroomViewModel chatroomViewModel;
 
   //メンバー変数
   private EditText senderMessage;
@@ -34,7 +34,7 @@
     EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示
     setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定
 
-    chatViewModel = new ViewModelProvider(this).get(ChatroomViewModel.class);
+    chatroomViewModel = new ViewModelProvider(this).get(ChatroomViewModel.class);
 
     senderMessage = findViewById(R.id.sender_message);
     receiverMessage = findViewById(R.id.receiver_message);
@@ -69,13 +69,13 @@
               String senderId = tampopo.getUserId();
               String token = tampopo.getToken();
               String chatroomId = tampopo.getChatroomId();
-              ChatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
+              chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
               senderMessage.setText(senderText);//送信欄に表示
             }
         }
       });
 
-    chatViewModel.getLatestMessageLiveData().observe(this, receiverText -> {
+    chatroomViewModel.getLatestMessageLiveData().observe(this, receiverText -> {
       if (receiverText != null) {
         receiverMessage.setText(receiverText.getContent());
       }
diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
index c038a2d..e4ed758 100644
--- a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
+++ b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
@@ -77,7 +77,7 @@
         mFriendIcon.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 Context ctx = getContext();
-                Intent intent = new Intent(ctx, FriendActivity. class);
+                Intent intent = new Intent(ctx, ChatActivity. class);
                 ctx.startActivity(intent);
             }
         });