diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index 4427fc242..3958119e0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -16,7 +16,7 @@ import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.MoshidonLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new MegalodonLoginFragment());
+				showFragmentClearingBackStack(new MoshidonLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
similarity index 94%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
index ca8b67520..7a96c3926 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MegalodonLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/MoshidonLoginFragment.java
@@ -5,22 +5,18 @@ import android.content.res.ColorStateList;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.Space;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
@@ -28,27 +24,23 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.PaginatedList;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class MegalodonLoginFragment extends InstanceCatalogFragment {
+public class MoshidonLoginFragment extends InstanceCatalogFragment {
 	private View headerView;
 
-	public MegalodonLoginFragment() {
-		super(R.layout.fragment_megalodon_welcome, 1);
+	public MoshidonLoginFragment() {
+		super(R.layout.fragment_moshidon_welcome, 1);
 	}
 
 	@Override
@@ -63,9 +55,9 @@ public class MegalodonLoginFragment extends InstanceCatalogFragment {
 		dataLoaded();
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 
 		if (!canGoBack()) {
 			ImageView toolbarLogo=new ImageView(getActivity());
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
index 4ad938f33..fef941c29 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -23,7 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.MegalodonLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.MoshidonLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -77,7 +77,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, MegalodonLoginFragment.class, null);
+			Nav.go(activity, MoshidonLoginFragment.class, null);
 			dismiss();
 		}));
 
diff --git a/mastodon/src/main/res/layout/fragment_megalodon_welcome.xml b/mastodon/src/main/res/layout/fragment_moshidon_welcome.xml
similarity index 100%
rename from mastodon/src/main/res/layout/fragment_megalodon_welcome.xml
rename to mastodon/src/main/res/layout/fragment_moshidon_welcome.xml