diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index d706ce285f..aacee8c7c1 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -354,7 +354,7 @@ bool ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI, EditButton &button )
 }
 
 /* Given a DeviceInput that was just depressed, return an active edit function. */
-bool ScreenEdit::MenuInputToEditButton( MenuButton MenuI, EditButton &button ) const
+bool ScreenEdit::MenuButtonToEditButton( MenuButton MenuI, EditButton &button ) const
 {
 	const MapEditButtonToMenuButton *pCurrentMap = GetCurrentMenuButtonMap();
 
@@ -1086,7 +1086,7 @@ void ScreenEdit::Input( const InputEventPlus &input )
 
 	EditButton EditB;
 	if( !DeviceToEdit( input.DeviceI, EditB ) )
-		MenuInputToEditButton( input.MenuI, EditB );
+		MenuButtonToEditButton( input.MenuI, EditB );
 		
 
 	if( EditB == EDIT_BUTTON_REMOVE_NOTE )
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 688dbcdab7..ce11453c15 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -457,7 +457,7 @@ public:
 
 	void InitEditMappings();
 	bool DeviceToEdit( const DeviceInput &DeviceI, EditButton &button ) const;
-	bool MenuInputToEditButton( MenuButton MenuI, EditButton &button ) const;
+	bool MenuButtonToEditButton( MenuButton MenuI, EditButton &button ) const;
 	bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const;
 	bool EditPressed( EditButton button, const DeviceInput &DeviceI );
 	bool EditIsBeingPressed( EditButton button ) const;