diff --git a/zulip/zulip/__init__.py b/zulip/zulip/__init__.py
index d04c596..926cde4 100644
--- a/zulip/zulip/__init__.py
+++ b/zulip/zulip/__init__.py
@@ -989,12 +989,12 @@ class Client(object):
             request=request,
         )
 
-    def get_presence(self, email):
+    def get_user_presence(self, email):
         # type: (Dict[str, Any]) -> Dict[str, Any]
         '''
             Example usage:
 
-            >>> client.get_presence()
+            >>> client.get_user_presence('iago@zulip.com')
             {'presence': {'website': {'timestamp': 1486799122, 'status': 'active'}}, 'result': 'success', 'msg': ''}
         '''
         return self.call_endpoint(
diff --git a/zulip/zulip/examples/get-presence b/zulip/zulip/examples/get-user-presence
similarity index 92%
rename from zulip/zulip/examples/get-presence
rename to zulip/zulip/examples/get-user-presence
index 2e99f67..5b33607 100755
--- a/zulip/zulip/examples/get-presence
+++ b/zulip/zulip/examples/get-user-presence
@@ -24,7 +24,7 @@
 from __future__ import print_function
 import argparse
 
-usage = """get-presence --email=<email address> [options]
+usage = """get-user-presence --email=<email address> [options]
 
 Get presence data for another user.
 """
@@ -37,4 +37,4 @@ options = parser.parse_args()
 
 client = zulip.init_from_options(options)
 
-print(client.get_presence(options.email))
+print(client.get_user_presence(options.email))