diff --git a/artiq/frontend/artiq_client.py b/artiq/frontend/artiq_client.py
index 03eca3887..bdd751e43 100755
--- a/artiq/frontend/artiq_client.py
+++ b/artiq/frontend/artiq_client.py
@@ -327,7 +327,7 @@ def main():
             "scan_devices": "master_device_db",
             "scan_repository": "master_experiment_db",
             "ls": "master_experiment_db",
-            "terminate": "master_terminate",
+            "terminate": "master_management",
         }[action]
         remote = Client(args.server, port, target_name)
         try:
diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py
index 033d58ee7..bb88f39c7 100755
--- a/artiq/frontend/artiq_dashboard.py
+++ b/artiq/frontend/artiq_dashboard.py
@@ -125,11 +125,11 @@ def main():
         atexit.register(client.close_rpc)
         rpc_clients[target] = client
 
-    config = Client(args.server, args.port_control, "master_config")
+    master_management = Client(args.server, args.port_control, "master_management")
     try:
-        server_name = config.get_name()
+        server_name = master_management.get_name()
     finally:
-        config.close_rpc()
+        master_management.close_rpc()
 
     disconnect_reported = False
     def report_disconnect():
diff --git a/artiq/frontend/artiq_master.py b/artiq/frontend/artiq_master.py
index b5f725b47..f61d6cf52 100755
--- a/artiq/frontend/artiq_master.py
+++ b/artiq/frontend/artiq_master.py
@@ -65,14 +65,6 @@ def get_argparser():
     return parser
 
 
-class MasterConfig:
-    def __init__(self, name):
-        self.name = name
-
-    def get_name(self):
-        return self.name
-
-
 def main():
     args = get_argparser().parse_args()
     log_forwarder = init_log(args)
@@ -118,8 +110,6 @@ def main():
     scheduler.start(loop=loop)
     atexit_register_coroutine(scheduler.stop, loop=loop)
 
-    config = MasterConfig(args.name)
-
     worker_handlers.update({
         "get_device_db": device_db.get_device_db,
         "get_device": device_db.get,
@@ -136,15 +126,17 @@ def main():
     experiment_db.scan_repository_async(loop=loop)
 
     signal_handler_task = loop.create_task(signal_handler.wait_terminate())
-    master_terminate = SimpleNamespace(terminate=lambda: signal_handler_task.cancel())
+    master_management = SimpleNamespace(
+        get_name=lambda: args.name,
+        terminate=lambda: signal_handler_task.cancel()
+    )
 
     server_control = RPCServer({
-        "master_config": config,
+        "master_management": master_management,
         "master_device_db": device_db,
         "master_dataset_db": dataset_db,
         "master_schedule": scheduler,
         "master_experiment_db": experiment_db,
-        "master_terminate": master_terminate
     }, allow_parallel=True)
     loop.run_until_complete(server_control.start(
         bind, args.port_control))