diff --git a/pkg/mpeg4audio/aac.go b/pkg/mpeg4audio/mpeg4audio.go
similarity index 100%
rename from pkg/mpeg4audio/aac.go
rename to pkg/mpeg4audio/mpeg4audio.go
diff --git a/track.go b/track.go
index 7a4542ac..6fdfeda7 100644
--- a/track.go
+++ b/track.go
@@ -67,7 +67,7 @@ func newTrackFromMediaDescription(md *psdp.MediaDescription) (Track, error) {
 				return newTrackJPEGFromMediaDescription(control)
 
 			case md.MediaName.Formats[0] == "32":
-				return newTrackMPEGVideoFromMediaDescription(control)
+				return newTrackMPEG2VideoFromMediaDescription(control)
 
 			case rtpmapPart1 == "H264/90000":
 				return newTrackH264FromMediaDescription(control, payloadType, md)
@@ -91,7 +91,7 @@ func newTrackFromMediaDescription(md *psdp.MediaDescription) (Track, error) {
 				return newTrackPCMAFromMediaDescription(control, rtpmapPart1)
 
 			case md.MediaName.Formats[0] == "14":
-				return newTrackMPEGAudioFromMediaDescription(control)
+				return newTrackMPEG2AudioFromMediaDescription(control)
 
 			case strings.HasPrefix(strings.ToLower(rtpmapPart1), "mpeg4-generic/"):
 				return newTrackMPEG4AudioFromMediaDescription(control, payloadType, md)
diff --git a/track_mpegaudio.go b/track_mpeg2audio.go
similarity index 59%
rename from track_mpegaudio.go
rename to track_mpeg2audio.go
index 143a2e01..770dd3f5 100644
--- a/track_mpegaudio.go
+++ b/track_mpeg2audio.go
@@ -4,15 +4,15 @@ import (
 	psdp "github.com/pion/sdp/v3"
 )
 
-// TrackMPEGAudio is a MPEG-1 or MPEG-2 audio track.
-type TrackMPEGAudio struct {
+// TrackMPEG2Audio is a MPEG-1 or MPEG-2 audio track.
+type TrackMPEG2Audio struct {
 	trackBase
 }
 
-func newTrackMPEGAudioFromMediaDescription(
-	control string) (*TrackMPEGAudio, error,
+func newTrackMPEG2AudioFromMediaDescription(
+	control string) (*TrackMPEG2Audio, error,
 ) {
-	return &TrackMPEGAudio{
+	return &TrackMPEG2Audio{
 		trackBase: trackBase{
 			control: control,
 		},
@@ -20,18 +20,18 @@ func newTrackMPEGAudioFromMediaDescription(
 }
 
 // ClockRate returns the track clock rate.
-func (t *TrackMPEGAudio) ClockRate() int {
+func (t *TrackMPEG2Audio) ClockRate() int {
 	return 90000
 }
 
-func (t *TrackMPEGAudio) clone() Track {
-	return &TrackMPEGAudio{
+func (t *TrackMPEG2Audio) clone() Track {
+	return &TrackMPEG2Audio{
 		trackBase: t.trackBase,
 	}
 }
 
 // MediaDescription returns the track media description in SDP format.
-func (t *TrackMPEGAudio) MediaDescription() *psdp.MediaDescription {
+func (t *TrackMPEG2Audio) MediaDescription() *psdp.MediaDescription {
 	return &psdp.MediaDescription{
 		MediaName: psdp.MediaName{
 			Media:   "audio",
diff --git a/track_mpegaudio_test.go b/track_mpeg2audio_test.go
similarity index 69%
rename from track_mpegaudio_test.go
rename to track_mpeg2audio_test.go
index ee1881f5..91310d35 100644
--- a/track_mpegaudio_test.go
+++ b/track_mpeg2audio_test.go
@@ -7,21 +7,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestTrackMPEGAudioNew(t *testing.T) {
-	track := &TrackMPEGAudio{}
+func TestTrackMPEG2AudioNew(t *testing.T) {
+	track := &TrackMPEG2Audio{}
 	require.Equal(t, "", track.GetControl())
 }
 
-func TestTrackMPEGAudioClone(t *testing.T) {
-	track := &TrackMPEGAudio{}
+func TestTrackMPEG2AudioClone(t *testing.T) {
+	track := &TrackMPEG2Audio{}
 
 	clone := track.clone()
 	require.NotSame(t, track, clone)
 	require.Equal(t, track, clone)
 }
 
-func TestTrackMPEGAudioMediaDescription(t *testing.T) {
-	track := &TrackMPEGAudio{}
+func TestTrackMPEG2AudioMediaDescription(t *testing.T) {
+	track := &TrackMPEG2Audio{}
 
 	require.Equal(t, &psdp.MediaDescription{
 		MediaName: psdp.MediaName{
diff --git a/track_mpegvideo.go b/track_mpeg2video.go
similarity index 59%
rename from track_mpegvideo.go
rename to track_mpeg2video.go
index 0d7dfdfd..4b6097de 100644
--- a/track_mpegvideo.go
+++ b/track_mpeg2video.go
@@ -4,15 +4,15 @@ import (
 	psdp "github.com/pion/sdp/v3"
 )
 
-// TrackMPEGVideo is a MPEG-1 or MPEG-2 video track.
-type TrackMPEGVideo struct {
+// TrackMPEG2Video is a MPEG-1 or MPEG-2 video track.
+type TrackMPEG2Video struct {
 	trackBase
 }
 
-func newTrackMPEGVideoFromMediaDescription(
-	control string) (*TrackMPEGVideo, error,
+func newTrackMPEG2VideoFromMediaDescription(
+	control string) (*TrackMPEG2Video, error,
 ) {
-	return &TrackMPEGVideo{
+	return &TrackMPEG2Video{
 		trackBase: trackBase{
 			control: control,
 		},
@@ -20,18 +20,18 @@ func newTrackMPEGVideoFromMediaDescription(
 }
 
 // ClockRate returns the track clock rate.
-func (t *TrackMPEGVideo) ClockRate() int {
+func (t *TrackMPEG2Video) ClockRate() int {
 	return 90000
 }
 
-func (t *TrackMPEGVideo) clone() Track {
-	return &TrackMPEGVideo{
+func (t *TrackMPEG2Video) clone() Track {
+	return &TrackMPEG2Video{
 		trackBase: t.trackBase,
 	}
 }
 
 // MediaDescription returns the track media description in SDP format.
-func (t *TrackMPEGVideo) MediaDescription() *psdp.MediaDescription {
+func (t *TrackMPEG2Video) MediaDescription() *psdp.MediaDescription {
 	return &psdp.MediaDescription{
 		MediaName: psdp.MediaName{
 			Media:   "video",
diff --git a/track_mpegvideo_test.go b/track_mpeg2video_test.go
similarity index 69%
rename from track_mpegvideo_test.go
rename to track_mpeg2video_test.go
index 021335a1..7c8c5d19 100644
--- a/track_mpegvideo_test.go
+++ b/track_mpeg2video_test.go
@@ -7,21 +7,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestTrackMPEGVideoNew(t *testing.T) {
-	track := &TrackMPEGVideo{}
+func TestTrackMPEG2VideoNew(t *testing.T) {
+	track := &TrackMPEG2Video{}
 	require.Equal(t, "", track.GetControl())
 }
 
-func TestTrackMPEGVideoClone(t *testing.T) {
-	track := &TrackMPEGVideo{}
+func TestTrackMPEG2VideoClone(t *testing.T) {
+	track := &TrackMPEG2Video{}
 
 	clone := track.clone()
 	require.NotSame(t, track, clone)
 	require.Equal(t, track, clone)
 }
 
-func TestTrackMPEGVideoMediaDescription(t *testing.T) {
-	track := &TrackMPEGVideo{}
+func TestTrackMPEG2VideoMediaDescription(t *testing.T) {
+	track := &TrackMPEG2Video{}
 
 	require.Equal(t, &psdp.MediaDescription{
 		MediaName: psdp.MediaName{
diff --git a/track_test.go b/track_test.go
index 892d0986..ceb31407 100644
--- a/track_test.go
+++ b/track_test.go
@@ -47,7 +47,7 @@ func TestTrackNewFromMediaDescription(t *testing.T) {
 					Formats: []string{"14"},
 				},
 			},
-			&TrackMPEGAudio{},
+			&TrackMPEG2Audio{},
 		},
 		{
 			"aac",
@@ -226,7 +226,7 @@ func TestTrackNewFromMediaDescription(t *testing.T) {
 					Formats: []string{"32"},
 				},
 			},
-			&TrackMPEGVideo{},
+			&TrackMPEG2Video{},
 		},
 		{
 			"h264",