diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
index 16060c2..38bec0f 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
@@ -49,16 +49,6 @@
 
         TextView profileText = findViewById(R.id.profileText);
 
-        Button returnButton = findViewById(R.id.returnButton);
-
-        //前の画面に戻る処理
-        returnButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-
         Button followUserButton = findViewById(R.id.followUserButton);
 
         //閲覧しているユーザーページが自分のページならフォローボタンを非表示する
@@ -67,8 +57,8 @@
         }
 
         //ログインしているユーザーがフォローしているかの有無で画面表示時のボタンの文字を変更する
-        userPageViewModel.getFollows(loginUid);
-        userPageViewModel.getFollowJson().observe(this, new Observer<FollowJson>() {
+        userPageViewModel.getMyFollows(loginUid);
+        userPageViewModel.getMyFollowJson().observe(this, new Observer<FollowJson>() {
             @Override
             public void onChanged(@Nullable FollowJson followJson) {
                 followsUidList = followJson.getFollowUids();
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
index c1d78d9..3a3fbcd 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
@@ -1,4 +1,4 @@
-package org.ntlab.acanthus_client.views.userpage.followList;
+package org.ntlab.acanthus_client.views.userpage.followFollower.followList;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -52,8 +52,8 @@
         ListView listView = getActivity().findViewById(R.id.followListView);
 
         //フォロー一覧の取得と表示
-        userPageViewModel.getFollows(uid);
-        userPageViewModel.getFollowJson().observe(getViewLifecycleOwner(), new Observer<FollowJson>() {
+        userPageViewModel.getMyFollows(uid);
+        userPageViewModel.getMyFollowJson().observe(getViewLifecycleOwner(), new Observer<FollowJson>() {
             @Override
             public void onChanged(FollowJson followJson) {
                 ArrayList<Integer> followUidList = followJson.getFollowUids();
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
index 1fd2b59..3219cf9 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
@@ -1,19 +1,26 @@
-package org.ntlab.acanthus_client.views.userpage.followerList;
+package org.ntlab.acanthus_client.views.userpage.followFollower.followerList;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+
 import org.jetbrains.annotations.Nullable;
+import org.ntlab.acanthus_client.Acanthus;
 import org.ntlab.acanthus_client.R;
 import org.ntlab.acanthus_client.entities.FollowerJson;
-import org.ntlab.acanthus_client.views.userpage.UserListViewAdapter;
+import org.ntlab.acanthus_client.views.userpage.followFollower.UserListViewAdapter;
 import org.ntlab.acanthus_client.views.userpage.UserPageActivity;
-import org.ntlab.acanthus_client.views.userpage.UserPageViewModel;
+import org.ntlab.acanthus_client.views.userpage.followFollower.UserPageViewModel;
 
 import java.util.ArrayList;
 
@@ -32,7 +39,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        acanthus = (Acanthus) getActivity().getApplication();
+        Acanthus acanthus = (Acanthus) getActivity().getApplication();
 
         Intent intent = getActivity().getIntent(); //UserPageActivityからuidをもらう
         Integer uid = intent.getIntExtra("UID", 0);
diff --git a/app/src/main/res/layout/activity_follow_list.xml b/app/src/main/res/layout/activity_follow_list.xml
deleted file mode 100644
index e69de29..0000000
--- a/app/src/main/res/layout/activity_follow_list.xml
+++ /dev/null
diff --git a/app/src/main/res/layout/activity_follower_list.xml b/app/src/main/res/layout/activity_follower_list.xml
deleted file mode 100644
index e69de29..0000000
--- a/app/src/main/res/layout/activity_follower_list.xml
+++ /dev/null