diff --git a/CHANGES.txt b/CHANGES.txt
index 67e8253..3082180 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
Changelog
=========
+2.2.0 (unreleased)
+------------------
+
+- Refactor the comment creator/author_name to comply with the Plone core
+ convention to store the username on the creator attribute and not the
+ fullname.
+ [timo]
+
+
2.1.8 (unreleased)
------------------
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index ac38d1a..d986816 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -48,7 +48,7 @@
border="0"
height="32"
tal:attributes="src portrait_url;
- alt reply/Creator" />
+ alt reply/author_name" />
+ alt reply/author_name" />