diff --git a/zuul/cmd/executor.py b/zuul/cmd/executor.py
index 13d24b4..96ba4b3 100644
--- a/zuul/cmd/executor.py
+++ b/zuul/cmd/executor.py
@@ -79,9 +79,9 @@
 
         self.log = logging.getLogger("zuul.Executor")
 
-        LaunchServer = zuul.executor.server.LaunchServer
-        self.executor = LaunchServer(self.config, self.connections,
-                                     keep_jobdir=self.args.keep_jobdir)
+        ExecutorServer = zuul.executor.server.ExecutorServer
+        self.executor = ExecutorServer(self.config, self.connections,
+                                       keep_jobdir=self.args.keep_jobdir)
         self.executor.start()
 
         signal.signal(signal.SIGUSR2, zuul.cmd.stack_dump_handler)
diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py
index 889ad2b..ff4e1f4 100755
--- a/zuul/cmd/scheduler.py
+++ b/zuul/cmd/scheduler.py
@@ -141,7 +141,7 @@
 
         self.sched = zuul.scheduler.Scheduler(self.config)
 
-        gearman = zuul.executor.client.LaunchClient(self.config, self.sched)
+        gearman = zuul.executor.client.ExecutorClient(self.config, self.sched)
         merger = zuul.merger.client.MergeClient(self.config, self.sched)
         nodepool = zuul.nodepool.Nodepool(self.sched)