diff --git a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
index 62e173b..651439d 100644
--- a/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
@@ -2,8 +2,6 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -22,7 +20,7 @@
         setContentView(R.layout.activity_forgot_password);
 
         //idの取得
-        final EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+        final EditText EmailAddressText = findViewById(R.id.NameText);
         Button SendButton = findViewById(R.id.SendButton);
 
         //EmailAddressText.addTextChangedListener(this);
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
index ea7be6d..6147454 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -22,7 +22,7 @@
         //各種IDを取得
         Button SigninButton = findViewById(R.id.SigninButton);
         Button SignupButton = findViewById(R.id.SignupButton);
-        final EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+        final EditText NameText = findViewById(R.id.NameText);
         final EditText PasswordText = findViewById(R.id.PasswordText);
         Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton);
 
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index ea0f04f..7162648 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -39,7 +39,7 @@
         //各種idを取得
         Button LoginButton = findViewById(R.id.LoginButton);
         Button MakeAccountButton = findViewById(R.id.MakeAccountButton);
-        final EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+        final EditText NameText = findViewById(R.id.NameText);
         final EditText PasswordText = findViewById(R.id.PasswordText);
         final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
 
@@ -57,7 +57,7 @@
                 }
 
                 //API呼び出しのための値入力
-                Call<User> call = signup.listUser(EmailAddressText.getText().toString(),PasswordText.getText().toString(),null);
+                Call<User> call = signup.listUser(NameText.getText().toString(),PasswordText.getText().toString(),null);
 
                 call.enqueue(new Callback<User>() {
                     //成功時
diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml
index 3d8782c..e5b5ac9 100644
--- a/app/src/main/res/layout/activity_forgot_password.xml
+++ b/app/src/main/res/layout/activity_forgot_password.xml
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toBottomOf="@+id/textView8" />
 
     <EditText
-        android:id="@+id/EMailAddressText"
+        android:id="@+id/NameText"
         android:layout_width="294dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -49,5 +49,5 @@
         android:layout_marginTop="24dp"
         android:text="送信"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText" />
+        app:layout_constraintTop_toBottomOf="@+id/NameText" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 89a1177..1e7806b 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -39,10 +39,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText" />
+        app:layout_constraintTop_toBottomOf="@+id/NameText" />
 
     <EditText
-        android:id="@+id/EMailAddressText"
+        android:id="@+id/NameText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 7250830..71b68f6 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -119,10 +119,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText" />
+        app:layout_constraintTop_toBottomOf="@+id/NameText" />
 
     <EditText
-        android:id="@+id/EMailAddressText"
+        android:id="@+id/NameText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"