diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c10fa49789..0eadf0ba31 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -179,8 +179,8 @@
         "message": "Reset session",
         "description": "This is a menu item for resetting the session, using the imperative case, as in a command."
     },
-    "verifySafetyNumbers": {
-        "message": "Verify safety number"
+    "showSafetyNumber": {
+        "message": "Show safety number"
     },
     "theirIdentityUnknown": {
         "message": "You haven't exchanged any messages with this contact yet. Your safety number with them will be available after the first message."
@@ -203,7 +203,7 @@
     },
     "installTagline": {
         "message": "Privacy is possible. Signal makes it easy.",
-        "description": "Tagline displayed under installWelcome on the install page"
+        "description": "Tagline displayed under 'installWelcome' string on the install page"
     },
     "installGetStartedButton": {
         "message": "Get started"
diff --git a/background.html b/background.html
index eb127d8ce5..7b01094f46 100644
--- a/background.html
+++ b/background.html
@@ -85,7 +85,7 @@
                   {{/group}}
                   {{^group}}
                       <li class='end-session'>{{ end-session }}</li>
-                      <li class='verify-identity'>{{ verify-identity }}</li>
+                      <li class='show-identity'>{{ show-identity }}</li>
                   {{/group}}
                   <li class='disappearing-messages'>{{ disappearing-messages }}</li>
                   <li class='destroy'>{{ destroy }}</li>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index ce89d38319..c50c553d50 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -74,7 +74,7 @@
                 expireTimer: this.model.get('expireTimer'),
                 'view-members'    : i18n('members'),
                 'end-session'     : i18n('resetSession'),
-                'verify-identity' : i18n('verifySafetyNumbers'),
+                'show-identity' : i18n('showSafetyNumber'),
                 'destroy'         : i18n('deleteMessages'),
                 'send-message'    : i18n('sendMessage'),
                 'disappearing-messages': i18n('disappearingMessages'),
@@ -144,7 +144,7 @@
             'click .end-session': 'endSession',
             'click .leave-group': 'leaveGroup',
             'click .update-group': 'newGroupUpdate',
-            'click .verify-identity': 'verifyIdentity',
+            'click .show-identity': 'showIdentity',
             'click .view-members': 'viewMembers',
             'click .conversation-menu .hamburger': 'toggleMenu',
             'click .openInbox' : 'openInbox',
@@ -165,7 +165,7 @@
             'close .menu': 'closeMenu',
             'select .message-list .entry': 'messageDetail',
             'force-resize': 'forceUpdateMessageFieldSize',
-            'verify-identity': 'verifyIdentity'
+            'show-identity': 'showIdentity'
         },
         enableDisappearingMessages: function() {
             if (!this.model.get('expireTimer')) {
@@ -493,7 +493,7 @@
             }
         },
 
-        verifyIdentity: function(ev, model) {
+        showIdentity: function(ev, model) {
             if (!model && this.model.isPrivate()) {
                 model = this.model;
             }
diff --git a/js/views/key_verification_view.js b/js/views/key_verification_view.js
index ef39dde207..e10da5f430 100644
--- a/js/views/key_verification_view.js
+++ b/js/views/key_verification_view.js
@@ -7,7 +7,7 @@
 
     // TODO; find all uses of that removed panel
     // Add the Verify functionality to this view
-    Whisper.KeyVerificationView = Whisper.View.extend({
+    Whisper.KeyVerificationPanelView = Whisper.View.extend({
         className: 'key-verification panel',
         templateName: 'key-verification',
         initialize: function(options) {
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 05658b200c..6d63698ec4 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -86,15 +86,15 @@
             this.listenTo(this.conversation, 'change', this.render);
         },
         events: {
-            'click .content': 'verifyIdentity'
+            'click .content': 'showIdentity'
         },
         render_attributes: function() {
             return {
               content: this.model.getNotificationText()
             };
         },
-        verifyIdentity: function() {
-            this.$el.trigger('verify-identity', this.conversation);
+        showIdentity: function() {
+            this.$el.trigger('show-identity', this.conversation);
         }
     });
 
diff --git a/test/index.html b/test/index.html
index fc283b11f9..14f35e60d9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -99,7 +99,7 @@
                   {{/group}}
                   {{^group}}
                       <li class='end-session'>{{ end-session }}</li>
-                      <li class='verify-identity'>{{ verify-identity }}</li>
+                      <li class='show-identity'>{{ show-identity }}</li>
                   {{/group}}
                   <li class='destroy'>{{ destroy }}</li>
               </ul>