diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
index 91ea1857a..c21514c81 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@@ -12,9 +12,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.flyoutpanel.oldqualitylayout.fingerprints.NewQualityLayoutBuilderFingerprint
 import app.revanced.patches.youtube.flyoutpanel.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelBuilderFingerprint
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
@@ -36,14 +36,14 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 @Version("0.0.1")
 class OldQualityLayoutPatch : BytecodePatch(
     listOf(
-        NewQualityLayoutBuilderFingerprint,
+        NewFlyoutPanelBuilderFingerprint,
         QualityMenuViewInflateFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
 
         /**
-         * For old player flyout panels
+         * Old method
          */
         QualityMenuViewInflateFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -58,9 +58,9 @@ class OldQualityLayoutPatch : BytecodePatch(
         } ?: return QualityMenuViewInflateFingerprint.toErrorResult()
 
         /**
-         * For new player flyout panels
+         * New method
          */
-        NewQualityLayoutBuilderFingerprint.result?.let {
+        NewFlyoutPanelBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = implementation!!.instructions.size - 1
                 val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
@@ -70,7 +70,7 @@ class OldQualityLayoutPatch : BytecodePatch(
                     "invoke-static { v$insertRegister }, $FLYOUT_PANEL->enableOldQualityMenu(Landroid/widget/LinearLayout;)V"
                 )
             }
-        } ?: return NewQualityLayoutBuilderFingerprint.toErrorResult()
+        } ?: return NewFlyoutPanelBuilderFingerprint.toErrorResult()
 
         context.updatePatchStatus("OldQualityLayout")
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/fingerprints/NewQualityLayoutBuilderFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelBuilderFingerprint.kt
similarity index 79%
rename from src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/fingerprints/NewQualityLayoutBuilderFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelBuilderFingerprint.kt
index 74ea8b4d5..3014d81f1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/fingerprints/NewQualityLayoutBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelBuilderFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.flyoutpanel.oldqualitylayout.fingerprints
+package app.revanced.patches.youtube.utils.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
@@ -6,7 +6,7 @@ import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.util.bytecode.isWideLiteralExists
 import org.jf.dexlib2.AccessFlags
 
-object NewQualityLayoutBuilderFingerprint : MethodFingerprint(
+object NewFlyoutPanelBuilderFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L"),
     returnType = "Landroid/widget/LinearLayout;",
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelsOnClickListenerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt
similarity index 95%
rename from src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelsOnClickListenerFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt
index 64497cd0b..2b3a1da84 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelsOnClickListenerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-object NewFlyoutPanelsOnClickListenerFingerprint : MethodFingerprint(
+object NewFlyoutPanelOnClickListenerFingerprint : MethodFingerprint(
     returnType = "L",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L"),
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
index b05f62e5b..9f4a0b4a3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
@@ -15,7 +15,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
-import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelsOnClickListenerFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelOnClickListenerFingerprint
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch.Companion.contexts
 import app.revanced.patches.youtube.utils.videocpn.patch.VideoCpnPatch
@@ -44,14 +44,14 @@ import org.jf.dexlib2.iface.reference.FieldReference
 @Version("0.0.1")
 class VideoQualityPatch : BytecodePatch(
     listOf(
-        NewFlyoutPanelsOnClickListenerFingerprint,
+        NewFlyoutPanelOnClickListenerFingerprint,
         VideoQualitySetterFingerprint,
         VideoQualitySettingsParentFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
 
-        NewFlyoutPanelsOnClickListenerFingerprint.result?.let { parentResult ->
+        NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult ->
             NewVideoQualityChangedFingerprint.also {
                 it.resolve(
                     context,
@@ -68,7 +68,7 @@ class VideoQualityPatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return NewFlyoutPanelsOnClickListenerFingerprint.toErrorResult()
+        } ?: return NewFlyoutPanelOnClickListenerFingerprint.toErrorResult()
 
         VideoQualitySetterFingerprint.result?.let { parentResult ->
             VideoQualityReferenceFingerprint.also {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
index c0ddce3eb..2458fd560 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
-import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelsOnClickListenerFingerprint
+import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelOnClickListenerFingerprint
 import app.revanced.patches.youtube.utils.overridespeed.patch.OverrideSpeedHookPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.youtube.utils.videocpn.patch.VideoCpnPatch
@@ -34,11 +34,11 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 @YouTubeCompatibility
 @Version("0.0.1")
 class VideoSpeedPatch : BytecodePatch(
-    listOf(NewFlyoutPanelsOnClickListenerFingerprint)
+    listOf(NewFlyoutPanelOnClickListenerFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
 
-        NewFlyoutPanelsOnClickListenerFingerprint.result?.let { parentResult ->
+        NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult ->
             NewVideoSpeedChangedFingerprint.also {
                 it.resolve(
                     context,
@@ -57,7 +57,7 @@ class VideoSpeedPatch : BytecodePatch(
                     }
                 }
             } ?: return NewVideoSpeedChangedFingerprint.toErrorResult()
-        } ?: return NewFlyoutPanelsOnClickListenerFingerprint.toErrorResult()
+        } ?: return NewFlyoutPanelOnClickListenerFingerprint.toErrorResult()
 
         VideoCpnPatch.injectCall("$INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Z)V")