diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
index 7d5c2b4a0a..390ac5ba65 100644
--- a/doomsday/client/client.pro
+++ b/doomsday/client/client.pro
@@ -349,10 +349,10 @@ DENG_HEADERS += \
     include/sys_system.h \
     include/tab_anorms.h \
     include/ui/b_command.h \
-    include/ui/b_context.h \
     include/ui/b_device.h \
     include/ui/b_main.h \
     include/ui/b_util.h \
+    include/ui/bindcontext.h \
     include/ui/busyvisual.h \
     include/ui/clientrootwidget.h \
     include/ui/clientwindow.h \
@@ -676,10 +676,10 @@ SOURCES += \
     src/sys_system.cpp \
     src/tab_tables.c \
     src/ui/b_command.cpp \
-    src/ui/b_context.cpp \
     src/ui/b_device.cpp \
     src/ui/b_main.cpp \
     src/ui/b_util.cpp \
+    src/ui/bindcontext.cpp \
     src/ui/busyvisual.cpp \
     src/ui/clientrootwidget.cpp \
     src/ui/clientwindow.cpp \
diff --git a/doomsday/client/include/de_console.h b/doomsday/client/include/de_console.h
index 277a2e9436..3380ddb7c1 100644
--- a/doomsday/client/include/de_console.h
+++ b/doomsday/client/include/de_console.h
@@ -38,7 +38,7 @@
 #  include "ui/progress.h"
 #  include "ui/widgetactions.h"
 #  include "ui/b_main.h"
-#  include "ui/b_context.h"
+#  include "ui/bindcontext.h"
 #endif
 
 #include "api_console.h"
diff --git a/doomsday/client/include/ui/b_context.h b/doomsday/client/include/ui/bindcontext.h
similarity index 98%
rename from doomsday/client/include/ui/b_context.h
rename to doomsday/client/include/ui/bindcontext.h
index af4a323da5..409654653e 100644
--- a/doomsday/client/include/ui/b_context.h
+++ b/doomsday/client/include/ui/bindcontext.h
@@ -1,4 +1,4 @@
-/** @file b_context.h  Input system binding contexts.
+/** @file bindcontext.h  Input system binding context.
  *
  * @authors Copyright © 2009-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2007-2014 Daniel Swanson <danij@dengine.net>
@@ -165,7 +165,7 @@ class BindContext
      *
      * @return Action instance (caller gets ownership), or @c nullptr if not found.
      */
-    de::Action *actionForEvent(ddevent_t const *event,
+    de::Action *actionForEvent(ddevent_t const &event,
                                bool respectHigherAssociatedContexts = true) const;
 
     /**
diff --git a/doomsday/client/src/ui/b_device.cpp b/doomsday/client/src/ui/b_device.cpp
index 6d94e5499f..fd9f196f55 100644
--- a/doomsday/client/src/ui/b_device.cpp
+++ b/doomsday/client/src/ui/b_device.cpp
@@ -24,7 +24,7 @@
 #include "clientapp.h"
 #include "dd_main.h"
 #include "ui/b_main.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/inputdevice.h"
 #include "ui/inputdeviceaxiscontrol.h"
 #include "ui/inputdevicebuttoncontrol.h"
diff --git a/doomsday/client/src/ui/b_main.cpp b/doomsday/client/src/ui/b_main.cpp
index 58ce0ce2eb..ecdcbdf74c 100644
--- a/doomsday/client/src/ui/b_main.cpp
+++ b/doomsday/client/src/ui/b_main.cpp
@@ -31,7 +31,7 @@
 #include "dd_def.h"
 #include "clientapp.h"
 #include "ui/b_command.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/p_control.h"
 #include "ui/inputdevice.h"
 #include "ui/inputdeviceaxiscontrol.h"
diff --git a/doomsday/client/src/ui/b_util.cpp b/doomsday/client/src/ui/b_util.cpp
index 67bd994ff0..8295a84621 100644
--- a/doomsday/client/src/ui/b_util.cpp
+++ b/doomsday/client/src/ui/b_util.cpp
@@ -28,7 +28,7 @@
 #include "ui/b_util.h"
 
 #include "ui/b_main.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/inputdevice.h"
 #include "ui/inputdeviceaxiscontrol.h"
 #include "ui/inputdevicebuttoncontrol.h"
diff --git a/doomsday/client/src/ui/b_context.cpp b/doomsday/client/src/ui/bindcontext.cpp
similarity index 98%
rename from doomsday/client/src/ui/b_context.cpp
rename to doomsday/client/src/ui/bindcontext.cpp
index 129086e0e2..7c5a9daeee 100644
--- a/doomsday/client/src/ui/b_context.cpp
+++ b/doomsday/client/src/ui/bindcontext.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "de_platform.h" // strdup macro
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 
 #include <cstring>
 #include <de/memory.h>
@@ -357,12 +357,12 @@ bool BindContext::deleteBinding(int bid)
     return false;
 }
 
-Action *BindContext::actionForEvent(ddevent_t const *event, bool respectHigherAssociatedContexts) const
+Action *BindContext::actionForEvent(ddevent_t const &event, bool respectHigherAssociatedContexts) const
 {
     // See if the command bindings will have it.
     for(cbinding_t *eb = d->commandBinds.next; eb != &d->commandBinds; eb = eb->next)
     {
-        if(Action *act = CommandBinding_ActionForEvent(eb, event, this, respectHigherAssociatedContexts))
+        if(Action *act = CommandBinding_ActionForEvent(eb, &event, this, respectHigherAssociatedContexts))
         {
             return act;
         }
diff --git a/doomsday/client/src/ui/infine/finale.cpp b/doomsday/client/src/ui/infine/finale.cpp
index 68ddd7ef78..55a896e412 100644
--- a/doomsday/client/src/ui/infine/finale.cpp
+++ b/doomsday/client/src/ui/infine/finale.cpp
@@ -20,7 +20,7 @@
 #include <de/Log>
 #include "ui/infine/finale.h"
 
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/infine/finaleinterpreter.h"
 #include "network/net_main.h"
 #ifdef __SERVER__
diff --git a/doomsday/client/src/ui/infine/infinesystem.cpp b/doomsday/client/src/ui/infine/infinesystem.cpp
index 9762e2f4f8..2537945c04 100644
--- a/doomsday/client/src/ui/infine/infinesystem.cpp
+++ b/doomsday/client/src/ui/infine/infinesystem.cpp
@@ -29,7 +29,7 @@
 #ifdef __CLIENT__
 #  include "clientapp.h"
 #endif
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/infine/finale.h"
 #include "ui/infine/finaleinterpreter.h"
 
diff --git a/doomsday/client/src/ui/inputsystem.cpp b/doomsday/client/src/ui/inputsystem.cpp
index 34ae8d354e..eec72e9f51 100644
--- a/doomsday/client/src/ui/inputsystem.cpp
+++ b/doomsday/client/src/ui/inputsystem.cpp
@@ -39,7 +39,7 @@
 
 #include "ui/dd_input.h"
 #include "ui/b_main.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include "ui/p_control.h"
 #include "ui/clientwindow.h"
 #include "ui/clientwindowsystem.h"
@@ -1088,7 +1088,7 @@ Action *InputSystem::actionForEvent(ddevent_t const &event) const
     {
         if(!bc->isActive()) continue;
 
-        if(Action *act = bc->actionForEvent(&event))
+        if(Action *act = bc->actionForEvent(event))
         {
             return act;
         }
diff --git a/doomsday/client/src/ui/widgetactions.cpp b/doomsday/client/src/ui/widgetactions.cpp
index 7c1e8bbda1..b180599168 100644
--- a/doomsday/client/src/ui/widgetactions.cpp
+++ b/doomsday/client/src/ui/widgetactions.cpp
@@ -19,7 +19,7 @@
 #include "WidgetActions"
 #include "clientapp.h"
 #include "ui/b_main.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 
 using namespace de;
 
@@ -68,7 +68,7 @@ bool WidgetActions::tryEvent(Event const &event, String const &context)
     // Check a specific binding context for an action (regardless of its activation status).
     if(inputSys().hasContext(context))
     {
-        AutoRef<Action> act(inputSys().context(context).actionForEvent(&ddev, false));
+        AutoRef<Action> act(inputSys().context(context).actionForEvent(ddev, false));
         if(act.get())
         {
             act->trigger();
diff --git a/doomsday/client/src/ui/widgets/inputbindingwidget.cpp b/doomsday/client/src/ui/widgets/inputbindingwidget.cpp
index 528ef0dd13..041efaa3d1 100644
--- a/doomsday/client/src/ui/widgets/inputbindingwidget.cpp
+++ b/doomsday/client/src/ui/widgets/inputbindingwidget.cpp
@@ -19,7 +19,7 @@
 #include "ui/widgets/inputbindingwidget.h"
 #include "clientapp.h"
 #include "ui/b_main.h"
-#include "ui/b_context.h"
+#include "ui/bindcontext.h"
 #include <de/AuxButtonWidget>
 #include <de/charsymbols.h>