diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py
index 97bfa3f..9373a77 100644
--- a/plone/app/discussion/comment.py
+++ b/plone/app/discussion/comment.py
@@ -26,7 +26,7 @@ class Comment(Explicit, Traversable, RoleManager, Owned):
     __parent__ = None
     
     comment_id = None # int
-    reply_to = None # int
+    in_reply_to = None # int
 
     title = u""
     
@@ -50,11 +50,6 @@ class Comment(Explicit, Traversable, RoleManager, Owned):
         for k, v in kw.items():
             setattr(self, k, v)
 
-    @property
-    def in_reply_to(self):
-        # TODO
-        return self.reply_to
-    
     @property
     def __name__(self):
         return unicode(self.comment_id)
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index db2c8cc..21e8343 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -75,7 +75,7 @@ class IConversation(IIterableMapping, IWriteMapping):
         """
         
     def addComment(comment):
-        """Adds a new comment to the list of comments, amd returns the 
+        """Adds a new comment to the list of comments, and returns the 
         comment id that was assigned.
         """