diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index d45813cb17..b901f98f19 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -298,7 +298,7 @@ module.exports = React.createClass({
     onEmoteSenderClick: function(event) {
         const mxEvent = this.props.mxEvent;
         dis.dispatch({
-            action: 'insert_displayname',
+            action: 'insert_mention',
             user_id: mxEvent.getSender(),
         });
     },
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 32f0739795..b3831a7d0d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -359,7 +359,7 @@ module.exports = withMatrixClient(React.createClass({
     onSenderProfileClick: function(event) {
         const mxEvent = this.props.mxEvent;
         dis.dispatch({
-            action: 'insert_displayname',
+            action: 'insert_mention',
             user_id: mxEvent.getSender(),
         });
     },
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index cf934c09fd..ddb205d08e 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -285,7 +285,7 @@ export default class MessageComposerInput extends React.Component {
             case 'focus_composer':
                 editor.focus();
                 break;
-            case 'insert_displayname': {
+            case 'insert_mention': {
                 // Pretend that we've autocompleted this user because keeping two code
                 // paths for inserting a user pill is not fun
                 const selection = this.state.editorState.getSelection();