diff --git a/tests/taglib/test_aiff.rs b/tests/taglib/test_aiff.rs
index 3808e3df6..91439fb05 100644
--- a/tests/taglib/test_aiff.rs
+++ b/tests/taglib/test_aiff.rs
@@ -10,7 +10,7 @@ use crate::{assert_delta, temp_file};
 fn test_aiff_properties() {
 	let file = lofty::read_from_path("tests/taglib/data/empty.aiff").unwrap();
 
-	assert_eq!(file.file_type(), FileType::AIFF);
+	assert_eq!(file.file_type(), FileType::Aiff);
 
 	let properties = file.properties();
 	assert_eq!(properties.duration().as_secs(), 0);
@@ -29,7 +29,7 @@ fn test_aiff_properties() {
 fn test_aifc_properties() {
 	let file = lofty::read_from_path("tests/taglib/data/alaw.aifc").unwrap();
 
-	assert_eq!(file.file_type(), FileType::AIFF);
+	assert_eq!(file.file_type(), FileType::Aiff);
 
 	let properties = file.properties();
 	assert_eq!(properties.duration().as_secs(), 0);
@@ -53,16 +53,16 @@ fn test_save_id3v2() {
 	{
 		let mut tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		assert!(tfile.tag(lofty::TagType::ID3v2).is_none());
+		assert!(tfile.tag(lofty::TagType::Id3v2).is_none());
 
-		let mut tag = lofty::Tag::new(lofty::TagType::ID3v2);
+		let mut tag = lofty::Tag::new(lofty::TagType::Id3v2);
 		tag.set_title("TitleXXX".to_string());
 		tfile.insert_tag(tag);
 		file.rewind().unwrap();
 		tfile.save_to(&mut file).unwrap();
-		assert!(tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 
 	file.rewind().unwrap();
@@ -70,15 +70,15 @@ fn test_save_id3v2() {
 	{
 		let mut tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		let mut tag = tfile.tag(lofty::TagType::ID3v2).unwrap().to_owned();
+		let mut tag = tfile.tag(lofty::TagType::Id3v2).unwrap().to_owned();
 		assert_eq!(tag.title().as_deref(), Some("TitleXXX"));
 		tag.set_title("".to_string());
 		tfile.insert_tag(tag);
 		file.rewind().unwrap();
 		tfile.save_to(&mut file).unwrap();
-		assert!(!tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(!tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 
 	file.rewind().unwrap();
@@ -86,9 +86,9 @@ fn test_save_id3v2() {
 	{
 		let tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		assert!(!tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(!tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 }
 
@@ -100,7 +100,7 @@ fn test_save_id3v2() {
 fn test_fuzzed_file1() {
 	assert_eq!(
 		get_filetype("tests/taglib/data/segfault.aif"),
-		FileType::AIFF
+		FileType::Aiff
 	);
 }
 
diff --git a/tests/taglib/test_ape.rs b/tests/taglib/test_ape.rs
index 49370f371..b7cc0ad0d 100644
--- a/tests/taglib/test_ape.rs
+++ b/tests/taglib/test_ape.rs
@@ -80,13 +80,13 @@ fn test_properties_390() {
 fn test_fuzzed_file_1() {
 	assert_eq!(
 		get_filetype("tests/taglib/data/longloop.ape"),
-		FileType::APE
+		FileType::Ape
 	);
 }
 
 #[test]
 fn test_fuzzed_file_2() {
-	assert_eq!(get_filetype("tests/taglib/data/zerodiv.ape"), FileType::APE);
+	assert_eq!(get_filetype("tests/taglib/data/zerodiv.ape"), FileType::Ape);
 }
 
 #[test]
diff --git a/tests/taglib/test_fileref.rs b/tests/taglib/test_fileref.rs
index 8a0182e05..1bc62d3cc 100644
--- a/tests/taglib/test_fileref.rs
+++ b/tests/taglib/test_fileref.rs
@@ -103,12 +103,12 @@ fn test_speex() {
 
 #[test]
 fn test_flac() {
-	file_ref_save("no-tags.flac", FileType::FLAC);
+	file_ref_save("no-tags.flac", FileType::Flac);
 }
 
 #[test]
 fn test_mp3() {
-	file_ref_save("xing.mp3", FileType::MPEG);
+	file_ref_save("xing.mp3", FileType::Mpeg);
 }
 
 #[test]
@@ -120,35 +120,35 @@ fn test_true_audio() {
 
 #[test]
 fn test_mp4_1() {
-	file_ref_save("has-tags.m4a", FileType::MP4);
+	file_ref_save("has-tags.m4a", FileType::Mp4);
 }
 
 #[test]
 #[ignore] // TODO: The file has a malformed `free` atom. How does TagLib handle this? Currently we mess up entirely and just write a duplicate tag.
 fn test_mp4_2() {
-	file_ref_save("no-tags.m4a", FileType::MP4);
+	file_ref_save("no-tags.m4a", FileType::Mp4);
 }
 
 #[test]
 #[ignore] // TODO: We are able to write the first tag and even reread, but the second save causes a `SizeMismatch`.
 fn test_mp4_3() {
-	file_ref_save("no-tags.3g2", FileType::MP4);
+	file_ref_save("no-tags.3g2", FileType::Mp4);
 }
 
 #[test]
 fn test_mp4_4() {
-	file_ref_save("blank_video.m4v", FileType::MP4);
+	file_ref_save("blank_video.m4v", FileType::Mp4);
 }
 
 #[test]
 fn test_wav() {
-	file_ref_save("empty.wav", FileType::WAV);
+	file_ref_save("empty.wav", FileType::Wav);
 }
 
 #[test]
 #[ignore] // TODO: We don't yet support FLAC in oga
 fn test_oga_flac() {
-	file_ref_save("empty_flac.oga", FileType::FLAC);
+	file_ref_save("empty_flac.oga", FileType::Flac);
 }
 
 #[test]
@@ -158,17 +158,17 @@ fn test_oga_vorbis() {
 
 #[test]
 fn test_ape() {
-	file_ref_save("mac-399.ape", FileType::APE);
+	file_ref_save("mac-399.ape", FileType::Ape);
 }
 
 #[test]
 fn test_aiff_1() {
-	file_ref_save("empty.aiff", FileType::AIFF);
+	file_ref_save("empty.aiff", FileType::Aiff);
 }
 
 #[test]
 fn test_aiff_2() {
-	file_ref_save("alaw.aifc", FileType::AIFF);
+	file_ref_save("alaw.aifc", FileType::Aiff);
 }
 
 #[test]
@@ -222,7 +222,7 @@ fn test_default_file_extensions() {
 fn test_file_resolver() {
 	{
 		let file = lofty::read_from_path("tests/taglib/data/xing.mp3").unwrap();
-		assert_eq!(file.file_type(), FileType::MPEG);
+		assert_eq!(file.file_type(), FileType::Mpeg);
 	}
 
 	struct DummyResolver;
diff --git a/tests/taglib/test_id3v1.rs b/tests/taglib/test_id3v1.rs
index 8cc6bed40..61f428a67 100644
--- a/tests/taglib/test_id3v1.rs
+++ b/tests/taglib/test_id3v1.rs
@@ -3,7 +3,7 @@ use crate::temp_file;
 use std::io::Seek;
 
 use lofty::id3::v1::{ID3v1Tag, GENRES};
-use lofty::mpeg::MPEGFile;
+use lofty::mpeg::MpegFile;
 use lofty::{Accessor, AudioFile, ParseOptions};
 
 #[test]
@@ -11,7 +11,7 @@ use lofty::{Accessor, AudioFile, ParseOptions};
 fn test_strip_whitespace() {
 	let mut file = temp_file!("tests/taglib/data/xing.mp3");
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 
 		let mut tag = ID3v1Tag::default();
@@ -21,7 +21,7 @@ fn test_strip_whitespace() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert_eq!(f.id3v1().unwrap().artist().as_deref(), Some("Artist"));
 	}
 }
diff --git a/tests/taglib/test_mp4.rs b/tests/taglib/test_mp4.rs
index 058f4bafb..c6cab2b1c 100644
--- a/tests/taglib/test_mp4.rs
+++ b/tests/taglib/test_mp4.rs
@@ -420,7 +420,7 @@ fn test_remove_metadata() {
 
 		assert!(f.ilst().is_some());
 		assert!(!f.ilst().unwrap().is_empty());
-		TagType::MP4ilst.remove_from(&mut file).unwrap();
+		TagType::Mp4Ilst.remove_from(&mut file).unwrap();
 	}
 	file.rewind().unwrap();
 	{
diff --git a/tests/taglib/test_mpeg.rs b/tests/taglib/test_mpeg.rs
index e88c47a6c..afeb1a579 100644
--- a/tests/taglib/test_mpeg.rs
+++ b/tests/taglib/test_mpeg.rs
@@ -6,14 +6,14 @@ use std::io::Seek;
 use lofty::ape::ApeTag;
 use lofty::id3::v1::ID3v1Tag;
 use lofty::id3::v2::{ID3v2Tag, ID3v2Version};
-use lofty::mpeg::MPEGFile;
+use lofty::mpeg::MpegFile;
 use lofty::{Accessor, AudioFile, ParseOptions};
 
 #[test]
 #[ignore]
 fn test_audio_properties_xing_header_cbr() {
 	let mut file = File::open("tests/taglib/data/lame_cbr.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 1887); // TODO: Off by 9
 	assert_eq!(f.properties().duration().as_millis(), 1887164);
@@ -28,7 +28,7 @@ fn test_audio_properties_xing_header_cbr() {
 #[ignore]
 fn test_audio_properties_xing_header_vbr() {
 	let mut file = File::open("tests/taglib/data/lame_vbr.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 1887); // TODO: Off by 9
 	assert_eq!(f.properties().duration().as_millis(), 1887164);
@@ -43,7 +43,7 @@ fn test_audio_properties_xing_header_vbr() {
 #[ignore]
 fn test_audio_properties_vbri_header() {
 	let mut file = File::open("tests/taglib/data/rare_frames.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 222); // TODO: Off by 1
 	assert_eq!(f.properties().duration().as_millis(), 222198);
@@ -58,7 +58,7 @@ fn test_audio_properties_vbri_header() {
 #[ignore]
 fn test_audio_properties_no_vbr_headers() {
 	let mut file = File::open("tests/taglib/data/bladeenc.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 3); // Off by 1
 	assert_eq!(f.properties().duration().as_millis(), 3553);
@@ -73,7 +73,7 @@ fn test_audio_properties_no_vbr_headers() {
 #[test]
 fn test_skip_invalid_frames_1() {
 	let mut file = File::open("tests/taglib/data/invalid-frames1.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 0);
 	assert_eq!(f.properties().duration().as_millis(), 392);
@@ -86,7 +86,7 @@ fn test_skip_invalid_frames_1() {
 #[ignore]
 fn test_skip_invalid_frames_2() {
 	let mut file = File::open("tests/taglib/data/invalid-frames2.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 0);
 	assert_eq!(f.properties().duration().as_millis(), 314); // TODO: Off by 79
@@ -99,7 +99,7 @@ fn test_skip_invalid_frames_2() {
 #[ignore]
 fn test_skip_invalid_frames_3() {
 	let mut file = File::open("tests/taglib/data/invalid-frames3.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 
 	assert_eq!(f.properties().duration().as_secs(), 0);
 	assert_eq!(f.properties().duration().as_millis(), 183); // TODO: Off by 26
@@ -112,7 +112,7 @@ fn test_skip_invalid_frames_3() {
 #[ignore]
 fn test_version_2_duration_with_xing_header() {
 	let mut file = File::open("tests/taglib/data/mpeg2.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 	assert_eq!(f.properties().duration().as_secs(), 5387); // TODO: Off by 15
 	assert_eq!(f.properties().duration().as_millis(), 5387285);
 }
@@ -123,7 +123,7 @@ fn test_save_id3v24() {
 
 	let xxx = "X".repeat(254);
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 		assert!(f.id3v2().is_none());
 
@@ -135,7 +135,7 @@ fn test_save_id3v24() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert_eq!(f.id3v2().unwrap().original_version(), ID3v2Version::V4);
 		assert_eq!(f.id3v2().unwrap().artist().as_deref(), Some("Artist A"));
 		assert_eq!(f.id3v2().unwrap().title().as_deref(), Some(xxx.as_str()));
@@ -155,7 +155,7 @@ fn test_save_id3v23() {
 
 	let xxx = "X".repeat(254);
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 		assert!(f.id3v2().is_none());
 
@@ -167,7 +167,7 @@ fn test_save_id3v23() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert_eq!(f.id3v2().unwrap().original_version(), ID3v2Version::V3);
 		assert_eq!(f.id3v2().unwrap().artist().as_deref(), Some("Artist A"));
 		assert_eq!(f.id3v2().unwrap().title().as_deref(), Some(xxx.as_str()));
@@ -177,14 +177,14 @@ fn test_save_id3v23() {
 #[test]
 fn test_duplicate_id3v2() {
 	let mut file = File::open("tests/taglib/data/duplicate_id3v2.mp3").unwrap();
-	let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 	assert_eq!(f.properties().sample_rate(), 44100);
 }
 
 #[test]
 fn test_fuzzed_file() {
 	let mut file = File::open("tests/taglib/data/invalid-frames3.mp3").unwrap();
-	let _ = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+	let _ = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 }
 
 #[test]
@@ -198,7 +198,7 @@ fn test_strip_and_properties() {
 	let mut file = temp_file!("tests/taglib/data/xing.mp3");
 
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 
 		let mut id3v2 = ID3v2Tag::default();
@@ -214,7 +214,7 @@ fn test_strip_and_properties() {
 	}
 	file.rewind().unwrap();
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert_eq!(f.id3v2().unwrap().title().as_deref(), Some("ID3v2"));
 		f.remove_id3v2();
 		assert_eq!(f.ape().unwrap().title().as_deref(), Some("APE"));
@@ -245,7 +245,7 @@ fn test_repeated_save_3() {
 	let mut file = temp_file!("tests/taglib/data/xing.mp3");
 
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 		assert!(f.ape().is_none());
 		assert!(f.id3v1().is_none());
@@ -276,7 +276,7 @@ fn test_repeated_save_3() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert!(f.ape().is_some());
 		assert!(f.id3v1().is_some());
 	}
@@ -306,7 +306,7 @@ fn test_ignore_garbage() {
 	let mut file = temp_file!("tests/taglib/data/garbage.mp3");
 
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 		assert!(f.id3v2().is_some());
 
@@ -316,7 +316,7 @@ fn test_ignore_garbage() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert!(f.id3v2().is_some());
 		assert_eq!(f.id3v2().unwrap().title().as_deref(), Some("Title B"));
 	}
diff --git a/tests/taglib/test_wav.rs b/tests/taglib/test_wav.rs
index 3568a4523..e0f4f44c9 100644
--- a/tests/taglib/test_wav.rs
+++ b/tests/taglib/test_wav.rs
@@ -193,7 +193,7 @@ fn test_strip_tags() {
 		assert!(f.id3v2().is_some());
 		assert!(f.riff_info().is_some());
 
-		TagType::RIFFInfo.remove_from(&mut file).unwrap();
+		TagType::RiffInfo.remove_from(&mut file).unwrap();
 	}
 	file.rewind().unwrap();
 	{
@@ -215,7 +215,7 @@ fn test_strip_tags() {
 		assert!(f.id3v2().is_some());
 		assert!(f.riff_info().is_some());
 
-		TagType::ID3v2.remove_from(&mut file).unwrap();
+		TagType::Id3v2.remove_from(&mut file).unwrap();
 	}
 	file.rewind().unwrap();
 	{
@@ -311,9 +311,9 @@ fn test_file_with_garbage_appended() {
 	}
 	file.rewind().unwrap();
 	{
-		TagType::ID3v2.remove_from(&mut file).unwrap();
+		TagType::Id3v2.remove_from(&mut file).unwrap();
 		file.rewind().unwrap();
-		TagType::RIFFInfo.remove_from(&mut file).unwrap();
+		TagType::RiffInfo.remove_from(&mut file).unwrap();
 	}
 	file.rewind().unwrap();
 	{