diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index d80505dd75..0944cf96c2 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -873,7 +873,7 @@
 			this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI;
 			this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem";
 			this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
-			this.recordAVIToolStripMenuItem.Text = "Record AVI";
+			this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV";
 			this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click);
 			// 
 			// stopAVIToolStripMenuItem
@@ -881,7 +881,7 @@
 			this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
 			this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem";
 			this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
-			this.stopAVIToolStripMenuItem.Text = "Stop AVI";
+			this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV";
 			this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click);
 			// 
 			// screenshotToolStripMenuItem
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index eba104add3..5f4db938bf 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -571,7 +571,7 @@ namespace BizHawk.MultiClient
 				"LoadSlot7","LoadSlot8","LoadSlot9", "ToolBox", "Previous Slot", "Next Slot", "Ram Watch", "Ram Search", "Ram Poke", "Hex Editor",
 				"Lua Console", "Cheats", "Open ROM", "Close ROM", "Display FPS", "Display FrameCounter", "Display LagCounter", "Display Input", "Toggle Read Only",
 				"Play Movie", "Record Movie", "Stop Movie", "Play Beginning", "Volume Up", "Volume Down", "Toggle MultiTrack", "Record All", "Record None", "Increment Player",
-				"Soft Reset", "Decrement Player", "Record AVI", "Stop AVI", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input"}
+				"Soft Reset", "Decrement Player", "Record AVI/WAV", "Stop AVI/WAV", "Toggle Menu", "Increase Speed", "Decrease Speed", "Toggle Background Input"}
 		};
 
 		private void InitControls()
@@ -654,8 +654,8 @@ namespace BizHawk.MultiClient
 			controls.BindMulti("Increment Player", Global.Config.MTIncrementPlayer);
 			controls.BindMulti("Decrement Player", Global.Config.MTDecrementPlayer);
 			controls.BindMulti("Soft Reset", Global.Config.SoftResetBinding);
-			controls.BindMulti("Record AVI", Global.Config.AVIRecordBinding);
-			controls.BindMulti("Stop AVI", Global.Config.AVIStopBinding);
+			controls.BindMulti("Record AVI/WAV", Global.Config.AVIRecordBinding);
+			controls.BindMulti("Stop AVI/WAV", Global.Config.AVIStopBinding);
 			controls.BindMulti("Toggle Menu", Global.Config.ToggleMenuBinding);
 
 			Global.ClientControls = controls;
@@ -1697,10 +1697,10 @@ namespace BizHawk.MultiClient
 				case "DecreaseWindowSize":
 					DecreaseWIndowSize();
 					break;
-				case "Record AVI":
+				case "Record AVI/WAV":
 					RecordAVI();
 					break;
-				case "Stop AVI":
+				case "Stop AVI/WAV":
 					StopAVI();
 					break;
 				case "ToolBox":