diff --git a/include/QF/input.h b/include/QF/input.h
index a98fd713b..0ed314f55 100644
--- a/include/QF/input.h
+++ b/include/QF/input.h
@@ -41,20 +41,17 @@ extern viewdelta_t viewdelta;
 #define freelook (in_mlook.state & 1 || in_freelook->int_val)
 
 
-void IN_UpdateGrab (struct cvar_s *);
 void IN_Init (void);
 void IN_Init_Cvars (void);
 
 void IN_Shutdown (void);
 
-void IN_Commands (void);
-// oportunity for devices to stick commands on the script buffer
+void IN_ProcessEvents (void);
+
+void IN_UpdateGrab (struct cvar_s *);
 
 void IN_ClearStates (void);
 
-void IN_SendKeyEvents (void);
-// Perform Key_Event () callbacks until the input que is empty
-
 void IN_Move (void); // FIXME: was cmduser_t?
 // add additional movement on top of the keyboard move cmd
 
@@ -72,7 +69,7 @@ extern float		in_mouse_x, in_mouse_y;
 void IN_LL_Init_Cvars (void);
 void IN_LL_Init (void);
 void IN_LL_Shutdown (void);
-void IN_LL_SendKeyEvents (void);
+void IN_LL_ProcessEvents (void);
 void IN_LL_ClearStates (void);
 void IN_LL_Grab_Input (int grab);
 
diff --git a/libs/video/targets/in_common.c b/libs/video/targets/in_common.c
index 23c0593b8..332e70802 100644
--- a/libs/video/targets/in_common.c
+++ b/libs/video/targets/in_common.c
@@ -87,16 +87,11 @@ IN_UpdateGrab (cvar_t *var)		// called from context_*.c
 }
 
 void
-IN_Commands (void)
-{
-	JOY_Command ();
-}
-
-void
-IN_SendKeyEvents (void)
+IN_ProcessEvents (void)
 {
 	/* Get events from environment. */
-	IN_LL_SendKeyEvents ();
+	JOY_Command ();
+	IN_LL_ProcessEvents ();
 }
 
 void
diff --git a/libs/video/targets/in_fbdev.c b/libs/video/targets/in_fbdev.c
index 7e745e722..48005e206 100644
--- a/libs/video/targets/in_fbdev.c
+++ b/libs/video/targets/in_fbdev.c
@@ -96,7 +96,7 @@ IN_LL_Shutdown (void)
 }
 
 void
-IN_LL_SendKeyEvents (void)
+IN_LL_ProcessEvents (void)
 {
 	int k, down;
 	char buf[4];
diff --git a/libs/video/targets/in_sdl.c b/libs/video/targets/in_sdl.c
index e297f8936..49e0f4a3a 100644
--- a/libs/video/targets/in_sdl.c
+++ b/libs/video/targets/in_sdl.c
@@ -71,7 +71,7 @@ event_focusin (void)
 }
 
 void
-IN_LL_SendKeyEvents (void)
+IN_LL_ProcessEvents (void)
 {
 	SDL_Event   event;
 	int         sym, state, but;
diff --git a/libs/video/targets/in_svgalib.c b/libs/video/targets/in_svgalib.c
index d378f57d2..5c91fd7b3 100644
--- a/libs/video/targets/in_svgalib.c
+++ b/libs/video/targets/in_svgalib.c
@@ -418,7 +418,7 @@ IN_LL_Shutdown (void)
 
 
 void
-IN_LL_SendKeyEvents (void)
+IN_LL_ProcessEvents (void)
 {
 	if (!in_svgalib_inited)
 		return;
diff --git a/libs/video/targets/in_win.c b/libs/video/targets/in_win.c
index 04d9da689..00d86d3d6 100644
--- a/libs/video/targets/in_win.c
+++ b/libs/video/targets/in_win.c
@@ -423,7 +423,7 @@ IN_LL_ClearStates (void)
 }
 
 void
-IN_LL_SendKeyEvents (void)
+IN_LL_ProcessEvents (void)
 {
 	MSG         msg;
 	int         mx, my;
diff --git a/libs/video/targets/in_x11.c b/libs/video/targets/in_x11.c
index b318823a4..494e00492 100644
--- a/libs/video/targets/in_x11.c
+++ b/libs/video/targets/in_x11.c
@@ -621,7 +621,7 @@ IN_LL_Grab_Input (int grab)
 }
 
 void
-IN_LL_SendKeyEvents (void)
+IN_LL_ProcessEvents (void)
 {
 	X11_ProcessEvents ();	// Get events from X server.
 }
diff --git a/nq/source/host.c b/nq/source/host.c
index baef377d8..be45480a3 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -598,13 +598,8 @@ _Host_Frame (float time)
 		return;							// don't run too fast, or packets
 										// will flood out
 
-	if (cls.state != ca_dedicated) {
-	// get new key events
-		IN_SendKeyEvents ();
-
-	// allow mice or other external controllers to add commands
-		IN_Commands ();
-	}
+	if (cls.state != ca_dedicated)
+		IN_ProcessEvents ();
 
 	// process gib threads
 	
diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c
index 4b02d25b1..ac348ec02 100644
--- a/nq/source/sv_ded.c
+++ b/nq/source/sv_ded.c
@@ -200,11 +200,6 @@ Host_Skin_Init_Cvars (void)
 {
 }
 
-void
-IN_Commands (void)
-{
-}
-
 void
 IN_Init (void)
 {
@@ -216,7 +211,7 @@ IN_Init_Cvars (void)
 }
 
 void
-IN_SendKeyEvents (void)
+IN_ProcessEvents (void)
 {
 }
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 5fa7bc7a5..3c204bfb3 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1495,11 +1495,7 @@ Host_Frame (float time)
 	oldrealtime = realtime;
 	host_frametime = min (host_frametime, 0.2);
 
-	// get new key events
-	IN_SendKeyEvents ();
-
-	// allow mouses or other external controllers to add commands
-	IN_Commands ();
+	IN_ProcessEvents ();
 
 	// process gib threads