diff --git a/bskyweb/templates/post.html b/bskyweb/templates/post.html
index 85e2a526ec..5c7c844e61 100644
--- a/bskyweb/templates/post.html
+++ b/bskyweb/templates/post.html
@@ -63,7 +63,8 @@
       "author": {
         "@type": "Person",
         {%- if postView.Author.DisplayName %}
-        "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
+        "name": "{{ postView.Author.DisplayName }}",
+        "alternateName": "@{{ postView.Author.Handle }}",
         {% else %}
         "name": "@{{ postView.Author.Handle }}",
         {% endif -%}
diff --git a/bskyweb/templates/profile.html b/bskyweb/templates/profile.html
index 6f015e5fce..b4be429289 100644
--- a/bskyweb/templates/profile.html
+++ b/bskyweb/templates/profile.html
@@ -59,12 +59,12 @@
     "dateCreated": "{{ profileView.CreatedAt }}",
     "mainEntity": {
       "@type": "Person",
-      {%- if postView.Author.DisplayName %}
-      "name": "{{ postView.Author.DisplayName }} (@{{ postView.Author.Handle }})",
-      {% else %}
-      "name": "@{{ postView.Author.Handle }}",
-      {% endif -%}
+      {%- if profileView.DisplayName %}
+      "name": "{{ profileView.DisplayName }}",
       "alternateName": "@{{ profileView.Handle }}",
+      {% else %}
+      "name": "@{{ profileView.Handle }}",
+      {% endif -%}
       "identifier": "{{ profileView.Did }}",
       "description": "{{ profileView.Description }}",
       "image": "{{ profileView.Avatar }}",