diff --git a/lib/nntp/tiny/client.py b/lib/nntp/tiny/client.py
index 58f9bab..56410ba 100644
--- a/lib/nntp/tiny/client.py
+++ b/lib/nntp/tiny/client.py
@@ -15,8 +15,8 @@ from nntp.tiny.remote import (
     RemoteException,
     RemoteNewsgroup,
     RemoteNewsgroupDescription,
-    RemoteNewsgroupOverview,
-    RemoteMessage
+    RemoteNewsgroupSummary,
+    RemoteMessageOverview
 )
 
 class ClientException(Exception):
@@ -111,10 +111,10 @@ class Client(Connection):
             if len(parts) != 4:
                 raise RemoteException('Unexpected result from NEWGROUPS')
             
-            yield RemoteNewsgroupOverview(parts[0],
-                                          int(parts[1]),
-                                          int(parts[2]),
-                                          parts[3] == 'y')
+            yield RemoteNewsgroupSummary(parts[0],
+                                         int(parts[1]),
+                                         int(parts[2]),
+                                         parts[3] == 'y')
 
     def each_newsgroup_message(self, newsgroup: RemoteNewsgroup, msgrange: Optional[MessageRange]):
         self.request('GROUP', newsgroup.name)
@@ -123,7 +123,7 @@ class Client(Connection):
         for line in self.each_response_line():
             parts = line.split('\t')
 
-            message = RemoteMessage()
+            message = RemoteMessageOverview()
             message.id         = int(parts[0])
             message.subject    = parts[1]
             message.sender     = parts[2]
diff --git a/lib/nntp/tiny/remote.py b/lib/nntp/tiny/remote.py
index cb2d0a2..7cba0f5 100644
--- a/lib/nntp/tiny/remote.py
+++ b/lib/nntp/tiny/remote.py
@@ -23,7 +23,7 @@ class RemoteNewsgroupDescription(RemoteNewsgroup):
             self.name, self.description
         )
 
-class RemoteNewsgroupOverview(RemoteNewsgroup):
+class RemoteNewsgroupSummary(RemoteNewsgroup):
     __slots__ = 'name', 'low', 'high', 'post',
     
     def __init__(self, name: str, low: int, high: int, post: bool):
@@ -41,7 +41,7 @@ class RemoteNewsgroupOverview(RemoteNewsgroup):
             'y' if self.post else 'n'
         )
 
-class RemoteMessage():
+class RemoteMessageOverview():
     __slots__ = (
         'id', 'subject', 'sender', 'created_on', 'message_id',
         'references', 'size', 'lines', 'headers'