diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index cdced0579..504caab3b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -71,11 +71,11 @@ object PreferenceKeys {
 
     const val autoUpdateTrack = "pref_auto_update_manga_sync_key"
 
-    const val lastUsedCatalogueSource = "last_catalogue_source"
+    const val lastUsedSource = "last_catalogue_source"
 
     const val lastUsedCategory = "last_used_category"
 
-    const val catalogueDisplayMode = "pref_display_mode_catalogue"
+    const val sourceDisplayMode = "pref_display_mode_catalogue"
 
     const val enabledLanguages = "source_languages"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 1b0ddf56e..509e39fb2 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -135,13 +135,13 @@ class PreferencesHelper(val context: Context) {
 
     fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)
 
-    fun lastUsedCatalogueSource() = flowPrefs.getLong(Keys.lastUsedCatalogueSource, -1)
+    fun lastUsedSource() = flowPrefs.getLong(Keys.lastUsedSource, -1)
 
     fun lastUsedCategory() = flowPrefs.getInt(Keys.lastUsedCategory, 0)
 
     fun lastVersionCode() = flowPrefs.getInt("last_version_code", 0)
 
-    fun catalogueDisplayMode() = flowPrefs.getEnum(Keys.catalogueDisplayMode, DisplayMode.COMPACT_GRID)
+    fun sourceDisplayMode() = flowPrefs.getEnum(Keys.sourceDisplayMode, DisplayMode.COMPACT_GRID)
 
     fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("all", "en", Locale.getDefault().language))
 
@@ -222,9 +222,9 @@ class PreferencesHelper(val context: Context) {
 
     fun searchPinnedSourcesOnly() = prefs.getBoolean(Keys.searchPinnedSourcesOnly, false)
 
-    fun hiddenCatalogues() = flowPrefs.getStringSet("hidden_catalogues", mutableSetOf())
+    fun disabledSources() = flowPrefs.getStringSet("hidden_catalogues", emptySet())
 
-    fun pinnedCatalogues() = flowPrefs.getStringSet("pinned_catalogues", emptySet())
+    fun pinnedSources() = flowPrefs.getStringSet("pinned_catalogues", emptySet())
 
     fun downloadNew() = flowPrefs.getBoolean(Keys.downloadNew, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
index 0f0d1e1d7..cc6c0b75f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
@@ -149,7 +149,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
                                     }
 
                                     // React to enable/disable all changes
-                                    preferences.hiddenCatalogues().asFlow()
+                                    preferences.disabledSources().asFlow()
                                         .onEach {
                                             val enabled = source.isEnabled()
                                             isChecked = enabled
@@ -217,9 +217,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
     }
 
     private fun toggleSource(source: Source, enable: Boolean) {
-        val current = preferences.hiddenCatalogues().get()
+        val current = preferences.disabledSources().get()
 
-        preferences.hiddenCatalogues().set(
+        preferences.disabledSources().set(
             if (enable) {
                 current - source.id.toString()
             } else {
@@ -229,7 +229,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
     }
 
     private fun Source.isEnabled(): Boolean {
-        return id.toString() !in preferences.hiddenCatalogues().get()
+        return id.toString() !in preferences.disabledSources().get()
     }
 
     private fun getPreferenceThemeContext(): Context {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardItem.kt
index 58721ce4d..227e4f4d5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardItem.kt
@@ -15,7 +15,7 @@ import uy.kohesive.injekt.api.get
 class LatestCardItem(val manga: Manga) : AbstractFlexibleItem<LatestCardHolder>() {
 
     override fun getLayoutRes(): Int {
-        return when (Injekt.get<PreferencesHelper>().catalogueDisplayMode().get()) {
+        return when (Injekt.get<PreferencesHelper>().sourceDisplayMode().get()) {
             PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item
             else -> R.layout.global_search_controller_comfortable_card_item
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt
index 87e92f2ee..dccda3f5f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt
@@ -198,7 +198,7 @@ open class LatestController :
      * Opens a catalogue with the given search.
      */
     override fun onTitleClick(source: CatalogueSource) {
-        presenter.preferences.lastUsedCatalogueSource().set(source.id)
+        presenter.preferences.lastUsedSource().set(source.id)
         parentController?.router?.pushController(LatestUpdatesController(source).withFadeTransaction())
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt
index 53169c3f1..8545c8654 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt
@@ -66,14 +66,14 @@ open class LatestPresenter(
     protected open fun getEnabledSources(): List<CatalogueSource> {
         val languages = preferences.enabledLanguages().get()
         val watchedSources = preferences.latestTabSources().get()
-        val pinnedCatalogues = preferences.pinnedCatalogues().get()
+        val pinnedSources = preferences.pinnedSources().get()
 
         val list = sourceManager.getVisibleCatalogueSources()
             .filter { it.lang in languages }
             .sortedBy { "(${it.lang}) ${it.name}" }
 
         return list.filter { it.id.toString() in watchedSources }
-            .sortedBy { it.id.toString() !in pinnedCatalogues }
+            .sortedBy { it.id.toString() !in pinnedSources }
     }
 
     private fun getSourcesToGetLatest(): List<CatalogueSource> {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
index 7ee5572f7..582fc3051 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
@@ -145,8 +145,8 @@ class PreMigrationController(bundle: Bundle? = null) :
 
     fun isEnabled(id: String): Boolean {
         val sourcesSaved = prefs.migrationSources().get()
-        val hiddenCatalogues = prefs.hiddenCatalogues().get()
-        return if (sourcesSaved.isEmpty()) id !in hiddenCatalogues
+        val disabledSourceIds = prefs.disabledSources().get()
+        return if (sourcesSaved.isEmpty()) id !in disabledSourceIds
         else sourcesSaved.split("/").contains(id)
     }
 
@@ -164,9 +164,9 @@ class PreMigrationController(bundle: Bundle? = null) :
             }
             R.id.action_match_enabled, R.id.action_match_pinned -> {
                 val enabledSources = if (item.itemId == R.id.action_match_enabled) {
-                    prefs.hiddenCatalogues().get().mapNotNull { it.toLongOrNull() }
+                    prefs.disabledSources().get().mapNotNull { it.toLongOrNull() }
                 } else {
-                    prefs.pinnedCatalogues().get().mapNotNull { it.toLongOrNull() }
+                    prefs.pinnedSources().get().mapNotNull { it.toLongOrNull() }
                 }
                 val items = adapter?.currentItems?.toList() ?: return true
                 items.forEach {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 416aa21c2..bfb66bfa8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -148,7 +148,7 @@ class SourceController(bundle: Bundle? = null) :
         when (mode) {
             Mode.CATALOGUE -> {
                 // Open the catalogue view.
-                openCatalogue(source, BrowseSourceController(source))
+                openSource(source, BrowseSourceController(source))
             }
             Mode.SMART_SEARCH -> router.pushController(
                 SmartSearchController(
@@ -171,11 +171,11 @@ class SourceController(bundle: Bundle? = null) :
         val items = mutableListOf(
             Pair(
                 activity.getString(if (isPinned) R.string.action_unpin else R.string.action_pin),
-                { pinCatalogue(item.source, isPinned) }
+                { pinSource(item.source, isPinned) }
             )
         )
         if (item.source !is LocalSource) {
-            items.add(Pair(activity.getString(R.string.action_hide), { hideCatalogue(item.source) }))
+            items.add(Pair(activity.getString(R.string.action_disable), { disableSource(item.source) }))
         }
 
         // SY -->
@@ -210,19 +210,19 @@ class SourceController(bundle: Bundle? = null) :
             .show()
     }
 
-    private fun hideCatalogue(source: Source) {
-        val current = preferences.hiddenCatalogues().get()
-        preferences.hiddenCatalogues().set(current + source.id.toString())
+    private fun disableSource(source: Source) {
+        val current = preferences.disabledSources().get()
+        preferences.disabledSources().set(current + source.id.toString())
 
         presenter.updateSources()
     }
 
-    private fun pinCatalogue(source: Source, isPinned: Boolean) {
-        val current = preferences.pinnedCatalogues().get()
+    private fun pinSource(source: Source, isPinned: Boolean) {
+        val current = preferences.pinnedSources().get()
         if (isPinned) {
-            preferences.pinnedCatalogues().set(current - source.id.toString())
+            preferences.pinnedSources().set(current - source.id.toString())
         } else {
-            preferences.pinnedCatalogues().set(current + source.id.toString())
+            preferences.pinnedSources().set(current + source.id.toString())
         }
 
         presenter.updateSources()
@@ -303,14 +303,14 @@ class SourceController(bundle: Bundle? = null) :
      */
     override fun onLatestClick(position: Int) {
         val item = adapter?.getItem(position) as? SourceItem ?: return
-        openCatalogue(item.source, LatestUpdatesController(item.source))
+        openSource(item.source, LatestUpdatesController(item.source))
     }
 
     /**
      * Opens a catalogue with the given controller.
      */
-    private fun openCatalogue(source: CatalogueSource, controller: BrowseSourceController) {
-        preferences.lastUsedCatalogueSource().set(source.id)
+    private fun openSource(source: CatalogueSource, controller: BrowseSourceController) {
+        preferences.lastUsedSource().set(source.id)
         parentController!!.router.pushController(controller.withFadeTransaction())
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
index 04efb04a6..8d8b16932 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
@@ -106,24 +106,24 @@ class SourceFilterController : SettingsController() {
      * @param group the language category.
      */
     private fun addLanguageSources(group: PreferenceGroup, sources: List<HttpSource>) {
-        val hiddenCatalogues = preferences.hiddenCatalogues().get()
+        val disabledSourceIds = preferences.disabledSources().get()
 
         val selectAllPreference = CheckBoxPreference(group.context).apply {
             title = "\t\t${context.getString(R.string.pref_category_all_sources)}"
             key = "all_${sources.first().lang}"
             isPersistent = false
-            isChecked = sources.all { it.id.toString() !in hiddenCatalogues }
+            isChecked = sources.all { it.id.toString() !in disabledSourceIds }
             isVisible = query.isEmpty()
 
             onChange { newValue ->
                 val checked = newValue as Boolean
-                val current = preferences.hiddenCatalogues().get() as MutableSet? ?: mutableSetOf()
+                val current = preferences.disabledSources().get() as MutableSet? ?: mutableSetOf()
                 if (checked) {
                     current.removeAll(sources.map { it.id.toString() })
                 } else {
                     current.addAll(sources.map { it.id.toString() })
                 }
-                preferences.hiddenCatalogues().set(current)
+                preferences.disabledSources().set(current)
                 group.removeAll()
                 addLanguageSources(group, sortedSources(sources))
                 true
@@ -137,7 +137,7 @@ class SourceFilterController : SettingsController() {
                 title = source.name
                 key = getSourceKey(source.id)
                 isPersistent = false
-                isChecked = id !in hiddenCatalogues
+                isChecked = id !in disabledSourceIds
                 isVisible = query.isEmpty() || source.name.contains(query, ignoreCase = true)
 
                 val sourceIcon = source.icon()
@@ -147,9 +147,9 @@ class SourceFilterController : SettingsController() {
 
                 onChange { newValue ->
                     val checked = newValue as Boolean
-                    val current = preferences.hiddenCatalogues().get()
+                    val current = preferences.disabledSources().get()
 
-                    preferences.hiddenCatalogues().set(
+                    preferences.disabledSources().set(
                         if (checked) {
                             current - id
                         } else {
@@ -226,9 +226,9 @@ class SourceFilterController : SettingsController() {
     private fun sortedSources(sources: List<HttpSource>?): List<HttpSource> {
         val sourceAlpha = sources.orEmpty().sortedBy { it.name }
         return if (sorting == SourcesSort.Enabled) {
-            val hiddenCatalogues = preferences.hiddenCatalogues().get()
-            sourceAlpha.filter { it.id.toString() !in hiddenCatalogues } +
-                sourceAlpha.filterNot { it.id.toString() !in hiddenCatalogues }
+            val disabledSourceIds = preferences.disabledSources().get()
+            sourceAlpha.filter { it.id.toString() !in disabledSourceIds } +
+                sourceAlpha.filterNot { it.id.toString() !in disabledSourceIds }
         } else {
             sourceAlpha
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
index 81fbca0b7..e5b89c560 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
@@ -61,7 +61,7 @@ class SourcePresenter(
         sourceSubscription?.unsubscribe()
 
         val pinnedSources = mutableListOf<SourceItem>()
-        val pinnedCatalogues = preferences.pinnedCatalogues().get()
+        val pinnedSourceIds = preferences.pinnedSources().get()
 
         // SY -->
         val categories = mutableListOf<SourceCategory>()
@@ -91,7 +91,7 @@ class SourcePresenter(
         var sourceItems = byLang.flatMap {
             val langItem = LangItem(it.key)
             it.value.map { source ->
-                if (source.id.toString() in pinnedCatalogues) {
+                if (source.id.toString() in pinnedSourceIds) {
                     pinnedSources.add(SourceItem(source, LangItem(PINNED_KEY), controllerMode == SourceController.Mode.CATALOGUE))
                 }
 
@@ -135,10 +135,10 @@ class SourcePresenter(
 
     private fun loadLastUsedSource() {
         // Immediate initial load
-        preferences.lastUsedCatalogueSource().get().let { updateLastUsedSource(it) }
+        preferences.lastUsedSource().get().let { updateLastUsedSource(it) }
 
         // Subsequent updates
-        preferences.lastUsedCatalogueSource().asFlow()
+        preferences.lastUsedSource().asFlow()
             .drop(1)
             .onStart { delay(500) }
             .distinctUntilChanged()
@@ -164,11 +164,11 @@ class SourcePresenter(
      */
     private fun getEnabledSources(): List<CatalogueSource> {
         val languages = preferences.enabledLanguages().get()
-        val hiddenCatalogues = preferences.hiddenCatalogues().get()
+        val disabledSourceIds = preferences.disabledSources().get()
 
         return sourceManager.getVisibleCatalogueSources()
             .filter { it.lang in languages }
-            .filterNot { it.id.toString() in hiddenCatalogues }
+            .filterNot { it.id.toString() in disabledSourceIds }
             .sortedBy { "(${it.lang}) ${it.name}" } +
             sourceManager.get(LocalSource.ID) as LocalSource
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
index 2e18b0a17..720a232c4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
@@ -333,7 +333,7 @@ open class BrowseSourceController(bundle: Bundle) :
             binding.catalogueView.removeView(oldRecycler)
         }
 
-        val recycler = if (preferences.catalogueDisplayMode().get() == DisplayMode.LIST) {
+        val recycler = if (preferences.sourceDisplayMode().get() == DisplayMode.LIST) {
             RecyclerView(view.context).apply {
                 id = R.id.recycler
                 layoutManager = LinearLayoutManager(context)
@@ -418,7 +418,7 @@ open class BrowseSourceController(bundle: Bundle) :
             }
         )
 
-        val displayItem = when (preferences.catalogueDisplayMode().get()) {
+        val displayItem = when (preferences.sourceDisplayMode().get()) {
             DisplayMode.COMPACT_GRID -> R.id.action_compact_grid
             DisplayMode.COMFORTABLE_GRID -> R.id.action_comfortable_grid
             DisplayMode.LIST -> R.id.action_list
@@ -620,7 +620,7 @@ open class BrowseSourceController(bundle: Bundle) :
         val view = view ?: return
         val adapter = adapter ?: return
 
-        preferences.catalogueDisplayMode().set(mode)
+        preferences.sourceDisplayMode().set(mode)
         presenter.refreshDisplayMode()
         activity?.invalidateOptionsMenu()
         setupRecycler(view)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
index f682fc9ef..975a9fc39 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
@@ -156,7 +156,7 @@ open class BrowseSourcePresenter(
 
         val sourceId = source.id
 
-        val catalogueDisplayMode = prefs.catalogueDisplayMode()
+        val sourceDisplayMode = prefs.sourceDisplayMode()
 
         // Prepare the pager.
         pagerSubscription?.let { remove(it) }
@@ -164,7 +164,7 @@ open class BrowseSourcePresenter(
             .observeOn(Schedulers.io())
             .map { pair -> pair.first to pair.second.map { networkToLocalManga(it, sourceId) } }
             .doOnNext { initializeMangas(it.second) }
-            .map { pair -> pair.first to pair.second.map { SourceItem(it, catalogueDisplayMode) } }
+            .map { pair -> pair.first to pair.second.map { SourceItem(it, sourceDisplayMode) } }
             .observeOn(AndroidSchedulers.mainThread())
             .subscribeReplay(
                 { view, (page, mangas) ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
index 93942f761..5ee0bb61a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
@@ -17,11 +17,11 @@ import eu.kanade.tachiyomi.widget.AutofitRecyclerView
 import kotlinx.android.synthetic.main.source_compact_grid_item.view.card
 import kotlinx.android.synthetic.main.source_compact_grid_item.view.gradient
 
-class SourceItem(val manga: Manga, private val catalogueDisplayMode: Preference<DisplayMode>) :
+class SourceItem(val manga: Manga, private val displayMode: Preference<DisplayMode>) :
     AbstractFlexibleItem<SourceHolder>() {
 
     override fun getLayoutRes(): Int {
-        return when (catalogueDisplayMode.get()) {
+        return when (displayMode.get()) {
             DisplayMode.COMPACT_GRID -> R.layout.source_compact_grid_item
             DisplayMode.COMFORTABLE_GRID -> R.layout.source_comfortable_grid_item
             DisplayMode.LIST -> R.layout.source_list_item
@@ -32,7 +32,7 @@ class SourceItem(val manga: Manga, private val catalogueDisplayMode: Preference<
         view: View,
         adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>
     ): SourceHolder {
-        return when (catalogueDisplayMode.get()) {
+        return when (displayMode.get()) {
             DisplayMode.COMPACT_GRID -> {
                 val parent = adapter.recyclerView as AutofitRecyclerView
                 val coverHeight = parent.itemWidth / 3 * 4
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt
index 5817a6285..d2b8e6d23 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt
@@ -16,7 +16,7 @@ class GlobalSearchCardItem(val manga: Manga) : AbstractFlexibleItem<GlobalSearch
 
     override fun getLayoutRes(): Int {
         // SY -->
-        return when (Injekt.get<PreferencesHelper>().catalogueDisplayMode().get()) {
+        return when (Injekt.get<PreferencesHelper>().sourceDisplayMode().get()) {
             PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item
             else -> R.layout.global_search_controller_comfortable_card_item
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
index 93023ce40..8061ad09c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
@@ -204,7 +204,7 @@ open class GlobalSearchController(
      * Opens a catalogue with the given search.
      */
     override fun onTitleClick(source: CatalogueSource) {
-        presenter.preferences.lastUsedCatalogueSource().set(source.id)
+        presenter.preferences.lastUsedSource().set(source.id)
         router.pushController(BrowseSourceController(source, presenter.query).withFadeTransaction())
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
index 4fa901886..409e4adde 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
@@ -103,18 +103,18 @@ open class GlobalSearchPresenter(
      */
     protected open fun getEnabledSources(): List<CatalogueSource> {
         val languages = preferences.enabledLanguages().get()
-        val hiddenCatalogues = preferences.hiddenCatalogues().get()
-        val pinnedCatalogues = preferences.pinnedCatalogues().get()
+        val disabledSourceIds = preferences.disabledSources().get()
+        val pinnedSourceIds = preferences.pinnedSources().get()
 
         val list = sourceManager.getVisibleCatalogueSources()
             .filter { it.lang in languages }
-            .filterNot { it.id.toString() in hiddenCatalogues }
+            .filterNot { it.id.toString() in disabledSourceIds }
             .sortedBy { "(${it.lang}) ${it.name}" }
 
         return if (preferences.searchPinnedSourcesOnly()) {
-            list.filter { it.id.toString() in pinnedCatalogues }
+            list.filter { it.id.toString() in pinnedSourceIds }
         } else {
-            list.sortedBy { it.id.toString() !in pinnedCatalogues }
+            list.sortedBy { it.id.toString() !in pinnedSourceIds }
         }
     }
 
@@ -137,10 +137,10 @@ open class GlobalSearchPresenter(
         }
 
         val onlyPinnedSources = preferences.searchPinnedSourcesOnly()
-        val pinnedCatalogues = preferences.pinnedCatalogues().get()
+        val pinnedSourceIds = preferences.pinnedSources().get()
 
         return enabledSources
-            .filter { if (onlyPinnedSources) it.id.toString() in pinnedCatalogues else true }
+            .filter { if (onlyPinnedSources) it.id.toString() in pinnedSourceIds else true }
     }
 
     /**
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e7238e7f..984d8fcce 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,7 +90,7 @@
     <string name="action_display_download_badge">Download badges</string>
     <string name="action_display_unread_badge">Unread badges</string>
     <string name="action_display_show_tabs">Show category tabs</string>
-    <string name="action_hide">Hide</string>
+    <string name="action_disable">Disable</string>
     <string name="action_pin">Pin</string>
     <string name="action_unpin">Unpin</string>
     <string name="action_cancel">Cancel</string>