diff --git a/README.md b/README.md
index 151fe7f5..f1bb48e2 100644
--- a/README.md
+++ b/README.md
@@ -247,7 +247,7 @@ disable = false # Disable all comments
 disable_kinds = [] # Page kinds to disable comments for. Examples: ["list"], ["page", "term"].
 
 [paige.comments.cactus] # See https://cactus.chat
-account_id = ""
+site_name = ""
 
 [paige.comments.commento] # See https://commento.io
 script_url = ""
@@ -260,7 +260,7 @@ host_url = ""
 account_id = ""
 
 [paige.comments.hyvor] # See https://hyvor.com
-account_id = ""
+website = ""
 
 [paige.comments.intensedebate] # See https://intensedebate.com
 account_id = ""
@@ -273,10 +273,10 @@ host_url = ""
 site_id = ""
 
 [paige.comments.replybox] # See https://getreplybox.com
-account_id = ""
+site = ""
 
 [paige.comments.utterances] # See https://utteranc.es
-github_repo = ""
+repo = ""
 
 [paige.feed]
 disable = false # Exclude the page from feeds
diff --git a/layouts/partials/paige/comments/cactus.html b/layouts/partials/paige/comments/cactus.html
index dec3266c..434686b4 100644
--- a/layouts/partials/paige/comments/cactus.html
+++ b/layouts/partials/paige/comments/cactus.html
@@ -10,7 +10,7 @@
             node: document.getElementById("comment-section"),
             defaultHomeserverUrl: "https://matrix.cactus.chat:8448",
             serverName: "cactus.chat",
-            siteName: "{{ .account_id | safeJS }}",
+            siteName: "{{ .site_name | safeJS }}",
             commentSectionId: "{{ $page.RelPermalink | safeJS }}"
         })
         </script>
diff --git a/layouts/partials/paige/comments/hyvor.html b/layouts/partials/paige/comments/hyvor.html
index 86cc793a..fdb194b8 100644
--- a/layouts/partials/paige/comments/hyvor.html
+++ b/layouts/partials/paige/comments/hyvor.html
@@ -4,7 +4,7 @@
     <div class="mb-3" id="paige-comments">
         <div id="hyvor-talk-view"></div>
         <script type="text/javascript">
-        var HYVOR_TALK_WEBSITE = "{{ .account_id | safeJS }}";
+        var HYVOR_TALK_WEBSITE = "{{ .website | safeJS }}";
         var HYVOR_TALK_CONFIG = {
             url: false,
             id: "{{ $page.RelPermalink | safeJS }}"
diff --git a/layouts/partials/paige/comments/replybox.html b/layouts/partials/paige/comments/replybox.html
index 819ab6f4..b02904e5 100644
--- a/layouts/partials/paige/comments/replybox.html
+++ b/layouts/partials/paige/comments/replybox.html
@@ -5,7 +5,7 @@
         <div id="replybox"></div>
         <script>
         window.replybox = {
-            site: "{{ .account_id | safeJS }}",
+            site: "{{ .site | safeJS }}",
             identifier: "{{ $page.RelPermalink | safeJS }}"
         };
         </script>
diff --git a/layouts/partials/paige/comments/utterances.html b/layouts/partials/paige/comments/utterances.html
index 46a5369d..5da19458 100644
--- a/layouts/partials/paige/comments/utterances.html
+++ b/layouts/partials/paige/comments/utterances.html
@@ -2,7 +2,7 @@
 
 {{ with $page.Param "paige.comments.utterances" }}
     <div class="mb-3" id="paige-comments">
-        <script async crossorigin="anonymous" issue-term="pathname" repo="{{ .github_repo }}" src="https://utteranc.es/client.js" theme="preferred-color-scheme"></script>
+        <script async crossorigin="anonymous" issue-term="pathname" repo="{{ .repo }}" src="https://utteranc.es/client.js" theme="preferred-color-scheme"></script>
         <noscript>{{ i18n "paige_noscript" }}</noscript>
     </div>
 {{ end }}