diff --git a/tekuti.el b/tekuti.el
index 72f8c32..2034839 100644
--- a/tekuti.el
+++ b/tekuti.el
@@ -32,7 +32,7 @@
 ;; #+TITLE: SOME TITLE
 ;; #+DATE: <2021-06-03 Thu 22:45>
 ;; #+TAGS: comma,separated
-;; #+COMMENTS: open
+;; #+COMMENT_STATUS: open
 ;; #+COMMENTS_DATE:
 ;; #+STATUS: publish
 
@@ -58,7 +58,7 @@
                     ("DATE" ,(tekuti--format-date))
                     ("TAGS")
                     ("STATUS")
-                    ("COMMENTS")
+                    ("COMMENT_STATUS")
                     ("COMMENTS-CLOSED-DATE")
                     ("BODY")))
         (data (append
@@ -72,7 +72,7 @@
                            (and (not (string-empty-p date))
                                 (tekuti--format-date date))))
                     (_ pair)))
-                (org-collect-keywords '("TITLE" "TAGS" "STATUS" "COMMENTS" "DATE" "COMMENTS_DATE")))
+                (org-collect-keywords '("TITLE" "TAGS" "STATUS" "COMMENT_STATUS" "DATE" "COMMENTS_DATE")))
                (list
                 (list "BODY"
                       (with-current-buffer (org-html-export-as-html nil nil nil t)
@@ -101,7 +101,7 @@
          (goto-char (point-min))
          (search-forward "\n\n")
          (backward-char)
-         (let ((data (org-collect-keywords '("TITLE" "TAGS" "STATUS" "COMMENTS" "DATE" "COMMENTS_DATE"))))
+         (let ((data (org-collect-keywords '("TITLE" "TAGS" "STATUS" "COMMENT_STATUS" "DATE" "COMMENTS_DATE"))))
            (mapc (lambda (item)
                    (let ((key (car item))
                          (value (cadr item)))