diff --git a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
index 2184bbb5f8..0ee7315891 100644
--- a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
+++ b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
@@ -2,6 +2,8 @@
 using System.IO;
 using BizHawk.Emulation.DiscSystem;
 
+using BizHawk.Common;
+
 namespace BizHawk.Client.DiscoHawk
 {
 	public static class AudioExtractor
@@ -45,7 +47,7 @@ namespace BizHawk.Client.DiscoHawk
 				try
 				{
 					File.WriteAllBytes(tempfile, waveData);
-					var ffmpeg = new FFMpeg();
+					var ffmpeg = new FFmpegService();
 					ffmpeg.Run("-f", "s16le", "-ar", "44100", "-ac", "2", "-i", tempfile, "-f", "mp3", "-ab", "192k", mp3Path);
 				}
 				finally
diff --git a/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs b/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
index 0eb43b37da..b281b411ed 100644
--- a/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
+++ b/src/BizHawk.Client.DiscoHawk/DiscoHawk.cs
@@ -78,7 +78,8 @@ namespace BizHawk.Client.DiscoHawk
 			var ffmpegPath = Path.Combine(GetExeDirectoryAbsolute(), "ffmpeg.exe");
 			if (!File.Exists(ffmpegPath))
 				ffmpegPath = Path.Combine(Path.Combine(GetExeDirectoryAbsolute(), "dll"), "ffmpeg.exe");
-			FFMpeg.FFMpegPath = ffmpegPath;
+			//TODO FFMPEG
+			//FFMpeg.FFMpegPath = ffmpegPath;
 			AudioExtractor.FFmpegPath = ffmpegPath;
 			new DiscoHawk().Run(args);
 		}
diff --git a/src/BizHawk.Common/FFmpegService.cs b/src/BizHawk.Common/FFmpegService.cs
index 2a6336c72b..dc99e1ae20 100644
--- a/src/BizHawk.Common/FFmpegService.cs
+++ b/src/BizHawk.Common/FFmpegService.cs
@@ -8,7 +8,7 @@ using System.IO;
 
 namespace BizHawk.Common
 {
-	public class FFMpeg
+	public class FFmpegService
 	{
 		public static string FFMpegPath;
 
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscDecoding.cs b/src/BizHawk.Emulation.DiscSystem/DiscDecoding.cs
index 46d3a04871..87f1950fec 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscDecoding.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscDecoding.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.DiscSystem
 {
 	internal class AudioDecoder
@@ -25,7 +22,7 @@ namespace BizHawk.Emulation.DiscSystem
 
 		private bool CheckForAudio(string path)
 		{
-			FFMpeg ffmpeg = new FFMpeg();
+			FFmpegService ffmpeg = new FFmpegService();
 			var qa = ffmpeg.QueryAudio(path);
 			return qa.IsAudio;
 		}
@@ -62,7 +59,7 @@ namespace BizHawk.Emulation.DiscSystem
 		}
 
 		/// <exception cref="AudioDecoder_Exception">could not find source audio for <paramref name="audioPath"/></exception>
-		public byte[] AcquireWaveData(string audioPath) => new FFMpeg()
+		public byte[] AcquireWaveData(string audioPath) => new FFmpegService()
 			.DecodeAudio(FindAudio(audioPath) ?? throw new AudioDecoder_Exception($"Could not find source audio for: {Path.GetFileName(audioPath)}"));
 	}
 }
\ No newline at end of file
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
index 5d74547a04..c30df45442 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
@@ -2,6 +2,8 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 //this would be a good place for structural validation
 //after this step, we won't want to have to do stuff like that (it will gunk up already sticky code)
 
@@ -327,7 +329,7 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 			//check whether processing was available
 			if (needsCodec)
 			{
-				FFMpeg ffmpeg = new FFMpeg();
+				FFmpegService ffmpeg = new FFmpegService();
 				if (!ffmpeg.QueryServiceAvailable())
 					Warn("Decoding service will be required for further processing, but is not available");
 			}
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
index 8cc8bd1c58..ff0ec35b71 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
@@ -21,6 +21,8 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.DiscSystem.CUE
 {
 	/// <summary>
@@ -102,10 +104,10 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 						}
 					case CompiledCueFileType.DecodeAudio:
 						{
-							FFMpeg ffmpeg = new FFMpeg();
+							FFmpegService ffmpeg = new FFmpegService();
 							if (!ffmpeg.QueryServiceAvailable())
 							{
-								throw new DiscReferenceException(ccf.FullPath, "No decoding service was available (make sure ffmpeg.exe is available. even though this may be a wav, ffmpeg is used to load oddly formatted wave files. If you object to this, please send us a note and we'll see what we can do. It shouldn't be too hard.)");
+								throw new DiscReferenceException(ccf.FullPath, "No decoding service was available (make sure ffmpeg.exe is available. Even though this may be a wav, ffmpeg is used to load oddly formatted wave files. If you object to this, please send us a note and we'll see what we can do. It shouldn't be too hard.)");
 							}
 							AudioDecoder dec = new AudioDecoder();
 							byte[] buf = dec.AcquireWaveData(ccf.FullPath);