diff --git a/artiq/management/pc_rpc.py b/artiq/management/pc_rpc.py
index 43681622a..a00c7cbcb 100644
--- a/artiq/management/pc_rpc.py
+++ b/artiq/management/pc_rpc.py
@@ -12,7 +12,7 @@ class Client:
     def __init__(self, host, port):
         self.socket = socket.create_connection((host, port))
 
-    def close(self):
+    def close_rpc(self):
         self.socket.close()
 
     def do_rpc(self, name, args, kwargs):
diff --git a/frontend/artiq b/frontend/artiq
index 2ad149a19..b6a3989af 100755
--- a/frontend/artiq
+++ b/frontend/artiq
@@ -37,7 +37,7 @@ def main():
         if args.quit_master:
             remote.quit()
     finally:
-        remote.close()
+        remote.close_rpc()
 
 if __name__ == "__main__":
     main()