corrections for top entity naming

Author: superdiana

README.rst

@@ -39,7 +39,7 @@ Initializing
 ~~~~~~~~~~~~
 
 Import the package at the top of any file where you will use it. At the very least you will need the
-``Client`` class from the opentok module. Then initialize an opentok Client instance with your own API Key and API Secret.
+``Client`` class. Then initialize an Client instance with your own API Key and API Secret.
 
 .. code:: python
 
@@ -300,7 +300,7 @@ The method returns a StreamList object that contains a list of all the streams
   print stream.name #stream name
   print stream.layoutClassList #['full']
 
-You can change the layout classes for streams in a session by calling the `set_stream_class_lists(session_id, stream_list)` method of the `OpenTok` class.
+You can change the layout classes for streams in a session by calling the `set_stream_class_lists(session_id, stream_list)` method of the `Client` class.
 
 The layout classes define how the stream is displayed in the layout of a composed OpenTok archive.
 

opentok/__init__.py

@@ -7,7 +7,7 @@
     ForceDisconnectError,
     ArchiveError,
     SetStreamClassError,
-    BroadcastError,
+    BroadcastError
 )
 from .version import __version__
 from .stream import Stream

opentok/endpoints.py

@@ -1,3 +1,6 @@
+import warnings
+
+
 class Endpoints(object):
     """
     For internal use.
@@ -8,17 +11,34 @@ def __init__(self, api_url, api_key):
         self.api_url = api_url
         self.api_key = api_key
 
-    def session_url(self):
+    def get_session_url(self):
         url = self.api_url + "/session/create"
         return url
 
-    def archive_url(self, archive_id=None):
+    def session_url(self):
+        warnings.warn(
+            "endpoints.session_url is deprecated (use endpoints.get_session_url instead).",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
+        return self.get_session_url()
+
+    def get_archive_url(self, archive_id=None):
         url = self.api_url + "/v2/project/" + self.api_key + "/archive"
         if archive_id:
             url = url + "/" + archive_id
         return url
 
-    def signaling_url(self, session_id, connection_id=None):
+    def archive_url(self, archive_id=None):
+        warnings.warn(
+            "endpoints.archive_url is deprecated (use endpoints.get_archive_url instead).",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.get_archive_url(archive_id)
+
+    def get_signaling_url(self, session_id, connection_id=None):
         url = self.api_url + "/v2/project/" + self.api_key + "/session/" + session_id
 
         if connection_id:
@@ -27,6 +47,14 @@ def signaling_url(self, session_id, connection_id=None):
         url += "/signal"
         return url
 
+    def signaling_url(self, session_id, connection_id=None):
+        warnings.warn(
+            "endpoints.signaling_url is deprecated (use endpoints.get_signaling_url instead).",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.get_signaling_url(session_id, connection_id)
+
     def get_stream_url(self, session_id, stream_id=None):
         """ this method returns the url to get streams information """
         url = (
@@ -41,6 +69,14 @@ def get_stream_url(self, session_id, stream_id=None):
             url = url + "/" + stream_id
         return url
 
+    def broadcast_url(self, broadcast_id=None, stop=False, layout=False):
+        warnings.warn(
+            "endpoints.broadcast_url is deprecated (use endpoints.get_broadcast_url instead).",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.get_broadcast_url(broadcast_id, stop, layout)
+
     def force_disconnect_url(self, session_id, connection_id):
         """ this method returns the force disconnect url endpoint """
         url = (
@@ -83,7 +119,7 @@ def set_stream_class_lists_url(self, session_id):
         )
         return url
 
-    def broadcast_url(self, broadcast_id=None, stop=False, layout=False):
+    def get_broadcast_url(self, broadcast_id=None, stop=False, layout=False):
         """ this method returns urls for working with broadcast """
         url = self.api_url + "/v2/project/" + self.api_key + "/broadcast"