diff --git a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Av1FrameDecoder.cs b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Av1FrameDecoder.cs
index b4618c7a1f..e8211a3534 100644
--- a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Av1FrameDecoder.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Av1FrameDecoder.cs
@@ -14,7 +14,7 @@ internal class Av1FrameDecoder
     private readonly ObuFrameHeader frameHeader;
     private readonly Av1FrameInfo frameInfo;
     private readonly Av1InverseQuantizer inverseQuantizer;
-    private readonly DeQuant deQuants;
+    private readonly Av1DeQuantizationContext deQuants;
 
     public Av1FrameDecoder(ObuSequenceHeader sequenceHeader, ObuFrameHeader frameHeader, Av1FrameInfo frameInfo)
     {
diff --git a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/DeQuant.cs b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1DeQuantizationContext.cs
similarity index 93%
rename from src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/DeQuant.cs
rename to src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1DeQuantizationContext.cs
index b93431b147..304b72cdf5 100644
--- a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/DeQuant.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1DeQuantizationContext.cs
@@ -3,12 +3,12 @@
 
 namespace SixLabors.ImageSharp.Formats.Heif.Av1.Pipeline.Quantification;
 
-internal class DeQuant
+internal class Av1DeQuantizationContext
 {
     private readonly short[][] dcContent;
     private readonly short[][] acContent;
 
-    public DeQuant()
+    public Av1DeQuantizationContext()
     {
         this.dcContent = new short[Av1Constants.MaxSegmentCount][];
         this.acContent = new short[Av1Constants.MaxSegmentCount][];
diff --git a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1InverseQuantizer.cs b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1InverseQuantizer.cs
index 550c09b951..80904460d7 100644
--- a/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1InverseQuantizer.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Pipeline/Quantification/Av1InverseQuantizer.cs
@@ -15,7 +15,7 @@ internal class Av1InverseQuantizer
     private readonly ObuSequenceHeader sequenceHeader;
     private readonly ObuFrameHeader frameHeader;
     private readonly int[][][] inverseQuantizationMatrix;
-    private DeQuant? deQuantsDeltaQ;
+    private Av1DeQuantizationContext? deQuantsDeltaQ;
 
     public Av1InverseQuantizer(ObuSequenceHeader sequenceHeader, ObuFrameHeader frameHeader)
     {
@@ -55,7 +55,7 @@ internal class Av1InverseQuantizer
         }
     }
 
-    public void UpdateDequant(DeQuant deQuants, Av1SuperblockInfo superblockInfo)
+    public void UpdateDequant(Av1DeQuantizationContext deQuants, Av1SuperblockInfo superblockInfo)
     {
         Av1BitDepth bitDepth = this.sequenceHeader.ColorConfig.BitDepth;
         Guard.NotNull(deQuants, nameof(deQuants));