diff --git a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
index 0d69387514..f1b417a32a 100644
--- a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
+++ b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
@@ -6,12 +6,12 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public interface IStickyController : IInputAdapter
+	public interface IStickyAdapter : IInputAdapter
 	{
 		bool IsSticky(string button);
 	}
 
-	public class StickyXorAdapter : IStickyController
+	public class StickyXorAdapter : IStickyAdapter
 	{
 		public ControllerDefinition Definition => Source.Definition;
 
@@ -107,7 +107,7 @@ namespace BizHawk.Client.Common
 		}
 	}
 
-	public class AutoFireStickyXorAdapter : IStickyController, IInputAdapter
+	public class AutoFireStickyXorAdapter : IStickyAdapter, IInputAdapter
 	{
 		public ControllerDefinition Definition => Source.Definition;
 
diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs
index 4275d95255..1f2e53f898 100644
--- a/src/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/MovieSession.cs
@@ -51,7 +51,7 @@ namespace BizHawk.Client.Common
 
 		public IInputAdapter MovieIn { private get; set; }
 		public IInputAdapter MovieOut { get; } = new CopyControllerAdapter();
-		public IStickyController StickySource { get; set; }
+		public IStickyAdapter StickySource { get; set; }
 
 		public IMovieController MovieController { get; private set; } = new Bk2Controller("", NullController.Instance.Definition);
 
diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs
index f9c9488c4b..c0ec1adae6 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs
@@ -59,7 +59,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void SetFromSticky(IStickyController controller)
+		public void SetFromSticky(IStickyAdapter controller)
 		{
 			foreach (var button in Definition.BoolButtons)
 			{
diff --git a/src/BizHawk.Client.Common/movie/interfaces/IMovieController.cs b/src/BizHawk.Client.Common/movie/interfaces/IMovieController.cs
index ed18577de1..1cfabb5efe 100644
--- a/src/BizHawk.Client.Common/movie/interfaces/IMovieController.cs
+++ b/src/BizHawk.Client.Common/movie/interfaces/IMovieController.cs
@@ -10,10 +10,10 @@ namespace BizHawk.Client.Common
 		void SetFrom(IController source);
 
 		/// <summary>
-		/// Latches to the given <see cref="IStickyController" />
+		/// Latches to the given <see cref="IStickyAdapter" />
 		/// For buttons it latches autohold state, for analogs it latches mid value.
 		/// </summary>
-		void SetFromSticky(IStickyController controller);
+		void SetFromSticky(IStickyAdapter controller);
 
 		/// <summary>
 		/// Sets the controller to the state represented by the given mnemonic string
diff --git a/src/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/src/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index f83f202d52..3d0b855e38 100644
--- a/src/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -25,7 +25,7 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Provides a source for sticky controls ot use when recording
 		/// </summary>
-		IStickyController StickySource { get; set; }
+		IStickyAdapter StickySource { get; set; }
 
 		/// <summary>
 		/// Represents the input source that is fed to