diff --git a/zerver/lib/push_notifications.py b/zerver/lib/push_notifications.py
index 02684461cf..051187ee9e 100644
--- a/zerver/lib/push_notifications.py
+++ b/zerver/lib/push_notifications.py
@@ -383,7 +383,7 @@ def remove_push_device_token(user_profile: UserProfile, token_str: bytes, kind:
             'token': token_str,
             'token_kind': kind,
         }
-        # Calls zilencer.views.remote_server_unregister_push.
+        # Calls zilencer.views.unregister_remote_push_device
         send_to_push_bouncer("POST", "unregister", post_data)
         return
 
diff --git a/zilencer/urls.py b/zilencer/urls.py
index 8bbddc83a2..9b7c57dc11 100644
--- a/zilencer/urls.py
+++ b/zilencer/urls.py
@@ -14,7 +14,7 @@ v1_api_and_json_patterns = [
     url('^remotes/push/register$', rest_dispatch,
         {'POST': 'zilencer.views.register_remote_push_device'}),
     url('^remotes/push/unregister$', rest_dispatch,
-        {'POST': 'zilencer.views.remote_server_unregister_push'}),
+        {'POST': 'zilencer.views.unregister_remote_push_device'}),
     url('^remotes/push/notify$', rest_dispatch,
         {'POST': 'zilencer.views.remote_server_notify_push'}),
 ]
diff --git a/zilencer/views.py b/zilencer/views.py
index 83fb7418bd..f060a72090 100644
--- a/zilencer/views.py
+++ b/zilencer/views.py
@@ -60,7 +60,7 @@ def register_remote_push_device(request: HttpRequest, entity: Union[UserProfile,
     return json_success()
 
 @has_request_variables
-def remote_server_unregister_push(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
+def unregister_remote_push_device(request: HttpRequest, entity: Union[UserProfile, RemoteZulipServer],
                                   token: bytes=REQ(),
                                   token_kind: int=REQ(validator=check_int),
                                   ios_app_id: Optional[Text]=None) -> HttpResponse: