diff --git a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs
index c001236168..fe85323692 100644
--- a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs
+++ b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs
@@ -32,8 +32,8 @@ namespace BizHawk.Client.EmuHawk
 				.GetAssembly(typeof(IEmulator))
 				.GetTypes()
 				.Where(t => t.IsInterface)
-				.Where(t => typeof(ICoreService).IsAssignableFrom(t))
-				.Where(t => t != typeof(ICoreService))
+				.Where(t => typeof(IEmulatorService).IsAssignableFrom(t))
+				.Where(t => t != typeof(IEmulatorService))
 				.ToList();
 
 			var cores = Assembly
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 0910275921..ab2c629c77 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -65,9 +65,9 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="Interfaces\IController.cs" />
     <Compile Include="Interfaces\ICoreFileProvider.cs" />
-    <Compile Include="Interfaces\ICoreService.cs" />
     <Compile Include="Interfaces\IDebuggable.cs" />
     <Compile Include="Interfaces\IEmulator.cs" />
+    <Compile Include="Interfaces\IEmulatorService.cs" />
     <Compile Include="Interfaces\IInputCallbackSystem.cs" />
     <Compile Include="Interfaces\IInputPollable.cs" />
     <Compile Include="Interfaces\IMemoryDomains.cs" />
diff --git a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
index 8c49765ac6..7010dc1fd4 100644
--- a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
@@ -2,7 +2,7 @@
 
 namespace BizHawk.Emulation.Common
 {
-	public interface IDebuggable : IEmulator, ICoreService
+	public interface IDebuggable : IEmulator, IEmulatorService
 	{
 		/// <summary>
 		/// Returns a list of Cpu registers and their current state
diff --git a/BizHawk.Emulation.Common/Interfaces/IEmulator.cs b/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
index 694424fd6d..3ae36eae3c 100644
--- a/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
@@ -4,7 +4,7 @@ using System.IO;
 
 namespace BizHawk.Emulation.Common
 {
-	public interface IEmulator : ICoreService, IDisposable
+	public interface IEmulator : IEmulatorService, IDisposable
 	{
 		/// <summary>
 		/// Video provider to the client
diff --git a/BizHawk.Emulation.Common/Interfaces/ICoreService.cs b/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
similarity index 93%
rename from BizHawk.Emulation.Common/Interfaces/ICoreService.cs
rename to BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
index b153b39d8d..8daeddefb4 100644
--- a/BizHawk.Emulation.Common/Interfaces/ICoreService.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
@@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Common
 	/// but is an optional part of the core functionality
 	/// Clients should gracefully handle an IEmulator that has a missing or partial implementation of one of these services
 	/// </summary>
-	public interface ICoreService
+	public interface IEmulatorService
 	{
 	}
 
diff --git a/BizHawk.Emulation.Common/Interfaces/IInputPollable.cs b/BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
index c539206720..b9f7ba9a9a 100644
--- a/BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Emulation.Common
 {
-	public interface IInputPollable : ICoreService, IEmulator
+	public interface IInputPollable : IEmulatorService, IEmulator
 	{
 		/// <summary>
 		/// The lag count.
diff --git a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs
index 748618e6f9..bac0635523 100644
--- a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Emulation.Common
 {
-	public interface IMemoryDomains : IEmulator, ICoreService
+	public interface IMemoryDomains : IEmulator, IEmulatorService
 	{
 		///The list of all avaialble memory domains
 		/// A memory domain is a byte array that respresents a distinct part of the emulated system.
diff --git a/BizHawk.Emulation.Common/Interfaces/ISaveRam.cs b/BizHawk.Emulation.Common/Interfaces/ISaveRam.cs
index 11c487a943..7cd00e1cd3 100644
--- a/BizHawk.Emulation.Common/Interfaces/ISaveRam.cs
+++ b/BizHawk.Emulation.Common/Interfaces/ISaveRam.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Emulation.Common
 {
-	public interface ISaveRam : IEmulator, ICoreService
+	public interface ISaveRam : IEmulator, IEmulatorService
 	{
 		/// <summary>
 		/// return a copy of the saveram.  editing it won't do you any good unless you later call StoreSaveRam()
diff --git a/BizHawk.Emulation.Common/Interfaces/ISettable.cs b/BizHawk.Emulation.Common/Interfaces/ISettable.cs
index 856acf5921..06daf3b20c 100644
--- a/BizHawk.Emulation.Common/Interfaces/ISettable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/ISettable.cs
@@ -90,7 +90,7 @@ namespace BizHawk.Emulation.Common
 		}
 	}
 
-	public interface ISettable<TSettings, TSync> : IEmulator, ICoreService
+	public interface ISettable<TSettings, TSync> : IEmulator, IEmulatorService
 	{
 		// in addition to these methods, it's expected that the constructor or Load() method
 		// will take a Settings and SyncSettings object to set the initial state of the core
diff --git a/BizHawk.Emulation.Common/Interfaces/IStatable.cs b/BizHawk.Emulation.Common/Interfaces/IStatable.cs
index 30139a4987..4c05dffe56 100644
--- a/BizHawk.Emulation.Common/Interfaces/IStatable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IStatable.cs
@@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Common
 	/// <summary>
 	/// Savestate handling methods
 	/// </summary>
-	public interface IStatable : ICoreService, IEmulator
+	public interface IStatable : IEmulatorService, IEmulator
 	{
 		void SaveStateText(TextWriter writer);
 		void LoadStateText(TextReader reader);