diff --git a/app/src/main/java/com/topjohnwu/magisk/base/MagiskActivity.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
similarity index 92%
rename from app/src/main/java/com/topjohnwu/magisk/base/MagiskActivity.kt
rename to app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
index fe7338334..def4f4aea 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/MagiskActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
@@ -18,7 +18,7 @@ import com.karumi.dexter.listener.PermissionRequest
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.extensions.set
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
@@ -26,9 +26,9 @@ import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.currentLocale
 
-typealias RequestCallback = MagiskActivity<*, *>.(Int, Intent?) -> Unit
+typealias RequestCallback = BaseActivity<*, *>.(Int, Intent?) -> Unit
 
-abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
         AppCompatActivity(), EventHandler {
 
     protected lateinit var binding: Binding
@@ -66,7 +66,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
 
         binding = DataBindingUtil.setContentView<Binding>(this, layoutRes).apply {
             setVariable(BR.viewModel, viewModel)
-            lifecycleOwner = this@MagiskActivity
+            lifecycleOwner = this@BaseActivity
         }
     }
 
@@ -100,7 +100,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
         super.onActivityResult(requestCode, resultCode, data)
         resultCallbacks[requestCode]?.apply {
             resultCallbacks.remove(requestCode)
-            invoke(this@MagiskActivity, resultCode, data)
+            invoke(this@BaseActivity, resultCode, data)
         }
     }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/MagiskFragment.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
similarity index 81%
rename from app/src/main/java/com/topjohnwu/magisk/base/MagiskFragment.kt
rename to app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
index a08f4a09e..368bb4e91 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/MagiskFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
@@ -9,15 +9,14 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.events.ViewEvent
-import com.topjohnwu.magisk.ui.MainActivity
 
-abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBinding> :
+abstract class BaseFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding> :
     Fragment(), EventHandler {
 
-    protected val activity get() = requireActivity() as MainActivity
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
     protected abstract val viewModel: ViewModel
@@ -34,7 +33,7 @@ abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBin
     ): View? {
         binding = DataBindingUtil.inflate<Binding>(inflater, layoutRes, container, false).apply {
             setVariable(BR.viewModel, viewModel)
-            lifecycleOwner = this@MagiskFragment
+            lifecycleOwner = this@BaseFragment
         }
 
         return binding.root
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt b/app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt
index 092be22c6..01aa437c0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BasePreferenceFragment.kt
@@ -14,7 +14,7 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
 
     protected val prefs: SharedPreferences by inject()
-    protected val activity get() = requireActivity() as MagiskActivity<*, *>
+    protected val activity get() = requireActivity() as BaseActivity<*, *>
 
     override fun onCreateView(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/MagiskViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
similarity index 97%
rename from app/src/main/java/com/topjohnwu/magisk/base/viewmodel/MagiskViewModel.kt
rename to app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
index cf9c14c75..5c065c73b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/MagiskViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/viewmodel/BaseViewModel.kt
@@ -13,7 +13,7 @@ import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 
 
-abstract class MagiskViewModel(
+abstract class BaseViewModel(
     initialState: State = State.LOADING
 ) : LoadingViewModel(initialState) {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
index 3aa93002d..9f442f60d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
@@ -12,8 +12,8 @@ import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.ActivityMainBinding
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.snackbar
@@ -35,7 +35,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 import kotlin.reflect.KClass
 
-open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>(), Navigator,
+open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Navigator,
         FragNavController.RootFragmentListener, FragNavController.TransactionListener {
 
     override val layoutRes: Int = R.layout.activity_main
@@ -102,7 +102,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>(),
     }
 
     override fun onBackPressed() {
-        val fragment = navigationController?.currentFrag as? MagiskFragment<*, *>
+        val fragment = navigationController?.currentFrag as? BaseFragment<*, *>
 
         if (fragment?.onBackPressed() == true) {
             return
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt
index 4264988d1..35688183f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainViewModel.kt
@@ -2,11 +2,11 @@ package com.topjohnwu.magisk.ui
 
 import android.view.MenuItem
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.model.navigation.Navigation
 
 
-class MainViewModel : MagiskViewModel() {
+class MainViewModel : BaseViewModel() {
 
     fun navPressed() = Navigation.Main.OPEN_NAV.publish()
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
index cbbbc099f..79e573dca 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
@@ -9,13 +9,13 @@ import androidx.core.net.toUri
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityFlashBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.io.File
 
-open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>() {
+open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>() {
 
     override val layoutRes: Int = R.layout.activity_flash
     override val viewModel: FlashViewModel by viewModel {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index d76c44930..e2ead2b3b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -11,7 +11,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
@@ -31,7 +31,7 @@ class FlashViewModel(
     installer: Uri,
     uri: Uri,
     private val resources: Resources
-) : MagiskViewModel(), FlashResultListener {
+) : BaseViewModel(), FlashResultListener {
 
     val canShowReboot = Shell.rootAccess()
     val showRestartTitle = KObservableField(false)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
index 42b5ab774..8e09a010f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.ui.hide
 
 import android.content.pm.ApplicationInfo
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -22,7 +22,7 @@ import timber.log.Timber
 class HideViewModel(
     private val magiskRepo: MagiskRepository,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
     val isShowSystem = KObservableField(false)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt
index 08bb96e19..f9d4c67f3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.kt
@@ -6,11 +6,11 @@ import android.view.MenuItem
 import android.widget.SearchView
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentMagiskHideBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class MagiskHideFragment : MagiskFragment<HideViewModel, FragmentMagiskHideBinding>(),
+class MagiskHideFragment : BaseFragment<HideViewModel, FragmentMagiskHideBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_magisk_hide
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
index 4a72c580e..bc17b8368 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
@@ -5,8 +5,8 @@ import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseActivity
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
 import com.topjohnwu.magisk.extensions.inject
@@ -24,7 +24,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.io.File
 import java.lang.reflect.InvocationHandler
 
-class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
+class HomeFragment : BaseFragment<HomeViewModel, FragmentMagiskBinding>(),
     SafetyNetHelper.Callback {
 
     override val layoutRes: Int = R.layout.fragment_magisk
@@ -61,7 +61,7 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
             return
         }
 
-        MagiskInstallDialog(requireActivity() as MagiskActivity<*, *>).show()
+        MagiskInstallDialog(requireActivity() as BaseActivity<*, *>).show()
     }
 
     private fun installManager() = ManagerInstallDialog(requireActivity()).show()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index 34f2024a9..1f1cdae18 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.ui.home
 
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.*
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.extensions.*
 import com.topjohnwu.magisk.model.events.*
@@ -25,7 +25,7 @@ enum class MagiskItem {
 
 class HomeViewModel(
     private val magiskRepo: MagiskRepository
-) : MagiskViewModel(State.LOADED) {
+) : BaseViewModel(State.LOADED) {
 
     val hasGMS = runCatching {
         get<PackageManager>().getPackageInfo("com.google.android.gms", 0); true
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
index 91379308c..24f0e1db2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
@@ -7,13 +7,13 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentLogBinding
 import com.topjohnwu.magisk.model.events.PageChangedEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
+class LogFragment : BaseFragment<LogViewModel, FragmentLogBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_log
     override val viewModel: LogViewModel by viewModel()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
index dc6e14613..21beec611 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
@@ -5,7 +5,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -30,7 +30,7 @@ import java.util.*
 class LogViewModel(
     private val resources: Resources,
     private val logRepo: LogRepository
-) : MagiskViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
+) : BaseViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
 
     val itemsAdapter = BindingAdapter()
     val items = DiffObservableList(ComparableRvItem.callback)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
index 56c745084..1ac4ed62b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.ui.module
 import android.content.res.Resources
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.*
@@ -25,7 +25,7 @@ class ModuleViewModel(
     private val resources: Resources,
     private val repoUpdater: RepoUpdater,
     private val repoDB: RepoDao
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val query = KObservableField("")
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
index f3f3a9986..fa57d6605 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentModulesBinding
 import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.ui.flash.FlashActivity
 import com.topjohnwu.superuser.Shell
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>() {
+class ModulesFragment : BaseFragment<ModuleViewModel, FragmentModulesBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_modules
     override val viewModel: ModuleViewModel by sharedViewModel()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
index b9eaae06f..70ebb78c5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
@@ -8,7 +8,7 @@ import android.view.MenuItem
 import android.widget.SearchView
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentReposBinding
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
@@ -21,7 +21,7 @@ import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
+class ReposFragment : BaseFragment<ModuleViewModel, FragmentReposBinding>(),
     SearchView.OnQueryTextListener {
 
     override val layoutRes: Int = R.layout.fragment_repos
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
index c9ab0d901..00386b01e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.ui.superuser
 
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskFragment
+import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentSuperuserBinding
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SuperuserFragment :
-    MagiskFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
+    BaseFragment<SuperuserViewModel, FragmentSuperuserBinding>() {
 
     override val layoutRes: Int = R.layout.fragment_superuser
     override val viewModel: SuperuserViewModel by viewModel()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
index 895a6dbee..adbae5577 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
@@ -4,7 +4,7 @@ import android.content.pm.PackageManager
 import android.content.res.Resources
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.applySchedulers
@@ -29,7 +29,7 @@ class SuperuserViewModel(
     private val packageManager: PackageManager,
     private val resources: Resources,
     rxBus: RxBus
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val items = DiffObservableList(ComparableRvItem.callback)
     val itemBinding = ItemBinding.of<ComparableRvItem<*>> { itemBinding, _, item ->
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
index bd007ce75..2fb93eeea 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.Window
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityRequestBinding
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.events.DieEvent
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.model.receiver.GeneralReceiver
 import com.topjohnwu.magisk.utils.SuLogger
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-open class SuRequestActivity : MagiskActivity<SuRequestViewModel, ActivityRequestBinding>() {
+open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestBinding>() {
 
     override val layoutRes: Int = R.layout.activity_request
     override val viewModel: SuRequestViewModel by viewModel()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
index e87f9f1f8..0475b2104 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
@@ -12,7 +12,7 @@ import android.text.TextUtils
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.viewmodel.MagiskViewModel
+import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
@@ -36,7 +36,7 @@ class SuRequestViewModel(
     private val policyDB: PolicyDao,
     private val timeoutPrefs: SharedPreferences,
     private val resources: Resources
-) : MagiskViewModel() {
+) : BaseViewModel() {
 
     val icon = KObservableField<Drawable?>(null)
     val title = KObservableField("")
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt
index 319e1870a..4d0e0c09a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.kt
@@ -7,13 +7,13 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.utils.Utils
 
-internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List<String>) :
+internal class InstallMethodDialog(activity: BaseActivity<*, *>, options: List<String>) :
     AlertDialog.Builder(activity) {
 
     init {
@@ -28,11 +28,11 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
         }
     }
 
-    private fun flash(activity: MagiskActivity<*, *>) = DownloadService(activity) {
+    private fun flash(activity: BaseActivity<*, *>) = DownloadService(activity) {
         subject = DownloadSubject.Magisk(Configuration.Flash.Primary)
     }
 
-    private fun patchBoot(activity: MagiskActivity<*, *>) = activity.withExternalRW {
+    private fun patchBoot(activity: BaseActivity<*, *>) = activity.withExternalRW {
         onSuccess {
             Utils.toast(R.string.patch_file_msg, Toast.LENGTH_LONG)
             val intent = Intent(Intent.ACTION_GET_CONTENT)
@@ -49,7 +49,7 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
         }
     }
 
-    private fun downloadOnly(activity: MagiskActivity<*, *>) = activity.withExternalRW {
+    private fun downloadOnly(activity: BaseActivity<*, *>) = activity.withExternalRW {
         onSuccess {
             DownloadService(activity) {
                 subject = DownloadSubject.Magisk(Configuration.Download)
@@ -57,7 +57,7 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
         }
     }
 
-    private fun installInactiveSlot(activity: MagiskActivity<*, *>) {
+    private fun installInactiveSlot(activity: BaseActivity<*, *>) {
         CustomAlertDialog(activity)
             .setTitle(R.string.warning)
             .setMessage(R.string.install_inactive_slot_msg)
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt
index 4c351f55f..2f83b6f98 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.kt
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.view.dialogs
 import android.net.Uri
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.base.MagiskActivity
+import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 import java.util.*
 
-class MagiskInstallDialog(a: MagiskActivity<*, *>) : CustomAlertDialog(a) {
+class MagiskInstallDialog(a: BaseActivity<*, *>) : CustomAlertDialog(a) {
     init {
         val filename = "Magisk v${Info.remote.magisk.version}" +
                 "(${Info.remote.magisk.versionCode})"