diff --git a/background.html b/background.html
index 60ce85d54..4a3fa4f39 100644
--- a/background.html
+++ b/background.html
@@ -153,7 +153,7 @@
       {{ #title }}
         <h4>{{ title }}</h4>
       {{ /title }}
-      <input type='text' name='name' class='name' placeholder='Type a nickname' autofocus maxlength="25">
+      <input type='text' name='name' class='name' placeholder='Type a name' autofocus maxlength="25">
       {{ #message }}
         <div class='message'>{{ message }}</div>
       {{ /message }}
diff --git a/js/background.js b/js/background.js
index 8cd1f68d4..e1cb7f6cc 100644
--- a/js/background.js
+++ b/js/background.js
@@ -574,12 +574,12 @@
       const displayName = profile && profile.name && profile.name.displayName;
       if (appView) {
         appView.showNicknameDialog({
-          title: 'Change your own nickname',
-          message: 'Note: Your nickname will be visible to your contacts.',
+          title: 'Change your own display name',
+          message: 'Note: Your display name will be visible to your contacts.',
           nickname: displayName,
-          onOk: async (newNickname) => {
+          onOk: async (newName) => {
             // Update our profiles accordingly'
-            const trimmed = newNickname && newNickname.trim();
+            const trimmed = newName && newName.trim();
             let newProfile = null;
             if (_.isEmpty(trimmed)) {
               await storage.removeLocalProfile();
diff --git a/test/index.html b/test/index.html
index 05d46c1c6..9e2db1e7d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -130,7 +130,7 @@
   <script type='text/x-tmpl-mustache' id='nickname-dialog'>
     <div class="content">
       <div class='message'>{{ message }}</div>
-      <input type='text' name='name' class='name' placeholder='Type a nickname' value='{{ name }}'>
+      <input type='text' name='name' class='name' placeholder='Type a name' value='{{ name }}'>
       <div class='buttons'>
         <button class='clear' tabindex='3'>{{ clear }}</button>
         <button class='cancel' tabindex='2'>{{ cancel }}</button>
diff --git a/ts/components/IdentityKeyHeader.tsx b/ts/components/IdentityKeyHeader.tsx
index b03b60876..a345cef0e 100644
--- a/ts/components/IdentityKeyHeader.tsx
+++ b/ts/components/IdentityKeyHeader.tsx
@@ -22,7 +22,7 @@ export class IdentityKeyHeader extends React.Component<Props> {
           </div>
           {!!name &&
             <div>
-              Your nickname: <span className='identity-key_bold'>{name}</span>
+              Your display name: <span className='identity-key_bold'>{name}</span>
             </div>
           }
         </div>