diff --git a/defaults/main.yaml b/defaults/main.yaml
index 1b261bf..63eee1c 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -36,11 +36,11 @@ zuul_file_gearman_logging_conf_mode: 0644
 zuul_file_gearman_logging_conf_owner: "{{ zuul_user_name }}"
 zuul_file_gearman_logging_conf_src: etc/zuul/gearman-logging.conf
 
-zuul_file_launcher_logging_conf_dest: /etc/zuul/launcher-logging.conf
-zuul_file_launcher_logging_conf_group: "{{ zuul_user_group }}"
-zuul_file_launcher_logging_conf_mode: 0644
-zuul_file_launcher_logging_conf_owner: "{{ zuul_user_name }}"
-zuul_file_launcher_logging_conf_src: etc/zuul/launcher-logging.conf
+zuul_file_executor_logging_conf_dest: /etc/zuul/executor-logging.conf
+zuul_file_executor_logging_conf_group: "{{ zuul_user_group }}"
+zuul_file_executor_logging_conf_mode: 0644
+zuul_file_executor_logging_conf_owner: "{{ zuul_user_name }}"
+zuul_file_executor_logging_conf_src: etc/zuul/executor-logging.conf
 
 zuul_file_merger_logging_conf_dest: /etc/zuul/merger-logging.conf
 zuul_file_merger_logging_conf_group: "{{ zuul_user_group }}"
@@ -73,11 +73,11 @@ zuul_pip_name: zuul
 #zuul_pip_virtualenv:
 
 # tasks/service.yaml
-zuul_file_zuul_launcher_service_group: root
-zuul_file_zuul_launcher_service_owner: root
+zuul_file_zuul_executor_service_group: root
+zuul_file_zuul_executor_service_owner: root
 
-zuul_file_zuul_launcher_service_config_group: root
-zuul_file_zuul_launcher_service_config_owner: root
+zuul_file_zuul_executor_service_config_group: root
+zuul_file_zuul_executor_service_config_owner: root
 
 zuul_file_zuul_merger_service_group: root
 zuul_file_zuul_merger_service_owner: root
@@ -91,10 +91,10 @@ zuul_file_zuul_scheduler_service_owner: root
 zuul_file_zuul_scheduler_service_config_group: root
 zuul_file_zuul_scheduler_service_config_owner: root
 
-zuul_service_zuul_launcher_enabled: yes
-zuul_service_zuul_launcher_manage: true
-zuul_service_zuul_launcher_name: zuul-launcher
-zuul_service_zuul_launcher_state: started
+zuul_service_zuul_executor_enabled: yes
+zuul_service_zuul_executor_manage: true
+zuul_service_zuul_executor_name: zuul-executor
+zuul_service_zuul_executor_state: started
 
 zuul_service_zuul_merger_enabled: yes
 zuul_service_zuul_merger_manage: true
diff --git a/files/etc/default/zuul-launcher b/files/etc/default/zuul-executor
similarity index 63%
rename from files/etc/default/zuul-launcher
rename to files/etc/default/zuul-executor
index 722a4a9..864cdb7 100644
--- a/files/etc/default/zuul-launcher
+++ b/files/etc/default/zuul-executor
@@ -2,9 +2,9 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
-# The prefix used when zuul-launcher was installed. Be sure to update this value
+# The prefix used when zuul-executor was installed. Be sure to update this value
 # if you are using a virtualenv.
 PREFIX=/usr/local
 
-# The user used to start zuul-launcher service.
+# The user used to start zuul-executor service.
 RUNASUSER=zuul
diff --git a/files/etc/init.d/zuul-launcher b/files/etc/init.d/zuul-executor
similarity index 95%
rename from files/etc/init.d/zuul-launcher
rename to files/etc/init.d/zuul-executor
index 509c881..815df2b 100644
--- a/files/etc/init.d/zuul-launcher
+++ b/files/etc/init.d/zuul-executor
@@ -1,27 +1,27 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zuul-launcher
+# Provides:          zuul-executor
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Zuul
-# Description:       Trunk gating system launcher
+# Description:       Trunk gating system executor
 ### END INIT INFO
 
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Zuul Launcher"
-NAME=zuul-launcher
+DESC="Zuul executor"
+NAME=zuul-executor
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-DAEMON=$PREFIX/bin/zuul-launcher
+DAEMON=$PREFIX/bin/zuul-executor
 USER=${RUNASUSER:-zuul}
 
 # Exit if the package is not installed
@@ -102,7 +102,7 @@ case "$1" in
         case "$?" in
             0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
             2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-            3) echo "Pidfile at $PIDFILE already exists, run service zuul-launcher stop to clean up."
+            3) echo "Pidfile at $PIDFILE already exists, run service zuul-executor stop to clean up."
         esac
         ;;
     stop)
diff --git a/files/etc/sysconfig/zuul-launcher b/files/etc/sysconfig/zuul-executor
similarity index 72%
rename from files/etc/sysconfig/zuul-launcher
rename to files/etc/sysconfig/zuul-executor
index 9e84766..9201e4b 100644
--- a/files/etc/sysconfig/zuul-launcher
+++ b/files/etc/sysconfig/zuul-executor
@@ -2,6 +2,6 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
-# The prefix used when zuul-launcher was installed. Be sure to update this value
+# The prefix used when zuul-executor was installed. Be sure to update this value
 # if you are using a virtualenv.
 PREFIX=/usr
diff --git a/files/etc/systemd/system/zuul-executor.service.centos-7 b/files/etc/systemd/system/zuul-executor.service.centos-7
new file mode 100644
index 0000000..f66e2bc
--- /dev/null
+++ b/files/etc/systemd/system/zuul-executor.service.centos-7
@@ -0,0 +1,13 @@
+[Unit]
+Description=Zuul Executor Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=zuul
+Group=zuul
+EnvironmentFile=-/etc/sysconfig/zuul-executor
+ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-executor.service.ubuntu-xenial b/files/etc/systemd/system/zuul-executor.service.ubuntu-xenial
new file mode 100644
index 0000000..26751a4
--- /dev/null
+++ b/files/etc/systemd/system/zuul-executor.service.ubuntu-xenial
@@ -0,0 +1,13 @@
+[Unit]
+Description=Zuul Executor Service
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=zuul
+Group=zuul
+EnvironmentFile=-/etc/default/zuul-executor
+ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-launcher.service.centos-7 b/files/etc/systemd/system/zuul-launcher.service.centos-7
deleted file mode 100644
index 0b2b6fc..0000000
--- a/files/etc/systemd/system/zuul-launcher.service.centos-7
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Zuul Launcher Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=zuul
-Group=zuul
-EnvironmentFile=-/etc/sysconfig/zuul-launcher
-ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-launcher -d"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-launcher.service.ubuntu-xenial b/files/etc/systemd/system/zuul-launcher.service.ubuntu-xenial
deleted file mode 100644
index 7d1457a..0000000
--- a/files/etc/systemd/system/zuul-launcher.service.ubuntu-xenial
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Zuul Launcher Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=zuul
-Group=zuul
-EnvironmentFile=-/etc/default/zuul-launcher
-ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-launcher -d"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/handlers/main.yaml b/handlers/main.yaml
index dc42b19..09fcc5a 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -12,14 +12,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Reload zuul-launcher
+- name: Reload zuul-executor
   become: yes
   service:
-    name: zuul-launcher
+    name: zuul-executor
     state: reloaded
-  when: zuul_service_zuul_launcher_manage and
-        zuul_service_zuul_launcher_state == "started" and not
-        zuul_service_zuul_launcher.changed
+  when: zuul_service_zuul_executor_manage and
+        zuul_service_zuul_executor_state == "started" and not
+        zuul_service_zuul_executor.changed
 
 - name: Reload zuul-merger
   become: yes
diff --git a/tasks/config.yaml b/tasks/config.yaml
index a9b5f73..5fc3874 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -34,16 +34,16 @@
   register: zuul_file_gearman_logging_conf
   notify: Reload zuul-scheduler
 
-- name: Install launcher logging file.
+- name: Install executor logging file.
   become: yes
   template:
-    dest: "{{ zuul_file_launcher_logging_conf_dest }}"
-    group: "{{ zuul_file_launcher_logging_conf_group }}"
-    mode: "{{ zuul_file_launcher_logging_conf_mode }}"
-    owner: "{{ zuul_file_launcher_logging_conf_owner }}"
-    src: "{{ zuul_file_launcher_logging_conf_src }}"
-  register: zuul_file_launcher_logging_conf
-  notify: Reload zuul-launcher
+    dest: "{{ zuul_file_executor_logging_conf_dest }}"
+    group: "{{ zuul_file_executor_logging_conf_group }}"
+    mode: "{{ zuul_file_executor_logging_conf_mode }}"
+    owner: "{{ zuul_file_executor_logging_conf_owner }}"
+    src: "{{ zuul_file_executor_logging_conf_src }}"
+  register: zuul_file_executor_logging_conf
+  notify: Reload zuul-executor
 
 - name: Install merger logging file.
   become: yes
@@ -88,6 +88,6 @@
     src: "{{ zuul_file_zuul_conf_src }}"
   register: zuul_file_zuul_conf
   notify:
-    - Reload zuul-launcher
+    - Reload zuul-executor
     - Reload zuul-merger
     - Reload zuul-scheduler
diff --git a/tasks/service.yaml b/tasks/service.yaml
index a343ab4..a4fb74f 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -12,35 +12,35 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Define zuul_file_zuul_launcher_service_dest.
+- name: Define zuul_file_zuul_executor_service_dest.
   set_fact:
-    zuul_file_zuul_launcher_service_dest: "{{ __zuul_file_zuul_launcher_service_dest }}"
-  when: zuul_file_zuul_launcher_service_dest is not defined
+    zuul_file_zuul_executor_service_dest: "{{ __zuul_file_zuul_executor_service_dest }}"
+  when: zuul_file_zuul_executor_service_dest is not defined
 
-- name: Define zuul_file_zuul_launcher_service_mode.
+- name: Define zuul_file_zuul_executor_service_mode.
   set_fact:
-    zuul_file_zuul_launcher_service_mode: "{{ __zuul_file_zuul_launcher_service_mode }}"
-  when: zuul_file_zuul_launcher_service_mode is not defined
+    zuul_file_zuul_executor_service_mode: "{{ __zuul_file_zuul_executor_service_mode }}"
+  when: zuul_file_zuul_executor_service_mode is not defined
 
-- name: Define zuul_file_zuul_launcher_service_src.
+- name: Define zuul_file_zuul_executor_service_src.
   set_fact:
-    zuul_file_zuul_launcher_service_src: "{{ __zuul_file_zuul_launcher_service_src }}"
-  when: zuul_file_zuul_launcher_service_src is not defined
+    zuul_file_zuul_executor_service_src: "{{ __zuul_file_zuul_executor_service_src }}"
+  when: zuul_file_zuul_executor_service_src is not defined
 
-- name: Define zuul_file_zuul_launcher_service_config_dest.
+- name: Define zuul_file_zuul_executor_service_config_dest.
   set_fact:
-    zuul_file_zuul_launcher_service_config_dest: "{{ __zuul_file_zuul_launcher_service_config_dest }}"
-  when: zuul_file_zuul_launcher_service_config_dest is not defined
+    zuul_file_zuul_executor_service_config_dest: "{{ __zuul_file_zuul_executor_service_config_dest }}"
+  when: zuul_file_zuul_executor_service_config_dest is not defined
 
-- name: Define zuul_file_zuul_launcher_service_config_mode.
+- name: Define zuul_file_zuul_executor_service_config_mode.
   set_fact:
-    zuul_file_zuul_launcher_service_config_mode: "{{ __zuul_file_zuul_launcher_service_config_mode }}"
-  when: zuul_file_zuul_launcher_service_config_mode is not defined
+    zuul_file_zuul_executor_service_config_mode: "{{ __zuul_file_zuul_executor_service_config_mode }}"
+  when: zuul_file_zuul_executor_service_config_mode is not defined
 
-- name: Define zuul_file_zuul_launcher_service_config_src.
+- name: Define zuul_file_zuul_executor_service_config_src.
   set_fact:
-    zuul_file_zuul_launcher_service_config_src: "{{ __zuul_file_zuul_launcher_service_config_src }}"
-  when: zuul_file_zuul_launcher_service_config_src is not defined
+    zuul_file_zuul_executor_service_config_src: "{{ __zuul_file_zuul_executor_service_config_src }}"
+  when: zuul_file_zuul_executor_service_config_src is not defined
 
 - name: Define zuul_file_zuul_merger_service_dest.
   set_fact:
@@ -102,25 +102,25 @@
     zuul_file_zuul_scheduler_service_config_src: "{{ __zuul_file_zuul_scheduler_service_config_src }}"
   when: zuul_file_zuul_scheduler_service_config_src is not defined
 
-- name: Copy zuul-launcher service into place.
+- name: Copy zuul-executor service into place.
   become: yes
   copy:
-    dest: "{{ zuul_file_zuul_launcher_service_dest }}"
-    group: "{{ zuul_file_zuul_launcher_service_group }}"
-    mode: "{{ zuul_file_zuul_launcher_service_mode }}"
-    owner: "{{ zuul_file_zuul_launcher_service_owner }}"
-    src: "{{ zuul_file_zuul_launcher_service_src }}"
-  register: zuul_file_zuul_launcher_service
+    dest: "{{ zuul_file_zuul_executor_service_dest }}"
+    group: "{{ zuul_file_zuul_executor_service_group }}"
+    mode: "{{ zuul_file_zuul_executor_service_mode }}"
+    owner: "{{ zuul_file_zuul_executor_service_owner }}"
+    src: "{{ zuul_file_zuul_executor_service_src }}"
+  register: zuul_file_zuul_executor_service
 
-- name: Copy zuul-launcher service config into place.
+- name: Copy zuul-executor service config into place.
   become: yes
   copy:
-    dest: "{{ zuul_file_zuul_launcher_service_config_dest }}"
-    group: "{{ zuul_file_zuul_launcher_service_config_group }}"
-    mode: "{{ zuul_file_zuul_launcher_service_config_mode }}"
-    owner: "{{ zuul_file_zuul_launcher_service_config_owner }}"
-    src: "{{ zuul_file_zuul_launcher_service_config_src }}"
-  register: zuul_file_zuul_launcher_service_config
+    dest: "{{ zuul_file_zuul_executor_service_config_dest }}"
+    group: "{{ zuul_file_zuul_executor_service_config_group }}"
+    mode: "{{ zuul_file_zuul_executor_service_config_mode }}"
+    owner: "{{ zuul_file_zuul_executor_service_config_owner }}"
+    src: "{{ zuul_file_zuul_executor_service_config_src }}"
+  register: zuul_file_zuul_executor_service_config
 
 - name: Copy zuul-merger service into place.
   become: yes
@@ -162,14 +162,14 @@
     src: "{{ zuul_file_zuul_scheduler_service_config_src }}"
   register: zuul_file_zuul_scheduler_service_config
 
-- name: Enable zuul-launcher service.
+- name: Enable zuul-executor service.
   become: yes
   service:
-    enabled: "{{ zuul_service_zuul_launcher_enabled }}"
-    name: "{{ zuul_service_zuul_launcher_name }}"
-    state: "{{ zuul_service_zuul_launcher_state }}"
-  register: zuul_service_zuul_launcher
-  when: zuul_service_zuul_launcher_manage
+    enabled: "{{ zuul_service_zuul_executor_enabled }}"
+    name: "{{ zuul_service_zuul_executor_name }}"
+    state: "{{ zuul_service_zuul_executor_state }}"
+  register: zuul_service_zuul_executor
+  when: zuul_service_zuul_executor_manage
 
 - name: Enable zuul-merger service.
   become: yes
diff --git a/templates/etc/zuul/launcher-logging.conf b/templates/etc/zuul/executor-logging.conf
similarity index 89%
rename from templates/etc/zuul/launcher-logging.conf
rename to templates/etc/zuul/executor-logging.conf
index d44871c..5a67076 100644
--- a/templates/etc/zuul/launcher-logging.conf
+++ b/templates/etc/zuul/executor-logging.conf
@@ -36,13 +36,13 @@ args=(sys.stdout,)
 level=DEBUG
 class=logging.handlers.WatchedFileHandler
 formatter=simple
-args=('/var/log/zuul/launcher-debug.log',)
+args=('/var/log/zuul/executor-debug.log',)
 
 [handler_normal]
 level=INFO
 class=logging.handlers.WatchedFileHandler
 formatter=simple
-args=('/var/log/zuul/launcher.log',)
+args=('/var/log/zuul/executor.log',)
 
 [formatter_simple]
 format=%(asctime)s %(levelname)s %(name)s: %(message)s
diff --git a/templates/etc/zuul/zuul.conf b/templates/etc/zuul/zuul.conf
index 0c322a9..3763cb6 100644
--- a/templates/etc/zuul/zuul.conf
+++ b/templates/etc/zuul/zuul.conf
@@ -22,9 +22,9 @@ log_config = /etc/zuul/scheduler-logging.conf
 pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid
 state_dir = /var/lib/zuul
 
-[launcher]
+[executor]
 jenkins_jobs=/var/lib/zuul
-log_config = /etc/zuul/launcher-logging.conf
+log_config = /etc/zuul/executor-logging.conf
 workspace_root=/var/lib/zuul/workspace
 
 [merger]
diff --git a/tests/test.yaml b/tests/test.yaml
index 987eaec..4b91470 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -31,18 +31,18 @@
       assert:
         that:
           - zuul_file_gearman_logging_conf
-          - zuul_file_launcher_logging_conf
+          - zuul_file_executor_logging_conf
           - zuul_file_merger_logging_conf
           - zuul_file_scheduler_logging_conf
           - zuul_file_layout
           - zuul_file_zuul_conf
-          - zuul_file_zuul_launcher_service
-          - zuul_file_zuul_launcher_service_config
+          - zuul_file_zuul_executor_service
+          - zuul_file_zuul_executor_service_config
           - zuul_file_zuul_merger_service
           - zuul_file_zuul_merger_service_config
           - zuul_file_zuul_scheduler_service
           - zuul_file_zuul_scheduler_service_config
-          - zuul_service_zuul_launcher
+          - zuul_service_zuul_executor
           - zuul_service_zuul_merger
           - zuul_service_zuul_scheduler
 
@@ -126,40 +126,40 @@
           - zuul_conf_stat.stat.pw_name == 'zuul'
           - zuul_conf_stat.stat.gr_name == 'zuul'
 
-    - name: Register /etc/init.d/zuul-launcher
+    - name: Register /etc/init.d/zuul-executor
       stat:
-        path: /etc/init.d/zuul-launcher
-      register: _zuul_launcher_service_initd_stat
+        path: /etc/init.d/zuul-executor
+      register: _zuul_executor_service_initd_stat
       when:
         - ansible_distribution == 'Ubuntu'
         - ansible_distribution_release == 'trusty'
 
-    - name: Assert _zuul_launcher_service_initd_stat tests.
+    - name: Assert _zuul_executor_service_initd_stat tests.
       assert:
         that:
-          - _zuul_launcher_service_initd_stat.stat.exists
-          - _zuul_launcher_service_initd_stat.stat.isreg
-          - _zuul_launcher_service_initd_stat.stat.pw_name == 'root'
-          - _zuul_launcher_service_initd_stat.stat.gr_name == 'root'
-          - _zuul_launcher_service_initd_stat.stat.mode == '0755'
+          - _zuul_executor_service_initd_stat.stat.exists
+          - _zuul_executor_service_initd_stat.stat.isreg
+          - _zuul_executor_service_initd_stat.stat.pw_name == 'root'
+          - _zuul_executor_service_initd_stat.stat.gr_name == 'root'
+          - _zuul_executor_service_initd_stat.stat.mode == '0755'
       when:
         - ansible_distribution == 'Ubuntu'
         - ansible_distribution_release == 'trusty'
 
-    - name: Register /etc/default/zuul-launcher
+    - name: Register /etc/default/zuul-executor
       stat:
-        path: /etc/default/zuul-launcher
-      register: debian_zuul_launcher_service_config_stat
+        path: /etc/default/zuul-executor
+      register: debian_zuul_executor_service_config_stat
       when: ansible_os_family == 'Debian'
 
-    - name: Assert debian_zuul_launcher_service_config_stat tests.
+    - name: Assert debian_zuul_executor_service_config_stat tests.
       assert:
         that:
-          - debian_zuul_launcher_service_config_stat.stat.exists
-          - debian_zuul_launcher_service_config_stat.stat.isreg
-          - debian_zuul_launcher_service_config_stat.stat.pw_name == 'root'
-          - debian_zuul_launcher_service_config_stat.stat.gr_name == 'root'
-          - debian_zuul_launcher_service_config_stat.stat.mode == '0644'
+          - debian_zuul_executor_service_config_stat.stat.exists
+          - debian_zuul_executor_service_config_stat.stat.isreg
+          - debian_zuul_executor_service_config_stat.stat.pw_name == 'root'
+          - debian_zuul_executor_service_config_stat.stat.gr_name == 'root'
+          - debian_zuul_executor_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
     - name: Register /etc/init.d/zuul-merger
@@ -234,38 +234,38 @@
           - debian_zuul_scheduler_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
-    - name: Register /etc/systemd/system/zuul-launcher.service
+    - name: Register /etc/systemd/system/zuul-executor.service
       stat:
-        path: /etc/systemd/system/zuul-launcher.service
-      register: _zuul_launcher_service_systemd_stat
+        path: /etc/systemd/system/zuul-executor.service
+      register: _zuul_executor_service_systemd_stat
       when: (ansible_os_family == 'RedHat') or
             (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert _zuul_launcher_service_systemd_stat tests.
+    - name: Assert _zuul_executor_service_systemd_stat tests.
       assert:
         that:
-          - _zuul_launcher_service_systemd_stat.stat.exists
-          - _zuul_launcher_service_systemd_stat.stat.isreg
-          - _zuul_launcher_service_systemd_stat.stat.pw_name == 'root'
-          - _zuul_launcher_service_systemd_stat.stat.gr_name == 'root'
-          - _zuul_launcher_service_systemd_stat.stat.mode == '0644'
+          - _zuul_executor_service_systemd_stat.stat.exists
+          - _zuul_executor_service_systemd_stat.stat.isreg
+          - _zuul_executor_service_systemd_stat.stat.pw_name == 'root'
+          - _zuul_executor_service_systemd_stat.stat.gr_name == 'root'
+          - _zuul_executor_service_systemd_stat.stat.mode == '0644'
       when: (ansible_os_family == 'RedHat') or
             (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Register /etc/sysconfig/zuul-launcher
+    - name: Register /etc/sysconfig/zuul-executor
       stat:
-        path: /etc/sysconfig/zuul-launcher
-      register: redhat_zuul_launcher_service_config_stat
+        path: /etc/sysconfig/zuul-executor
+      register: redhat_zuul_executor_service_config_stat
       when: ansible_os_family == 'RedHat'
 
-    - name: Assert redhat_zuul_launcher_service_config_stat tests.
+    - name: Assert redhat_zuul_executor_service_config_stat tests.
       assert:
         that:
-          - redhat_zuul_launcher_service_config_stat.stat.exists
-          - redhat_zuul_launcher_service_config_stat.stat.isreg
-          - redhat_zuul_launcher_service_config_stat.stat.pw_name == 'root'
-          - redhat_zuul_launcher_service_config_stat.stat.gr_name == 'root'
-          - redhat_zuul_launcher_service_config_stat.stat.mode == '0644'
+          - redhat_zuul_executor_service_config_stat.stat.exists
+          - redhat_zuul_executor_service_config_stat.stat.isreg
+          - redhat_zuul_executor_service_config_stat.stat.pw_name == 'root'
+          - redhat_zuul_executor_service_config_stat.stat.gr_name == 'root'
+          - redhat_zuul_executor_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
     - name: Register /etc/systemd/system/zuul-merger.service
@@ -336,9 +336,9 @@
           - redhat_zuul_scheduler_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
-    - name: Ensure zuul-launcher is running.
+    - name: Ensure zuul-executor is running.
       become: yes
-      shell: /usr/sbin/service zuul-launcher status
+      shell: /usr/sbin/service zuul-executor status
       tags: skip_ansible_lint
 
     - name: Ensure zuul-merger is running.
diff --git a/vars/redhat.yaml b/vars/redhat.yaml
index 94cce3f..1cd07ee 100644
--- a/vars/redhat.yaml
+++ b/vars/redhat.yaml
@@ -18,13 +18,13 @@ __zuul_build_depends:
   - git
   - python-devel
 
-__zuul_file_zuul_launcher_service_dest: /etc/systemd/system/zuul-launcher.service
-__zuul_file_zuul_launcher_service_mode: 0644
-__zuul_file_zuul_launcher_service_src: etc/systemd/system/zuul-launcher.service.centos-7
+__zuul_file_zuul_executor_service_dest: /etc/systemd/system/zuul-executor.service
+__zuul_file_zuul_executor_service_mode: 0644
+__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service.centos-7
 
-__zuul_file_zuul_launcher_service_config_dest: /etc/sysconfig/zuul-launcher
-__zuul_file_zuul_launcher_service_config_mode: 0644
-__zuul_file_zuul_launcher_service_config_src: etc/sysconfig/zuul-launcher
+__zuul_file_zuul_executor_service_config_dest: /etc/sysconfig/zuul-executor
+__zuul_file_zuul_executor_service_config_mode: 0644
+__zuul_file_zuul_executor_service_config_src: etc/sysconfig/zuul-executor
 
 __zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service
 __zuul_file_zuul_merger_service_mode: 0644
diff --git a/vars/ubuntu-trusty.yaml b/vars/ubuntu-trusty.yaml
index 0352df6..bf0ecc5 100644
--- a/vars/ubuntu-trusty.yaml
+++ b/vars/ubuntu-trusty.yaml
@@ -17,13 +17,13 @@ __zuul_build_depends:
   - git
   - python-dev
 
-__zuul_file_zuul_launcher_service_dest: /etc/init.d/zuul-launcher
-__zuul_file_zuul_launcher_service_mode: 0755
-__zuul_file_zuul_launcher_service_src: etc/init.d/zuul-launcher
+__zuul_file_zuul_executor_service_dest: /etc/init.d/zuul-executor
+__zuul_file_zuul_executor_service_mode: 0755
+__zuul_file_zuul_executor_service_src: etc/init.d/zuul-executor
 
-__zuul_file_zuul_launcher_service_config_dest: /etc/default/zuul-launcher
-__zuul_file_zuul_launcher_service_config_mode: 0644
-__zuul_file_zuul_launcher_service_config_src: etc/default/zuul-launcher
+__zuul_file_zuul_executor_service_config_dest: /etc/default/zuul-executor
+__zuul_file_zuul_executor_service_config_mode: 0644
+__zuul_file_zuul_executor_service_config_src: etc/default/zuul-executor
 
 __zuul_file_zuul_merger_service_dest: /etc/init.d/zuul-merger
 __zuul_file_zuul_merger_service_mode: 0755
diff --git a/vars/ubuntu-xenial.yaml b/vars/ubuntu-xenial.yaml
index 36cec07..6cecaa9 100644
--- a/vars/ubuntu-xenial.yaml
+++ b/vars/ubuntu-xenial.yaml
@@ -17,13 +17,13 @@ __zuul_build_depends:
   - git
   - python-dev
 
-__zuul_file_zuul_launcher_service_dest: /etc/systemd/system/zuul-launcher.service
-__zuul_file_zuul_launcher_service_mode: 0644
-__zuul_file_zuul_launcher_service_src: etc/systemd/system/zuul-launcher.service.ubuntu-xenial
+__zuul_file_zuul_executor_service_dest: /etc/systemd/system/zuul-executor.service
+__zuul_file_zuul_executor_service_mode: 0644
+__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service.ubuntu-xenial
 
-__zuul_file_zuul_launcher_service_config_dest: /etc/default/zuul-launcher
-__zuul_file_zuul_launcher_service_config_mode: 0644
-__zuul_file_zuul_launcher_service_config_src: etc/default/zuul-launcher
+__zuul_file_zuul_executor_service_config_dest: /etc/default/zuul-executor
+__zuul_file_zuul_executor_service_config_mode: 0644
+__zuul_file_zuul_executor_service_config_src: etc/default/zuul-executor
 
 __zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service
 __zuul_file_zuul_merger_service_mode: 0644