diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 231e681047..9148a11fdb 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -30,7 +30,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
 
         // check for serverId, it won't be present on selectserver
         if (card && card.getAttribute('data-serverid')) {
-            inputManager.trigger('menu', {
+            inputManager.handleCommand('menu', {
                 sourceElement: card
             });
 
diff --git a/src/scripts/inputManager.js b/src/scripts/inputManager.js
index 8af52c77e8..23a0ec25a3 100644
--- a/src/scripts/inputManager.js
+++ b/src/scripts/inputManager.js
@@ -235,9 +235,6 @@ import appHost from 'apphost';
         }
     }
 
-    // Alias for backward compatibility
-    export const trigger = handleCommand;
-
     dom.addEventListener(document, 'click', notify, {
         passive: true
     });
@@ -245,8 +242,7 @@ import appHost from 'apphost';
 /* eslint-enable indent */
 
 export default {
-    trigger: handleCommand,
-    handle: handleCommand,
+    handleCommand: handleCommand,
     notify: notify,
     notifyMouseMove: notifyMouseMove,
     idleTime: idleTime,
diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js
index 6543207fee..a621d69412 100644
--- a/src/scripts/keyboardNavigation.js
+++ b/src/scripts/keyboardNavigation.js
@@ -90,53 +90,53 @@ export function enable() {
 
         switch (key) {
             case 'ArrowLeft':
-                inputManager.handle('left');
+                inputManager.handleCommand('left');
                 break;
             case 'ArrowUp':
-                inputManager.handle('up');
+                inputManager.handleCommand('up');
                 break;
             case 'ArrowRight':
-                inputManager.handle('right');
+                inputManager.handleCommand('right');
                 break;
             case 'ArrowDown':
-                inputManager.handle('down');
+                inputManager.handleCommand('down');
                 break;
 
             case 'Back':
-                inputManager.handle('back');
+                inputManager.handleCommand('back');
                 break;
 
             case 'Escape':
                 if (layoutManager.tv) {
-                    inputManager.handle('back');
+                    inputManager.handleCommand('back');
                 } else {
                     capture = false;
                 }
                 break;
 
             case 'MediaPlay':
-                inputManager.handle('play');
+                inputManager.handleCommand('play');
                 break;
             case 'Pause':
-                inputManager.handle('pause');
+                inputManager.handleCommand('pause');
                 break;
             case 'MediaPlayPause':
-                inputManager.handle('playpause');
+                inputManager.handleCommand('playpause');
                 break;
             case 'MediaRewind':
-                inputManager.handle('rewind');
+                inputManager.handleCommand('rewind');
                 break;
             case 'MediaFastForward':
-                inputManager.handle('fastforward');
+                inputManager.handleCommand('fastforward');
                 break;
             case 'MediaStop':
-                inputManager.handle('stop');
+                inputManager.handleCommand('stop');
                 break;
             case 'MediaTrackPrevious':
-                inputManager.handle('previoustrack');
+                inputManager.handleCommand('previoustrack');
                 break;
             case 'MediaTrackNext':
-                inputManager.handle('nexttrack');
+                inputManager.handleCommand('nexttrack');
                 break;
 
             default:
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 7f3a16e31e..effef64d86 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -116,7 +116,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     }
 
     function showSearch() {
-        inputManager.trigger('search');
+        inputManager.handleCommand('search');
     }
 
     function onHeaderUserButtonClick(e) {
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index cddd2cf794..3de2ac58b5 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -36,28 +36,28 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
         console.debug('Received command: ' + cmd.Name);
         switch (cmd.Name) {
             case 'Select':
-                inputManager.trigger('select');
+                inputManager.handleCommand('select');
                 return;
             case 'Back':
-                inputManager.trigger('back');
+                inputManager.handleCommand('back');
                 return;
             case 'MoveUp':
-                inputManager.trigger('up');
+                inputManager.handleCommand('up');
                 return;
             case 'MoveDown':
-                inputManager.trigger('down');
+                inputManager.handleCommand('down');
                 return;
             case 'MoveLeft':
-                inputManager.trigger('left');
+                inputManager.handleCommand('left');
                 return;
             case 'MoveRight':
-                inputManager.trigger('right');
+                inputManager.handleCommand('right');
                 return;
             case 'PageUp':
-                inputManager.trigger('pageup');
+                inputManager.handleCommand('pageup');
                 return;
             case 'PageDown':
-                inputManager.trigger('pagedown');
+                inputManager.handleCommand('pagedown');
                 return;
             case 'PlayTrailers':
                 playTrailers(apiClient, cmd.Arguments.ItemId);
@@ -69,25 +69,25 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
                 playbackManager.setQueueShuffleMode(cmd.Arguments.ShuffleMode);
                 break;
             case 'VolumeUp':
-                inputManager.trigger('volumeup');
+                inputManager.handleCommand('volumeup');
                 return;
             case 'VolumeDown':
-                inputManager.trigger('volumedown');
+                inputManager.handleCommand('volumedown');
                 return;
             case 'ChannelUp':
-                inputManager.trigger('channelup');
+                inputManager.handleCommand('channelup');
                 return;
             case 'ChannelDown':
-                inputManager.trigger('channeldown');
+                inputManager.handleCommand('channeldown');
                 return;
             case 'Mute':
-                inputManager.trigger('mute');
+                inputManager.handleCommand('mute');
                 return;
             case 'Unmute':
-                inputManager.trigger('unmute');
+                inputManager.handleCommand('unmute');
                 return;
             case 'ToggleMute':
-                inputManager.trigger('togglemute');
+                inputManager.handleCommand('togglemute');
                 return;
             case 'SetVolume':
                 notifyApp();
@@ -102,19 +102,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
                 playbackManager.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index));
                 break;
             case 'ToggleFullscreen':
-                inputManager.trigger('togglefullscreen');
+                inputManager.handleCommand('togglefullscreen');
                 return;
             case 'GoHome':
-                inputManager.trigger('home');
+                inputManager.handleCommand('home');
                 return;
             case 'GoToSettings':
-                inputManager.trigger('settings');
+                inputManager.handleCommand('settings');
                 return;
             case 'DisplayContent':
                 displayContent(cmd, apiClient);
                 break;
             case 'GoToSearch':
-                inputManager.trigger('search');
+                inputManager.handleCommand('search');
                 return;
             case 'DisplayMessage':
                 displayMessage(cmd);
@@ -165,19 +165,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
             }
         } else if (msg.MessageType === 'Playstate') {
             if (msg.Data.Command === 'Stop') {
-                inputManager.trigger('stop');
+                inputManager.handleCommand('stop');
             } else if (msg.Data.Command === 'Pause') {
-                inputManager.trigger('pause');
+                inputManager.handleCommand('pause');
             } else if (msg.Data.Command === 'Unpause') {
-                inputManager.trigger('play');
+                inputManager.handleCommand('play');
             } else if (msg.Data.Command === 'PlayPause') {
-                inputManager.trigger('playpause');
+                inputManager.handleCommand('playpause');
             } else if (msg.Data.Command === 'Seek') {
                 playbackManager.seek(msg.Data.SeekPositionTicks);
             } else if (msg.Data.Command === 'NextTrack') {
-                inputManager.trigger('next');
+                inputManager.handleCommand('next');
             } else if (msg.Data.Command === 'PreviousTrack') {
-                inputManager.trigger('previous');
+                inputManager.handleCommand('previous');
             } else {
                 notifyApp();
             }