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 c88c250..380bc4b 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
@@ -13,11 +13,11 @@
 import androidx.lifecycle.ViewModelProvider;
 import com.example.tampopo_client.R;
 import com.example.tampopo_client.Tampopo;
-import com.example.tampopo_client.viewmodels.ChatroomViewModel;
+import com.example.tampopo_client.viewmodels.ChatViewModel;
 
 public class ChatActivity extends AppCompatActivity {
 
-  private ChatroomViewModel chatroomViewModel;
+  private ChatViewModel chatViewModel;
 
   //メンバー変数
   private EditText senderMessage;
@@ -34,7 +34,7 @@
     EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示
     setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定
 
-    chatroomViewModel = new ViewModelProvider(this).get(ChatroomViewModel.class);
+    chatViewModel = new ViewModelProvider(this).get(ChatViewModel.class);
 
     senderMessage = findViewById(R.id.sender_message);
     receiverMessage = findViewById(R.id.receiver_message);
@@ -49,7 +49,7 @@
 //        if (!receiverText.isEmpty()) {
 //          String senderId = tampopo.getUserId();
 //          String token = tampopo.getToken();
-//          ChatroomViewModel.loadLatestMessage(null, senderId, token);
+//          ChatViewModel.loadLatestMessage(null, senderId, token);
 //          receiverMessage.setText(receiverText);//受信欄に表示
 //          senderMessage.setText("");//送信欄をクリア
 //        }
@@ -58,7 +58,7 @@
 
 //        String receiverText = senderMessage.getText().toString();//senderMessageにユーザーが入力した文字を取り出して、String型の 変数receiverText に入れる
 //        if (!receiverText.isEmpty()) {
-//          receiverMessage.setText(ChatroomViewModel.latestMessage);
+//          receiverMessage.setText(ChatViewModel.latestMessage);
 //        }
 
       buttonSend.setOnClickListener(new OnClickListener() {
@@ -69,13 +69,13 @@
               String senderId = tampopo.getUserId();
               String token = tampopo.getToken();
               String chatroomId = tampopo.getChatroomId();
-              chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
+              chatViewModel.sendMessage(chatroomId, senderId, senderText, token);
               senderMessage.setText(senderText);//送信欄に表示
             }
         }
       });
 
-    chatroomViewModel.getLatestMessageLiveData().observe(this, receiverText -> {
+    chatViewModel.getLatestMessageLiveData().observe(this, receiverText -> {
       if (receiverText != null) {
         receiverMessage.setText(receiverText.getContent());
       }