diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index a2f161847..d2cbb49e0 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -69,7 +69,7 @@ import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
@@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity {
             ErrorActivity.reportUiError(this, e);
         }
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             FocusOverlayView.setupFocusObserver(this);
         }
     }
@@ -489,7 +489,7 @@ public class MainActivity extends AppCompatActivity {
     public void onBackPressed() {
         if (DEBUG) Log.d(TAG, "onBackPressed() called");
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             View drawerPanel = findViewById(R.id.navigation_layout);
             if (drawer.isDrawerOpen(drawerPanel)) {
                 drawer.closeDrawers();
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index c5b97f86f..412bea0e1 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -45,7 +45,7 @@ import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -319,7 +319,7 @@ public class RouterActivity extends AppCompatActivity {
 
         alertDialog.show();
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             FocusOverlayView.setupFocusObserver(alertDialog);
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 6ceacbb05..514c3dd37 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -12,8 +12,7 @@ import android.view.MenuItem;
 import android.view.ViewTreeObserver;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
@@ -53,7 +52,7 @@ public class DownloadActivity extends AppCompatActivity {
             }
         });
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             FocusOverlayView.setupFocusObserver(this);
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index f2e8aa244..9e4fd467c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -40,7 +40,7 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.search.SearchInfo;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -471,7 +471,7 @@ public class SearchFragment
             if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
                 showSuggestionsPanel();
             }
-            if(FireTvUtils.isFireTv()){
+            if(AndroidTvUtils.isTv()){
                 showKeyboardSearch();
             }
         });
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
index fa742f771..470e1c963 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -78,7 +78,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.AnimationUtils;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.util.KoreUtil;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -166,7 +166,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                 super.onChange(selfChange);
                 if (globalScreenOrientationLocked()) {
                     final boolean lastOrientationWasLandscape = defaultPreferences.getBoolean(
-                            getString(R.string.last_orientation_landscape_key), FireTvUtils.isFireTv());
+                            getString(R.string.last_orientation_landscape_key), AndroidTvUtils.isTv());
                     setLandscape(lastOrientationWasLandscape);
                 } else {
                     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
@@ -178,7 +178,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                 Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
                 false, rotationObserver);
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             FocusOverlayView.setupFocusObserver(this);
         }
     }
@@ -206,7 +206,7 @@ public final class MainVideoPlayer extends AppCompatActivity
             default:
                 break;
             case KeyEvent.KEYCODE_BACK:
-                if (FireTvUtils.isFireTv() && playerImpl.isControlsVisible()) {
+                if (AndroidTvUtils.isTv() && playerImpl.isControlsVisible()) {
                     playerImpl.hideControls(0, 0);
                     hideSystemUi();
                     return true;
@@ -241,7 +241,7 @@ public final class MainVideoPlayer extends AppCompatActivity
 
         if (globalScreenOrientationLocked()) {
             boolean lastOrientationWasLandscape = defaultPreferences.getBoolean(
-                    getString(R.string.last_orientation_landscape_key), FireTvUtils.isFireTv());
+                    getString(R.string.last_orientation_landscape_key), AndroidTvUtils.isTv());
             setLandscape(lastOrientationWasLandscape);
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index e53b7ba07..49d6d49fe 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -12,7 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
@@ -59,7 +59,7 @@ public class SettingsActivity extends AppCompatActivity implements BasePreferenc
                     .commit();
         }
 
-        if (FireTvUtils.isFireTv()) {
+        if (AndroidTvUtils.isTv()) {
             FocusOverlayView.setupFocusObserver(this);
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java b/app/src/main/java/org/schabi/newpipe/util/AndroidTvUtils.java
similarity index 92%
rename from app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
rename to app/src/main/java/org/schabi/newpipe/util/AndroidTvUtils.java
index 2c5090381..203501a51 100644
--- a/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/AndroidTvUtils.java
@@ -6,9 +6,9 @@ import android.content.pm.PackageManager;
 import android.view.KeyEvent;
 import org.schabi.newpipe.App;
 
-public class FireTvUtils {
+public class AndroidTvUtils {
     @SuppressLint("InlinedApi")
-    public static boolean isFireTv(){
+    public static boolean isTv(){
         final String AMAZON_FEATURE_FIRE_TV = "amazon.hardware.fire_tv";
 
         PackageManager pm =  App.getApp().getPackageManager();
diff --git a/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java b/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java
index dafd5ae6f..8ccff85d5 100644
--- a/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java
+++ b/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java
@@ -25,7 +25,7 @@ import android.view.ViewTreeObserver;
 import android.widget.SeekBar;
 
 import androidx.appcompat.widget.AppCompatSeekBar;
-import org.schabi.newpipe.util.FireTvUtils;
+import org.schabi.newpipe.util.AndroidTvUtils;
 
 /**
  * SeekBar, adapted for directional navigation. It emulates touch-related callbacks
@@ -58,7 +58,7 @@ public final class FocusAwareSeekBar extends AppCompatSeekBar {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (!isInTouchMode() && FireTvUtils.isConfirmKey(keyCode)) {
+        if (!isInTouchMode() && AndroidTvUtils.isConfirmKey(keyCode)) {
             releaseTrack();
         }