diff --git a/pkg/rtc/subscribedtrack.go b/pkg/rtc/subscribedtrack.go
index cb626bacc..94a998d32 100644
--- a/pkg/rtc/subscribedtrack.go
+++ b/pkg/rtc/subscribedtrack.go
@@ -129,8 +129,8 @@ func NewSubscribedTrack(params SubscribedTrackParams) (*SubscribedTrack, error)
 	if isEncrypted {
 		trailer = params.Subscriber.GetTrailer()
 	}
-	stripPayloadTrailer := params.MediaTrack.HasPacketTrailerFeature(livekit.PacketTrailerFeature_PTF_USER_TIMESTAMP) &&
-		!params.Subscriber.ProtocolVersion().SupportsPayloadTrailer()
+	stripPacketTrailer := params.MediaTrack.HasPacketTrailerFeature(livekit.PacketTrailerFeature_PTF_USER_TIMESTAMP) &&
+		!params.Subscriber.ProtocolVersion().SupportsPacketTrailer()
 	downTrack, err := sfu.NewDownTrack(sfu.DownTrackParams{
 		Codecs:             codecs,
 		IsEncrypted:        isEncrypted,
@@ -143,7 +143,7 @@ func NewSubscribedTrack(params SubscribedTrackParams) (*SubscribedTrack, error)
 		PlayoutDelayLimit:  params.Subscriber.GetPlayoutDelayConfig(),
 		Pacer:              params.Subscriber.GetPacer(),
 		Trailer:            trailer,
-		StripPayloadTrailer: stripPayloadTrailer,
+		StripPacketTrailer: stripPacketTrailer,
 		Logger: LoggerWithTrack(
 			params.Subscriber.GetLogger().WithComponent(sutils.ComponentSub),
 			params.MediaTrack.ID(),
diff --git a/pkg/rtc/types/protocol_version.go b/pkg/rtc/types/protocol_version.go
index d8bd5035a..9edab8b07 100644
--- a/pkg/rtc/types/protocol_version.go
+++ b/pkg/rtc/types/protocol_version.go
@@ -100,6 +100,6 @@ func (v ProtocolVersion) SupportsMoving() bool {
 	return v > 15
 }
 
-func (v ProtocolVersion) SupportsPayloadTrailer() bool {
+func (v ProtocolVersion) SupportsPacketTrailer() bool {
 	return v > 16
 }
diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go
index 064552c22..69a18d616 100644
--- a/pkg/sfu/downtrack.go
+++ b/pkg/sfu/downtrack.go
@@ -39,11 +39,11 @@ import (
 	"github.com/livekit/protocol/utils/mono"
 
 	"github.com/livekit/livekit-server/pkg/sfu/buffer"
-	"github.com/livekit/livekit-server/pkg/sfu/packettrailer"
 	"github.com/livekit/livekit-server/pkg/sfu/bwe"
 	"github.com/livekit/livekit-server/pkg/sfu/ccutils"
 	"github.com/livekit/livekit-server/pkg/sfu/connectionquality"
 	"github.com/livekit/livekit-server/pkg/sfu/pacer"
+	"github.com/livekit/livekit-server/pkg/sfu/packettrailer"
 	act "github.com/livekit/livekit-server/pkg/sfu/rtpextension/abscapturetime"
 	dd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/dependencydescriptor"
 	pd "github.com/livekit/livekit-server/pkg/sfu/rtpextension/playoutdelay"
@@ -310,7 +310,7 @@ type DownTrackParams struct {
 	RTCPWriter                     func([]rtcp.Packet) error
 	DisableSenderReportPassThrough bool
 	SupportsCodecChange            bool
-	StripPayloadTrailer            bool
+	StripPacketTrailer             bool
 	Listener                       DownTrackListener
 }
 
@@ -1059,7 +1059,7 @@ func (d *DownTrack) WriteRTP(extPkt *buffer.ExtPacket, layer int32) int32 {
 	}
 	payload = payload[:len(tp.codecBytes)+n]
 
-	if d.params.StripPayloadTrailer {
+	if d.params.StripPacketTrailer {
 		if strip := packettrailer.StripTrailer(payload, tp.marker); strip > 0 {
 			payload = payload[:len(payload)-strip]
 		}
@@ -2183,7 +2183,7 @@ func (d *DownTrack) retransmitPacket(epm *extPacketMeta, sourcePkt []byte, isPro
 		payload = payload[:rtxOffset+int(epm.numCodecBytesOut)+len(pkt.Payload)-int(epm.numCodecBytesIn)]
 	}
 
-	if d.params.StripPayloadTrailer {
+	if d.params.StripPacketTrailer {
 		if strip := packettrailer.StripTrailer(payload[rtxOffset:], epm.marker); strip > 0 {
 			payload = payload[:len(payload)-strip]
 		}
diff --git a/pkg/sfu/packettrailer/payload_trailer.go b/pkg/sfu/packettrailer/packet_trailer.go
similarity index 100%
rename from pkg/sfu/packettrailer/payload_trailer.go
rename to pkg/sfu/packettrailer/packet_trailer.go
diff --git a/pkg/sfu/packettrailer/payload_trailer_test.go b/pkg/sfu/packettrailer/packet_trailer_test.go
similarity index 100%
rename from pkg/sfu/packettrailer/payload_trailer_test.go
rename to pkg/sfu/packettrailer/packet_trailer_test.go