diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 14683f9fbd..8a70f917ff 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -127,10 +127,10 @@
     <Compile Include="movie\IMovie.cs" />
     <Compile Include="movie\IMovieHeader.cs" />
     <Compile Include="movie\InputAdapters.cs" />
+    <Compile Include="movie\MnemonicGenerators\BooleanControllerMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicGenerators\IMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicGenerators\IMnemonicPorts.cs" />
     <Compile Include="movie\MnemonicGenerators\MnemonicGeneratorFactory.cs" />
-    <Compile Include="movie\MnemonicGenerators\MnemonicGenerators.cs" />
     <Compile Include="movie\MnemonicGenerators\NesMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicsGenerator.cs" />
     <Compile Include="movie\Movie.cs" />
diff --git a/BizHawk.Client.Common/movie/MnemonicGenerators/MnemonicGenerators.cs b/BizHawk.Client.Common/movie/MnemonicGenerators/BooleanControllerMnemonicGenerator.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/MnemonicGenerators/MnemonicGenerators.cs
rename to BizHawk.Client.Common/movie/MnemonicGenerators/BooleanControllerMnemonicGenerator.cs
diff --git a/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicGenerator.cs b/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicGenerator.cs
index 6e1a683687..86a9bd6d21 100644
--- a/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicGenerator.cs
+++ b/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicGenerator.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Emulation.Common;
+
 namespace BizHawk.Client.Common
 {
 	public interface IMnemonicGenerator
diff --git a/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicPorts.cs b/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicPorts.cs
index ba21a4964e..dc740e5cbe 100644
--- a/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicPorts.cs
+++ b/BizHawk.Client.Common/movie/MnemonicGenerators/IMnemonicPorts.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
+using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
@@ -12,12 +10,12 @@ namespace BizHawk.Client.Common
 	public interface IMnemonicPorts
 	{
 		/// <summary>
-		/// Total number of available controller ports (this does not include the console controls
+		/// Gets the total number of available controller ports (this does not include the console controls
 		/// </summary>
 		int Count { get; }
 
 		/// <summary>
-		/// Source controller to read input state from
+		/// Gets or sets the Source controller to read the input state from
 		/// </summary>
 		IController Source { get; set; }