diff --git a/bindep.txt b/bindep.txt
index 3e30527..fe28f49 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -6,3 +6,4 @@ libffi-devel [platform:rpm]
 libselinux-python [platform:rpm]
 libssl-dev [platform:dpkg]
 openssl-devel [platform:rpm]
+python2-dnf [platform:fedora]
diff --git a/defaults/main.yaml b/defaults/main.yaml
index f9b00c1..1b261bf 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -48,11 +48,11 @@ zuul_file_merger_logging_conf_mode: 0644
 zuul_file_merger_logging_conf_owner: "{{ zuul_user_name }}"
 zuul_file_merger_logging_conf_src: etc/zuul/merger-logging.conf
 
-zuul_file_server_logging_conf_dest: /etc/zuul/server-logging.conf
-zuul_file_server_logging_conf_group: "{{ zuul_user_group }}"
-zuul_file_server_logging_conf_mode: 0644
-zuul_file_server_logging_conf_owner: "{{ zuul_user_name }}"
-zuul_file_server_logging_conf_src: etc/zuul/server-logging.conf
+zuul_file_scheduler_logging_conf_dest: /etc/zuul/scheduler-logging.conf
+zuul_file_scheduler_logging_conf_group: "{{ zuul_user_group }}"
+zuul_file_scheduler_logging_conf_mode: 0644
+zuul_file_scheduler_logging_conf_owner: "{{ zuul_user_name }}"
+zuul_file_scheduler_logging_conf_src: etc/zuul/scheduler-logging.conf
 
 zuul_file_zuul_conf_dest: /etc/zuul/zuul.conf
 zuul_file_zuul_conf_group: "{{ zuul_user_group }}"
@@ -63,7 +63,7 @@ zuul_file_zuul_conf_src: etc/zuul/zuul.conf
 # tasks/install.yaml
 zuul_git_dest: /opt/ansible-role-zuul/git/openstack-infra/zuul
 zuul_git_uri: https://git.openstack.org/openstack-infra/zuul
-zuul_git_version: master
+zuul_git_version: feature/zuulv3
 
 zuul_install_method: git
 
@@ -85,11 +85,11 @@ zuul_file_zuul_merger_service_owner: root
 zuul_file_zuul_merger_service_config_group: root
 zuul_file_zuul_merger_service_config_owner: root
 
-zuul_file_zuul_server_service_group: root
-zuul_file_zuul_server_service_owner: root
+zuul_file_zuul_scheduler_service_group: root
+zuul_file_zuul_scheduler_service_owner: root
 
-zuul_file_zuul_server_service_config_group: root
-zuul_file_zuul_server_service_config_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
@@ -101,7 +101,7 @@ zuul_service_zuul_merger_manage: true
 zuul_service_zuul_merger_name: zuul-merger
 zuul_service_zuul_merger_state: started
 
-zuul_service_zuul_server_enabled: yes
-zuul_service_zuul_server_manage: true
-zuul_service_zuul_server_name: zuul-server
-zuul_service_zuul_server_state: started
+zuul_service_zuul_scheduler_enabled: yes
+zuul_service_zuul_scheduler_manage: true
+zuul_service_zuul_scheduler_name: zuul-scheduler
+zuul_service_zuul_scheduler_state: started
diff --git a/files/etc/default/zuul-server b/files/etc/default/zuul-scheduler
similarity index 57%
rename from files/etc/default/zuul-server
rename to files/etc/default/zuul-scheduler
index 40a97c5..3482b32 100644
--- a/files/etc/default/zuul-server
+++ b/files/etc/default/zuul-scheduler
@@ -2,9 +2,9 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
-# The prefix used when zuul-server was installed. Be sure to update this value
+# The prefix used when zuul-scheduler was installed. Be sure to update this value
 # if you are using a virtualenv.
 PREFIX=/usr/local
 
-# The user used to start zuul-server service.
+# The user used to start zuul-scheduler service.
 RUNASUSER=zuul
diff --git a/files/etc/init.d/zuul-server b/files/etc/init.d/zuul-scheduler
similarity index 97%
rename from files/etc/init.d/zuul-server
rename to files/etc/init.d/zuul-scheduler
index 3111706..11f8fe6 100644
--- a/files/etc/init.d/zuul-server
+++ b/files/etc/init.d/zuul-scheduler
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zuul-server
+# Provides:          zuul-scheduler
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -12,14 +12,14 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Zuul"
-NAME=zuul-server
+NAME=zuul-scheduler
 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-server
+DAEMON=$PREFIX/bin/zuul-scheduler
 USER=${RUNASUSER:-zuul}
 
 # Exit if the package is not installed
diff --git a/files/etc/sysconfig/zuul-server b/files/etc/sysconfig/zuul-scheduler
similarity index 65%
rename from files/etc/sysconfig/zuul-server
rename to files/etc/sysconfig/zuul-scheduler
index 9f77105..d1c582f 100644
--- a/files/etc/sysconfig/zuul-server
+++ b/files/etc/sysconfig/zuul-scheduler
@@ -2,6 +2,6 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
-# The prefix used when zuul-server was installed. Be sure to update this value
+# The prefix used when zuul-scheduler was installed. Be sure to update this value
 # if you are using a virtualenv.
 PREFIX=/usr
diff --git a/files/etc/systemd/system/zuul-server.service.centos-7 b/files/etc/systemd/system/zuul-scheduler.service.centos-7
similarity index 53%
rename from files/etc/systemd/system/zuul-server.service.centos-7
rename to files/etc/systemd/system/zuul-scheduler.service.centos-7
index 0e0b3c1..228f4e0 100644
--- a/files/etc/systemd/system/zuul-server.service.centos-7
+++ b/files/etc/systemd/system/zuul-scheduler.service.centos-7
@@ -1,13 +1,13 @@
 [Unit]
-Description=Zuul Server Service
+Description=Zuul Scheduler Service
 After=syslog.target network.target
 
 [Service]
 Type=simple
 User=zuul
 Group=zuul
-EnvironmentFile=-/etc/sysconfig/zuul-server
-ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-server -d"
+EnvironmentFile=-/etc/sysconfig/zuul-scheduler
+ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d"
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/files/etc/systemd/system/zuul-server.service.ubuntu-xenial b/files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial
similarity index 54%
rename from files/etc/systemd/system/zuul-server.service.ubuntu-xenial
rename to files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial
index 9843bf4..adaf548 100644
--- a/files/etc/systemd/system/zuul-server.service.ubuntu-xenial
+++ b/files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial
@@ -1,13 +1,13 @@
 [Unit]
-Description=Zuul Server Service
+Description=Zuul Scheduler Service
 After=syslog.target network.target
 
 [Service]
 Type=simple
 User=zuul
 Group=zuul
-EnvironmentFile=-/etc/default/zuul-server
-ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-server -d"
+EnvironmentFile=-/etc/default/zuul-scheduler
+ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d"
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/handlers/main.yaml b/handlers/main.yaml
index e3c8c16..dc42b19 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -30,11 +30,11 @@
         zuul_service_zuul_merger_state == "started" and not
         zuul_service_zuul_merger.changed
 
-- name: Reload zuul-server
+- name: Reload zuul-scheduler
   become: yes
   service:
-    name: zuul-server
+    name: zuul-scheduler
     state: reloaded
-  when: zuul_service_zuul_server_manage and
-        zuul_service_zuul_server_state == "started" and not
-        zuul_service_zuul_server.changed
+  when: zuul_service_zuul_scheduler_manage and
+        zuul_service_zuul_scheduler_state == "started" and not
+        zuul_service_zuul_scheduler.changed
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 6b5478c..a9b5f73 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -32,7 +32,7 @@
     owner: "{{ zuul_file_gearman_logging_conf_owner }}"
     src: "{{ zuul_file_gearman_logging_conf_src }}"
   register: zuul_file_gearman_logging_conf
-  notify: Reload zuul-server
+  notify: Reload zuul-scheduler
 
 - name: Install launcher logging file.
   become: yes
@@ -56,16 +56,16 @@
   register: zuul_file_merger_logging_conf
   notify: Reload zuul-merger
 
-- name: Install server logging file.
+- name: Install scheduler logging file.
   become: yes
   template:
-    dest: "{{ zuul_file_server_logging_conf_dest }}"
-    group: "{{ zuul_file_server_logging_conf_group }}"
-    mode: "{{ zuul_file_server_logging_conf_mode }}"
-    owner: "{{ zuul_file_server_logging_conf_owner }}"
-    src: "{{ zuul_file_server_logging_conf_src }}"
-  register: zuul_file_server_logging_conf
-  notify: Reload zuul-server
+    dest: "{{ zuul_file_scheduler_logging_conf_dest }}"
+    group: "{{ zuul_file_scheduler_logging_conf_group }}"
+    mode: "{{ zuul_file_scheduler_logging_conf_mode }}"
+    owner: "{{ zuul_file_scheduler_logging_conf_owner }}"
+    src: "{{ zuul_file_scheduler_logging_conf_src }}"
+  register: zuul_file_scheduler_logging_conf
+  notify: Reload zuul-scheduler
 
 - name: Install layout configuration.
   become: yes
@@ -76,7 +76,7 @@
     owner: "{{ zuul_file_layout_owner }}"
     src: "{{ zuul_file_layout_src }}"
   register: zuul_file_layout
-  notify: Reload zuul-server
+  notify: Reload zuul-scheduler
 
 - name: Install zuul configuration.
   become: yes
@@ -90,4 +90,4 @@
   notify:
     - Reload zuul-launcher
     - Reload zuul-merger
-    - Reload zuul-server
+    - Reload zuul-scheduler
diff --git a/tasks/service.yaml b/tasks/service.yaml
index eda4783..a343ab4 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -72,35 +72,35 @@
     zuul_file_zuul_merger_service_config_src: "{{ __zuul_file_zuul_merger_service_config_src }}"
   when: zuul_file_zuul_merger_service_config_src is not defined
 
-- name: Define zuul_file_zuul_server_service_dest.
+- name: Define zuul_file_zuul_scheduler_service_dest.
   set_fact:
-    zuul_file_zuul_server_service_dest: "{{ __zuul_file_zuul_server_service_dest }}"
-  when: zuul_file_zuul_server_service_dest is not defined
+    zuul_file_zuul_scheduler_service_dest: "{{ __zuul_file_zuul_scheduler_service_dest }}"
+  when: zuul_file_zuul_scheduler_service_dest is not defined
 
-- name: Define zuul_file_zuul_server_service_mode.
+- name: Define zuul_file_zuul_scheduler_service_mode.
   set_fact:
-    zuul_file_zuul_server_service_mode: "{{ __zuul_file_zuul_server_service_mode }}"
-  when: zuul_file_zuul_server_service_mode is not defined
+    zuul_file_zuul_scheduler_service_mode: "{{ __zuul_file_zuul_scheduler_service_mode }}"
+  when: zuul_file_zuul_scheduler_service_mode is not defined
 
-- name: Define zuul_file_zuul_server_service_src.
+- name: Define zuul_file_zuul_scheduler_service_src.
   set_fact:
-    zuul_file_zuul_server_service_src: "{{ __zuul_file_zuul_server_service_src }}"
-  when: zuul_file_zuul_server_service_src is not defined
+    zuul_file_zuul_scheduler_service_src: "{{ __zuul_file_zuul_scheduler_service_src }}"
+  when: zuul_file_zuul_scheduler_service_src is not defined
 
-- name: Define zuul_file_zuul_server_service_config_dest.
+- name: Define zuul_file_zuul_scheduler_service_config_dest.
   set_fact:
-    zuul_file_zuul_server_service_config_dest: "{{ __zuul_file_zuul_server_service_config_dest }}"
-  when: zuul_file_zuul_server_service_config_dest is not defined
+    zuul_file_zuul_scheduler_service_config_dest: "{{ __zuul_file_zuul_scheduler_service_config_dest }}"
+  when: zuul_file_zuul_scheduler_service_config_dest is not defined
 
-- name: Define zuul_file_zuul_server_service_config_mode.
+- name: Define zuul_file_zuul_scheduler_service_config_mode.
   set_fact:
-    zuul_file_zuul_server_service_config_mode: "{{ __zuul_file_zuul_server_service_config_mode }}"
-  when: zuul_file_zuul_server_service_config_mode is not defined
+    zuul_file_zuul_scheduler_service_config_mode: "{{ __zuul_file_zuul_scheduler_service_config_mode }}"
+  when: zuul_file_zuul_scheduler_service_config_mode is not defined
 
-- name: Define zuul_file_zuul_server_service_config_src.
+- name: Define zuul_file_zuul_scheduler_service_config_src.
   set_fact:
-    zuul_file_zuul_server_service_config_src: "{{ __zuul_file_zuul_server_service_config_src }}"
-  when: zuul_file_zuul_server_service_config_src is not defined
+    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.
   become: yes
@@ -142,25 +142,25 @@
     src: "{{ zuul_file_zuul_merger_service_config_src }}"
   register: zuul_file_zuul_merger_service_config
 
-- name: Copy zuul-server service into place.
+- name: Copy zuul-scheduler service into place.
   become: yes
   copy:
-    dest: "{{ zuul_file_zuul_server_service_dest }}"
-    group: "{{ zuul_file_zuul_server_service_group }}"
-    mode: "{{ zuul_file_zuul_server_service_mode }}"
-    owner: "{{ zuul_file_zuul_server_service_owner }}"
-    src: "{{ zuul_file_zuul_server_service_src }}"
-  register: zuul_file_zuul_server_service
+    dest: "{{ zuul_file_zuul_scheduler_service_dest }}"
+    group: "{{ zuul_file_zuul_scheduler_service_group }}"
+    mode: "{{ zuul_file_zuul_scheduler_service_mode }}"
+    owner: "{{ zuul_file_zuul_scheduler_service_owner }}"
+    src: "{{ zuul_file_zuul_scheduler_service_src }}"
+  register: zuul_file_zuul_scheduler_service
 
-- name: Copy zuul-server service config into place.
+- name: Copy zuul-scheduler service config into place.
   become: yes
   copy:
-    dest: "{{ zuul_file_zuul_server_service_config_dest }}"
-    group: "{{ zuul_file_zuul_server_service_config_group }}"
-    mode: "{{ zuul_file_zuul_server_service_config_mode }}"
-    owner: "{{ zuul_file_zuul_server_service_config_owner }}"
-    src: "{{ zuul_file_zuul_server_service_config_src }}"
-  register: zuul_file_zuul_server_service_config
+    dest: "{{ zuul_file_zuul_scheduler_service_config_dest }}"
+    group: "{{ zuul_file_zuul_scheduler_service_config_group }}"
+    mode: "{{ zuul_file_zuul_scheduler_service_config_mode }}"
+    owner: "{{ zuul_file_zuul_scheduler_service_config_owner }}"
+    src: "{{ zuul_file_zuul_scheduler_service_config_src }}"
+  register: zuul_file_zuul_scheduler_service_config
 
 - name: Enable zuul-launcher service.
   become: yes
@@ -180,11 +180,11 @@
   register: zuul_service_zuul_merger
   when: zuul_service_zuul_merger_manage
 
-- name: Enable zuul-server service.
+- name: Enable zuul-scheduler service.
   become: yes
   service:
-    enabled: "{{ zuul_service_zuul_server_enabled }}"
-    name: "{{ zuul_service_zuul_server_name }}"
-    state: "{{ zuul_service_zuul_server_state }}"
-  register: zuul_service_zuul_server
-  when: zuul_service_zuul_server_manage
+    enabled: "{{ zuul_service_zuul_scheduler_enabled }}"
+    name: "{{ zuul_service_zuul_scheduler_name }}"
+    state: "{{ zuul_service_zuul_scheduler_state }}"
+  register: zuul_service_zuul_scheduler
+  when: zuul_service_zuul_scheduler_manage
diff --git a/templates/etc/zuul/server-logging.conf b/templates/etc/zuul/scheduler-logging.conf
similarity index 89%
rename from templates/etc/zuul/server-logging.conf
rename to templates/etc/zuul/scheduler-logging.conf
index 742ba13..a3d451e 100644
--- a/templates/etc/zuul/server-logging.conf
+++ b/templates/etc/zuul/scheduler-logging.conf
@@ -36,13 +36,13 @@ args=(sys.stdout,)
 level=DEBUG
 class=logging.handlers.WatchedFileHandler
 formatter=simple
-args=('/var/log/zuul/server-debug.log',)
+args=('/var/log/zuul/scheduler-debug.log',)
 
 [handler_normal]
 level=INFO
 class=logging.handlers.WatchedFileHandler
 formatter=simple
-args=('/var/log/zuul/server.log',)
+args=('/var/log/zuul/scheduler.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 6cf6a47..0c322a9 100644
--- a/templates/etc/zuul/zuul.conf
+++ b/templates/etc/zuul/zuul.conf
@@ -18,8 +18,8 @@ user = zuul
 
 [zuul]
 layout_config = /etc/zuul/config/layout.yaml
-log_config = /etc/zuul/server-logging.conf
-pidfile = /var/run/zuul-server/zuul-server.pid
+log_config = /etc/zuul/scheduler-logging.conf
+pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid
 state_dir = /var/lib/zuul
 
 [launcher]
diff --git a/tests/test.yaml b/tests/test.yaml
index b6b9092..987eaec 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -33,18 +33,18 @@
           - zuul_file_gearman_logging_conf
           - zuul_file_launcher_logging_conf
           - zuul_file_merger_logging_conf
-          - zuul_file_server_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_merger_service
           - zuul_file_zuul_merger_service_config
-          - zuul_file_zuul_server_service
-          - zuul_file_zuul_server_service_config
+          - zuul_file_zuul_scheduler_service
+          - zuul_file_zuul_scheduler_service_config
           - zuul_service_zuul_launcher
           - zuul_service_zuul_merger
-          - zuul_service_zuul_server
+          - zuul_service_zuul_scheduler
 
     - name: Ensure zuul_user_name is zuul.
       shell: /usr/bin/getent passwd zuul
@@ -198,40 +198,40 @@
           - debian_zuul_merger_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
-    - name: Register /etc/init.d/zuul-server
+    - name: Register /etc/init.d/zuul-scheduler
       stat:
-        path: /etc/init.d/zuul-server
-      register: _zuul_server_service_initd_stat
+        path: /etc/init.d/zuul-scheduler
+      register: _zuul_scheduler_service_initd_stat
       when:
         - ansible_distribution == 'Ubuntu'
         - ansible_distribution_release == 'trusty'
 
-    - name: Assert _zuul_server_service_initd_stat tests.
+    - name: Assert _zuul_scheduler_service_initd_stat tests.
       assert:
         that:
-          - _zuul_server_service_initd_stat.stat.exists
-          - _zuul_server_service_initd_stat.stat.isreg
-          - _zuul_server_service_initd_stat.stat.pw_name == 'root'
-          - _zuul_server_service_initd_stat.stat.gr_name == 'root'
-          - _zuul_server_service_initd_stat.stat.mode == '0755'
+          - _zuul_scheduler_service_initd_stat.stat.exists
+          - _zuul_scheduler_service_initd_stat.stat.isreg
+          - _zuul_scheduler_service_initd_stat.stat.pw_name == 'root'
+          - _zuul_scheduler_service_initd_stat.stat.gr_name == 'root'
+          - _zuul_scheduler_service_initd_stat.stat.mode == '0755'
       when:
         - ansible_distribution == 'Ubuntu'
         - ansible_distribution_release == 'trusty'
 
-    - name: Register /etc/default/zuul-server
+    - name: Register /etc/default/zuul-scheduler
       stat:
-        path: /etc/default/zuul-server
-      register: debian_zuul_server_service_config_stat
+        path: /etc/default/zuul-scheduler
+      register: debian_zuul_scheduler_service_config_stat
       when: ansible_os_family == 'Debian'
 
-    - name: Assert debian_zuul_server_service_config_stat tests.
+    - name: Assert debian_zuul_scheduler_service_config_stat tests.
       assert:
         that:
-          - debian_zuul_server_service_config_stat.stat.exists
-          - debian_zuul_server_service_config_stat.stat.isreg
-          - debian_zuul_server_service_config_stat.stat.pw_name == 'root'
-          - debian_zuul_server_service_config_stat.stat.gr_name == 'root'
-          - debian_zuul_server_service_config_stat.stat.mode == '0644'
+          - debian_zuul_scheduler_service_config_stat.stat.exists
+          - debian_zuul_scheduler_service_config_stat.stat.isreg
+          - debian_zuul_scheduler_service_config_stat.stat.pw_name == 'root'
+          - debian_zuul_scheduler_service_config_stat.stat.gr_name == 'root'
+          - debian_zuul_scheduler_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'Debian'
 
     - name: Register /etc/systemd/system/zuul-launcher.service
@@ -302,38 +302,38 @@
           - redhat_zuul_merger_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
-    - name: Register /etc/systemd/system/zuul-server.service
+    - name: Register /etc/systemd/system/zuul-scheduler.service
       stat:
-        path: /etc/systemd/system/zuul-server.service
-      register: _zuul_server_service_systemd_stat
+        path: /etc/systemd/system/zuul-scheduler.service
+      register: _zuul_scheduler_service_systemd_stat
       when: (ansible_os_family == 'RedHat') or
             (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
 
-    - name: Assert _zuul_server_service_systemd_stat tests.
+    - name: Assert _zuul_scheduler_service_systemd_stat tests.
       assert:
         that:
-          - _zuul_server_service_systemd_stat.stat.exists
-          - _zuul_server_service_systemd_stat.stat.isreg
-          - _zuul_server_service_systemd_stat.stat.pw_name == 'root'
-          - _zuul_server_service_systemd_stat.stat.gr_name == 'root'
-          - _zuul_server_service_systemd_stat.stat.mode == '0644'
+          - _zuul_scheduler_service_systemd_stat.stat.exists
+          - _zuul_scheduler_service_systemd_stat.stat.isreg
+          - _zuul_scheduler_service_systemd_stat.stat.pw_name == 'root'
+          - _zuul_scheduler_service_systemd_stat.stat.gr_name == 'root'
+          - _zuul_scheduler_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-server
+    - name: Register /etc/sysconfig/zuul-scheduler
       stat:
-        path: /etc/sysconfig/zuul-server
-      register: redhat_zuul_server_service_config_stat
+        path: /etc/sysconfig/zuul-scheduler
+      register: redhat_zuul_scheduler_service_config_stat
       when: ansible_os_family == 'RedHat'
 
-    - name: Assert redhat_zuul_server_service_config_stat tests.
+    - name: Assert redhat_zuul_scheduler_service_config_stat tests.
       assert:
         that:
-          - redhat_zuul_server_service_config_stat.stat.exists
-          - redhat_zuul_server_service_config_stat.stat.isreg
-          - redhat_zuul_server_service_config_stat.stat.pw_name == 'root'
-          - redhat_zuul_server_service_config_stat.stat.gr_name == 'root'
-          - redhat_zuul_server_service_config_stat.stat.mode == '0644'
+          - redhat_zuul_scheduler_service_config_stat.stat.exists
+          - redhat_zuul_scheduler_service_config_stat.stat.isreg
+          - redhat_zuul_scheduler_service_config_stat.stat.pw_name == 'root'
+          - redhat_zuul_scheduler_service_config_stat.stat.gr_name == 'root'
+          - redhat_zuul_scheduler_service_config_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure zuul-launcher is running.
@@ -346,7 +346,7 @@
       shell: /usr/sbin/service zuul-merger status
       tags: skip_ansible_lint
 
-    - name: Ensure zuul-server is running.
+    - name: Ensure zuul-scheduler is running.
       become: yes
-      shell: /usr/sbin/service zuul-server status
+      shell: /usr/sbin/service zuul-scheduler status
       tags: skip_ansible_lint
diff --git a/vars/redhat.yaml b/vars/redhat.yaml
index d5df2e8..94cce3f 100644
--- a/vars/redhat.yaml
+++ b/vars/redhat.yaml
@@ -34,10 +34,10 @@ __zuul_file_zuul_merger_service_config_dest: /etc/sysconfig/zuul-merger
 __zuul_file_zuul_merger_service_config_mode: 0644
 __zuul_file_zuul_merger_service_config_src: etc/sysconfig/zuul-merger
 
-__zuul_file_zuul_server_service_dest: /etc/systemd/system/zuul-server.service
-__zuul_file_zuul_server_service_mode: 0644
-__zuul_file_zuul_server_service_src: etc/systemd/system/zuul-server.service.centos-7
+__zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service
+__zuul_file_zuul_scheduler_service_mode: 0644
+__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service.centos-7
 
-__zuul_file_zuul_server_service_config_dest: /etc/sysconfig/zuul-server
-__zuul_file_zuul_server_service_config_mode: 0644
-__zuul_file_zuul_server_service_config_src: etc/sysconfig/zuul-server
+__zuul_file_zuul_scheduler_service_config_dest: /etc/sysconfig/zuul-scheduler
+__zuul_file_zuul_scheduler_service_config_mode: 0644
+__zuul_file_zuul_scheduler_service_config_src: etc/sysconfig/zuul-scheduler
diff --git a/vars/ubuntu-trusty.yaml b/vars/ubuntu-trusty.yaml
index da12ee2..0352df6 100644
--- a/vars/ubuntu-trusty.yaml
+++ b/vars/ubuntu-trusty.yaml
@@ -33,10 +33,10 @@ __zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger
 __zuul_file_zuul_merger_service_config_mode: 0644
 __zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger
 
-__zuul_file_zuul_server_service_dest: /etc/init.d/zuul-server
-__zuul_file_zuul_server_service_mode: 0755
-__zuul_file_zuul_server_service_src: etc/init.d/zuul-server
+__zuul_file_zuul_scheduler_service_dest: /etc/init.d/zuul-scheduler
+__zuul_file_zuul_scheduler_service_mode: 0755
+__zuul_file_zuul_scheduler_service_src: etc/init.d/zuul-scheduler
 
-__zuul_file_zuul_server_service_config_dest: /etc/default/zuul-server
-__zuul_file_zuul_server_service_config_mode: 0644
-__zuul_file_zuul_server_service_config_src: etc/default/zuul-server
+__zuul_file_zuul_scheduler_service_config_dest: /etc/default/zuul-scheduler
+__zuul_file_zuul_scheduler_service_config_mode: 0644
+__zuul_file_zuul_scheduler_service_config_src: etc/default/zuul-scheduler
diff --git a/vars/ubuntu-xenial.yaml b/vars/ubuntu-xenial.yaml
index 9606db9..36cec07 100644
--- a/vars/ubuntu-xenial.yaml
+++ b/vars/ubuntu-xenial.yaml
@@ -33,10 +33,10 @@ __zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger
 __zuul_file_zuul_merger_service_config_mode: 0644
 __zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger
 
-__zuul_file_zuul_server_service_dest: /etc/systemd/system/zuul-server.service
-__zuul_file_zuul_server_service_mode: 0644
-__zuul_file_zuul_server_service_src: etc/systemd/system/zuul-server.service.ubuntu-xenial
+__zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service
+__zuul_file_zuul_scheduler_service_mode: 0644
+__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service.ubuntu-xenial
 
-__zuul_file_zuul_server_service_config_dest: /etc/default/zuul-server
-__zuul_file_zuul_server_service_config_mode: 0644
-__zuul_file_zuul_server_service_config_src: etc/default/zuul-server
+__zuul_file_zuul_scheduler_service_config_dest: /etc/default/zuul-scheduler
+__zuul_file_zuul_scheduler_service_config_mode: 0644
+__zuul_file_zuul_scheduler_service_config_src: etc/default/zuul-scheduler